From 6992aaf0587c09f7c511c1afd12e1519d91363d3 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 14 Dec 2023 15:38:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-api/src/main/resources/application-qa.yml | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/screen-api/src/main/resources/application-qa.yml b/screen-api/src/main/resources/application-qa.yml
index 78bf4a3..6b0351b 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,8 +18,10 @@
include: bulletin, specialCity, announcement
application:
name: screen-api
+ main:
+ allow-bean-definition-overriding: true
redis:
- host: r-bp1hez4g7rkqjswpaypd1.redis.rds.aliyuncs.com
+ host: r-bp1hez4g7rkqjswpaypd159.redis.rds.aliyuncs.com
port: 6379
password: moral_123456
timeout: 30000
@@ -34,7 +38,7 @@
max-wait: 30000
min-idle: 32
tokenRedis:
- host: r-bp1hez4g7rkqjswpaypd1.redis.rds.aliyuncs.com
+ host: r-bp1hez4g7rkqjswpaypd159.redis.rds.aliyuncs.com
port: 6379
password: moral_123456
timeout: 30000
@@ -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
@@ -118,13 +122,15 @@
interceptor:
exclude:
- /login
+ - /AppUser/**
- /swagger-ui.html
- /swagger-resources/**
- /swagger-ui.html/**
- /webjars/**
- /verificationCode/**
- /static/**
- - /file/**
+ - /doc.html
+ - /file/preview/**
AES:
@@ -134,3 +140,5 @@
KEY:
foh3wi2ooghiCh5
+file:
+ path: /data/upload/
\ No newline at end of file
--
Gitblit v1.8.0