rev：集群相关修改

2024-01-23 17:44:07 +08:00
parent 1dfc62bd36
commit 14090a0d46
15 changed files with 370 additions and 185 deletions
--- a/lms/nladmin-system/src/main/resources/config/application-prod.yml
+++ b/lms/nladmin-system/src/main/resources/config/application-prod.yml
@@ -1,12 +1,12 @@
 server:
-  port: 8013
+  port: 8010
 #配置数据源
 spring:
  datasource:
    druid:
      db-type: com.alibaba.druid.pool.DruidDataSource
      driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-      url: jdbc:log4jdbc:mysql://${DB_HOST:10.1.3.91}:${DB_PORT:3306}/${DB_NAME:lms_test2}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
+      url: jdbc:log4jdbc:mysql://${DB_HOST:10.1.3.91}:${DB_PORT:3306}/${DB_NAME:lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
      #      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:hl_tb_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
      #      username: ${DB_USER:root}
      username: ${DB_USER:root}
@@ -17,11 +17,11 @@ spring:
      # 最小连接数
      min-idle: 15
      # 最大连接数
-      max-active: 30
+      max-active: 220
      # 超时时间(以秒数为单位)
      remove-abandoned-timeout: 180
      # 获取连接超时时间
-      max-wait: 3000
+      max-wait: 2000
      # 连接有效性检测时间
      time-between-eviction-runs-millis: 60000
      # 连接在池中最小生存的时间
@@ -45,20 +45,19 @@ spring:
        reset-enable: false
      filters:
        DruidFilter,stat
-      validation-query-timeout: 5000
  #        stat:
-#          enabled: true
-#          # 记录慢SQL
-#          log-slow-sql: true
-#          slow-sql-millis: 1000
-#          merge-sql: true
-#        wall:
-#          config:
-#            multi-statement-allow: true
+  #          enabled: true
+  #          # 记录慢SQL
+  #          log-slow-sql: true
+  #          slow-sql-millis: 1000
+  #          merge-sql: true
+  #        wall:
+  #          config:
+  #            multi-statement-allow: true
  redis:
    #数据库索引
-    database: ${REDIS_DB:14}
-    host: ${REDIS_HOST:127.0.0.1}
+    database: ${REDIS_DB:11}
+    host: ${REDIS_HOST:10.1.3.93}
    port: ${REDIS_PORT:6379}
    password: ${REDIS_PWD:}
    redisson:
@@ -68,12 +67,10 @@ spring:
        singleServerConfig:
          connectionMinimumIdleSize: 8
          connectionPoolSize: 8
-          database: 14
-          address: redis://127.0.0.1:6379
+          database: 11
+          address: redis://10.1.3.93:6379
          idleConnectionTimeout: 10000
          timeout: 3000
-
-
 # 登录相关配置
 login:
  # 登录缓存
@@ -114,15 +111,10 @@ jwt:
  detect: 1800000
  # 续期时间范围，默认1小时，单位毫秒
  renew: 3600000
-
 #是否允许生成代码，生产环境设置为false
 generator:
  enabled: true

-#是否开启 swagger-ui
-swagger:
-  enabled: true
-
 # IP 本地解析
 ip:
  local-parsing: true
@@ -143,7 +135,7 @@ file:
  avatarMaxSize: 5
 logging:
  file:
-    path: C:\log\wms
+    path: d:\log\wms
  config: classpath:logback-spring.xml

 # Sa-Token配置
@@ -164,10 +156,7 @@ sa-token:
  is-log: false
  jwt-secret-key: opsjajisdnnca0sdkksdfaaasdfwwq
  # token 前缀
-  token-prefix: Bearer
+  token-prefix:
  cookie:
    # 配置 Cookie 作用域:根据二级域名实现sso登入如lms.sso.com;acs.sso.com
    domain:
-lucene:
-  index:
-    path: D:\lms\lucene\index
--- a/lms/nladmin-system/src/main/resources/config/application.yml
+++ b/lms/nladmin-system/src/main/resources/config/application.yml
@@ -19,39 +19,15 @@ spring:
      enabledBanner: false                        # 是否启用 控制台banner，默认true
      enabledCollect: true                        # 是否开启监控指标采集，默认true
      collectorTypes: logging          # 监控数据采集器类型（logging | micrometer | internal_logging），默认micrometer
