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 | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 9a0def6..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.4.0
+ version: ${ruoyi-vue-plus.version}
# 鐗堟潈骞翠唤
copyrightYear: 2021
# 瀹炰緥婕旂ず寮�鍏�
@@ -79,6 +79,10 @@
restart:
# 鐑儴缃插紑鍏�
enabled: true
+ # 涓巚ue鏁村悎閮ㄧ讲浣跨敤
+ thymeleaf:
+ # 灏嗙郴缁熸ā鏉挎斁缃埌鏈�鍓嶉潰 鍚﹀垯浼氫笌 springboot-admin 椤甸潰鍐茬獊
+ template-resolver-order: 1
application:
name: ruoyi-vue-plus
boot:
@@ -119,6 +123,7 @@
# MyBatis閰嶇疆
# https://baomidou.com/config/
mybatis-plus:
+ mapperPackage: com.ruoyi.**.mapper
# 瀵瑰簲鐨� XML 鏂囦欢浣嶇疆
mapperLocations: classpath*:mapper/**/*Mapper.xml
# 瀹炰綋鎵弿锛屽涓猵ackage鐢ㄩ�楀彿鎴栬�呭垎鍙峰垎闅�
@@ -217,6 +222,12 @@
enabled: true
# 璇锋眰鍓嶇紑
pathMapping: /dev-api
+ # 鏍囬
+ title: '鏍囬锛歊uoYi-Vue-Plus鍚庡彴绠＄悊绯荤粺_鎺ュ彛鏂囨。'
+ # 鎻忚堪
+ description: '鎻忚堪锛氱敤浜庣鐞嗛泦鍥㈡棗涓嬪叕鍙哥殑浜哄憳淇℃伅,鍏蜂綋鍖呮嫭XXX,XXX妯″潡...'
+ # 鐗堟湰
+ version: '鐗堟湰鍙�: ${ruoyi-vue-plus.version}'
# 闃叉XSS鏀诲嚮
xss:
@@ -227,7 +238,26 @@
# 鍖归厤閾炬帴
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:
--
Gitblit v1.9.3