Merge branch 'zya'

郑永安

2023-08-15 c94f3c34d1c2c5a1d5e7010ab1e3cd0aded3cfac

 src/main/resources/application.yml

@@ -1,3 +1,4 @@

# mysql 多数据源
spring:
  application:
@@ -10,22 +11,21 @@
#    active: test-local

  #redis
  redis:
    database: 0
    host: 10.187.1.202
    port: 6379
    password: ZhongtaiRedis@103
    redisson:
      pool:
        max-active: 12
        min-idle: 6

    jedis:
      pool:
        max-idle: 8
        max-active: 8
        max-wait: -1ms
        min-idle: 1
#  redis:
#    database: 0
#    host: 10.187.1.202
#    port: 6379
#    password: ZhongtaiRedis@103
#    redisson:
#      pool:
#        max-active: 12
#        min-idle: 6
#    jedis:
#      pool:
#        max-idle: 8
#        max-active: 8
#        max-wait: -1ms
#        min-idle: 1
  #security
  security:
    user:
@@ -62,7 +62,6 @@
  corePoolSize: 20
  maxPoolSize: 20
  queueCapacity: 10000

logging:
  level:
    com.gk.hotwork: info