From 37b8351fc6ac8cc6b38f53c3b4ea471720b09b70 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 30 Aug 2023 11:36:18 +0800
Subject: [PATCH] fix:补充提交

---
 screen-api/src/main/resources/application-dev.yml |   28 ++++++++++------------------
 1 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/screen-api/src/main/resources/application-dev.yml b/screen-api/src/main/resources/application-dev.yml
index 49177d8..0dc6f52 100644
--- a/screen-api/src/main/resources/application-dev.yml
+++ b/screen-api/src/main/resources/application-dev.yml
@@ -1,25 +1,17 @@
 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: specialCity
+    include: bulletin, specialCity, announcement
   application:
     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:
@@ -34,9 +26,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:
@@ -54,9 +46,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

--
Gitblit v1.8.0