From 9159e2ed2293722db0c9a42024c00d38c1a2cd62 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 13 五月 2021 09:16:28 +0800
Subject: [PATCH] fix vue与boot整合打包与admin页面路由冲突

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

diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 4e0d2b7..6ab3030 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -1,9 +1,9 @@
 # 椤圭洰鐩稿叧閰嶇疆
 ruoyi:
   # 鍚嶇О
-  name: RuoYi
+  name: RuoYi-Vue-Plus
   # 鐗堟湰
-  version: 3.3.0
+  version: ${ruoyi-vue-plus.version}
   # 鐗堟潈骞翠唤
   copyrightYear: 2021
   # 瀹炰緥婕旂ず寮�鍏�
@@ -12,8 +12,16 @@
   profile: ${user.dir}/ruoyi/uploadPath
   # 鑾峰彇ip鍦板潃寮�鍏�
   addressEnabled: false
+
+captcha:
   # 楠岃瘉鐮佺被鍨� math 鏁扮粍璁＄畻 char 瀛楃楠岃瘉
   captchaType: math
+  # line 绾挎骞叉壈 circle 鍦嗗湀骞叉壈 shear 鎵洸骞叉壈
+  captchaCategory: circle
+  # 鏁板瓧楠岃瘉鐮佷綅鏁�
+  captchaNumberLength: 1
+  # 瀛楃楠岃瘉鐮侀暱搴�
+  captchaCharLength: 4
 
 # 寮�鍙戠幆澧冮厤缃�
 server:
@@ -49,6 +57,7 @@
   level:
     com.ruoyi: @logging.level@
     org.springframework: warn
+  config: classpath:logback.xml
 
 # Spring閰嶇疆
 spring:
@@ -70,6 +79,37 @@
     restart:
       # 鐑儴缃插紑鍏�
       enabled: true
+  # 涓巚ue鏁村悎閮ㄧ讲浣跨敤
+  thymeleaf:
+    # 灏嗙郴缁熸ā鏉挎斁缃埌鏈�鍓嶉潰 鍚﹀垯浼氫笌 springboot-admin 椤甸潰鍐茬獊
+    template-resolver-order: 1
+  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
+#        username: ruoyi
+#        password: 123456
+      # 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
 
 # token閰嶇疆
 token:
@@ -83,8 +123,9 @@
 # MyBatis閰嶇疆
 # https://baomidou.com/config/
 mybatis-plus:
+  mapperPackage: com.ruoyi.**.mapper
   # 瀵瑰簲鐨� XML 鏂囦欢浣嶇疆
-  mapper-locations: classpath*:mapper/**/*Mapper.xml
+  mapperLocations: classpath*:mapper/**/*Mapper.xml
   # 瀹炰綋鎵弿锛屽涓猵ackage鐢ㄩ�楀彿鎴栬�呭垎鍙峰垎闅�
   typeAliasesPackage: com.ruoyi.**.domain
   # 閽堝 typeAliasesPackage锛屽鏋滈厤缃簡璇ュ睘鎬э紝鍒欎粎浠呬細鎵弿璺緞涓嬩互璇ョ被浣滀负鐖剁被鐨勫煙瀵硅薄
@@ -153,7 +194,7 @@
       # 鍏ㄥ眬鐨別ntity鐨勯�昏緫鍒犻櫎瀛楁灞炴�у悕
       logicDeleteField: null
       # 閫昏緫宸插垹闄ゅ��
-      logicDeleteValue: 1
+      logicDeleteValue: 2
       # 閫昏緫鏈垹闄ゅ��
       logicNotDeleteValue: 0
       # 瀛楁楠岃瘉绛栫暐涔� insert,鍦� insert 鐨勬椂鍊欑殑瀛楁楠岃瘉绛栫暐
@@ -162,11 +203,11 @@
       # NOT_EMPTY 闈炵┖鍒ゆ柇(鍙瀛楃涓茬被鍨嬪瓧娈�,鍏朵粬绫诲瀷瀛楁渚濈劧涓洪潪NULL鍒ゆ柇)
       # DEFAULT 榛樿鐨�,涓�鑸彧鐢ㄤ簬娉ㄨВ閲�
       # NEVER 涓嶅姞鍏� SQL
-      insertStrategy: NOT_NULL
+      insertStrategy: NOT_EMPTY
       # 瀛楁楠岃瘉绛栫暐涔� update,鍦� update 鐨勬椂鍊欑殑瀛楁楠岃瘉绛栫暐
-      updateStrategy: NOT_NULL
+      updateStrategy: NOT_EMPTY
       # 瀛楁楠岃瘉绛栫暐涔� select,鍦� select 鐨勬椂鍊欑殑瀛楁楠岃瘉绛栫暐鏃� wrapper 鏍规嵁鍐呴儴 entity 鐢熸垚鐨� where 鏉′欢
-      selectStrategy: NOT_NULL
+      selectStrategy: NOT_EMPTY
 
 # PageHelper鍒嗛〉鎻掍欢
 pagehelper: 
@@ -181,6 +222,12 @@
   enabled: true
   # 璇锋眰鍓嶇紑
   pathMapping: /dev-api
+  # 鏍囬
+  title: '鏍囬锛歊uoYi-Vue-Plus鍚庡彴绠＄悊绯荤粺_鎺ュ彛鏂囨。'
+  # 鎻忚堪
+  description: '鎻忚堪锛氱敤浜庣鐞嗛泦鍥㈡棗涓嬪叕鍙哥殑浜哄憳淇℃伅,鍏蜂綋鍖呮嫭XXX,XXX妯″潡...'
+  # 鐗堟湰
+  version: '鐗堟湰鍙�: ${ruoyi-vue-plus.version}'
 
 # 闃叉XSS鏀诲嚮
 xss: 
@@ -190,3 +237,34 @@
   excludes: /system/notice/*
   # 鍖归厤閾炬帴
   urlPatterns: /system/*,/monitor/*,/tool/*
+
+threadPoolConfig:
+  # 鏄惁寮�鍚嚎绋嬫睜
+  enabled: false
+  # 鏍稿績绾跨▼姹犲ぇ灏�
+  corePoolSize: 8
+  # 鏈�澶у彲鍒涘缓鐨勭嚎绋嬫暟
+  maxPoolSize: 16
+  # 闃熷垪鏈�澶ч暱搴�
+  queueCapacity: 128
+  # 绾跨▼姹犵淮鎶ょ嚎绋嬫墍鍏佽鐨勭┖闂叉椂闂�
+  keepAliveSeconds: 300
+  # 绾跨▼姹犲鎷掔粷浠诲姟(鏃犵嚎绋嬪彲鐢�)鐨勫鐞嗙瓥鐣�
+  # CallerRunsPolicy 绛夊緟
+  # DiscardOldestPolicy 鏀惧純鏈�鏃х殑
+  # DiscardPolicy 涓㈠純
+  # AbortPolicy 涓
+  rejectedExecutionHandler: CallerRunsPolicy
+
+feign:
+  package: com.ruoyi.**.feign
+  # 寮�鍚帇缂�
+  compression:
+    request:
+      enabled: true
+    response:
+      enabled: true
+  okhttp:
+    enabled: true
+  hystrix:
+    enabled: true
\ No newline at end of file

--
Gitblit v1.9.3