From 7029a780a1738bffdb6b00fa94d7b845f9444a5d Mon Sep 17 00:00:00 2001 From: cjl <276999030@qq.com> Date: Fri, 07 Jul 2023 08:31:23 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/qa' into cjl --- screen-api/src/main/resources/application-qa.yml | 136 +++++++++++++++++++++++++++ screen-manage/src/main/resources/application-qa.yml | 129 +++++++++++++++++++++++++ 2 files changed, 265 insertions(+), 0 deletions(-) diff --git a/screen-api/src/main/resources/application-qa.yml b/screen-api/src/main/resources/application-qa.yml new file mode 100644 index 0000000..78bf4a3 --- /dev/null +++ b/screen-api/src/main/resources/application-qa.yml @@ -0,0 +1,136 @@ +server: + port: 8081 + tomcat: + uri-encoding: UTF-8 + #��������������� + min-spare-threads: 500 + #��������������� + max-threads: 2500 + #��������������� + max-connections: 6500 + #������������������������ + accept-count: 1000 +spring: + profiles: + active: dev + include: bulletin, specialCity, announcement + application: + name: screen-api + redis: + host: r-bp1hez4g7rkqjswpaypd1.redis.rds.aliyuncs.com + port: 6379 + password: moral_123456 + timeout: 30000 + jedis: + pool: + max-active: 256 + max-wait: 30000 + max-idle: 64 + min-idle: 32 + lettuce: + pool: + max-active: 256 + max-idle: 64 + max-wait: 30000 + min-idle: 32 + tokenRedis: + host: r-bp1hez4g7rkqjswpaypd1.redis.rds.aliyuncs.com + port: 6379 + password: moral_123456 + timeout: 30000 + database: 15 + pool: + max-active: 256 + max-wait: 30000 + max-idle: 64 + min-idle: 32 + datasource: + minIdle: 1 + time-between-eviction-runs-millis: 60000 + max-active: 20 + test-while-idle: true + validation-query: select 'x' + filters: stat + type: com.alibaba.druid.pool.DruidDataSource + max-wait: 60000 + url: jdbc:mysql://172.16.44.71: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 + min-evictable-idle-time-millis: 300000 + initial-size: 1 + driver-class-name: com.mysql.cj.jdbc.Driver + max-conn-lifetime-millis: 20 + test-on-return: false + + servlet: + multipart: + enabled: true + max-file-size: 10MB + max-request-size: 10MB + +mybatis-plus: + mapper-locations: classpath:mapper/*.xml + global-config: + db-config: + id-type: auto + field-strategy: NOT_EMPTY + db-type: MYSQL + configuration: + map-underscore-to-camel-case: true + call-setters-on-nulls: true + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + +kafka: + listener: + # ��������������������������������������������������� + ack-mode: manual_immediate + consumer: + auto: + offset: + reset: latest + # ��������������������������������������������������������� ���������*��������� + concurrency: 3 + # ������������������������������������������true������������������������������������������������������������������������false������������������������������ + enable: + auto: + commit: false + servers: 47.99.145.48:9092,47.111.116.38:9092,47.111.124.159:9092 + session: + timeout: 6000 + zookeeper: + connect: 47.99.145.48:2181,47.111.116.38:2181,47.111.124.159:2181 + producer: + batch: + size: 4096 + buffer: + memory: 40960 + linger: 1 + # ������������������������������������������ + retries: 0 + servers: 47.99.145.48:9092,47.111.116.38:9092,47.111.124.159:9092 + groupId: + second-data: SecondsDataGroup1 + cruiser-data: cruiserDataGroup1 +mvc: + interceptor: + exclude: + - /login + - /swagger-ui.html + - /swagger-resources/** + - /swagger-ui.html/** + - /webjars/** + - /verificationCode/** + - /static/** + - /file/** + + +AES: + KEY: + AD42F7787B035B7580000EF93BE20BAD +TOKEN: + KEY: + foh3wi2ooghiCh5 + diff --git a/screen-manage/src/main/resources/application-qa.yml b/screen-manage/src/main/resources/application-qa.yml new file mode 100644 index 0000000..57fe931 --- /dev/null +++ b/screen-manage/src/main/resources/application-qa.yml @@ -0,0 +1,129 @@ +server: + port: 8082 + tomcat: + uri-encoding: UTF-8 + #��������������� + min-spare-threads: 500 + #��������������� + max-threads: 2500 + #��������������� + max-connections: 6500 + #������������������������ + accept-count: 1000 +spring: + profiles: + active: dev + include: + moduleFormColumn + application: + name: screen-manage + redis: + host: r-bp1hez4g7rkqjswpaypd1.redis.rds.aliyuncs.com + port: 6379 + password: moral_123456 + timeout: 30000 + jedis: + pool: + max-active: 256 + max-wait: 30000 + max-idle: 64 + min-idle: 32 + lettuce: + pool: + max-active: 256 + max-idle: 64 + max-wait: 30000 + min-idle: 32 + tokenRedis: + host: r-bp1hez4g7rkqjswpaypd1.redis.rds.aliyuncs.com + port: 6379 + password: moral_123456 + timeout: 30000 + database: 14 + pool: + max-active: 256 + max-wait: 30000 + max-idle: 64 + min-idle: 32 + + datasource: + minIdle: 1 + time-between-eviction-runs-millis: 60000 + max-active: 20 + test-while-idle: true + validation-query: select 'x' + filters: stat + type: com.alibaba.druid.pool.DruidDataSource + max-wait: 60000 + url: jdbc:mysql://172.16.44.71: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 + min-evictable-idle-time-millis: 300000 + initial-size: 1 + driver-class-name: com.mysql.cj.jdbc.Driver + max-conn-lifetime-millis: 20 + test-on-return: false + +mybatis-plus: + mapper-locations: classpath:mapper/*.xml + global-config: + db-config: + id-type: auto + field-strategy: NOT_EMPTY + db-type: MYSQL + configuration: + map-underscore-to-camel-case: true + call-setters-on-nulls: true + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + +kafka: + listener: + ack-mode: manual_immediate + consumer: + auto: + commit: + interval: 100 + offset: + reset: latest + concurrency: 3 + enable: + auto: + commit: false + servers: 172.16.44.65:9092,172.16.44.67:9092,172.16.44.66:9092 + session: + timeout: 6000 + zookeeper: + connect: 172.16.44.65:2181,172.16.44.67:2181,172.16.44.66:2181 + producer: + batch: + size: 4096 + buffer: + memory: 40960 + linger: 1 + retries: 0 + servers: 172.16.44.65:9092,172.16.44.67:9092,172.16.44.66:9092 + groupId: + insert: Dev_insert + state: Dev_state +mvc: + interceptor: + exclude: + - /login + - /swagger-ui.html + - /swagger-resources/** + - /webjars/** + - /verificationCode/** + - /manageLog/** + - /dataReplication/** + +AES: + KEY: + AD42F7787B035B7580000EF93BE20BAD +TOKEN: + KEY: + foh3wi2ooghiCh5 + + -- Gitblit v1.8.0