From 72bc0dae229a9edb7515dea574a24cef6ee9ca7c Mon Sep 17 00:00:00 2001
From: cjl <chenjl@deyt.cn>
Date: Wed, 12 Jul 2023 21:06:28 +0800
Subject: [PATCH] chore:测试提交

---
 screen-api/src/main/resources/application-dev.yml |   92 +++++++++++++++++++++++++--------------------
 1 files changed, 51 insertions(+), 41 deletions(-)

diff --git a/screen-api/src/main/resources/application-dev.yml b/screen-api/src/main/resources/application-dev.yml
index 082c9dc..8619aca 100644
--- a/screen-api/src/main/resources/application-dev.yml
+++ b/screen-api/src/main/resources/application-dev.yml
@@ -2,46 +2,43 @@
   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:
-    #cluster:
-      #nodes: 47.112.126.78:7001,47.112.126.78:7002,47.112.126.132:7003,47.112.126.132:7004,47.112.132.193:7005,47.112.132.193:7006
-    #password: test
-    #timeout: 500
-    host: 39.97.177.149
-      port: 6379
-      password: chenkaiyu111
-      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: 39.97.177.149
+    host: r-bp1xdlb9wfc6zt0msp05.redis.rds.aliyuncs.com
     port: 6379
-    password: chenkaiyu111
+    password: QX_moral_2023
     timeout: 30000
-    database: 14
+    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-bp1xdlb9wfc6zt0msp05.redis.rds.aliyuncs.com
+    port: 6379
+    password: QX_moral_2023
+    timeout: 30000
+    database: 15
     pool:
       max-active: 256
       max-wait: 30000
@@ -57,9 +54,9 @@
     filters: stat
     type: com.alibaba.druid.pool.DruidDataSource
     max-wait: 60000
-    url: jdbc:mysql://39.97.177.149:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC
-    username: root
-    password: chenkaiyu111
+    url: jdbc:mysql://rm-bp1pr3rx9m3fnkwsk05.mysql.rds.aliyuncs.com:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+    username: moral_qx
+    password: QX_moral_2023
     test-on-borrow: false
     sql-script-encoding: utf-8
     pool-prepared-statements: true
@@ -69,6 +66,12 @@
     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
   global-config:
@@ -77,9 +80,9 @@
       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
+    map-underscore-to-camel-case: true
+    call-setters-on-nulls: true
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 
 kafka:
   listener:
@@ -94,14 +97,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
@@ -109,11 +109,21 @@
       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:
-      - /account/login
+      - /login
+      - /swagger-ui.html
+      - /swagger-resources/**
+      - /swagger-ui.html/**
+      - /webjars/**
+      - /verificationCode/**
+      - /static/**
+
 AES:
   KEY:
     AD42F7787B035B7580000EF93BE20BAD

--
Gitblit v1.8.0