diff --git a/acs3/nladmin-system/src/main/resources/config/application-dev2.yml b/acs3/nladmin-system/src/main/resources/config/application-dev2.yml index 3b2804d..6f40c0b 100644 --- a/acs3/nladmin-system/src/main/resources/config/application-dev2.yml +++ b/acs3/nladmin-system/src/main/resources/config/application-dev2.yml @@ -6,7 +6,7 @@ spring: druid: db-type: com.alibaba.druid.pool.DruidDataSource driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy - url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:sh_kn_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true + url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:sh_kn_acs2}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true username: ${DB_USER:root} password: ${DB_PWD:root} # 初始连接数 diff --git a/acs3/nladmin-system/src/main/resources/config/application-prod.yml b/acs3/nladmin-system/src/main/resources/config/application-prod.yml index 89ebb29..b43cfd0 100644 --- a/acs3/nladmin-system/src/main/resources/config/application-prod.yml +++ b/acs3/nladmin-system/src/main/resources/config/application-prod.yml @@ -6,7 +6,7 @@ spring: druid: db-type: com.alibaba.druid.pool.DruidDataSource driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy - url: jdbc:log4jdbc:mysql://${DB_HOST:10.1.60.222}:${DB_PORT:3306}/${DB_NAME:kn_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true + url: jdbc:log4jdbc:mysql://${DB_HOST:10.1.60.222}:${DB_PORT:3306}/${DB_NAME:kn_acs2}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true username: ${DB_USER:root} password: ${DB_PWD:123456} # 初始连接数 @@ -52,8 +52,8 @@ spring: multi-statement-allow: true redis: #数据库索引 - database: ${REDIS_DB:1} - host: ${REDIS_HOST:127.0.0.1} + database: ${REDIS_DB:4} + host: ${REDIS_HOST:10.1.60.222} port: ${REDIS_PORT:6379} password: ${REDIS_PWD:} @@ -62,7 +62,7 @@ spring: username: root password: 123456 cleanSession: true - url: 127.0.0.1 + url: 10.1.60.222 clientId: sdk_mqtt21 topics: - KN/# @@ -140,7 +140,7 @@ file: avatarMaxSize: 5 logging: file: - path: C:\logs\ACS + path: D:\logs\ACS config: classpath:logback-spring.xml lucene: index: diff --git a/acs3/nladmin-system/src/main/resources/config/application.yml b/acs3/nladmin-system/src/main/resources/config/application.yml index 9982b5c..1d44194 100644 --- a/acs3/nladmin-system/src/main/resources/config/application.yml +++ b/acs3/nladmin-system/src/main/resources/config/application.yml @@ -2,7 +2,7 @@ spring: freemarker: check-template-location: false profiles: - active: dev2 + active: dev jackson: time-zone: GMT+8 data: @@ -44,7 +44,7 @@ rsa: private_key: MIIBUwIBADANBgkqhkiG9w0BAQEFAASCAT0wggE5AgEAAkEA0vfvyTdGJkdbHkB8mp0f3FE0GYP3AYPaJF7jUd1M0XxFSE2ceK3k2kw20YvQ09NJKk+OMjWQl9WitG9pB6tSCQIDAQABAkA2SimBrWC2/wvauBuYqjCFwLvYiRYqZKThUS3MZlebXJiLB+Ue/gUifAAKIg1avttUZsHBHrop4qfJCwAI0+YRAiEA+W3NK/RaXtnRqmoUUkb59zsZUBLpvZgQPfj1MhyHDz0CIQDYhsAhPJ3mgS64NbUZmGWuuNKp5coY2GIj/zYDMJp6vQIgUueLFXv/eZ1ekgz2Oi67MNCk5jeTF2BurZqNLR3MSmUCIFT3Q6uHMtsB9Eha4u7hS31tj1UWE+D+ADzp59MGnoftAiBeHT7gDMuqeJHPL4b+kC+gzV4FGTfhR9q3tTbklZkD2A== logging: file: - path: C:\logs\ACS + path: D:\logs\ACS config: classpath:logback-spring.xml # sa-token白名单配置 security: