diff --git a/README.md b/README.md index d38c68ce6da82997277be495cbb6c1c825bea372..5ad1c09d08b9ecba771e8caf2497a430c668e047 100644 --- a/README.md +++ b/README.md @@ -213,7 +213,7 @@ acp-admin-cloud -------工程根目录,root模块 ``` - deploy 部署文件 - - nacos数据库初始化脚本 [nacos-mysql-2.0.sql](deploy/init/nacos-mysql-2.0.sql) + - nacos数据库初始化脚本 [nacos-mysql-3.0.sql](deploy/init/nacos-mysql-3.0.sql) - [docker部署](deploy/docker/README.md) - [k8s部署](deploy/k8s-demo/README.md) - swagger url : /doc.html diff --git a/deploy/init/nacos-mysql-2.0.sql b/deploy/init/nacos-mysql-3.0.sql similarity index 100% rename from deploy/init/nacos-mysql-2.0.sql rename to deploy/init/nacos-mysql-3.0.sql diff --git a/modules/deploy-server/src/main/kotlin/io/gitee/zhangbinhub/admin/deploy/conf/CustomerApiConfiguration.kt b/modules/deploy-server/src/main/kotlin/io/gitee/zhangbinhub/admin/deploy/conf/CustomerApiConfiguration.kt index a5b6521f0089ccafa0212f7b15cffbddcbd90a56..0e2c38a1a1200739a67cd00b24c9a738a5f4dbfc 100644 --- a/modules/deploy-server/src/main/kotlin/io/gitee/zhangbinhub/admin/deploy/conf/CustomerApiConfiguration.kt +++ b/modules/deploy-server/src/main/kotlin/io/gitee/zhangbinhub/admin/deploy/conf/CustomerApiConfiguration.kt @@ -15,7 +15,7 @@ import org.springframework.context.annotation.Configuration @Configuration(proxyBeanMethods = false) class CustomerApiConfiguration @Autowired constructor( - @Value("\${info.version}") + @Value($$"${info.version}") version: String? ) : BaseApiConfiguration(version) { @Bean diff --git a/modules/deploy-server/src/main/kotlin/io/gitee/zhangbinhub/admin/deploy/conf/DeployServerCustomerConfiguration.kt b/modules/deploy-server/src/main/kotlin/io/gitee/zhangbinhub/admin/deploy/conf/DeployServerCustomerConfiguration.kt index fb1a28823bf4656af6f3e4f4d6130b45f921c5b3..79d2631e9d4d0f3a713f007fd3227b249b937332 100644 --- a/modules/deploy-server/src/main/kotlin/io/gitee/zhangbinhub/admin/deploy/conf/DeployServerCustomerConfiguration.kt +++ b/modules/deploy-server/src/main/kotlin/io/gitee/zhangbinhub/admin/deploy/conf/DeployServerCustomerConfiguration.kt @@ -10,15 +10,15 @@ import org.springframework.stereotype.Component @Component @RefreshScope class DeployServerCustomerConfiguration { - @Value("\${deploy-server.upload-path}") + @Value($$"${deploy-server.upload-path}") var uploadPath: String = "" - @Value("\${deploy-server.script-path}") + @Value($$"${deploy-server.script-path}") var scriptPath: String = "" - @Value("\${deploy-server.param-character-prefix}") + @Value($$"${deploy-server.param-character-prefix}") var paramCharacterPrefix: String = "" - @Value("\${deploy-server.param-separator}") + @Value($$"${deploy-server.param-separator}") var paramSeparator: String = "," } diff --git a/modules/log-server/src/main/kotlin/io/gitee/zhangbinhub/admin/log/conf/CustomerApiConfiguration.kt b/modules/log-server/src/main/kotlin/io/gitee/zhangbinhub/admin/log/conf/CustomerApiConfiguration.kt index 7042cbd565ff6c748c5e646b21cbdcca34807c6b..6c171ce2b5a506f67d02988eb098b93cb48dd9b8 100644 --- a/modules/log-server/src/main/kotlin/io/gitee/zhangbinhub/admin/log/conf/CustomerApiConfiguration.kt +++ b/modules/log-server/src/main/kotlin/io/gitee/zhangbinhub/admin/log/conf/CustomerApiConfiguration.kt @@ -15,7 +15,7 @@ import org.springframework.context.annotation.Configuration @Configuration(proxyBeanMethods = false) class CustomerApiConfiguration @Autowired constructor( - @Value("\${info.version}") + @Value($$"${info.version}") version: String? ) : BaseApiConfiguration(version) { @Bean diff --git a/modules/log-server/src/main/kotlin/io/gitee/zhangbinhub/admin/log/conf/LogServerCustomerConfiguration.kt b/modules/log-server/src/main/kotlin/io/gitee/zhangbinhub/admin/log/conf/LogServerCustomerConfiguration.kt index 616a8d2cc8c8e41cb419ac938f4c9b5621125ea6..a8e2121928040627983ce1af29689240b13fa20a 100644 --- a/modules/log-server/src/main/kotlin/io/gitee/zhangbinhub/admin/log/conf/LogServerCustomerConfiguration.kt +++ b/modules/log-server/src/main/kotlin/io/gitee/zhangbinhub/admin/log/conf/LogServerCustomerConfiguration.kt @@ -10,37 +10,37 @@ import org.springframework.stereotype.Component @Component @RefreshScope class LogServerCustomerConfiguration { - @Value("\${logging.file.name}") + @Value($$"${logging.file.name}") var logFile: String = "" /** * 日志路径 */ - @Value("\${logging.file.path}") + @Value($$"${logging.file.path}") var logFilePath: String = "" /** * 日志最大保留天数,默认 180 天 */ - @Value("\${log-server.max-history-day-number}") + @Value($$"${log-server.max-history-day-number}") var maxHistoryDayNumber: Int = 180 /** * 是否记录路由日志 */ - @Value("\${log-server.route-log.enabled}") + @Value($$"${log-server.route-log.enabled}") var routeLogEnabled: Boolean = true /** * 是否记录操作日志 */ - @Value("\${log-server.operate-log.enabled}") + @Value($$"${log-server.operate-log.enabled}") var operateLogEnabled: Boolean = true /** * 日志迁移时,单个事务处理的日志记录数量 */ - @Value("\${log-server.quantity-per-process}") + @Value($$"${log-server.quantity-per-process}") var quantityPerProcess: Int = 100 } diff --git a/modules/oauth-server/src/main/kotlin/io/gitee/zhangbinhub/admin/oauth/conf/CustomerApiConfiguration.kt b/modules/oauth-server/src/main/kotlin/io/gitee/zhangbinhub/admin/oauth/conf/CustomerApiConfiguration.kt index 2bae84445310c5d5798e6c5dd9b0b8f1d7bc104a..accf8afa04666434880628a5b9e012a322f55dd1 100644 --- a/modules/oauth-server/src/main/kotlin/io/gitee/zhangbinhub/admin/oauth/conf/CustomerApiConfiguration.kt +++ b/modules/oauth-server/src/main/kotlin/io/gitee/zhangbinhub/admin/oauth/conf/CustomerApiConfiguration.kt @@ -16,7 +16,7 @@ import org.springframework.context.annotation.Configuration @Configuration(proxyBeanMethods = false) class CustomerApiConfiguration @Autowired constructor( - @Value("\${info.version}") + @Value($$"${info.version}") version: String?, ) : BaseApiConfiguration(version) { @Bean diff --git a/modules/oauth-server/src/main/kotlin/io/gitee/zhangbinhub/admin/oauth/controller/api/TokenController.kt b/modules/oauth-server/src/main/kotlin/io/gitee/zhangbinhub/admin/oauth/controller/api/TokenController.kt index 8adf294caebd3769d2364dbbbf2873b1b5ea0d7e..ed54bace889883b9ce9ee0fc6defabc142380bd8 100644 --- a/modules/oauth-server/src/main/kotlin/io/gitee/zhangbinhub/admin/oauth/controller/api/TokenController.kt +++ b/modules/oauth-server/src/main/kotlin/io/gitee/zhangbinhub/admin/oauth/controller/api/TokenController.kt @@ -47,9 +47,9 @@ constructor( private val cloudTools: CloudTools, private val applicationService: ApplicationService, private val userService: UserService, - @field:Qualifier("acpSpringCloudResourceServerRestClientBuilder") + @param:Qualifier("acpSpringCloudResourceServerRestClientBuilder") private val restClientBuilder: RestClient.Builder, - @field:Value("\${spring.application.name}") + @param:Value($$"${spring.application.name}") private val applicationName: String ) : BaseResourceServerController(logAdapter) { @Throws(WebException::class) diff --git a/modules/workflow-server/src/main/kotlin/io/gitee/zhangbinhub/admin/workflow/conf/CustomerApiConfiguration.kt b/modules/workflow-server/src/main/kotlin/io/gitee/zhangbinhub/admin/workflow/conf/CustomerApiConfiguration.kt index d66c1552155290e67866b511325413d1b1a17322..60aa0bc06a50e5f47717cf2f18d2feb5015992be 100644 --- a/modules/workflow-server/src/main/kotlin/io/gitee/zhangbinhub/admin/workflow/conf/CustomerApiConfiguration.kt +++ b/modules/workflow-server/src/main/kotlin/io/gitee/zhangbinhub/admin/workflow/conf/CustomerApiConfiguration.kt @@ -16,7 +16,7 @@ import org.springframework.context.annotation.Configuration @Configuration(proxyBeanMethods = false) class CustomerApiConfiguration @Autowired constructor( - @Value("\${info.version}") + @Value($$"${info.version}") version: String?, ) : BaseApiConfiguration(version) { @Bean