From a34fef3478e5281bcfec2f66ed4a961f21644712 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 13 五月 2021 09:21:08 +0800
Subject: [PATCH] !33 版本更新 v1.0.2 Merge pull request !33 from 疯狂的狮子li/dev
---
ruoyi-ui/package.json | 2
pom.xml | 2
ruoyi-admin/src/main/resources/application.yml | 4 ++
README.md | 46 +++++++++++-----------
ruoyi-framework/src/main/java/com/ruoyi/framework/config/AdminServerConfig.java | 34 +++++++++++++++++
5 files changed, 63 insertions(+), 25 deletions(-)
diff --git a/README.md b/README.md
index 5bb9e0e..e023751 100644
--- a/README.md
+++ b/README.md
@@ -1,26 +1,3 @@
-## 閲嶇偣娉ㄦ剰浜嬮」
-
-鑻ヤ緷鏂囨。瀵逛簨鍔℃敞瑙ｇ殑鎻忚堪 [鍏充簬浜嬪姟](https://doc.ruoyi.vip/ruoyi/document/htsc.html#%E4%BA%8B%E5%8A%A1%E7%AE%A1%E7%90%86) 浠ヤ笅瀵瑰鏁版嵁婧愪簨鍔″仛琛ュ厖:
-* 鍚屼竴涓簨鍔′笅鏄棤娉曞垏鎹㈡暟鎹簮鐨�
-* 绂佹 鐖舵柟娉曚娇鐢� @Transactional 鍒涘缓浜嬪姟 瀛愭柟娉曚娇鐢� @DataSource 鍒囨崲鏁版嵁婧�
-* 姝ｇ‘鐢ㄦ硶: 瀛愭柟娉曞崟鐙垱寤轰簨鍔� 鎴� 鐖舵柟娉曚娇鐢� @Transactional(propagation = Propagation.REQUIRES_NEW) 涓烘墍鏈夊瓙鏂规硶鍒涘缓鏂颁簨鍔�
-
-鍏充簬濡備綍浣跨敤Tomcat
-* 鏌ョ湅ruoyi-framework妯″潡鐨刾om.xml鏂囦欢,鏍规嵁娉ㄩ噴鏇存敼渚濊禆
-* 鏌ョ湅ruoyi-admin妯″潡涓殑application.yml鏂囦欢,鏍规嵁娉ㄩ噴鏇存敼閰嶇疆
-
-鍏充簬濡備綍鍒涘缓鏂版ā鍧�
-* 鍙傝�價uoyi-demo妯″潡
-* 闇�瑕佹敼鍔�: 鐖秔om 涓� admin妯″潡pom
-
-鍏充簬鏍戣〃鐢熸垚
-* 鐩存帴鍦╩ysql琛ㄤ腑 娣诲姞 parentId orderNum 绛夊瓧娈�(鏍规嵁闇�瑕佸弬鑰� TreeEntity绫�)
-* 浠ｇ爜鐢熸垚閫夋嫨鏍戣〃鐢熸垚鍗冲彲
-
-鍏充簬鏁版嵁鏉冮檺
-* @DataScope 娉ㄨВ浠ｇ爜鐢熸垚浠呮敮鎸佸湪 Controller list 鏂规硶浣跨敤
-* 鍏朵綑鏂规硶濡傝浣跨敤 闇�鍙傝�� list 鏂规硶瀹炵幇鍦� LambdaQueryWrapper 娉ㄥ叆鏁版嵁鏉冮檺鐢熸垚鐨� SQL 璇彞
-
## 淇敼RuoYi鍔熻兘
* ORM妗嗘灦 浣跨敤 Mybatis-Plus 绠�鍖朇RUD (鐩墠鏀寔鍗曡〃鐢熸垚涓庢爲琛� 涓嶆敮鎸佷富瀛愯〃)
@@ -30,6 +7,7 @@
* 浠ｇ爜鐢熸垚妯℃澘 鏀逛负閫傞厤 Mybatis-Plus 鐨勪唬鐮�
* 浠ｇ爜鐢熸垚妯℃澘 鎷嗗垎鍑篤o,QueryBo,AddBo,EditBo绛夐鍩熷璞�
* 椤圭洰淇敼涓� maven澶氱幆澧冮厤缃�
+* 椤圭洰閰嶇疆淇敼涓� application.yml 缁熶竴绠＄悊
* swagger 淇敼涓� knife4j
* 闆嗘垚 Hutool 5.X 骞堕噸鍐橰uoYi閮ㄥ垎鍔熻兘
* 闆嗘垚 Feign 鎺ュ彛鍖栫鐞� Http 璇锋眰(濡備笁鏂硅姹� 鏀粯,鐭俊,鎺ㄩ�佺瓑)
@@ -54,6 +32,28 @@
* 鎻愪緵浜嗗崟搴旂敤鐗堟湰[RuoYi-Vue-fast](https://github.com/yangzongzhuan/RuoYi-Vue-fast)锛孫racle鐗堟湰[RuoYi-Vue-Oracle](https://github.com/yangzongzhuan/RuoYi-Vue-Oracle)锛屼繚鎸佸悓姝ユ洿鏂般��
* 涓嶅垎绂荤増鏈紝璇风Щ姝RuoYi](https://gitee.com/y_project/RuoYi)锛屽井鏈嶅姟鐗堟湰锛岃绉绘[RuoYi-Cloud](https://gitee.com/y_project/RuoYi-Cloud)
+## 閲嶇偣娉ㄦ剰浜嬮」
+
+鑻ヤ緷鏂囨。瀵逛簨鍔℃敞瑙ｇ殑鎻忚堪 [鍏充簬浜嬪姟](https://doc.ruoyi.vip/ruoyi/document/htsc.html#%E4%BA%8B%E5%8A%A1%E7%AE%A1%E7%90%86) 浠ヤ笅瀵瑰鏁版嵁婧愪簨鍔″仛琛ュ厖:
+* 鍚屼竴涓簨鍔′笅鏄棤娉曞垏鎹㈡暟鎹簮鐨�
+* 绂佹 鐖舵柟娉曚娇鐢� @Transactional 鍒涘缓浜嬪姟 瀛愭柟娉曚娇鐢� @DataSource 鍒囨崲鏁版嵁婧�
+* 姝ｇ‘鐢ㄦ硶: 瀛愭柟娉曞崟鐙垱寤轰簨鍔� 鎴� 鐖舵柟娉曚娇鐢� @Transactional(propagation = Propagation.REQUIRES_NEW) 涓烘墍鏈夊瓙鏂规硶鍒涘缓鏂颁簨鍔�
+
+鍏充簬濡備綍浣跨敤Tomcat
+* 鏌ョ湅ruoyi-framework妯″潡鐨刾om.xml鏂囦欢,鏍规嵁娉ㄩ噴鏇存敼渚濊禆
+* 鏌ョ湅ruoyi-admin妯″潡涓殑application.yml鏂囦欢,鏍规嵁娉ㄩ噴鏇存敼閰嶇疆
+
+鍏充簬濡備綍鍒涘缓鏂版ā鍧�
+* 鍙傝�價uoyi-demo妯″潡
+* 闇�瑕佹敼鍔�: 鐖秔om 涓� admin妯″潡pom
+
+鍏充簬鏍戣〃鐢熸垚
+* 鐩存帴鍦╩ysql琛ㄤ腑 娣诲姞 parentId orderNum 绛夊瓧娈�(鏍规嵁闇�瑕佸弬鑰� TreeEntity绫�)
+* 浠ｇ爜鐢熸垚閫夋嫨鏍戣〃鐢熸垚鍗冲彲
+
+鍏充簬vue涓巄oot鏁村悎閮ㄧ讲
+* [鍓嶇闈欐�佽祫婧愬浣曟暣鍚堝埌鍚庣璁块棶](https://doc.ruoyi.vip/ruoyi-vue/other/faq.html#鍓嶇闈欐�佽祫婧愬浣曟暣鍚堝埌鍚庣璁块棶)
+
## 鍐呯疆鍔熻兘
1. 鐢ㄦ埛绠＄悊锛氱敤鎴锋槸绯荤粺鎿嶄綔鑰咃紝璇ュ姛鑳戒富瑕佸畬鎴愮郴缁熺敤鎴烽厤缃��
diff --git a/pom.xml b/pom.xml
index 74ccf9d..4b35d5d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
<description>RuoYi-Vue-Plus鍚庡彴绠＄悊绯荤粺</description>
<properties>
- <ruoyi-vue-plus.version>1.0.1</ruoyi-vue-plus.version>
+ <ruoyi-vue-plus.version>1.0.2</ruoyi-vue-plus.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 8500728..6ab3030 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -79,6 +79,10 @@
restart:
# 鐑儴缃插紑鍏�
enabled: true
+ # 涓巚ue鏁村悎閮ㄧ讲浣跨敤
+ thymeleaf:
+ # 灏嗙郴缁熸ā鏉挎斁缃埌鏈�鍓嶉潰 鍚﹀垯浼氫笌 springboot-admin 椤甸潰鍐茬獊
+ template-resolver-order: 1
application:
name: ruoyi-vue-plus
boot:
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/AdminServerConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/AdminServerConfig.java
index 5fa65c1..59fed50 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/AdminServerConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/AdminServerConfig.java
@@ -1,15 +1,25 @@
package com.ruoyi.framework.config;
import de.codecentric.boot.admin.server.config.EnableAdminServer;
+import org.springframework.beans.factory.ObjectProvider;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.task.TaskExecutionAutoConfiguration;
+import org.springframework.boot.autoconfigure.thymeleaf.ThymeleafProperties;
import org.springframework.boot.task.TaskExecutorBuilder;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Lazy;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+import org.thymeleaf.dialect.IDialect;
+import org.thymeleaf.spring5.ISpringTemplateEngine;
+import org.thymeleaf.spring5.SpringTemplateEngine;
+import org.thymeleaf.templateresolver.ITemplateResolver;
+import java.util.Comparator;
+import java.util.LinkedHashSet;
+import java.util.Set;
import java.util.concurrent.Executor;
+import java.util.stream.Collectors;
/**
* springboot-admin server閰嶇疆绫�
@@ -26,4 +36,28 @@
public ThreadPoolTaskExecutor applicationTaskExecutor(TaskExecutorBuilder builder) {
return builder.build();
}
+
+ /**
+ * 瑙ｅ喅 admin 涓� 椤圭洰 椤甸潰鐨勪氦鍙夊紩鐢� 灏� admin 鐨勮矾鐢辨斁鍒版渶鍚�
+ * @param properties
+ * @param templateResolvers
+ * @param dialects
+ * @return
+ */
+ @Bean
+ @ConditionalOnMissingBean(ISpringTemplateEngine.class)
+ SpringTemplateEngine templateEngine(ThymeleafProperties properties,
+ ObjectProvider<ITemplateResolver> templateResolvers, ObjectProvider<IDialect> dialects) {
+ SpringTemplateEngine engine = new SpringTemplateEngine();
+ engine.setEnableSpringELCompiler(properties.isEnableSpringElCompiler());
+ engine.setRenderHiddenMarkersBeforeCheckboxes(properties.isRenderHiddenMarkersBeforeCheckboxes());
+ templateResolvers.orderedStream().forEach(engine::addTemplateResolver);
+ dialects.orderedStream().forEach(engine::addDialect);
+ Set<ITemplateResolver> templateResolvers1 = engine.getTemplateResolvers();
+ templateResolvers1 = templateResolvers1.stream()
+ .sorted(Comparator.comparing(ITemplateResolver::getOrder))
+ .collect(Collectors.toCollection(LinkedHashSet::new));
+ engine.setTemplateResolvers(templateResolvers1);
+ return engine;
+ }
}
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index 58ee98d..c48cb3b 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "ruoyi-vue-plus",
- "version": "1.0.1",
+ "version": "1.0.2",
"description": "RuoYi-Vue-Plus鍚庡彴绠＄悊绯荤粺",
"author": "LionLi",
"license": "MIT",
--
Gitblit v1.9.3