From 4952f7dcdb12d2ffa73c74626a6a839204ec74ec Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 29 六月 2021 15:17:35 +0800
Subject: [PATCH] !61 update ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java. Merge pull request !61 from 陆继保/N/A
---
ruoyi-framework/src/main/java/com/ruoyi/framework/config/AdminServerConfig.java | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 deletions(-)
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;
+ }
}
--
Gitblit v1.9.3