diff --git a/nladmin-system/nlsso-server/pom.xml b/nladmin-system/nlsso-server/pom.xml index 02a32e4..ef31a0d 100644 --- a/nladmin-system/nlsso-server/pom.xml +++ b/nladmin-system/nlsso-server/pom.xml @@ -77,13 +77,13 @@ org.redisson redisson-spring-boot-starter - 3.12.3 - - - spring-boot-starter-actuator - org.springframework.boot - - + 3.19.1 + + + + com.esotericsoftware + kryo + 5.0.0-RC1 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 6d8589b..e5de989 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,5 +1,10 @@ server: port: 8010 + tomcat: + accept-count: 1000 + max-connections: 10000 + max-threads: 800 + min-spare-threads: 50 #配置数据源 spring: datasource: @@ -7,7 +12,7 @@ spring: 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.1}:${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.ext_constant.xml}:${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} @@ -34,7 +39,7 @@ spring: # 是否在归还到池中前进行检验 test-on-return: false # 检测连接是否有效 - validation-query: select 1 + validation-query: select ext_constant.xml # 配置监控统计 webStatFilter: enabled: true @@ -55,8 +60,19 @@ spring: redis: #数据库索引 database: ${REDIS_DB:2} - host: ${REDIS_HOST:127.0.0.1} + host: ${REDIS_HOST:127.0.0.ext_constant.xml} port: ${REDIS_PORT:6379} + redisson: + config: | + threads: 4 + nettyThreads: 4 + singleServerConfig: + connectionMinimumIdleSize: 8 + connectionPoolSize: 8 + address: redis://127.0.0.1:6379 + # password: 942464Yy + idleConnectionTimeout: 10000 + timeout: 3000 flyway: # flyway 数据库 DDL 版本控制 enabled: true # 正式环境才开启 clean-disabled: true # 禁用数据库清理 @@ -64,7 +80,7 @@ spring: locations: classpath:db # flyway 会在库中创建此名称元数据表,用于记录所有版本演化和状态,同一个库不同项目可能冲突,每个项目一张表来记录 table: flyway_schema_history_nl_platform #TODO 值的后缀指定为当前项目名称 - baseline-version: 1 # 基线版本默认开始序号 默认为 1 + baseline-version: ext_constant.xml # 基线版本默认开始序号 默认为 ext_constant.xml baseline-on-migrate: true # 针对非空数据库是否默认调用基线版本,为空的话默认会调用基线版本 placeholders: # 定义 afterMigrateError.sql 要清理的元数据表表名 flyway-table: ${spring.flyway.table} @@ -110,13 +126,13 @@ spring: threshold: 80 - type: reject enabled: true - threshold: 1 + threshold: ext_constant.xml - type: run_timeout enabled: true - threshold: 1 + threshold: ext_constant.xml - type: queue_timeout enabled: true - threshold: 1 + threshold: ext_constant.xml quartz: properties: org: @@ -221,7 +237,7 @@ sa-token: # Redis数据库索引(默认为0) database: 2 # Redis服务器地址 - host: 127.0.0.1 + host: 127.0.0.ext_constant.xml # Redis服务器连接端口 port: 6379 # Redis服务器连接密码(默认为空) 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 16b80c0..3f474f2 100644 --- a/nladmin-system/nlsso-server/src/main/resources/config/application.yml +++ b/nladmin-system/nlsso-server/src/main/resources/config/application.yml @@ -73,20 +73,4 @@ plumelog: lite: log: path: /lucene2 -redisson: - # redis key前缀 - keyPrefix: - # 线程池数量 - threads: 4 - # Netty线程池数量 - nettyThreads: 8 - # 单节点配置 - singleServerConfig: - # 最小空闲连接数 - connectionMinimumIdleSize: 4 - # 连接池大小 - connectionPoolSize: 8 - # 连接空闲超时,单位:毫秒 - idleConnectionTimeout: 10000 - # 命令等待超时,单位:毫秒 - timeout: 3000 +