From 2d78703bc3eca5b824852ec020975914c9999d47 Mon Sep 17 00:00:00 2001
From: Dftre <3066417822@qq.com>
Date: Fri, 7 Jun 2024 16:16:23 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E5=BE=AE?=
 =?UTF-8?q?=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/application-middleware.yml |  8 +++++
 .../src/main/resources/application.yml        | 29 +++++++------------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application-middleware.yml b/ruoyi-admin/src/main/resources/application-middleware.yml
index 118ed25..674ce2b 100644
--- a/ruoyi-admin/src/main/resources/application-middleware.yml
+++ b/ruoyi-admin/src/main/resources/application-middleware.yml
@@ -1,4 +1,12 @@
 spring:
+  cache:
+    redis:
+      # 指定存活时间（ms）
+      time-to-live: 86400000
+      # 指定前缀
+      use-key-prefix: true
+      # 是否缓存空值，可以防止缓存穿透
+      cache-null-values: true
   data:
     # redis 配置
     redis:
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 0740eda..3f7998d 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -50,13 +50,6 @@ spring:
   cache:
     # 指定缓存类型 jcache 本地缓存 redis 缓存
     type: redis
-    redis:
-      # 指定存活时间（ms）
-      time-to-live: 86400000
-      # 指定前缀
-      use-key-prefix: true
-      # 是否缓存空值，可以防止缓存穿透
-      cache-null-values: true
   mvc:
     pathmatch:
       matching-strategy: ANT_PATH_MATCHER
@@ -68,11 +61,11 @@ spring:
     active: druid,mybatis,oauth,pay,middleware
   # 文件上传
   servlet:
-     multipart:
-       # 单个文件大小
-       max-file-size:  10MB
-       # 设置总上传的文件大小
-       max-request-size:  20MB
+    multipart:
+      # 单个文件大小
+      max-file-size: 10MB
+      # 设置总上传的文件大小
+      max-request-size: 20MB
   # 服务模块
   devtools:
     restart:
@@ -81,12 +74,12 @@ spring:
 
 # token配置
 token:
-    # 令牌自定义标识
-    header: Authorization
-    # 令牌密钥
-    secret: abcdefghijklmnopqrstuvwxyz
-    # 令牌有效期（默认30分钟）
-    expireTime: 30
+  # 令牌自定义标识
+  header: Authorization
+  # 令牌密钥
+  secret: abcdefghijklmnopqrstuvwxyz
+  # 令牌有效期（默认30分钟）
+  expireTime: 30
 
 # Swagger配置
 swagger: