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 | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/screen-api/src/main/resources/application-qa.yml b/screen-api/src/main/resources/application-qa.yml
index 257eae4..6b0351b 100644
--- a/screen-api/src/main/resources/application-qa.yml
+++ b/screen-api/src/main/resources/application-qa.yml
@@ -18,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
@@ -36,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
@@ -120,13 +122,15 @@
interceptor:
exclude:
- /login
+ - /AppUser/**
- /swagger-ui.html
- /swagger-resources/**
- /swagger-ui.html/**
- /webjars/**
- /verificationCode/**
- /static/**
- - /file/**
+ - /doc.html
+ - /file/preview/**
AES:
@@ -136,3 +140,5 @@
KEY:
foh3wi2ooghiCh5
+file:
+ path: /data/upload/
\ No newline at end of file
--
Gitblit v1.8.0