Merge remote-tracking branch 'origin/cjl' into qa

cjl

2023-12-14 6992aaf0587c09f7c511c1afd12e1519d91363d3

 screen-api/src/main/resources/application-qa.yml

@@ -21,7 +21,7 @@
  main:
    allow-bean-definition-overriding: true
  redis:
    host: r-bp1hez4g7rkqjswpaypd1.redis.rds.aliyuncs.com
    host: r-bp1hez4g7rkqjswpaypd159.redis.rds.aliyuncs.com
    port: 6379
    password: moral_123456
    timeout: 30000
@@ -38,7 +38,7 @@
        max-wait: 30000
        min-idle: 32
  tokenRedis:
    host: r-bp1hez4g7rkqjswpaypd1.redis.rds.aliyuncs.com
    host: r-bp1hez4g7rkqjswpaypd159.redis.rds.aliyuncs.com
    port: 6379
    password: moral_123456
    timeout: 30000
@@ -122,6 +122,7 @@
  interceptor:
    exclude:
      - /login
      - /AppUser/**
      - /swagger-ui.html
      - /swagger-resources/**
      - /swagger-ui.html/**
@@ -140,4 +141,4 @@
    foh3wi2ooghiCh5

file:
  path: E:/upload
  path: /data/upload/