From 20c644e44d92fa02b873fb6189eee71615bc12d2 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 13 Oct 2023 14:28:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-api/src/main/resources/application-cjl.yml | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/resources/application-cjl.yml b/screen-api/src/main/resources/application-cjl.yml
index 0eb8c80..e2ff30e 100644
--- a/screen-api/src/main/resources/application-cjl.yml
+++ b/screen-api/src/main/resources/application-cjl.yml
@@ -16,6 +16,8 @@
include: bulletin, specialCity, announcement
application:
name: screen-api
+ main:
+ allow-bean-definition-overriding: true
redis:
host: r-bp1xdlb9wfc6zt0msppd13.redis.rds.aliyuncs.com
port: 6379
@@ -123,10 +125,14 @@
- /webjars/**
- /verificationCode/**
- /static/**
+ - /doc.html
+ - /file/preview/**
AES:
KEY:
AD42F7787B035B7580000EF93BE20BAD
TOKEN:
KEY:
- foh3wi2ooghiCh5
\ No newline at end of file
+ foh3wi2ooghiCh5
+file:
+ path: E:/upload
\ No newline at end of file
--
Gitblit v1.8.0