From c1dafc830993fcedb99a4f2b62178691e1e92e64 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期一, 07 八月 2023 14:07:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/resources/application.yml | 34 ++++++++++++++++++++++++----------
1 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 8a167b9..6903577 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -36,8 +36,10 @@
# 鏃ュ織閰嶇疆
logging:
level:
- com.ruoyi: debug
+ com.ruoyi.utils.tube: debug
+ com.ruoyi.inspect: info
org.springframework: warn
+ com.example.mapper: debug
# 鐢ㄦ埛閰嶇疆
user:
@@ -66,7 +68,7 @@
devtools:
restart:
# 鐑儴缃插紑鍏�
- enabled: true
+ enabled: false
# redis 閰嶇疆
redis:
# 鍦板潃
@@ -76,7 +78,7 @@
# 鏁版嵁搴撶储寮�
database: 0
# 瀵嗙爜
- password: 5959932
+ password:
# 杩炴帴瓒呮椂鏃堕棿
timeout: 10s
lettuce:
@@ -101,13 +103,25 @@
expireTime: 30
# MyBatis閰嶇疆
-mybatis:
- # 鎼滅储鎸囧畾鍖呭埆鍚�
- typeAliasesPackage: com.ruoyi.**.domain
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
+#mybatis:
+# # 鎼滅储鎸囧畾鍖呭埆鍚�
+# typeAliasesPackage: com.ruoyi.**.domain
+# # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
+# mapperLocations: classpath*:mapper/**/*Mapper.xml
+# # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
+# configLocation: classpath:mybatis/mybatis-config.xml
+mybatis-plus:
+ type-Aliases-Package: com.ruoyi.**.domain
+ mapper-Locations: classpath*:mapper/**/*Mapper.xml
+ config-Location: classpath:mybatis/mybatis-config.xml
+# configuration:
+# # 鏄惁寮�鍚嚜鍔ㄩ┘宄板懡鍚嶈鍒欐槧灏�:浠庢暟鎹簱鍒楀悕鍒癑ava灞炴�ч┘宄板懡鍚嶇殑绫讳技鏄犲皠
+# map-underscore-to-camel-case: true
+# # 濡傛灉鏌ヨ缁撴灉涓寘鍚┖鍊肩殑鍒楋紝鍒� MyBatis 鍦ㄦ槧灏勭殑鏃跺�欙紝涓嶄細鏄犲皠杩欎釜瀛楁
+# call-setters-on-nulls: true
+# # 杩欎釜閰嶇疆浼氬皢鎵ц鐨剆ql鎵撳嵃鍑烘潵锛屽湪寮�鍙戞垨娴嬭瘯鐨勬椂鍊欏彲浠ョ敤
+# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
# PageHelper鍒嗛〉鎻掍欢
pagehelper:
--
Gitblit v1.9.3