From 1c173dc3aa001ac93fee398a117b91ba06be39f2 Mon Sep 17 00:00:00 2001 From: zhangbinhub Date: Wed, 4 Dec 2024 03:22:06 +0800 Subject: [PATCH] v6.6.0 --- README.md | 12 +++++------ build.gradle | 16 ++++++-------- .../build.gradle | 1 - .../acp-admin-cloud-dependencies/build.gradle | 2 -- deploy/docker/middleware/.env | 4 ++-- deploy/docker/middleware/docker-compose.yaml | 2 +- doc/nacos_config_export_dev.zip | Bin 4549 -> 4512 bytes doc/version_history.md | 13 +++++++++++- gradle/dependencies.gradle | 8 +++---- gradle/moduleVersion.gradle | 20 +++++++++--------- modules/deploy-server/build.gradle | 2 -- .../admin/deploy/service/DeployFileService.kt | 2 +- .../admin/deploy/service/DeployTaskService.kt | 6 +++--- modules/gateway-server/build.gradle | 2 -- modules/log-server/build.gradle | 2 -- modules/oauth-server/build.gradle | 2 -- .../conf/AuthorizationServerConfiguration.kt | 2 ++ modules/route-server/build.gradle | 2 -- modules/workflow-server/build.gradle | 2 -- 19 files changed, 47 insertions(+), 53 deletions(-) diff --git a/README.md b/README.md index 31b0f2d5..08564105 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # acp-admin-cloud -###### v6.5.0 [版本更新日志](doc/version_history.md) +###### v6.6.0 [版本更新日志](doc/version_history.md) - 使用Application Construction Platform 应用构建平台作为脚手架 - 基于 Spring Cloud 的微服务版本，基于 Spring Boot @@ -9,9 +9,9 @@ ## 相关组件版本 -- [Spring Boot 3.3.5](https://projects.spring.io/spring-boot) -- [Spring Boot Admin 3.3.4](https://github.com/codecentric/spring-boot-admin) -- [Acp 2024.2.0](https://gitee.com/zhangbinhub/acp) +- [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.0](https://gitee.com/zhangbinhub/acp) - [sensitive](https://github.com/houbb/sensitive) ## 技术栈 @@ -91,8 +91,8 @@ ## 一、环境要求 - java 17+ -- gradle 7.5+ -- kotlin 1.6+ +- gradle 8.6+ +- kotlin 2.1+ ## 二、gradle 脚本配置及使用 diff --git a/build.gradle b/build.gradle index 416d10b6..90ad8e58 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,5 @@ import org.apache.tools.ant.filters.ReplaceTokens +import org.jetbrains.kotlin.gradle.dsl.JvmTarget ext { println("Environment : JAVA_HOME=$System.env.JAVA_HOME") @@ -45,7 +46,6 @@ allprojects { apply plugin: 'java' apply plugin: 'kotlin' - apply plugin: 'kotlin-kapt' apply plugin: 'kotlin-spring' apply plugin: 'kotlin-noarg' apply plugin: 'kotlin-jpa' @@ -86,14 +86,14 @@ allprojects { } javadoc { - options.charSet = projectProperties.getProperty('encoding') options.encoding = projectProperties.getProperty('encoding') - options.addStringOption('Xdoclint:none', '-quiet') } - kapt { - useBuildCache = true - includeCompileClasspath = false + kotlin { + compilerOptions { + allWarningsAsErrors = true + jvmTarget = JvmTarget.valueOf("JVM_" + projectProperties.getProperty('javaVersion')) + } } processResources { @@ -121,13 +121,9 @@ allprojects { } compileKotlin { dependsOn(processResources) - kotlinOptions.jvmTarget = projectProperties.getProperty('javaVersion') - kotlinOptions.javaParameters = true } compileTestKotlin { dependsOn(processResources) - kotlinOptions.jvmTarget = projectProperties.getProperty('javaVersion') - kotlinOptions.javaParameters = true } test { diff --git a/common/acp-admin-cloud-dependencies-resource-server/build.gradle b/common/acp-admin-cloud-dependencies-resource-server/build.gradle index 35606dd9..a943e6bd 100644 --- a/common/acp-admin-cloud-dependencies-resource-server/build.gradle +++ b/common/acp-admin-cloud-dependencies-resource-server/build.gradle @@ -10,7 +10,6 @@ dependencyManagement { } dependencies { api project(":acp-admin-cloud-dependencies") - kapt "org.springframework.boot:spring-boot-configuration-processor" api "io.gitee.zhangbinhub.acp:acp-spring-cloud-starter-resource-server" testImplementation platform("org.junit:junit-bom") diff --git a/common/acp-admin-cloud-dependencies/build.gradle b/common/acp-admin-cloud-dependencies/build.gradle index 5aa09cd7..d8a04219 100644 --- a/common/acp-admin-cloud-dependencies/build.gradle +++ b/common/acp-admin-cloud-dependencies/build.gradle @@ -10,8 +10,6 @@ dependencyManagement { } dependencies { api project(":acp-admin-cloud-constant") - kapt "org.springframework.boot:spring-boot-configuration-processor" - api "io.gitee.zhangbinhub.acp:acp-spring-cloud-starter" // 链路追踪 api "io.opentelemetry:opentelemetry-exporter-zipkin" diff --git a/deploy/docker/middleware/.env b/deploy/docker/middleware/.env index 42e24229..77387a5d 100644 --- a/deploy/docker/middleware/.env +++ b/deploy/docker/middleware/.env @@ -1,2 +1,2 @@ -HOST_MACHINE_IP=10.100.136.50 -MYSQL_HOST=10.100.136.50 \ No newline at end of file +HOST_MACHINE_IP=10.100.107.62 +MYSQL_HOST=10.100.107.62 \ No newline at end of file diff --git a/deploy/docker/middleware/docker-compose.yaml b/deploy/docker/middleware/docker-compose.yaml index 77f10b6b..9dc70f52 100644 --- a/deploy/docker/middleware/docker-compose.yaml +++ b/deploy/docker/middleware/docker-compose.yaml @@ -1,7 +1,7 @@ version: "3.7" services: nacos: - image: nacos/nacos-server:v2.4.2.1 + image: nacos/nacos-server:v2.4.3 container_name: nacos-standalone-mysql restart: always environment: diff --git a/doc/nacos_config_export_dev.zip b/doc/nacos_config_export_dev.zip index f38cccf4de75880d1dacc27cf173f7f70a6b147b..f214086fb5e4c7814bbc46e362e6050c432d4358 100644 GIT binary patch delta 620 zcmX@Ayg->Rz?+#xgn@&DgW-i_OXTJa?3zq0V3s^Pz z+~rh+m@|=2rJmu!+~A7WB7761Hx#gIn=KVM9{6b6tGApADs5b$D;B?f@>4m-BjW`> zpTTouuId95VmquRIZslQWtivh_e3%4z1H;3ZsmD>++I0X_q~{5yTyk)=VWh1sM*A+ zlX*LnnSVDOd3RRe`h$h9ul6q7E~WOYF~4P^buAuW%hKbd**Y<|Vb8ZZMs@Jlh><^*`NvVl}^0HHC^&*A(a9svCyvE2Xw delta 708 zcmZ3Wd{mh)z?+#xgn@&DgW-4X&xpxgd@A*95B4tqa7|N2!93w1Us#TptBm`~+m~)n zZkixr6>{O?djI`8IUX4=q}gYDW^J`iIHBhvds5MJzEnf$Qy;lSWqA*b3JZ^1&UEZ7 zy(KEUx&7A4R^6RK>rd(xJxHm26mf8!!p3T2>17`ef18=1HGhtyt4Zx~Rk^12ZGX)z z3;TA-*#GUX%C0f7%HA2j_?+~+!21C*Z@ { - Runtime.getRuntime().exec("chmod +x ${scriptFile.canonicalPath}").waitFor() - Runtime.getRuntime().exec(arrayOf("/bin/sh", "-c", scriptFile.canonicalPath), null, null) + Runtime.getRuntime().exec(arrayOf("chmod +x ${scriptFile.canonicalPath}")).waitFor() + Runtime.getRuntime().exec(arrayOf("/bin/sh", "-c", scriptFile.canonicalPath)) .apply { val reader = InputStreamReader(this.inputStream) val input = LineNumberReader(reader) @@ -229,7 +229,7 @@ constructor( } "bat" -> { - Runtime.getRuntime().exec(scriptFile.canonicalPath) + Runtime.getRuntime().exec(arrayOf(scriptFile.canonicalPath)) } "sql" -> { diff --git a/modules/gateway-server/build.gradle b/modules/gateway-server/build.gradle index 9e9deb43..8d759909 100644 --- a/modules/gateway-server/build.gradle +++ b/modules/gateway-server/build.gradle @@ -1,7 +1,5 @@ apply from: "$rootDir/gradle/application.gradle" dependencies { - kapt "org.springframework.boot:spring-boot-configuration-processor" - implementation project(":acp-admin-cloud-dependencies") implementation "org.springframework.boot:spring-boot-starter-security" implementation "org.springframework.cloud:spring-cloud-starter-gateway" diff --git a/modules/log-server/build.gradle b/modules/log-server/build.gradle index 183b9858..7c6826a8 100644 --- a/modules/log-server/build.gradle +++ b/modules/log-server/build.gradle @@ -1,7 +1,5 @@ apply from: "$rootDir/gradle/application.gradle" dependencies { - kapt "org.springframework.boot:spring-boot-configuration-processor" - implementation project(":acp-admin-cloud-dependencies-resource-server") // 数据库及驱动 implementation "org.springframework.boot:spring-boot-starter-data-jpa" diff --git a/modules/oauth-server/build.gradle b/modules/oauth-server/build.gradle index 376fbb42..ebe35cc2 100644 --- a/modules/oauth-server/build.gradle +++ b/modules/oauth-server/build.gradle @@ -1,7 +1,5 @@ apply from: "$rootDir/gradle/application.gradle" dependencies { - kapt "org.springframework.boot:spring-boot-configuration-processor" - implementation project(":acp-admin-cloud-dependencies-resource-server") implementation("org.springframework.boot:spring-boot-starter-oauth2-authorization-server") { exclude group: "org.springframework.boot", module: "spring-boot-starter-web" diff --git a/modules/oauth-server/src/main/kotlin/io/gitee/zhangbinhub/admin/oauth/conf/AuthorizationServerConfiguration.kt b/modules/oauth-server/src/main/kotlin/io/gitee/zhangbinhub/admin/oauth/conf/AuthorizationServerConfiguration.kt index b6b77683..4340dfca 100644 --- a/modules/oauth-server/src/main/kotlin/io/gitee/zhangbinhub/admin/oauth/conf/AuthorizationServerConfiguration.kt +++ b/modules/oauth-server/src/main/kotlin/io/gitee/zhangbinhub/admin/oauth/conf/AuthorizationServerConfiguration.kt @@ -41,6 +41,7 @@ import org.springframework.security.oauth2.server.authorization.web.authenticati import org.springframework.security.oauth2.server.authorization.web.authentication.OAuth2ClientCredentialsAuthenticationConverter import org.springframework.security.web.SecurityFilterChain import org.springframework.security.web.util.matcher.AntPathRequestMatcher +import org.springframework.web.bind.annotation.RequestMethod import org.springframework.web.client.RestClient import java.util.* @@ -105,6 +106,7 @@ class AuthorizationServerConfiguration @Autowired constructor( // 配置 endpoint 策略 httpSecurity.csrf { it.disable() }.authorizeHttpRequests { authorizeRequests -> authorizeRequests.requestMatchers(authorizationServerConfigurer.endpointsMatcher).permitAll() + .requestMatchers(AntPathRequestMatcher("/**", RequestMethod.OPTIONS.name)).permitAll() .requestMatchers(*security.map { AntPathRequestMatcher(it) }.toTypedArray()).authenticated() .requestMatchers(*permitAll.map { AntPathRequestMatcher(it) }.toTypedArray()).permitAll() .anyRequest().authenticated() diff --git a/modules/route-server/build.gradle b/modules/route-server/build.gradle index 40468d8d..1a5c0244 100644 --- a/modules/route-server/build.gradle +++ b/modules/route-server/build.gradle @@ -1,7 +1,5 @@ apply from: "$rootDir/gradle/application.gradle" dependencies { - kapt "org.springframework.boot:spring-boot-configuration-processor" - implementation project(":acp-admin-cloud-dependencies-resource-server") // 数据库及驱动 implementation "org.springframework.boot:spring-boot-starter-data-jpa" diff --git a/modules/workflow-server/build.gradle b/modules/workflow-server/build.gradle index 28b1108f..875470a6 100644 --- a/modules/workflow-server/build.gradle +++ b/modules/workflow-server/build.gradle @@ -1,7 +1,5 @@ apply from: "$rootDir/gradle/application.gradle" dependencies { - kapt "org.springframework.boot:spring-boot-configuration-processor" - implementation project(":acp-admin-cloud-dependencies-resource-server") // 数据库及驱动 implementation "org.springframework.boot:spring-boot-starter-data-jpa" -- Gitee