diff --git a/README.md b/README.md index 9919cc940e734924a6ae13b5379afaabe85f20c2..984823fddae993f381a5baf41bbd428fb4c6fc39 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # acp-admin-cloud -###### v6.7.1 [版本更新日志](doc/version_history.md) +###### v6.7.2 [版本更新日志](doc/version_history.md) - 使用Application Construction Platform 应用构建平台作为脚手架 - 基于 Spring Cloud 的微服务版本,基于 Spring Boot @@ -10,8 +10,8 @@ ## 相关组件版本 - [Spring Boot 3.4.3](https://projects.spring.io/spring-boot) -- [Spring Boot Admin 3.4.4](https://github.com/codecentric/spring-boot-admin) -- [Acp 2025.0.3](https://gitee.com/zhangbinhub/acp) +- [Spring Boot Admin 3.4.5](https://github.com/codecentric/spring-boot-admin) +- [Acp 2025.2.0](https://gitee.com/zhangbinhub/acp) - [sensitive](https://github.com/houbb/sensitive) ## 技术栈 diff --git a/deploy/docker/middleware/.env b/deploy/docker/middleware/.env index 09e908f69d6cbf494089874e6833cc4fd72989ae..7ac3d61d4bcf37e301d60882d4a0f9f4af4c8c68 100644 --- a/deploy/docker/middleware/.env +++ b/deploy/docker/middleware/.env @@ -1,2 +1 @@ -HOST_MACHINE_IP=10.100.138.14 -MYSQL_HOST=10.100.138.14 \ No newline at end of file +HOST_MACHINE_IP=10.100.137.68 \ No newline at end of file diff --git a/deploy/docker/middleware/docker-compose.yaml b/deploy/docker/middleware/docker-compose.yaml index ba34c39762239bdd4113135d5ca31e3355f6e20b..572c39844d50f4b2711059cdc9ebe71220877d7f 100644 --- a/deploy/docker/middleware/docker-compose.yaml +++ b/deploy/docker/middleware/docker-compose.yaml @@ -14,7 +14,7 @@ services: NACOS_AUTH_IDENTITY_KEY: nacos NACOS_AUTH_IDENTITY_VALUE: nacos SPRING_DATASOURCE_PLATFORM: mysql - MYSQL_SERVICE_HOST: ${MYSQL_HOST} + MYSQL_SERVICE_HOST: mysql MYSQL_SERVICE_PORT: 3306 MYSQL_SERVICE_DB_NAME: nacos MYSQL_SERVICE_USER: root @@ -28,7 +28,7 @@ services: - "9849:9849" - "9555:9555" networks: - - middleware_net + - mysql_net redis-acp: image: redis:7.2.0 @@ -40,7 +40,7 @@ services: - "6379:6379" command: redis-server --port 6379 --requirepass redis --appendonly yes networks: - - middleware_net + - mysql_net # command: redis-server --requirepass ${pwd} --notify-keyspace-events Eglx redisinsight-acp: @@ -52,7 +52,7 @@ services: ports: - "5540:5540" networks: - - middleware_net + - mysql_net zookeeper: image: bitnami/zookeeper:3.8.0 @@ -74,10 +74,10 @@ services: ZOO_CLIENT_PASSWORD: zk_pwd JVMFLAGS: "-Xms1024m -Xmx1024m" networks: - - middleware_net + - mysql_net kafka-1: - image: bitnami/kafka:3.3.1 + image: bitnami/kafka:3.8.0 hostname: kafka-1 container_name: kafka-1 restart: always @@ -93,7 +93,7 @@ services: KAFKA_ZOOKEEPER_PROTOCOL: "PLAINTEXT" KAFKA_ZOOKEEPER_USER: zk KAFKA_ZOOKEEPER_PASSWORD: zk_pwd - KAFKA_CFG_LISTENERS: OUTSIDE://:9091,INTERNAL://:9191 + KAFKA_CFG_LISTENERS: OUTSIDE://0.0.0.0:9091,INTERNAL://:9191 KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP: "OUTSIDE:PLAINTEXT,INTERNAL:PLAINTEXT" KAFKA_CFG_ADVERTISED_LISTENERS: OUTSIDE://${HOST_MACHINE_IP}:9091,INTERNAL://:9191 KAFKA_CFG_INTER_BROKER_LISTENER_NAME: INTERNAL @@ -101,91 +101,17 @@ services: KAFKA_CFG_ZOOKEEPER_CONNECT: "zookeeper:21810" # 非必须,设置保存7天数据,为默认值 KAFKA_CFG_LOG_RETENTION_HOURS: 168 - KAFKA_CFG_NUM_PARTITIONS: 3 - KAFKA_CFG_DEFAULT_REPLICATION_FACTOR: 3 - KAFKA_CFG_OFFSETS_TOPIC_REPLICATION_FACTOR: 3 + KAFKA_CFG_NUM_PARTITIONS: 1 + KAFKA_CFG_DEFAULT_REPLICATION_FACTOR: 1 + KAFKA_CFG_OFFSETS_TOPIC_REPLICATION_FACTOR: 1 KAFKA_CFG_AUTO_CREATE_TOPICS_ENABLE: "true" # KAFKA_HEAP_OPTS: "-Xmx1G -Xms1G" - HOST_MACHINE_IP: ${HOST_MACHINE_IP} - KAFKA_JMX_OPTS: "-Dcom.sun.management.jmxremote.port=9891 -Dcom.sun.management.jmxremote.rmi.port=9991 -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.local.only=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=$HOST_MACHINE_IP" +# HOST_MACHINE_IP: ${HOST_MACHINE_IP} + KAFKA_JMX_OPTS: "-Dcom.sun.management.jmxremote.port=9891 -Dcom.sun.management.jmxremote.rmi.port=9991 -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.local.only=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false" depends_on: - zookeeper networks: - - middleware_net - - kafka-2: - image: bitnami/kafka:3.3.1 - hostname: kafka-2 - container_name: kafka-2 - restart: always - volumes: - - ./kafka/data/kafka-2:/bitnami/kafka/data - ports: - - "9092:9092" - - "9892:9892" - - "9992:9992" - environment: - ALLOW_PLAINTEXT_LISTENER: "yes" - KAFKA_BROKER_ID: 2 - KAFKA_ZOOKEEPER_PROTOCOL: "PLAINTEXT" - KAFKA_ZOOKEEPER_USER: zk - KAFKA_ZOOKEEPER_PASSWORD: zk_pwd - KAFKA_CFG_LISTENERS: OUTSIDE://:9092,INTERNAL://:9192 - KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP: "OUTSIDE:PLAINTEXT,INTERNAL:PLAINTEXT" - KAFKA_CFG_ADVERTISED_LISTENERS: OUTSIDE://${HOST_MACHINE_IP}:9092,INTERNAL://:9192 - KAFKA_CFG_INTER_BROKER_LISTENER_NAME: INTERNAL - # KAFKA_CFG_ADVERTISED_PORT: 9092 - KAFKA_CFG_ZOOKEEPER_CONNECT: "zookeeper:21810" - # 非必须,设置保存7天数据,为默认值 - KAFKA_CFG_LOG_RETENTION_HOURS: 168 - KAFKA_CFG_NUM_PARTITIONS: 3 - KAFKA_CFG_DEFAULT_REPLICATION_FACTOR: 3 - KAFKA_CFG_OFFSETS_TOPIC_REPLICATION_FACTOR: 3 - KAFKA_CFG_AUTO_CREATE_TOPICS_ENABLE: "true" - # KAFKA_HEAP_OPTS: "-Xmx1G -Xms1G" - HOST_MACHINE_IP: ${HOST_MACHINE_IP} - KAFKA_JMX_OPTS: "-Dcom.sun.management.jmxremote.port=9892 -Dcom.sun.management.jmxremote.rmi.port=9992 -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.local.only=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=$HOST_MACHINE_IP" - depends_on: - - zookeeper - networks: - - middleware_net - - kafka-3: - image: bitnami/kafka:3.3.1 - hostname: kafka-3 - container_name: kafka-3 - restart: always - volumes: - - ./kafka/data/kafka-3:/bitnami/kafka/data - ports: - - "9093:9093" - - "9893:9893" - - "9993:9993" - environment: - ALLOW_PLAINTEXT_LISTENER: "yes" - KAFKA_BROKER_ID: 3 - KAFKA_ZOOKEEPER_PROTOCOL: "PLAINTEXT" - KAFKA_ZOOKEEPER_USER: zk - KAFKA_ZOOKEEPER_PASSWORD: zk_pwd - KAFKA_CFG_LISTENERS: OUTSIDE://:9093,INTERNAL://:9193 - KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP: "OUTSIDE:PLAINTEXT,INTERNAL:PLAINTEXT" - KAFKA_CFG_ADVERTISED_LISTENERS: OUTSIDE://${HOST_MACHINE_IP}:9093,INTERNAL://:9193 - KAFKA_CFG_INTER_BROKER_LISTENER_NAME: INTERNAL - # KAFKA_CFG_ADVERTISED_PORT: 9093 - KAFKA_CFG_ZOOKEEPER_CONNECT: "zookeeper:21810" - # 非必须,设置保存7天数据,为默认值 - KAFKA_CFG_LOG_RETENTION_HOURS: 168 - KAFKA_CFG_NUM_PARTITIONS: 3 - KAFKA_CFG_DEFAULT_REPLICATION_FACTOR: 3 - KAFKA_CFG_OFFSETS_TOPIC_REPLICATION_FACTOR: 3 - KAFKA_CFG_AUTO_CREATE_TOPICS_ENABLE: "true" - # KAFKA_HEAP_OPTS: "-Xmx1G -Xms1G" - HOST_MACHINE_IP: ${HOST_MACHINE_IP} - KAFKA_JMX_OPTS: "-Dcom.sun.management.jmxremote.port=9893 -Dcom.sun.management.jmxremote.rmi.port=9993 -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.local.only=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=$HOST_MACHINE_IP" - depends_on: - - zookeeper - networks: - - middleware_net + - mysql_net efak: image: seawenc/efak:3.0.6 @@ -199,7 +125,7 @@ services: depends_on: - zookeeper networks: - - middleware_net + - mysql_net # mysql-zipkin: # image: mysql:8.0.33 @@ -224,7 +150,7 @@ services: ports: - "9411:9411" environment: - - KAFKA_BOOTSTRAP_SERVERS=kafka-1:9191,kafka-2:9192,kafka-3:9193 + - KAFKA_BOOTSTRAP_SERVERS=kafka-1:9191 # - STORAGE_TYPE=mysql # - MYSQL_HOST=mysql-zipkin # - MYSQL_TCP_PORT=3306 @@ -234,7 +160,7 @@ services: - kMEM_MAX_SPANS=100000 # - "JAVA_OPTS=-Xms512m -Xmx2g -XX:+ExitOnOutOfMemoryError" networks: - - middleware_net + - mysql_net networks: - middleware_net: - name: middleware_net \ No newline at end of file + mysql_net: + external: true \ No newline at end of file diff --git a/doc/atom-server-common-dev.yaml b/doc/atom-server-common-dev.yaml index 42f34aa88c319171d5a34ccf4206516453d57d05..58e2e4e869c9f5b4fb1b8dab2bec7d4c08816782 100644 --- a/doc/atom-server-common-dev.yaml +++ b/doc/atom-server-common-dev.yaml @@ -45,7 +45,7 @@ spring: redis: url: redis://:redis@127.0.0.1:6379 kafka: - bootstrap-servers: 127.0.0.1:9091,127.0.0.1:9092,127.0.0.1:9093 + bootstrap-servers: 127.0.0.1:9091 producer: # 0代表:不进行消息接收是否成功的确认(默认值); # 1代表:当Leader副本接收成功后,返回接收成功确认信息; diff --git a/doc/nacos_config_export_dev.zip b/doc/nacos_config_export_dev.zip index f214086fb5e4c7814bbc46e362e6050c432d4358..1b53820553b0c2332086d3c655f001b7c0358e92 100644 Binary files a/doc/nacos_config_export_dev.zip and b/doc/nacos_config_export_dev.zip differ diff --git a/doc/version_history.md b/doc/version_history.md index b507a378829c1be309b15be8b9b494625d804269..6c022e7955fbeeedb89cd7141cd9e598b9623b87 100644 --- a/doc/version_history.md +++ b/doc/version_history.md @@ -1,5 +1,12 @@ ## 版本更新记录 +##### v6.7.2 + +- Global + - [Upgrade] 升级依赖 + - Acp 2025.2.0 + - Spring Boot Admin 3.4.5 + ##### v6.7.1 - Global diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index d73434b67d8f194f052420e0b1e0a607934c8053..077476abbede66f8c6c65edf719e35644850d4c4 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -5,8 +5,8 @@ ext { versions += [ kotlin : "2.1.0", springBoot : "3.4.3", - springBootAdmin : "3.4.4", - acp : "2025.0.3", + springBootAdmin : "3.4.5", + acp : "2025.2.0", sensitive : "1.7.0", sensitiveDeepCopy: "0.0.1", camunda : "7.22.0", diff --git a/gradle/moduleVersion.gradle b/gradle/moduleVersion.gradle index 076b14747d85479b8826513b3cd9509e96425ec3..9c2ad9369f0b1fa3efd8702f9eacf711a0f47813 100644 --- a/gradle/moduleVersion.gradle +++ b/gradle/moduleVersion.gradle @@ -1,30 +1,30 @@ project(':acp-admin-cloud-constant') { - version '6.7.1' + version '6.7.2' } project(':acp-admin-cloud-dependencies') { - version '6.7.1' + version '6.7.2' } project(':acp-admin-cloud-dependencies-resource-server') { - version '6.7.1' + version '6.7.2' } project(':admin-server') { - version '6.7.1' + version '6.7.2' } project(':deploy-server') { - version '6.7.1' + version '6.7.2' } project(':gateway-server') { - version '6.7.1' + version '6.7.2' } project(':log-server') { - version '6.7.1' + version '6.7.2' } project(':oauth-server') { - version '6.7.1' + version '6.7.2' } project(':route-server') { - version '6.7.1' + version '6.7.2' } project(':workflow-server') { - version '6.7.1' + version '6.7.2' } \ No newline at end of file