From 200170e5f3cd25c16bb9a891b96320af96f8edb3 Mon Sep 17 00:00:00 2001
From: 陆继保 <lubao0120@163.com>
Date: 星期二, 29 六月 2021 15:04:25 +0800
Subject: [PATCH] update ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java.

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

diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index b034d99..9fec4ae 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -8,12 +8,14 @@
   copyrightYear: 2021
   # 瀹炰緥婕旂ず寮�鍏�
   demoEnabled: true
-  # 鏂囦欢璺緞,浣跨敤jvm绯荤粺鍙橀噺,鍏煎windows鍜宭inux;
-  profile: ${user.dir}/ruoyi/uploadPath
+  # 鏂囦欢璺緞
+  profile: ./ruoyi/uploadPath
   # 鑾峰彇ip鍦板潃寮�鍏�
-  addressEnabled: false
+  addressEnabled: true
 
 captcha:
+  # 楠岃瘉鐮佸紑鍏�
+  enabled: true
   # 楠岃瘉鐮佺被鍨� math 鏁扮粍璁＄畻 char 瀛楃楠岃瘉
   type: math
   # line 绾挎骞叉壈 circle 鍦嗗湀骞叉壈 shear 鎵洸骞叉壈
@@ -84,6 +86,17 @@
   thymeleaf:
     # 灏嗙郴缁熸ā鏉挎斁缃埌鏈�鍓嶉潰 鍚﹀垯浼氫笌 springboot-admin 椤甸潰鍐茬獊
     template-resolver-order: 1
+  jackson:
+    # 鏃ユ湡鏍煎紡鍖�
+    date-format: yyyy-MM-dd HH:mm:ss
+    serialization:
+      # 鏍煎紡鍖栬緭鍑�
+      indent_output: false
+      # 蹇界暐鏃犳硶杞崲鐨勫璞�
+      fail_on_empty_beans: false
+    deserialization:
+      # 鍏佽瀵硅薄蹇界暐json涓笉瀛樺湪鐨勫睘鎬�
+      fail_on_unknown_properties: false
 
 # token閰嶇疆
 token:
@@ -97,6 +110,8 @@
 # MyBatisPlus閰嶇疆
 # https://baomidou.com/config/
 mybatis-plus:
+  # 涓嶆敮鎸佸鍖�, 濡傛湁闇�瑕佸彲鍦ㄦ敞瑙ｉ厤缃� 鎴� 鎻愬崌鎵寘绛夌骇
+  # 渚嬪 com.**.**.mapper
   mapperPackage: com.ruoyi.**.mapper
   # 瀵瑰簲鐨� XML 鏂囦欢浣嶇疆
   mapperLocations: classpath*:mapper/**/*Mapper.xml
@@ -144,6 +159,8 @@
     localCacheScope: SESSION
     # 寮�鍚疢ybatis浜岀骇缂撳瓨锛岄粯璁や负 true
     cacheEnabled: true
+    # 鏇磋缁嗙殑鏃ュ織杈撳嚭 浼氭湁鎬ц兘鎹熻��
+    # logImpl: org.apache.ibatis.logging.stdout.StdOutImpl
   global-config:
     # 鏄惁鎵撳嵃 Logo banner
     banner: true
@@ -187,6 +204,8 @@
 swagger:
   # 鏄惁寮�鍚痵wagger
   enabled: true
+  # 璇锋眰鍓嶇紑
+  pathMapping: /dev-api
   # 鏍囬
   title: '鏍囬锛歊uoYi-Vue-Plus鍚庡彴绠＄悊绯荤粺_鎺ュ彛鏂囨。'
   # 鎻忚堪
@@ -229,6 +248,8 @@
 
 # feign 鐩稿叧閰嶇疆
 feign:
+  # 涓嶆敮鎸佸鍖�, 濡傛湁闇�瑕佸彲鍦ㄦ敞瑙ｉ厤缃� 鎴� 鎻愬崌鎵寘绛夌骇
+  # 渚嬪 com.**.**.feign
   package: com.ruoyi.**.feign
   # 寮�鍚帇缂�
   compression:
@@ -238,8 +259,15 @@
       enabled: true
   okhttp:
     enabled: true
-  hystrix:
+  circuitbreaker:
     enabled: true
+
+--- # 鍒嗗竷寮忛攣 lock4j 鍏ㄥ眬閰嶇疆
+lock4j:
+  # 鑾峰彇鍒嗗竷寮忛攣瓒呮椂鏃堕棿锛岄粯璁や负 3000 姣
+  acquire-timeout: 3000
+  # 鍒嗗竷寮忛攣鐨勮秴鏃舵椂闂达紝榛樿涓� 30 姣
+  expire: 30000
 
 --- # 瀹氭椂浠诲姟閰嶇疆
 spring:
@@ -284,8 +312,6 @@
         url: http://localhost:${server.port}${spring.boot.admin.context-path}
         instance:
           prefer-ip: true # 娉ㄥ唽瀹炰緥鏃讹紝浼樺厛浣跨敤 IP
-      #        username: ruoyi
-      #        password: 123456
       # Spring Boot Admin Server 鏈嶅姟绔殑鐩稿叧閰嶇疆
       context-path: /admin # 閰嶇疆 Spring
 

--
Gitblit v1.9.3