From 218c85f5128b95cedcc20127c60d1915bb1f7bc6 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 06 三月 2025 16:33:12 +0800
Subject: [PATCH] Merge branch 'dev_zj' into dev

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

diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index cb2179d..8a825d3 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -7,7 +7,7 @@
   # 鐗堟潈骞翠唤
   copyrightYear: 2025
   # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
-  profile: D:/ruoyi/uploadPath
+  profile: /javaWork/lims-ruoyi/file/uploadPath
   # 鑾峰彇ip鍦板潃寮�鍏�
   addressEnabled: false
   # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
@@ -33,8 +33,9 @@
 
 # 鏃ュ織閰嶇疆
 logging:
+  file-location: /javaWork/lims-ruoyi
   level:
-    com.ruoyi: debug
+    com.ruoyi: info
     org.springframework: warn
 
 # 鐢ㄦ埛閰嶇疆
@@ -53,6 +54,10 @@
     basename: i18n/messages
   profiles:
     active: druid
+  # 鍏ㄥ眬鏃堕棿澶勭悊 LocalDateTime鏃堕棿搴忓垪鍙�
+  jackson:
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
   # 鏂囦欢涓婁紶
   servlet:
     multipart:
@@ -61,10 +66,10 @@
       # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
       max-request-size: 20MB
   # 鏈嶅姟妯″潡
-  devtools:
-    restart:
-      # 鐑儴缃插紑鍏�
-      enabled: true
+#  devtools:
+#    restart:
+#      # 鐑儴缃插紑鍏�
+#      enabled: false
   # redis 閰嶇疆
   redis:
     # 鍦板潃
@@ -73,8 +78,8 @@
     port: 6379
     # 鏁版嵁搴撶储寮�
     database: 0
-    # 瀵嗙爜
-    password:
+#    # 瀵嗙爜
+#    password: root2022!
     # 杩炴帴瓒呮椂鏃堕棿
     timeout: 10s
     lettuce:
@@ -95,16 +100,7 @@
   # 浠ょ墝瀵嗛挜
   secret: abcdefghijklmnopqrstuvwxyz
   # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
-  expireTime: 30
-
-# MyBatis閰嶇疆
-mybatis:
-  # 鎼滅储鎸囧畾鍖呭埆鍚�
-  typeAliasesPackage: com.ruoyi.**.domain
-  # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
-  mapperLocations: classpath*:mapper/**/*Mapper.xml
-  # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
-  configLocation: classpath:mybatis/mybatis-config.xml
+  expireTime: 450
 
 # PageHelper鍒嗛〉鎻掍欢
 pagehelper:
@@ -116,8 +112,6 @@
 swagger:
   # 鏄惁寮�鍚痵wagger
   enabled: true
-  # 璇锋眰鍓嶇紑
-  pathMapping: /dev-api
 
 # 闃叉XSS鏀诲嚮
 xss:
@@ -127,3 +121,17 @@
   excludes: /system/notice
   # 鍖归厤閾炬帴
   urlPatterns: /system/*,/monitor/*,/tool/*
+
+# mybatis-plus閰嶇疆
+mybatis-plus:
+  mapper-locations: classpath*:mapper/**/*Mapper.xml
+  type-aliases-package: com.ruoyi.**.domain
+  global-config:
+    banner: off
+    db-config:
+      id-type: auto
+  configuration:
+    map-underscore-to-camel-case: true
+    cache-enabled: false
+    log-impl: # org.apache.ibatis.logging.stdout.StdOutImpl
+

--
Gitblit v1.9.3