From 500b831eb1153e9ba04fbffefa8fdfdfa080316c Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期六, 15 三月 2025 11:43:24 +0800
Subject: [PATCH] Merge branch 'dev' into dev_dz

---
 ruoyi-admin/src/main/resources/application.yml |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 54fd4cb..ca23fdf 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -31,13 +31,6 @@
       # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
       min-spare: 100
 
-# 鏃ュ織閰嶇疆
-logging:
-  file-location: /javaWork/lims-ruoyi
-  level:
-    com.ruoyi: info
-    org.springframework: warn
-
 # 鐢ㄦ埛閰嶇疆
 user:
   password:
@@ -95,4 +88,11 @@
   # 鍖归厤閾炬帴
   urlPatterns: /system/*,/monitor/*,/tool/*
 
+#闆嗗洟缁熶竴鐧诲綍
+sso:
+  url:
+  clientId:
+  clientSecret:
+  callbackUrl:
+
 

--
Gitblit v1.9.3