From 1c11d7ccc125366ff12efa4770749e389aba01fb Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 09 七月 2021 15:30:40 +0800
Subject: [PATCH] update 转移 springboot-admin 到扩展模块项目

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

diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 563931b..3352d1d 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
@@ -244,6 +250,8 @@
 
 # feign 鐩稿叧閰嶇疆
 feign:
+  # 涓嶆敮鎸佸鍖�, 濡傛湁闇�瑕佸彲鍦ㄦ敞瑙ｉ厤缃� 鎴� 鎻愬崌鎵寘绛夌骇
+  # 渚嬪 com.**.**.feign
   package: com.ruoyi.**.feign
   # 寮�鍚帇缂�
   compression:
@@ -253,8 +261,30 @@
       enabled: true
   okhttp:
     enabled: true
-  hystrix:
+  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:
+  # 鑾峰彇鍒嗗竷寮忛攣瓒呮椂鏃堕棿锛岄粯璁や负 3000 姣
+  acquire-timeout: 3000
+  # 鍒嗗竷寮忛攣鐨勮秴鏃舵椂闂达紝榛樿涓� 30 姣
+  expire: 30000
 
 --- # 瀹氭椂浠诲姟閰嶇疆
 spring:
@@ -289,18 +319,16 @@
 
 --- # 鐩戞帶閰嶇疆
 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}
+        url: http://localhost:9090/admin
         instance:
           prefer-ip: true # 娉ㄥ唽瀹炰緥鏃讹紝浼樺厛浣跨敤 IP
-      # Spring Boot Admin Server 鏈嶅姟绔殑鐩稿叧閰嶇疆
-      context-path: /admin # 閰嶇疆 Spring
+        username: ruoyi
+        password: 123456
 
 # Actuator 鐩戞帶绔偣鐨勯厤缃」
 management:
@@ -310,6 +338,7 @@
       base-path: /actuator
       exposure:
         # 闇�瑕佸紑鏀剧殑绔偣銆傞粯璁ゅ�煎彧鎵撳紑 health 鍜� info 涓や釜绔偣銆傞�氳繃璁剧疆 * 锛屽彲浠ュ紑鏀炬墍鏈夌鐐广��
+        # 鐢熶骇鐜涓嶅缓璁斁寮�鎵�鏈� 鏍规嵁椤圭洰闇�姹傛斁寮�鍗冲彲
         include: '*'
   endpoint:
     logfile:

--
Gitblit v1.9.3