diff --git a/blog-core/src/main/java/com/zyd/blog/business/aspect/FreemarkerSharedVariableMonitorAspects.java b/blog-core/src/main/java/com/zyd/blog/business/aspect/FreemarkerSharedVariableMonitorAspects.java index f831d926e65a490cc3479ec710c3538520522699..4e945245ce6204ff42bf999cb72512309cfa7c14 100644 --- a/blog-core/src/main/java/com/zyd/blog/business/aspect/FreemarkerSharedVariableMonitorAspects.java +++ b/blog-core/src/main/java/com/zyd/blog/business/aspect/FreemarkerSharedVariableMonitorAspects.java @@ -1,6 +1,6 @@ package com.zyd.blog.business.aspect; -import com.zyd.blog.business.entity.Config; +import com.zyd.blog.business.entity.BaseConfig; import com.zyd.blog.business.service.SysConfigService; import freemarker.template.TemplateModelException; import lombok.extern.slf4j.Slf4j; @@ -39,7 +39,7 @@ public class FreemarkerSharedVariableMonitorAspects { @After("pointcut()") public void after(JoinPoint joinPoint) { - Config config = configService.get(); + BaseConfig config = configService.getBaseConfig(); if (null == config) { log.error("config为空"); return; diff --git a/blog-core/src/main/java/com/zyd/blog/framework/config/FreeMarkerConfig.java b/blog-core/src/main/java/com/zyd/blog/framework/config/FreeMarkerConfig.java index 282dfae4513489bee08d5d9f10655a7c3d4083f4..8e03b632df46f9983d23ffc58c15524431ab8929 100644 --- a/blog-core/src/main/java/com/zyd/blog/framework/config/FreeMarkerConfig.java +++ b/blog-core/src/main/java/com/zyd/blog/framework/config/FreeMarkerConfig.java @@ -38,7 +38,7 @@ public class FreeMarkerConfig { configuration.setSharedVariable("zhydTag", customTags); configuration.setSharedVariable("articleTag", articleTags); try { - configuration.setSharedVariable("config", configService.get()); + configuration.setSharedVariable("config", configService.getBaseConfig()); //shiro标签 configuration.setSharedVariable("shiro", new ShiroTags()); } catch (TemplateModelException e) {