From 9334c8b308436e5f698c89893ad47aca4dfabaa5 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 27 Sep 2023 15:22:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into wb
---
screen-api/src/main/resources/application-qa.yml | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/resources/application-qa.yml b/screen-api/src/main/resources/application-qa.yml
index 257eae4..3e5baa9 100644
--- a/screen-api/src/main/resources/application-qa.yml
+++ b/screen-api/src/main/resources/application-qa.yml
@@ -18,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
@@ -126,7 +128,8 @@
- /webjars/**
- /verificationCode/**
- /static/**
- - /file/**
+ - /doc.html
+ - /file/preview/**
AES:
@@ -136,3 +139,5 @@
KEY:
foh3wi2ooghiCh5
+file:
+ path: E:/upload
\ No newline at end of file
--
Gitblit v1.8.0