From dd7bdf78254c72cf1862974b2ae17c539c5362ac Mon Sep 17 00:00:00 2001 From: zhangbinhub Date: Fri, 28 Mar 2025 18:08:06 +0800 Subject: [PATCH] Acp 2025.2.0 --- README.md | 6 +- deploy/docker/middleware/.env | 3 +- deploy/docker/middleware/docker-compose.yaml | 110 +++---------------- doc/atom-server-common-dev.yaml | 2 +- doc/nacos_config_export_dev.zip | Bin 4512 -> 4442 bytes doc/version_history.md | 7 ++ gradle/dependencies.gradle | 4 +- gradle/moduleVersion.gradle | 20 ++-- 8 files changed, 42 insertions(+), 110 deletions(-) diff --git a/README.md b/README.md index 9919cc94..984823fd 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 09e908f6..7ac3d61d 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 ba34c397..572c3984 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 42f34aa8..58e2e4e8 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 GIT binary patch delta 1807 zcmaJ?X#2OUt#9so$OMmwVnX&w0=Cd!F;*9G<}|eWWu*R!$WJ zg+f6+tSFCCBu++73d#@4n1TO6>`++(Ku=WNj{zDo^{E=K8#`ubPW4yGP6gDSQ-|R4 zcTzh2FAkkgA+!$EFfkPsron=QipR<(Cf{J+CT7p(490suKilEE3w9@N7}gJ9Yy4u2^MTeO*)`U;zu(osE(N=RWbt7vwKhM z2rh}$y?fnu9F1AKmy~|@+aG|*9}Eu|u-oQUB?uK~EVT*=n~A8^aJrPE*K3czIqt6U zJuw(@va!`8AF3VH^40ba*Ag|ZTiA~Y?Sjxj+Qr4i-)9%(Y3~lLv0pI{ucXH%{Ph7% z^Hj)x@FgPuGdBi~l)Z{2PjA9Or;OjEu8*$ncbNqvpGs;al z{Y^?mF1sOcUpyOEQB5P!lND!`z2R+R5wJT1Pr>B z`A$I@eLAXHprr#8aldgf3A4-N(~=*q)U_cbzvbUCz>nU&2u)70{Kc+KrW>7=MK~=Q zSEb43@|#$(9}^3NXXM^B_ox0+KsrEM`UIpoI_50G&n)24xTSIDJ1NE-}!N>JX?8VH({cptF!;j6^ zR(qzFvE{Wt1-{ogHoJbHHX?9!g|xOZd*Wo4|K+jef{da!fy`V~%=~P|=vY_P(~3u=ey7QwJOh2FMyk!` z7JknCD1q3(fE~sqF#M`yB#wf4PiSduS1+X>dQ?wv&fYoA>jfcl)J*s=p#Zk(7+ZU% zz|~=qc1qM)8mT02qAx2mflx~7&;-w_bW}Di&~h%gc3TyDk69{4#YPjHZ<}~W*v^^q zx_D>hIslgVC1cSgJ64vHQ1?=~t>gtra~@1q69Bm3RkJ6dg~;2B7ToN8zr|h^;8*e0 zyce<=^it0s@42rBx4njf&bQjSG%~iq_(r~+FWvS!n{_Fo)QRpE!G>Czb;S>;-EPRl z)}FRq7-)doj#MQY!$Hf%?7{QdTYb!f_-_7yyt(A|?v((sQ%6j!I9qOy9eAJuhM?qk z0Lf>$Z~{c&^IRR`?l&Dzb+8xpG7GQhhI(sX`T7J2?5_h^YatIT%sHkK`=^%8kk;RR z;EsTA&ew}6%qyGZQjSYXn7C~3Qq>=>b3CU#MLeV>b5q1=&n!N3pqw|nRM?#OmsVZ~ z!*p41@-^6e>0S!~wfowUU0po*I4}py45b+xQpog%KH>{_f#9^XYs~yM>xx z&%1Nki3yaaMpi-@XIJjiFj{9&k;l_x)^(BfOa?5!Q&<=%i0?mUc+-qFlVKl$EAkB) zw;0=qh^b(f-9PRac|avOzN9aV>W#hB7dGdGjpif|0bpl}0<^@wty)(e1ZqTpK>xd4 z%g3NTpO$JlMN#iFV!-D=qW~p6Fd$vNpf3!zh4;_{!hQE#q6a76A|RXgB4ppoL?>)q zx3Vu0k@Eb}3Dde1i8%bNrVVlSXjw<0`|pNU&$hR(WBj@Kl?rM9N$_LnS5=Bb0=fJ1 zql>bQYAj0EQ!j8WrzB^6;?Vbef)Wg3S_w7H^V*v+IQ()o7`>s^)F72|L0Fb{VT*t> zSSkf9qYC=>RIme4wx13}A&RUdrTt&w>@}3lr;xQW8r;qHP{!#>6R>~m5{kFl`E0e* z`a&ZJL{em*R{Vm8PNmB((N@X=)29s;$!6mzHa(*pspEwMWq@f|_P3mLj1g3`)^? zl-g>vT3bWfB8=K=DQ>HlTnyLq+|Hdp_k2ITbDneF^PKbkc+Z$LT?S!e4*o$H0EI#U zi|ACRdV~__ha;!q97qHBACDReK1&X!2;)S_?IqGAk#Sc3#Pj7!oXz5oD7CQ+B16*d zNq%1t$3jCs-(?HIc$DBlLH(E@F&t!3k+;Yd@x&roL zUZICv^_?*B?h*H%$W*MvOnQ(LEImTnaRX9|=i@ABW#`!H1?s)-xnNO-_3)hffT=(~ zz6td)`xaUf>MJj}bbG>K4oOr^lk254+VbXp9D3LqDVnf8KWIh|4@*+N8c`6MVP*Dn zT_-5R6#?-f)vb7GgxM;SdjntP&t_Uwb=b$_uXM!IN9Dys9*^V6U0(2f9lHxwZ*I_i zKZsVP4mUXq>a((clV9gq7~~Dj9C(n<(qiem5(w?L)XSpkx;{bX9EawfqLnjdRG5L_ zhkpK>idP!X|B*~*=HQIFPoKq$nHs6ma;r2|#oyK>{e$te{G#RyvJS~byguLgj5=0& z7#R-P>|k^lFXe z*yq6?>(n^jXW0 z0m~sGs4L4AWnS#~wzSHs+aE`gL?f|8lDl^g)R^X8dy3@1hvWyg>)LJGK0+XCR2rYPmuP#BAP4u+tMkN$Qsc-*Idb zh8Ms7I2P8b0pqnrqxgJMFtK(fzgSdmw9IT4N}&FEZBn?2lT*FzGilwQn6z4&s!hHO z+->CJH?Qo=dTu9jl0U37Q;k2Zd(8gry-X%CxH(QToFEowZ>I(1oQ7~0E^^q@&5Fdj z(N&+*iMi|AZ@|bI)917`H{e1>oS2;6f*Q>JAnGhiV{r!N&rBJ3fDc`oR`91;sWD@; zRW?eaWtaRpZxUYZMj2V+=R^CzWQwHVYt6-ryAq{b(kct%eDJk_q9BqLaAuo-6#8OQ zmz-9wWu0PS=GHds@GLT%lKj$>i*czeE^}Zp1m&G@X-*ySCBAF0<`}P(BfZhu zYekkyHC}71&`vIG&u%RmUzE2VCW{gB=nW_RAs#cU7ag44_Nr&&yp1_8bgB~6ti%HV zOz{H%|0}Z%lTdfy$s?Tw{Ke1!ss~bx>VIPUSb~YLjbjOJaD__&$$u}0A41gweIh)( zJt92RV*&$ehRz|nu>63bBKzoNVMLBtT?ns=&LiYY+v%rEt9+8OKb^SFEL)x3kqNj$ zS`!Sg)4zA=p42Hov9;B#l;4^%EuA7$oDDMzV7D#i;TtVr0lit#*FAN9 zzE6dxdx5#h-JkoB@242c?{-|+jajDlJDK9wjEA>o+gkz%$-1UDz8P9_{abPR{>_Ba z0hP~g?`_0acS{ZqN#KR9=QYmK4=2w79gzYA2?M@gAF73an diff --git a/doc/version_history.md b/doc/version_history.md index b507a378..6c022e79 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 d73434b6..077476ab 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 076b1474..9c2ad936 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 -- Gitee