Merge pull request #34 from MartinDai/feature/springboot-3.x

Upgrade to SpringBoot 3.x and Java 17

Author: MartinDai

.github/workflows/maven.yml

@@ -2,7 +2,9 @@ name: Java CI with Maven
 
 on:
   push:
-    branches: [ master ]
+    branches:
+      - main
+      - 'feature/**'
   pull_request:
     branches: [ master ]
 
@@ -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

.gitignore

@@ -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

docker/README.md

@@ -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服务
 
@@ -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
 

docker/docker-compose-cache.yml

@@ -1,4 +1,3 @@
-version: '3.7'
 services:
   redis:
     image: redis:7.0.3
@@ -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:

docker/docker-compose-consul.yml

@@ -1,4 +1,3 @@
-version: '3.7'
 services:
   consul:
     image: consul:1.12.2

docker/docker-compose-es.yml docker/docker-compose-elasticsearch.ymldocker/docker-compose-es.yml renamed to docker/docker-compose-elasticsearch.yml

@@ -1,4 +1,3 @@
-version: '3.7'
 services:
   elasticsearch-master:
     image: elasticsearch:8.5.3
@@ -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"

docker/docker-compose-monitor.yml

@@ -1,4 +1,3 @@
-version: '3.7'
 services:
   prometheus:
     image: prom/prometheus:v2.31.0
@@ -10,7 +9,7 @@ services:
       - '--config.file=/etc/prometheus/prometheus.yml'
       - '--storage.tsdb.path=/prometheus'
     ports:
-      - 9090:9090
+      - "9090:9090"
     networks:
       - net-monitor
   grafana:
@@ -19,7 +18,7 @@ services:
     volumes:
       - ./grafana:/var/lib/grafana
     ports:
-      - 3000:3000
+      - "3000:3000"
     networks:
       - net-monitor
     depends_on:

docker/docker-compose-mysql.yml

@@ -1,4 +1,3 @@
-version: '3.7'
 services:
   mysql:
     container_name: mysql
@@ -17,7 +16,7 @@ services:
       '--lower-case-table-names=1'
     ]
     ports:
-      - 3306:3306
+      - "3306:3306"
     networks:
       - net-mysql
 networks:

docker/docker-compose-rocketmq.yml

@@ -1,4 +1,3 @@
-version: '3.7'
 services:
   namesrv:
     image: martindai/rocketmq:5.1.0

docker/docker-compose-seata.yml

@@ -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: