From dae6e068207ad1bff32dafd8c71f12d8a2a59aa2 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期一, 15 四月 2024 16:21:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

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

diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index b403f23..486d791 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -29,6 +29,8 @@
   secret: abcdefghijklmnopqrstuvwxyz
   # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
   expireTime: 30
+  # 鏄惁鍏佽璐︽埛澶氱粓绔悓鏃剁櫥褰� (true 鍏佽/ false 涓嶅厑璁�)
+  soloLogin: true
 # MyBatis閰嶇疆
 #mybatis:
 #    # 鎼滅储鎸囧畾鍖呭埆鍚�
@@ -133,5 +135,5 @@
         max-wait: -1ms
   # 婵�娲婚厤缃枃浠�
   profiles:
-    active: dev-druid,dev
+    active: prod-druid,prod
 

--
Gitblit v1.9.3