diff --git a/README.md b/README.md index 31b0f2d52093c058fbd341b94b6c8ad8d13f81c4..0856410557f29b4464a5feab5d19473f1a7c4175 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 416d10b6e35a4f6ef78e8e97ff90fbe7fdf65c74..90ad8e58f36a57b0831e5c6847079830caa63da4 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 35606dd99ac01dd248753d3c886cbfcbb5e57786..a943e6bde9d9378f4e16c2114d10b7d6347a379e 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 5aa09cd7258282c18cf070b2ee5d47be37c3dc97..d8a04219d6b35f195a05b932fd972180422313ed 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 42e24229c43d5420142c4651506688203dac5133..77387a5d2360311b8421d36b8225103e49791cdd 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 77f10b6bf3b7015bc66d3c2fe018396830ba6032..9dc70f5231c5c454009ae97858e2bc6539867bfd 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 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 943617d22dd1f7ab3e5fcfbc1eea57b10d346b49..8b90b83b3d868f8923afbee4478517846ea1ebbb 100644 --- a/doc/version_history.md +++ b/doc/version_history.md @@ -1,5 +1,15 @@ ## 版本更新记录 +##### v6.6.0 + +- Global + - [Upgrade] 调整gradle脚本 + - [Upgrade] 升级依赖 + - Kotlin 2.1.0 + - Spring Boot 3.3.6 + - Spring Boot Admin 3.3.6 + - Acp 2024.3.0 + ##### v6.5.0 - Global @@ -13,7 +23,8 @@ - Acp 2024.2.0 - camunda 7.22.0 - gateway-server - - 新增`writeableHeaders`自定义`WebFilter`,解决异常[HttpHeaders.writeHttpHeaders Fails with UnsupportedOperationException](https://github.com/spring-projects/spring-security/issues/15989) + - 新增`writeableHeaders`自定义`WebFilter` + ,解决异常[HttpHeaders.writeHttpHeaders Fails with UnsupportedOperationException](https://github.com/spring-projects/spring-security/issues/15989) ##### v6.4.1 diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 6a50e81cb8e87d06dc7e20286ed6700b7f56872c..402b7a42b56d89daed71af804184ed3229a07788 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -3,11 +3,11 @@ ext { } versions += [ - kotlin : "1.9.25", + kotlin : "2.1.0", kotlinCoroutines : "1.8.1", - springBoot : "3.3.5", - springBootAdmin : "3.3.4", - acp : "2024.2.0", + springBoot : "3.3.6", + springBootAdmin : "3.3.6", + acp : "2024.3.0", sensitive : "1.7.0", sensitiveDeepCopy: "0.0.1", camunda : "7.22.0", diff --git a/gradle/moduleVersion.gradle b/gradle/moduleVersion.gradle index 1dda5c9ae1037a789b0329f372d7424787bf8ca9..4374a48676d05e658c239b7a2bbfabc812e88487 100644 --- a/gradle/moduleVersion.gradle +++ b/gradle/moduleVersion.gradle @@ -1,30 +1,30 @@ project(':acp-admin-cloud-constant') { - version '6.5.0' + version '6.6.0' } project(':acp-admin-cloud-dependencies') { - version '6.5.0' + version '6.6.0' } project(':acp-admin-cloud-dependencies-resource-server') { - version '6.5.0' + version '6.6.0' } project(':admin-server') { - version '6.5.0' + version '6.6.0' } project(':deploy-server') { - version '6.5.0' + version '6.6.0' } project(':gateway-server') { - version '6.5.0' + version '6.6.0' } project(':log-server') { - version '6.5.0' + version '6.6.0' } project(':oauth-server') { - version '6.5.0' + version '6.6.0' } project(':route-server') { - version '6.5.0' + version '6.6.0' } project(':workflow-server') { - version '6.5.0' + version '6.6.0' } \ No newline at end of file diff --git a/modules/deploy-server/build.gradle b/modules/deploy-server/build.gradle index 40468d8dee1a2eb7d3f5797b4e82eded938349d4..1a5c0244c24c8c06918d07209cc77bf682e61837 100644 --- a/modules/deploy-server/build.gradle +++ b/modules/deploy-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/deploy-server/src/main/kotlin/io/gitee/zhangbinhub/admin/deploy/service/DeployFileService.kt b/modules/deploy-server/src/main/kotlin/io/gitee/zhangbinhub/admin/deploy/service/DeployFileService.kt index 47d5f0d35f3bb0111a095d575cf604d3214c21d9..9d231491a5e911a826fb922745c5c97e44c965d5 100644 --- a/modules/deploy-server/src/main/kotlin/io/gitee/zhangbinhub/admin/deploy/service/DeployFileService.kt +++ b/modules/deploy-server/src/main/kotlin/io/gitee/zhangbinhub/admin/deploy/service/DeployFileService.kt @@ -27,7 +27,7 @@ constructor( private fun setupPermission(file: File) { System.getProperty("os.name", "").lowercase().apply { if (!this.startsWith("win")) { - Runtime.getRuntime().exec("chmod -R 775 ${file.canonicalPath}").waitFor() + Runtime.getRuntime().exec(arrayOf("chmod -R 775 ${file.canonicalPath}")).waitFor() } } } diff --git a/modules/deploy-server/src/main/kotlin/io/gitee/zhangbinhub/admin/deploy/service/DeployTaskService.kt b/modules/deploy-server/src/main/kotlin/io/gitee/zhangbinhub/admin/deploy/service/DeployTaskService.kt index 5d9b6950fe45ed485d954d7b35ba3e4237b485ac..bcf1324f7cbfe2cc55c8692c476a19d80078de0e 100644 --- a/modules/deploy-server/src/main/kotlin/io/gitee/zhangbinhub/admin/deploy/service/DeployTaskService.kt +++ b/modules/deploy-server/src/main/kotlin/io/gitee/zhangbinhub/admin/deploy/service/DeployTaskService.kt @@ -214,8 +214,8 @@ constructor( private fun executeScriptFile(scriptFile: File) { when (CommonTools.getFileExt(scriptFile.name).lowercase()) { "sh" -> { - 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 9e9deb438862361a6154273874afead3bbebc29f..8d759909dc6f577f60ef84343aaff7c746d2f522 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 183b9858d7fd30d65d8d2d9be2ee0f921ab9ebda..7c6826a87ebf3c575620c8e742852462b1637d64 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 376fbb42420cf27c0b22ba592f14dc18ebf119f7..ebe35cc22118d700804175baa32972d3781ecb85 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 b6b77683d2713f8fbcf34185228621a7ccdad944..4340dfcafd9a93a2263b5f733baa8493a3cf7b04 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 40468d8dee1a2eb7d3f5797b4e82eded938349d4..1a5c0244c24c8c06918d07209cc77bf682e61837 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 28b1108f8f3d5306675c3b97dde429840a7ee7db..875470a65063fc7a59cf0f1e62a69c0e6540a3ae 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"