Merge branch 'cjl' into dev

cjl

2025-01-06 27e6bc3df3e39e0d0b147b155a89ad6837ea972b

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

@@ -18,9 +18,9 @@
  application:
    name: screen-job
  redis:
    host: r-bp1xdlb9wfc6zt0msppd.redis.rds.aliyuncs.com
    host: r-bp1hez4g7rkqjswpaypd1.redis.rds.aliyuncs.com
    port: 6379
    password: moral_qx_12345
    password: moral_123456
    timeout: 30000
    jedis:
      pool:
@@ -35,9 +35,9 @@
        max-wait: 30000
        min-idle: 32
  tokenRedis:
    host: r-bp1xdlb9wfc6zt0msppd.redis.rds.aliyuncs.com
    host: r-bp1hez4g7rkqjswpaypd1.redis.rds.aliyuncs.com
    port: 6379
    password: moral_qx_12345
    password: moral_123456
    timeout: 30000
    database: 14
    pool:
@@ -55,9 +55,9 @@
    filters: stat
    type: com.alibaba.druid.pool.DruidDataSource
    max-wait: 60000
    url: jdbc:mysql://rm-bp1pr3rx9m3fnkwsk8o2.mysql.rds.aliyuncs.com:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
    username: moral_qx
    password: moral_qx_12345
    url: jdbc:mysql://121.199.44.85:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
    username: root
    password: moral_123456
    test-on-borrow: false
    sql-script-encoding: utf-8
    pool-prepared-statements: true
@@ -66,7 +66,17 @@
    driver-class-name: com.mysql.cj.jdbc.Driver
    max-conn-lifetime-millis: 20
    test-on-return: false

  mail:
    host: smtp.qq.com   # 设置邮箱主机(服务商),这里使用QQ邮件服务器
    username: 909710561@qq.com  # 设置用户名 - 发送方
    password: vimrublcqpktbdjh   # 设置密码，该处的密码是QQ邮箱开启SMTP的授权码而非QQ密码
    properties:
      mail:
        smtp:
          auth: true  # 必须进行授权认证，它的目的就是阻止他人任意乱发邮件
          starttls: #SMTP加密方式:连接到一个TLS保护连接
          enable: true
          required: true
mybatis-plus:
  mapper-locations: classpath:mapper/*.xml
  global-config:
@@ -86,7 +96,7 @@
  job:
    admin:
      # 调度中心部署地址：如调度中心集群部署存在多个地址则用逗号分隔。执行器将会使用该地址进行"执行器心跳注册"和"任务结果回调"
      addresses: http://127.0.0.1:8090/xxl-job-admin
      addresses: http://120.26.43.34:8090/xxl-job-admin

    #执行器通讯TOKEN，无TOKEN则可以空白
    accessToken:
@@ -100,10 +110,15 @@
      appname: xxl-job-executor-sample-springboot
      ip:
      port: 9999

      #执行器运行日志文件存储的磁盘位置，需要对该路径拥有读写权限
      logpath: /data/applogs/xxl-job/jobhandler
      #执行器日志文件定期清理功能，指定日志保存天数，过期自动删除，最少保存3天否则不生效，-1则不启动。
      logretentiondays: -1


result:
  date:
    changshu: P5DND7A0245358,P5DND7A0245364,P5DND7A0245413,P5DND7A0245355,P5DND7A0245416,P5DND7A0245426,P5DND7A0245398,P5DND7A0245441,P5DND7A0245429,P5DND7A0245435,P5DND7A0245372,P5DND7A0245397,P5DND7A0245415,P5DND7A0245411,P5DND7A0245407,P5DND7A0245418,P5DND7A0245430,P5DND7A0245493,P5DND7A0245414,P5DND7A0245366,P5DND7A0245442,P5DND7A0245386,P5DND7A0245431,P5DND7A0245394,P5DND7A0245380,P5DND7A0245420,P5DND7A0245440,P5DND7A0245432,P5DND7A0391974,P5DND7A0391989,P5DND7A0245481,P5DND7A0392001,P5DND7A0391991,P5DND7A0391978,P5DND7A0245499
  device:
    list: p5dnd7a0245499,p5dnd7a0391962