diff --git a/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml b/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml index 5b6d20e..6be5b27 100644 --- a/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml +++ b/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml @@ -1,6 +1,32 @@ server: port: 8011 -#配置数据源 +# 项目配置 +nl: + config: + mysql: + ip: 127.0.0.1 + port: 3306 + username: root + password: 12356 + database: nl-platform + redis: + ip: 127.0.0.1 + port: 6379 + password: null + database: 1 + oracle: + ip: 172.27.37.66 + port: 1521 + scheme: RTMES + username: LMSTELCOM + password: LMSTELCOM_6463 + sqlserver: + ip: 10.93.41.2 + port: WINCC + username: sa + password: 123 + database: 马钢_RH +# 配置数据源 spring: autoconfigure: exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure @@ -10,30 +36,27 @@ spring: datasource: mysql: driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy -# url: jdbc:log4jdbc:mysql://${DB_HOST:10.93.41.198}:${DB_PORT:3306}/${DB_NAME:rl_mg_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true -# username: ${DB_USER:root} -# password: ${DB_PWD:123456} - url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:nl-platform}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true - username: ${DB_USER:root} - password: ${DB_PWD:12356} + url: jdbc:log4jdbc:mysql://${DB_HOST:${nl.config.mysql.ip}}:${DB_PORT:${nl.config.mysql.port}}/${DB_NAME:${nl.config.mysql.database}}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true + username: ${DB_USER:${nl.config.mysql.username}} + password: ${DB_PWD:${nl.config.mysql.password}} type: com.alibaba.druid.pool.DruidDataSource oracle: driver-class-name: oracle.jdbc.OracleDriver - url: jdbc:oracle:thin:@172.27.37.66:1521:RTMES - username: ${DB_USER:LMSTELCOM} - password: ${DB_PWD:LMSTELCOM_6463} + url: jdbc:oracle:thin:@${nl.config.oracle.ip}:${nl.config.oracle.port}:${nl.config.oracle.scheme} + username: ${DB_USER:${nl.config.oracle.username}} + password: ${DB_PWD:${nl.config.oracle.password}} type: com.alibaba.druid.pool.DruidDataSource sqlserver: driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver - url: jdbc:sqlserver://10.93.41.2\WINCC;DatabaseName=马钢_RH - username: ${DB_USER:sa} - password: ${DB_PWD:123} + url: jdbc:sqlserver://${nl.config.sqlserver.ip}\${nl.config.sqlserver.port};DatabaseName=${nl.config.sqlserver.database} + username: ${DB_USER:${nl.config.sqlserver.username}} + password: ${DB_PWD:${nl.config.sqlserver.password}} type: com.alibaba.druid.pool.DruidDataSource redis: - #数据库索引 - host: ${REDIS_HOST:127.0.0.1} - port: ${REDIS_PORT:6379} - password: ${REDIS_PWD:} + # 数据库索引 + host: ${REDIS_HOST:${nl.config.redis.ip}} + port: ${REDIS_PORT:${nl.config.redis.port}} + password: ${REDIS_PWD:${nl.config.redis.password}} redisson: config: | threads: 4 @@ -45,30 +68,26 @@ spring: address: redis://127.0.0.1:6379 idleConnectionTimeout: 10000 timeout: 3000 - -# 登录相关配置 -login: - # 登录缓存 - cache-enable: true - # 是否限制单用户登录 - single-login: false - # 验证码 - login-code: - # 验证码类型配置 查看 LoginProperties 类 - code-type: arithmetic - # 登录图形验证码有效时间/分钟 - expiration: 2 - # 验证码高度 - width: 111 - # 验证码宽度 - heigth: 36 - # 内容长度 - length: 2 - # 字体名称，为空则使用默认字体 - font-name: - # 字体大小 - font-size: 25 - +jetcache: + statIntervalMinutes: 15 + areaInCacheName: false + local: + default: + type: linkedhashmap + keyConvertor: fastjson + remote: + default: + type: redis + keyConvertor: fastjson2 + broadcastChannel: projectA + valueEncoder: java + valueDecoder: java + poolConfig: + minIdle: 5 + maxIdle: 20 + maxTotal: 50 + host: ${nl.config.redis.ip} + port: ${nl.config.redis.port} #是否允许生成代码，生产环境设置为false generator: enabled: true @@ -134,11 +153,11 @@ sa-token: token-session-check-login: false alone-redis: # Redis数据库索引（默认为0） - database: 1 + database: ${nl.config.redis.database} # Redis服务器地址 - host: 127.0.0.1 + host: ${nl.config.redis.ip} # Redis服务器连接端口 - port: 6379 + port: ${nl.config.redis.port} # Redis服务器连接密码（默认为空） password: # 连接超时时间 diff --git a/nladmin-system/nlsso-server/src/main/resources/config/application.yml b/nladmin-system/nlsso-server/src/main/resources/config/application.yml index c155642..121537a 100644 --- a/nladmin-system/nlsso-server/src/main/resources/config/application.yml +++ b/nladmin-system/nlsso-server/src/main/resources/config/application.yml @@ -106,14 +106,12 @@ task: # 队列容量 queue-capacity: 50 -#七牛云 -qiniu: - # 文件大小 /M - max-size: 15 - -#邮箱验证码有效时间/秒 -code: - expiration: 300 +# 登录相关配置 +login: + # 登录缓存 + cache-enable: true + # 是否限制单用户登录 + single-login: false #密码加密传输，前端公钥加密，后端私钥解密 rsa: @@ -151,6 +149,7 @@ security: - /api/localStorage/pictures # 参数 - /api/param/getValueByCode +# mybatis-plus配置 mybatis-plus: configuration: map-underscore-to-camel-case: false @@ -163,26 +162,6 @@ mybatis-plus: db-config: id-type: INPUT banner: false -jetcache: - statIntervalMinutes: 15 - areaInCacheName: false - local: - default: - type: linkedhashmap - keyConvertor: fastjson - remote: - default: - type: redis - keyConvertor: fastjson2 - broadcastChannel: projectA - valueEncoder: java - valueDecoder: java - poolConfig: - minIdle: 5 - maxIdle: 20 - maxTotal: 50 - host: 127.0.0.1 - port: 6379 lucene: index: path: D:\lucene\index @@ -208,4 +187,4 @@ sa-token: # 配置 Cookie 作用域:根据二级域名实现sso登入如lms.sso.com;acs.sso.com domain: is-read-cookie: false - is-print: false \ No newline at end of file + is-print: false