Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

jinpengyong

2023-10-13 bb6856a82a588f05040b0410a9747ae8029bb3be

 screen-manage/src/main/resources/application-dev.yml

@@ -18,9 +18,9 @@
  application:
    name: screen-manage
  redis:
      host: r-bp1xdlb9wfc6zt0msp.redis.rds.aliyuncs.com
      host: r-bp1xdlb9wfc6zt0msp18.redis.rds.aliyuncs.com
      port: 6379
      password: moral_qx_12345
      password: QxPcRedis_moarl_2320
      timeout: 30000
      jedis:
        pool:
@@ -35,9 +35,9 @@
          max-wait: 30000
          min-idle: 32
  tokenRedis:
    host: r-bp1xdlb9wfc6zt0msp.redis.rds.aliyuncs.com
    host: r-bp1xdlb9wfc6zt0msp18.redis.rds.aliyuncs.com
    port: 6379
    password: moral_qx_12345
    password: QxPcRedis_moarl_2320
    timeout: 30000
    database: 14
    pool:
@@ -55,9 +55,9 @@
    filters: stat
    type: com.alibaba.druid.pool.DruidDataSource
    max-wait: 60000
    url: jdbc:mysql://rm-bp1pr3rx9m3fnkwsk.mysql.rds.aliyuncs.com:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
    url: jdbc:mysql://rm-bp1pr3rx9m3fnkwsk18.mysql.rds.aliyuncs.com:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
    username: moral_qx
    password: moral_qx_12345
    password: QxPcRedis_moarl_2320
    test-on-borrow: false
    sql-script-encoding: utf-8
    pool-prepared-statements: true
@@ -125,5 +125,8 @@
TOKEN:
  KEY:
    foh3wi2ooghiCh5
result:
  device:
    list: p5dnd7a0245499,p5dnd7a0391962