From 2b5a2bb0525cc70d7f44d18b8bcf44f46db8a35e Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 31 Aug 2023 16:01:55 +0800
Subject: [PATCH] chore:测试提交

---
 screen-api/src/main/resources/application-qa.yml |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/screen-api/src/main/resources/application-qa.yml b/screen-api/src/main/resources/application-qa.yml
index 78bf4a3..ab0f0ae 100644
--- a/screen-api/src/main/resources/application-qa.yml
+++ b/screen-api/src/main/resources/application-qa.yml
@@ -1,5 +1,7 @@
 server:
   port: 8081
+  servlet:
+    context-path: /api
   tomcat:
     uri-encoding: UTF-8
     #���������������
@@ -16,6 +18,8 @@
     include: bulletin, specialCity, announcement
   application:
     name: screen-api
+  main:
+    allow-bean-definition-overriding: true
   redis:
     host: r-bp1hez4g7rkqjswpaypd1.redis.rds.aliyuncs.com
     port: 6379
@@ -53,7 +57,7 @@
     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
+    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

--
Gitblit v1.8.0