From 27e6bc3df3e39e0d0b147b155a89ad6837ea972b Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Mon, 06 Jan 2025 09:19:24 +0800
Subject: [PATCH] Merge branch 'cjl' into dev

---
 screen-api/src/main/resources/application-cjl.yml |    9 ++++++++-
 1 files changed, 8 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..67ded93 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
@@ -117,16 +119,21 @@
   interceptor:
     exclude:
       - /login
+      - /AppUser/**
       - /swagger-ui.html
       - /swagger-resources/**
       - /swagger-ui.html/**
       - /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