Skip to content

Commit

Permalink
Merge pull request #34 from MartinDai/feature/springboot-3.x
Browse files Browse the repository at this point in the history
Upgrade to SpringBoot 3.x and Java 17
  • Loading branch information
MartinDai authored Aug 30, 2024
2 parents 61f0ee8 + 9de85d9 commit 328d4cd
Show file tree
Hide file tree
Showing 70 changed files with 346 additions and 339 deletions.
8 changes: 5 additions & 3 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ name: Java CI with Maven

on:
push:
branches: [ master ]
branches:
- main
- 'feature/**'
pull_request:
branches: [ master ]

Expand All @@ -11,10 +13,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up JDK 8
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: '8'
java-version: '17'
distribution: 'temurin'
- name: Build with Maven
run: ./mvnw -B package --file pom.xml
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,7 @@ target/
/docker/rocketmq/broker/logs/
/docker/rocketmq/namesrv/logs/
/docker/grafana/
/docker/prometheus/data/
/docker/prometheus/data/
/docker/zk/zoo1/data
/docker/zk/zoo2/data
/docker/zk/zoo3/data
8 changes: 4 additions & 4 deletions docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ docker-compose -f docker-compose-consul.yml up -d
```
- 后台管理页面:http://localhost:8500

### Elasticsearch主从集群+Kibana服务+Cerebro服务
### Elasticsearch主从集群+Kibana服务+Elasticvue服务

```bash
docker-compose -f docker-compose-es.yml up -d
docker-compose -f docker-compose-elasticsearch.yml up -d
```
- 注意需要修改当前目录下的`elasticsearch/master/config/elasticsearch.yml``elasticsearch/master/config/elasticsearch.yml`两个文件中的ip为本机内网IP
- 这个组合比较消耗内存,至少保证docker有3.5G的空闲可分配内存再启动
- kibana管理页面:http://localhost:5601
- cerebro管理页面http://localhost:9000
- Elasticvue管理页面http://localhost:18080

### Prometheus+Grafana服务

Expand Down Expand Up @@ -52,7 +52,7 @@ docker-compose -f docker-compose-rocketmq.yml up -d
### Zookeeper集群+zoonavigator服务

```bash
docker-compose -f docker-compose-zk.yml up -d
docker-compose -f docker-compose-zookeeper.yml up -d
```
- zoonavigator管理页面:http://localhost:9000

Expand Down
5 changes: 2 additions & 3 deletions docker/docker-compose-cache.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: '3.7'
services:
redis:
image: redis:7.0.3
Expand All @@ -8,15 +7,15 @@ services:
volumes:
- ./redis/:/etc/redis/
ports:
- 6379:6379
- "6379:6379"
networks:
- net-cache
memcached:
image: memcached:1.6.15
container_name: memcached
restart: always
ports:
- 11211:11211
- "11211:11211"
networks:
- net-cache
networks:
Expand Down
1 change: 0 additions & 1 deletion docker/docker-compose-consul.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: '3.7'
services:
consul:
image: consul:1.12.2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: '3.7'
services:
elasticsearch-master:
image: elasticsearch:8.5.3
Expand Down Expand Up @@ -53,7 +52,7 @@ services:
depends_on:
- elasticsearch-master
elasticvue:
image: cars10/elasticvue:1.0.4
image: cars10/elasticvue:1.0.10
container_name: elasticvue
ports:
- "18080:8080"
Expand Down
5 changes: 2 additions & 3 deletions docker/docker-compose-monitor.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: '3.7'
services:
prometheus:
image: prom/prometheus:v2.31.0
Expand All @@ -10,7 +9,7 @@ services:
- '--config.file=/etc/prometheus/prometheus.yml'
- '--storage.tsdb.path=/prometheus'
ports:
- 9090:9090
- "9090:9090"
networks:
- net-monitor
grafana:
Expand All @@ -19,7 +18,7 @@ services:
volumes:
- ./grafana:/var/lib/grafana
ports:
- 3000:3000
- "3000:3000"
networks:
- net-monitor
depends_on:
Expand Down
3 changes: 1 addition & 2 deletions docker/docker-compose-mysql.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: '3.7'
services:
mysql:
container_name: mysql
Expand All @@ -17,7 +16,7 @@ services:
'--lower-case-table-names=1'
]
ports:
- 3306:3306
- "3306:3306"
networks:
- net-mysql
networks:
Expand Down
1 change: 0 additions & 1 deletion docker/docker-compose-rocketmq.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: '3.7'
services:
namesrv:
image: martindai/rocketmq:5.1.0
Expand Down
5 changes: 2 additions & 3 deletions docker/docker-compose-seata.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
version: '3.7'
services:
seata-server:
image: seataio/seata-server:1.6.0-SNAPSHOT
image: seataio/seata-server:2.0.0
container_name: seata-server
volumes:
- ./seata/config:/root/seata-config
environment:
- SEATA_PORT=8091
- SEATA_CONFIG_NAME=file:/root/seata-config/registry
ports:
- 8091:8091
- "8091:8091"
networks:
- net-seata
networks:
Expand Down
45 changes: 0 additions & 45 deletions docker/docker-compose-zk.yml

This file was deleted.

32 changes: 32 additions & 0 deletions docker/docker-compose-zookeeper.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
services:
zoo1:
image: zookeeper:3.6
container_name: zoo1
environment:
ZOO_MY_ID: 1
volumes:
- "./zk/zoo1/zoo.cfg:/conf/zoo.cfg"
- "./zk/zoo1/data:/data"
network_mode: "host"
zoo2:
image: zookeeper:3.6
container_name: zoo2
environment:
ZOO_MY_ID: 2
volumes:
- "./zk/zoo2/zoo.cfg:/conf/zoo.cfg"
- "./zk/zoo2/data:/data"
network_mode: "host"
zoo3:
image: zookeeper:3.6
container_name: zoo3
environment:
ZOO_MY_ID: 3
volumes:
- "./zk/zoo3/zoo.cfg:/conf/zoo.cfg"
- "./zk/zoo3/data:/data"
network_mode: "host"
zoo-navigator:
image: elkozmon/zoonavigator:1.1.3
container_name: zoo-navigator
network_mode: "host"
13 changes: 10 additions & 3 deletions docker/elasticsearch/master/config/elasticsearch.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
cluster:
name: "springboot-elasticsearch"
initial_master_nodes: "172.16.0.85:9300,172.16.0.85:9301"
initial_master_nodes: "192.168.8.197:9300,192.168.8.197:9301"
routing:
allocation:
disk:
watermark:
low: 90%
high: 95%
node:
name: "master"
network:
bind_host: 0.0.0.0
publish_host: 172.16.0.85
publish_host: 192.168.8.197
http:
port: 9200
cors:
Expand All @@ -14,9 +20,10 @@ http:
transport:
port: 9300
discovery:
seed_hosts: "172.16.0.85:9301"
seed_hosts: "192.168.8.197:9301"
bootstrap:
memory_lock: true
xpack:
security:
enabled: false

14 changes: 10 additions & 4 deletions docker/elasticsearch/slave/config/elasticsearch.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
cluster:
name: "performance-elasticsearch"
initial_master_nodes: "172.16.0.85:9300,172.16.0.85:9301"
name: "springboot-elasticsearch"
initial_master_nodes: "192.168.8.197:9300,192.168.8.197:9301"
routing:
allocation:
disk:
watermark:
low: 90%
high: 95%
node:
name: "slave"
network:
bind_host: 0.0.0.0
publish_host: 172.16.0.85
publish_host: 192.168.8.197
http:
port: 9201
cors:
Expand All @@ -14,7 +20,7 @@ http:
transport:
port: 9301
discovery:
seed_hosts: "172.16.0.85:9300"
seed_hosts: "192.168.8.197:9300"
bootstrap:
memory_lock: true
xpack:
Expand Down
2 changes: 1 addition & 1 deletion docker/rocketmq/broker/conf/broker.conf
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ autoCreateSubscriptionGroup=true

# Broker 对外服务的监听端口
listenPort=10911
brokerIP1=172.16.0.85
brokerIP1=192.168.8.197

# 存储路径
storePathRootDir=/home/rocketmq/store
Expand Down
15 changes: 15 additions & 0 deletions docker/zk/zoo1/zoo.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
tickTime=2000
initLimit=10
syncLimit=5
dataDir=/data
dataLogDir=/datalog
admin.serverPort=8181
# 客户端连接的端口
clientPort=2181
# 集群中的服务器之间通信的端口(通常与leader选举有关)
quorumPort=12888
# 集群中服务器选举leader的端口
electionPort=13888
server.1=127.0.0.1:12888:13888;2181
server.2=127.0.0.1:22888:23888;2182
server.3=127.0.0.1:32888:33888;2183
15 changes: 15 additions & 0 deletions docker/zk/zoo2/zoo.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
tickTime=2000
initLimit=10
syncLimit=5
dataDir=/data
dataLogDir=/datalog
admin.serverPort=8282
# 客户端连接的端口
clientPort=2182
# 集群中的服务器之间通信的端口(通常与leader选举有关)
quorumPort=22888
# 集群中服务器选举leader的端口
electionPort=23888
server.1=127.0.0.1:12888:13888;2181
server.2=127.0.0.1:22888:23888;2182
server.3=127.0.0.1:32888:33888;2183
15 changes: 15 additions & 0 deletions docker/zk/zoo3/zoo.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
tickTime=2000
initLimit=10
syncLimit=5
dataDir=/data
dataLogDir=/datalog
admin.serverPort=8383
# 客户端连接的端口
clientPort=2183
# 集群中的服务器之间通信的端口(通常与leader选举有关)
quorumPort=32888
# 集群中服务器选举leader的端口
electionPort=33888
server.1=127.0.0.1:12888:13888;2181
server.2=127.0.0.1:22888:23888;2182
server.3=127.0.0.1:32888:33888;2183
Loading

0 comments on commit 328d4cd

Please sign in to comment.