diff --git a/README.md b/README.md index d7c5730e150e533fa23cd03f3d80291a9a15e3a7..2ce4c0e2c07c31ad074936782d8d55a95331ced0 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # acp-admin-cloud -###### v6.6.0 [版本更新日志](doc/version_history.md) +###### v6.6.1 [版本更新日志](doc/version_history.md) - 使用Application Construction Platform 应用构建平台作为脚手架 - 基于 Spring Cloud 的微服务版本，基于 Spring Boot @@ -11,7 +11,7 @@ - [Spring Boot 3.3.6](https://projects.spring.io/spring-boot) - [Spring Boot Admin 3.3.6](https://github.com/codecentric/spring-boot-admin) -- [Acp 2024.3.1](https://gitee.com/zhangbinhub/acp) +- [Acp 2024.3.2](https://gitee.com/zhangbinhub/acp) - [sensitive](https://github.com/houbb/sensitive) ## 技术栈 diff --git a/build.gradle b/build.gradle index 90ad8e58f36a57b0831e5c6847079830caa63da4..33c754e1a2f626c10710613a85943081fd90d8ea 100644 --- a/build.gradle +++ b/build.gradle @@ -87,6 +87,7 @@ allprojects { javadoc { options.encoding = projectProperties.getProperty('encoding') + options.addStringOption('Xdoclint:none', '-quiet') } kotlin { diff --git a/common/acp-admin-cloud-dependencies-resource-server/build.gradle b/common/acp-admin-cloud-dependencies-resource-server/build.gradle index a943e6bde9d9378f4e16c2114d10b7d6347a379e..37511c2031e9ea69d78e7f83cc391fd231fa64b3 100644 --- a/common/acp-admin-cloud-dependencies-resource-server/build.gradle +++ b/common/acp-admin-cloud-dependencies-resource-server/build.gradle @@ -11,6 +11,7 @@ dependencyManagement { dependencies { api project(":acp-admin-cloud-dependencies") api "io.gitee.zhangbinhub.acp:acp-spring-cloud-starter-resource-server" + annotationProcessor "org.springframework.boot:spring-boot-configuration-processor" testImplementation platform("org.junit:junit-bom") testImplementation("org.junit.jupiter:junit-jupiter") diff --git a/common/acp-admin-cloud-dependencies/build.gradle b/common/acp-admin-cloud-dependencies/build.gradle index d8a04219d6b35f195a05b932fd972180422313ed..8f518a3f8e73d2e9f53aa671b250a470acd6d76b 100644 --- a/common/acp-admin-cloud-dependencies/build.gradle +++ b/common/acp-admin-cloud-dependencies/build.gradle @@ -11,6 +11,7 @@ dependencyManagement { dependencies { api project(":acp-admin-cloud-constant") api "io.gitee.zhangbinhub.acp:acp-spring-cloud-starter" + annotationProcessor "org.springframework.boot:spring-boot-configuration-processor" // 链路追踪 api "io.opentelemetry:opentelemetry-exporter-zipkin" api "io.zipkin.reporter2:zipkin-sender-kafka" diff --git a/common/acp-admin-cloud-dependencies/src/main/java/io/gitee/zhangbinhub/admin/common/conf/ZkClientConfiguration.java b/common/acp-admin-cloud-dependencies/src/main/java/io/gitee/zhangbinhub/admin/common/conf/ZkClientConfiguration.java new file mode 100644 index 0000000000000000000000000000000000000000..453bd42c8b35725b8b052427c64d737bed21506f --- /dev/null +++ b/common/acp-admin-cloud-dependencies/src/main/java/io/gitee/zhangbinhub/admin/common/conf/ZkClientConfiguration.java @@ -0,0 +1,79 @@ +package io.gitee.zhangbinhub.admin.common.conf; + +import org.springframework.boot.context.properties.ConfigurationProperties; + +@ConfigurationProperties(prefix = "acp.cloud.zookeeper") +public class ZkClientConfiguration { + public String getConnect() { + return connect; + } + + public void setConnect(String connect) { + this.connect = connect; + } + + public Boolean getAclEnable() { + return aclEnable; + } + + public void setAclEnable(Boolean aclEnable) { + this.aclEnable = aclEnable; + } + + public String getAclSchema() { + return aclSchema; + } + + public void setAclSchema(String aclSchema) { + this.aclSchema = aclSchema; + } + + public String getAclUsername() { + return aclUsername; + } + + public void setAclUsername(String aclUsername) { + this.aclUsername = aclUsername; + } + + public String getAclPassword() { + return aclPassword; + } + + public void setAclPassword(String aclPassword) { + this.aclPassword = aclPassword; + } + + public Integer getSessionTimeOut() { + return sessionTimeOut; + } + + public void setSessionTimeOut(Integer sessionTimeOut) { + this.sessionTimeOut = sessionTimeOut; + } + + public Integer getConnectionTimeOut() { + return connectionTimeOut; + } + + public void setConnectionTimeOut(Integer connectionTimeOut) { + this.connectionTimeOut = connectionTimeOut; + } + + public Integer getRetryIntervalMs() { + return retryIntervalMs; + } + + public void setRetryIntervalMs(Integer retryIntervalMs) { + this.retryIntervalMs = retryIntervalMs; + } + + private String connect = ""; + private Boolean aclEnable = false; + private String aclSchema = "digest"; + private String aclUsername = ""; + private String aclPassword = ""; + private Integer sessionTimeOut = 60 * 1000; + private Integer connectionTimeOut = 15 * 1000; + private Integer retryIntervalMs = 5000; +} diff --git a/common/acp-admin-cloud-dependencies/src/main/kotlin/io/gitee/zhangbinhub/admin/common/conf/ZkClientConfiguration.kt b/common/acp-admin-cloud-dependencies/src/main/kotlin/io/gitee/zhangbinhub/admin/common/conf/ZkClientConfiguration.kt deleted file mode 100644 index 23e21e7cb833ec46539bdcc9fd0f87b83d87131e..0000000000000000000000000000000000000000 --- a/common/acp-admin-cloud-dependencies/src/main/kotlin/io/gitee/zhangbinhub/admin/common/conf/ZkClientConfiguration.kt +++ /dev/null @@ -1,19 +0,0 @@ -package io.gitee.zhangbinhub.admin.common.conf - -import org.springframework.boot.context.properties.ConfigurationProperties - -/** - * @author zhang by 30/09/2019 - * @since JDK 11 - */ -@ConfigurationProperties(prefix = "acp.cloud.zookeeper") -class ZkClientConfiguration { - var connect: String = "" - var aclEnable: Boolean = false - var aclSchema: String = "digest" - var aclUsername: String = "" - var aclPassword: String = "" - var sessionTimeOut: Int = 60 * 1000 - var connectionTimeOut: Int = 15 * 1000 - var retryIntervalMs: Int = 5000 -} \ No newline at end of file diff --git a/deploy/docker/middleware/.env b/deploy/docker/middleware/.env index 77387a5d2360311b8421d36b8225103e49791cdd..e2323f0280069689f79c7addc19e01a92849b557 100644 --- a/deploy/docker/middleware/.env +++ b/deploy/docker/middleware/.env @@ -1,2 +1,2 @@ -HOST_MACHINE_IP=10.100.107.62 -MYSQL_HOST=10.100.107.62 \ No newline at end of file +HOST_MACHINE_IP=10.100.136.192 +MYSQL_HOST=10.100.136.192 \ No newline at end of file diff --git a/doc/version_history.md b/doc/version_history.md index ef925cb9ffe196b56e064a29f99475e7c1f5d1a5..976e33b2254656b6a44d56dac9c241215ed38846 100644 --- a/doc/version_history.md +++ b/doc/version_history.md @@ -1,5 +1,13 @@ ## 版本更新记录 +##### v6.6.1 + +- Global + - [Upgrade] 升级依赖 + - Acp 2024.3.2 +- acp-admin-cloud-dependencies + - [Upgrade] 配置类改用`java`语言编写 + ##### v6.6.0 - Global diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index e5dcb0db15a88b5fec96a3b6ca5385a169961131..d2f96cfec7c4f00a6d2cb432899b646166f0ee58 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -6,7 +6,7 @@ versions += [ kotlin : "2.1.0", springBoot : "3.3.6", springBootAdmin : "3.3.6", - acp : "2024.3.1", + acp : "2024.3.2", sensitive : "1.7.0", sensitiveDeepCopy: "0.0.1", camunda : "7.22.0", diff --git a/gradle/globalTask.gradle b/gradle/globalTask.gradle index a843dbe1d3e98b5f77b81782b3b9756130d49759..e2392581fa95e56907c67aba6fcc979fd87c9f88 100644 --- a/gradle/globalTask.gradle +++ b/gradle/globalTask.gradle @@ -1,73 +1,20 @@ -tasks.register('publishAll', Exec) { - workingDir "$rootDir" - commandLine "./gradlew", - "acp-admin-cloud-constant:publish", - "acp-admin-cloud-dependencies:publish", - "acp-admin-cloud-dependencies-resource-server:publish" +tasks.register('publishAll') { + dependsOn subprojects.findAll { subproject -> + subproject.name.startsWith('acp-admin-cloud-') + }.collect { ":${it.path}:publish" } } -tasks.register('publishAll_win', Exec) { - workingDir "$rootDir" - commandLine "./gradlew.bat", - "acp-admin-cloud-constant:publish", - "acp-admin-cloud-dependencies:publish", - "acp-admin-cloud-dependencies-resource-server:publish" +tasks.register('publishToMavenLocalAll') { + dependsOn subprojects.findAll { subproject -> + subproject.name.startsWith('acp-admin-cloud-') + }.collect { ":${it.path}:publishToMavenLocal" } } - -tasks.register('publishToMavenLocalAll', Exec) { - workingDir "$rootDir" - commandLine "./gradlew", - "acp-admin-cloud-constant:publishToMavenLocal", - "acp-admin-cloud-dependencies:publishToMavenLocal", - "acp-admin-cloud-dependencies-resource-server:publishToMavenLocal" +tasks.register('buildImageAll') { + dependsOn subprojects.findAll { subproject -> + subproject.name.endsWith('-server') + }.collect { ":${it.path}:buildImage" } } -tasks.register('publishToMavenLocalAll_win', Exec) { - workingDir "$rootDir" - commandLine "./gradlew.bat", - "acp-admin-cloud-constant:publishToMavenLocal", - "acp-admin-cloud-dependencies:publishToMavenLocal", - "acp-admin-cloud-dependencies-resource-server:publishToMavenLocal" -} -tasks.register('buildImageAll', Exec) { - workingDir "$rootDir" - commandLine "./gradlew", - "admin-server:buildImage", - "gateway-server:buildImage", - "deploy-server:buildImage", - "log-server:buildImage", - "oauth-server:buildImage", - "route-server:buildImage", - "workflow-server:buildImage" -} -tasks.register('buildImageAll_win', Exec) { - workingDir "$rootDir" - commandLine "./gradlew.bat", - "admin-server:buildImage", - "gateway-server:buildImage", - "deploy-server:buildImage", - "log-server:buildImage", - "oauth-server:buildImage", - "route-server:buildImage", - "workflow-server:buildImage" -} -tasks.register('pushImageAll', Exec) { - workingDir "$rootDir" - commandLine "./gradlew", - "admin-server:pushImage", - "gateway-server:pushImage", - "deploy-server:pushImage", - "log-server:pushImage", - "oauth-server:pushImage", - "route-server:pushImage", - "workflow-server:pushImage" -} -tasks.register('pushImageAll_win', Exec) { - workingDir "$rootDir" - commandLine "./gradlew.bat", - "admin-server:pushImage", - "gateway-server:pushImage", - "deploy-server:pushImage", - "log-server:pushImage", - "oauth-server:pushImage", - "route-server:pushImage", - "workflow-server:pushImage" +tasks.register('pushImageAll') { + dependsOn subprojects.findAll { subproject -> + subproject.name.endsWith('-server') + }.collect { ":${it.path}:pushImage" } } \ No newline at end of file diff --git a/gradle/moduleVersion.gradle b/gradle/moduleVersion.gradle index 4374a48676d05e658c239b7a2bbfabc812e88487..20fbf176b48cbf0880e1a037e5c80b4793ce5ff7 100644 --- a/gradle/moduleVersion.gradle +++ b/gradle/moduleVersion.gradle @@ -1,30 +1,30 @@ project(':acp-admin-cloud-constant') { - version '6.6.0' + version '6.6.1' } project(':acp-admin-cloud-dependencies') { - version '6.6.0' + version '6.6.1' } project(':acp-admin-cloud-dependencies-resource-server') { - version '6.6.0' + version '6.6.1' } project(':admin-server') { - version '6.6.0' + version '6.6.1' } project(':deploy-server') { - version '6.6.0' + version '6.6.1' } project(':gateway-server') { - version '6.6.0' + version '6.6.1' } project(':log-server') { - version '6.6.0' + version '6.6.1' } project(':oauth-server') { - version '6.6.0' + version '6.6.1' } project(':route-server') { - version '6.6.0' + version '6.6.1' } project(':workflow-server') { - version '6.6.0' + version '6.6.1' } \ No newline at end of file