From 56322786887f99604450cde07c9cab6fb5ea5135 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 12 七月 2021 11:39:43 +0800
Subject: [PATCH] !67 同步dev分支 Merge pull request !67 from 疯狂的狮子Li/dev

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

diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index e153d19..b88929d 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -64,6 +64,8 @@
 
 # Spring閰嶇疆
 spring:
+  application:
+    name: ${ruoyi.name}
   # 璧勬簮淇℃伅
   messages:
     # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
@@ -110,6 +112,8 @@
 # MyBatisPlus閰嶇疆
 # https://baomidou.com/config/
 mybatis-plus:
+  # 涓嶆敮鎸佸鍖�, 濡傛湁闇�瑕佸彲鍦ㄦ敞瑙ｉ厤缃� 鎴� 鎻愬崌鎵寘绛夌骇
+  # 渚嬪 com.**.**.mapper
   mapperPackage: com.ruoyi.**.mapper
   # 瀵瑰簲鐨� XML 鏂囦欢浣嶇疆
   mapperLocations: classpath*:mapper/**/*Mapper.xml
@@ -156,7 +160,9 @@
     # STATEMENT 鍏抽棴涓�绾х紦瀛�
     localCacheScope: SESSION
     # 寮�鍚疢ybatis浜岀骇缂撳瓨锛岄粯璁や负 true
-    cacheEnabled: true
+    cacheEnabled: false
+    # 鏇磋缁嗙殑鏃ュ織杈撳嚭 浼氭湁鎬ц兘鎹熻��
+    # logImpl: org.apache.ibatis.logging.stdout.StdOutImpl
   global-config:
     # 鏄惁鎵撳嵃 Logo banner
     banner: true
@@ -203,7 +209,7 @@
   # 璇锋眰鍓嶇紑
   pathMapping: /dev-api
   # 鏍囬
-  title: '鏍囬锛歊uoYi-Vue-Plus鍚庡彴绠＄悊绯荤粺_鎺ュ彛鏂囨。'
+  title: '鏍囬锛�${ruoyi.name}鍚庡彴绠＄悊绯荤粺_鎺ュ彛鏂囨。'
   # 鎻忚堪
   description: '鎻忚堪锛氱敤浜庣鐞嗛泦鍥㈡棗涓嬪叕鍙哥殑浜哄憳淇℃伅,鍏蜂綋鍖呮嫭XXX,XXX妯″潡...'
   # 鐗堟湰
@@ -244,6 +250,8 @@
 
 # feign 鐩稿叧閰嶇疆
 feign:
+  # 涓嶆敮鎸佸鍖�, 濡傛湁闇�瑕佸彲鍦ㄦ敞瑙ｉ厤缃� 鎴� 鎻愬崌鎵寘绛夌骇
+  # 渚嬪 com.**.**.feign
   package: com.ruoyi.**.feign
   # 寮�鍚帇缂�
   compression:
@@ -255,6 +263,21 @@
     enabled: true
   circuitbreaker:
     enabled: true
+
+--- # redisson 缂撳瓨閰嶇疆
+redisson:
+  cacheGroup:
+    # 鐢ㄤ緥: @Cacheable(cacheNames="groupId", key="#XXX") 鏂瑰彲浣跨敤缂撳瓨缁勯厤缃�
+    - groupId: redissonCacheMap
+      # 缁勮繃鏈熸椂闂�(鑴氭湰鐩戞帶)
+      ttl: 60000
+      # 缁勬渶澶х┖闂叉椂闂�(鑴氭湰鐩戞帶)
+      maxIdleTime: 60000
+      # 缁勬渶澶ч暱搴�
+      maxSize: 0
+    - groupId: testCache
+      ttl: 1000
+      maxIdleTime: 500
 
 --- # 鍒嗗竷寮忛攣 lock4j 鍏ㄥ眬閰嶇疆
 lock4j:
@@ -293,31 +316,3 @@
             tablePrefix: QRTZ_
             # sqlserver 鍚敤
             # selectWithLockSQL: SELECT * FROM {0}LOCKS UPDLOCK WHERE LOCK_NAME = ?
-
---- # 鐩戞帶閰嶇疆
-spring:
-  application:
-    name: ruoyi-vue-plus
-  boot:
-    admin:
-      # Spring Boot Admin Client 瀹㈡埛绔殑鐩稿叧閰嶇疆
-      client:
-        # 璁剧疆 Spring Boot Admin Server 鍦板潃
-        url: http://localhost:${server.port}${spring.boot.admin.context-path}
-        instance:
-          prefer-ip: true # 娉ㄥ唽瀹炰緥鏃讹紝浼樺厛浣跨敤 IP
-      # Spring Boot Admin Server 鏈嶅姟绔殑鐩稿叧閰嶇疆
-      context-path: /admin # 閰嶇疆 Spring
-
-# Actuator 鐩戞帶绔偣鐨勯厤缃」
-management:
-  endpoints:
-    web:
-      # Actuator 鎻愪緵鐨� API 鎺ュ彛鐨勬牴鐩綍銆傞粯璁や负 /actuator
-      base-path: /actuator
-      exposure:
-        # 闇�瑕佸紑鏀剧殑绔偣銆傞粯璁ゅ�煎彧鎵撳紑 health 鍜� info 涓や釜绔偣銆傞�氳繃璁剧疆 * 锛屽彲浠ュ紑鏀炬墍鏈夌鐐广��
-        include: '*'
-  endpoint:
-    logfile:
-      external-file: ./logs/sys-console.log

--
Gitblit v1.9.3