diff --git a/@rbv b/@rbv index 85c5ae2c0..f5e683f18 160000 --- a/@rbv +++ b/@rbv @@ -1 +1 @@ -Subproject commit 85c5ae2c04a9014fbce35bf89084c30f6fe4f7c1 +Subproject commit f5e683f1812ca53daa1141457582e1b9b2a738a1 diff --git a/src/main/java/com/rebuild/core/support/ConfigurationItem.java b/src/main/java/com/rebuild/core/support/ConfigurationItem.java index 08b959f2e..ce273b5a6 100644 --- a/src/main/java/com/rebuild/core/support/ConfigurationItem.java +++ b/src/main/java/com/rebuild/core/support/ConfigurationItem.java @@ -99,6 +99,10 @@ public enum ConfigurationItem { // SAML (IdP) SamlIdPEntityid, SamlIdPEndpoint, SamlIdPSloEndpoint, SamlIdPCert, + // PORTALs + PortalBaiduMapAk, + PortalOfficePreviewUrl, + // !!! 仅命令行适用 DataDirectory, // 数据目录 RedisDatabase(0), // Redis DB diff --git a/src/main/java/com/rebuild/web/RebuildWebConfigurer.java b/src/main/java/com/rebuild/web/RebuildWebConfigurer.java index e0320fb39..1ce29edde 100644 --- a/src/main/java/com/rebuild/web/RebuildWebConfigurer.java +++ b/src/main/java/com/rebuild/web/RebuildWebConfigurer.java @@ -81,6 +81,15 @@ public class RebuildWebConfigurer implements WebMvcConfigurer, ErrorViewResolver thymeleafViewResolver.addStaticVariable(WebConstants.PAGE_FOOTER, pageFooter); } + String officePreviewUrl = RebuildConfiguration.get(ConfigurationItem.PortalOfficePreviewUrl); + if (StringUtils.isNotBlank(officePreviewUrl)) { + thymeleafViewResolver.addStaticVariable(ConfigurationItem.PortalOfficePreviewUrl.name(), officePreviewUrl); + } + String baiduMapAk = RebuildConfiguration.get(ConfigurationItem.PortalBaiduMapAk); + if (StringUtils.isNotBlank(baiduMapAk)) { + thymeleafViewResolver.addStaticVariable(ConfigurationItem.PortalBaiduMapAk.name(), baiduMapAk); + } + // 清理缓存 thymeleafViewResolver.clearCache(); } diff --git a/src/main/resources/web/_include/header.html b/src/main/resources/web/_include/header.html index 59f07033c..df66bf9a0 100644 --- a/src/main/resources/web/_include/header.html +++ b/src/main/resources/web/_include/header.html @@ -30,6 +30,8 @@ + +