From 090f4dac98c412c5734a706b853724e2d2accda4 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 25 Oct 2023 15:17:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-api/src/main/resources/application-qa.yml | 8 +++++++-
1 files changed, 7 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..3cbbba3 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
@@ -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: E:/upload
\ No newline at end of file
--
Gitblit v1.8.0