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

cjl

2023-12-14 6992aaf0587c09f7c511c1afd12e1519d91363d3

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

@@ -1,24 +1,19 @@
server:
  port: 8081
  tomcat:
    uri-encoding: UTF-8
    #最小线程数
    min-spare-threads: 500
    #最大线程数
    max-threads: 2500
    #最大链接数
    max-connections: 6500
    #最大等待队列长度
    accept-count: 1000
  servlet:
    context-path: /api
spring:
  profiles:
    active: dev
    include: bulletin, specialCity, announcement
  application:
    name: screen-manage
    name: screen-api
  main:
    allow-bean-definition-overriding: true
  redis:
    host: r-bp1xdlb9wfc6zt0msp.redis.rds.aliyuncs.com
    host: r-bp1xdlb9wfc6zt0msp18.redis.rds.aliyuncs.com
    port: 6379
    password: moral_123456
    password: QxPcRedis_moarl_2320
    timeout: 30000
    jedis:
      pool:
@@ -33,9 +28,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_123456
    password: QxPcRedis_moarl_2320
    timeout: 30000
    database: 15
    pool:
@@ -53,9 +48,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
    username: root
    password: moral_123456
    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: QxPcRedis_moarl_2320
    test-on-borrow: false
    sql-script-encoding: utf-8
    pool-prepared-statements: true
@@ -64,6 +59,12 @@
    driver-class-name: com.mysql.cj.jdbc.Driver
    max-conn-lifetime-millis: 20
    test-on-return: false

  servlet:
    multipart:
      enabled: true
      max-file-size: 2MB
      max-request-size: 2MB

mybatis-plus:
  mapper-locations: classpath:mapper/*.xml
@@ -90,14 +91,11 @@
    enable:
      auto:
        commit: false
    group:
      id: test
    servers: 192.168.0.191:9092
    servers: 172.16.44.65:9092,172.16.44.67:9092,172.16.44.66:9092
    session:
      timeout: 6000
    topic: test_topic
    zookeeper:
      connect: 192.168.0.16:2181,192.168.0.17:2181,192.168.0.18:2181
      connect: 172.16.44.65:2181,172.16.44.67:2181,172.16.44.66:2181
  producer:
    batch:
      size: 4096
@@ -105,20 +103,27 @@
      memory: 40960
    linger: 1
    retries: 0
    servers: 192.168.0.16:9092,192.168.0.17:9092,192.168.0.18:9092
    servers: 172.16.44.65:9092,172.16.44.67:9092,172.16.44.66:9092
  groupId:
    second-data: Dev_SecondsDataGroup
    cruiser-data: Dev_CruiserDataGroup
mvc:
  interceptor:
    exclude:
      - /login
      - /AppUser/**
      - /swagger-ui.html
      - /swagger-resources/**
      - /swagger-ui.html/**
      - /webjars/**
      - /verificationCode/**

      - /static/**
      - /file/preview/**
AES:
  KEY:
    AD42F7787B035B7580000EF93BE20BAD
TOKEN:
  KEY:
    foh3wi2ooghiCh5
    foh3wi2ooghiCh5
file:
  path: /data/upload/