From 0a12bfc2e9594345a0a6cf136bcf234c62450d9d Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期六, 14 十月 2023 16:31:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 6199853..45fd4b6 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -11,7 +11,7 @@
   # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ard/uploadPath锛孡inux閰嶇疆 /home/ard/uploadPath锛�
   profile: D:/ard/uploadPath
   # 鑾峰彇ip鍦板潃寮�鍏�
-  addressEnabled: true
+  addressEnabled: false
   # 楠岃瘉鐮佺被鍨� math 鏁扮粍璁＄畻 char 瀛楃楠岃瘉
   captchaType: char
 # 鐢ㄦ埛閰嶇疆
@@ -44,7 +44,7 @@
   global-config:
     banner: off # 鍏抽棴mybatisplus鍚姩鍥炬爣
     db-config: #涓婚敭涓嶇敤MyBatis plus鐨勯洩鑺辩畻娉�,鐢ㄦ暟鎹簱鐨勪富閿嚜澧�
-      id-type: auto
+      id-type: uuid
 #  configuration:
 #    # 鏄惁寮�鍚嚜鍔ㄩ┘宄板懡鍚嶈鍒欐槧灏�:浠庢暟鎹簱鍒楀悕鍒癑ava灞炴�ч┘宄板懡鍚嶇殑绫讳技鏄犲皠
 #    map-underscore-to-camel-case: true
@@ -101,5 +101,5 @@
   thymeleaf:
     cache: false
   profiles:
-    active: dev-druid,dev
+    active: prod-druid,prod
 

--
Gitblit v1.9.3