From e5a3c13de890caddc5c4f466051bb921ab38b9cf Mon Sep 17 00:00:00 2001 From: ludj Date: Tue, 17 Jan 2023 14:48:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/config/application-dev.yml | 31 ++++++++++++------- 1 file changed, 20 insertions(+), 11 deletions(-) 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 e5de989..570cb48 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 @@ -11,8 +11,9 @@ spring: druid: db-type: com.alibaba.druid.pool.DruidDataSource driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy -# url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:nl-sso-server}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true - url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.ext_constant.xml}:${DB_PORT:3306}/${DB_NAME:nl_platform}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true + # url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:yongyu_lms2}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true + # url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:nl-sso-server}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true + 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:root} # password: ${DB_PWD:12356} @@ -39,7 +40,7 @@ spring: # 是否在归还到池中前进行检验 test-on-return: false # 检测连接是否有效 - validation-query: select ext_constant.xml + validation-query: select 1 # 配置监控统计 webStatFilter: enabled: true @@ -60,8 +61,9 @@ spring: redis: #数据库索引 database: ${REDIS_DB:2} - host: ${REDIS_HOST:127.0.0.ext_constant.xml} + host: ${REDIS_HOST:127.0.0.1} port: ${REDIS_PORT:6379} + password: ${REDIS_PWD:} redisson: config: | threads: 4 @@ -73,6 +75,7 @@ spring: # password: 942464Yy idleConnectionTimeout: 10000 timeout: 3000 + flyway: # flyway 数据库 DDL 版本控制 enabled: true # 正式环境才开启 clean-disabled: true # 禁用数据库清理 @@ -80,7 +83,7 @@ spring: locations: classpath:db # flyway 会在库中创建此名称元数据表，用于记录所有版本演化和状态,同一个库不同项目可能冲突，每个项目一张表来记录 table: flyway_schema_history_nl_platform #TODO 值的后缀指定为当前项目名称 - baseline-version: ext_constant.xml # 基线版本默认开始序号 默认为 ext_constant.xml + baseline-version: 1 # 基线版本默认开始序号 默认为 1 baseline-on-migrate: true # 针对非空数据库是否默认调用基线版本,为空的话默认会调用基线版本 placeholders: # 定义 afterMigrateError.sql 要清理的元数据表表名 flyway-table: ${spring.flyway.table} @@ -126,13 +129,13 @@ spring: threshold: 80 - type: reject enabled: true - threshold: ext_constant.xml + threshold: 1 - type: run_timeout enabled: true - threshold: ext_constant.xml + threshold: 1 - type: queue_timeout enabled: true - threshold: ext_constant.xml + threshold: 1 quartz: properties: org: @@ -231,16 +234,22 @@ sa-token: # ---- 除了以上配置项，你还需要为 Sa-Token 配置http请求处理器（文档有步骤说明） is-read-cookie: true is-print: false -# 未登录 StpUtil.getTokenSession() 设置值，获取值 @SaIgnore 得忽略接口 + # 未登录 StpUtil.getTokenSession() 设置值，获取值 @SaIgnore 得忽略接口 token-session-check-login: false alone-redis: # Redis数据库索引（默认为0） database: 2 # Redis服务器地址 - host: 127.0.0.ext_constant.xml + host: 127.0.0.1 # Redis服务器连接端口 port: 6379 # Redis服务器连接密码（默认为空） password: # 连接超时时间 - timeout: 10s \ No newline at end of file + timeout: 10s + + +loki: + url: http://localhost:3100/loki/api/v1 + systemName: acs +