-      logPath: C:\log\lms # 监控日志数据路径，默认 ${user.home}/logs，采集类型非logging不用配置
+      logPath: d:\log\lms # 监控日志数据路径，默认 ${user.home}/logs，采集类型非logging不用配置
      monitorInterval: 8
      tomcatTp: # tomcat webserver 线程池配置
        threadPoolAliasName: tomcat 线程池          # 线程池别名，可选
-        corePoolSize: 100
-        maximumPoolSize: 200
+        corePoolSize: 50
+        maximumPoolSize: 600
        keepAliveTime: 60
        runTimeout: 10000
        queueTimeout: 100
-        notifyItems: # 报警项，不配置自动会按默认值配置（变更通知、容量报警、活性报警、拒绝报警、任务超时报警）
-          - type: change
-            enabled: true
-
-          - type: capacity               # 队列容量使用率，报警项类型，查看源码 NotifyTypeEnum枚举类
-            enabled: true
-            threshold: 80                # 报警阈值，默认70，意思是队列使用率达到70%告警
-            interval: 120                # 报警间隔（单位：s），默认120
-
-          - type: liveness               # 线程池活性
-            enabled: true
-            threshold: 80                # 报警阈值，默认 70，意思是活性达到70%告警
-
-          - type: reject                 # 触发任务拒绝告警
-            enabled: true
-            threshold: 100               # 默认阈值10
-
-          - type: run_timeout            # 任务执行超时告警
-            enabled: true
-            threshold: 100               # 默认阈值10
-
-          - type: queue_timeout          # 任务排队超时告警
-            enabled: true
-            threshold: 100               # 默认阈值10
  #配置 Jpa
  jpa:
    hibernate:
@@ -90,7 +66,7 @@ rsa:
  private_key: MIIBUwIBADANBgkqhkiG9w0BAQEFAASCAT0wggE5AgEAAkEA0vfvyTdGJkdbHkB8mp0f3FE0GYP3AYPaJF7jUd1M0XxFSE2ceK3k2kw20YvQ09NJKk+OMjWQl9WitG9pB6tSCQIDAQABAkA2SimBrWC2/wvauBuYqjCFwLvYiRYqZKThUS3MZlebXJiLB+Ue/gUifAAKIg1avttUZsHBHrop4qfJCwAI0+YRAiEA+W3NK/RaXtnRqmoUUkb59zsZUBLpvZgQPfj1MhyHDz0CIQDYhsAhPJ3mgS64NbUZmGWuuNKp5coY2GIj/zYDMJp6vQIgUueLFXv/eZ1ekgz2Oi67MNCk5jeTF2BurZqNLR3MSmUCIFT3Q6uHMtsB9Eha4u7hS31tj1UWE+D+ADzp59MGnoftAiBeHT7gDMuqeJHPL4b+kC+gzV4FGTfhR9q3tTbklZkD2A==
 logging:
  file:
-    path: C:\log\lms
+    path: d:\log\lms
  config: classpath:logback-spring.xml
 # sa-token白名单配置
 security:
@@ -100,9 +76,6 @@ security:
    - /auth/login
    - /auth/code
    - /auth/logout
-    # swagger
-    - /swagger-ui.html
-    - /swagger-resources/**
    - /webjars/**
    - /file/**
    - /webSocket/**
@@ -183,4 +156,4 @@ jetcache:
      port: 6379
 lucene:
  index:
-    path: D:\lms\lucene\index
+    path: D:\log\lms\lucene\index
--- a/lms/nladmin-system/src/main/resources/logback-spring.xml
+++ b/lms/nladmin-system/src/main/resources/logback-spring.xml
@@ -14,7 +14,6 @@ https://juejin.cn/post/6844903775631572999
    <property name="log.pattern"
              value="%black(%contextName-) %X{traceId} %red(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %gray(%msg%n)"/>
    <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
-    <springProperty scope="context" name="esIndex" source="es.index"/>
    <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
    <property name="LOG_HOME" value="${logPath}"/>