From f26786e162241b6b803ada6d19d80e1f5fb615e5 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 16 Oct 2023 09:36:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-api/src/main/resources/application-qa.yml | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/screen-api/src/main/resources/application-qa.yml b/screen-api/src/main/resources/application-qa.yml
index 78bf4a3..f006132 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
@@ -124,7 +128,8 @@
- /webjars/**
- /verificationCode/**
- /static/**
- - /file/**
+ - /doc.html
+ - /file/preview/**
AES:
@@ -134,3 +139,5 @@
KEY:
foh3wi2ooghiCh5
+file:
+ path: /data/upload/
\ No newline at end of file
--
Gitblit v1.8.0