From c80ef67b511c18aeea0740da20ac9f5095fab816 Mon Sep 17 00:00:00 2001 From: wangbing Date: Thu, 11 Apr 2019 00:05:22 +0800 Subject: [PATCH] asd --- .../modules/SpringBoot/java/action/GlobalController.ftl | 4 ++-- .../modules/SpringBoot/java/frame/freemarker/Layout.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/resources/modules/SpringBoot/java/action/GlobalController.ftl b/src/main/resources/modules/SpringBoot/java/action/GlobalController.ftl index 175fbc11..402fe2b8 100644 --- a/src/main/resources/modules/SpringBoot/java/action/GlobalController.ftl +++ b/src/main/resources/modules/SpringBoot/java/action/GlobalController.ftl @@ -5,7 +5,7 @@ import ${basePackage}.frame.base.BaseResponse; import ${basePackage}.frame.base.ErrorType; import ${basePackage}.frame.base.Screen; import ${basePackage}.frame.utils.LocalData; -import ${basePackage}.config.BeanDefinitionRegistryConfig; +import ${basePackage}.config.ActionConfig; import org.springframework.beans.BeansException; import org.apache.commons.io.FileUtils; import org.springframework.boot.web.servlet.error.ErrorController; @@ -119,7 +119,7 @@ public class GlobalController implements ErrorController { Screen screenExec = null; try { servletPath = servletPath.replaceAll("/", ".").toLowerCase(); - screenExec = LocalData.getApplicationContext().getBean(BeanDefinitionRegistryConfig.SCREEN_PREFIX + servletPath, Screen.class); + screenExec = LocalData.getApplicationContext().getBean(ActionConfig.SCREEN_PREFIX + servletPath, Screen.class); screenExec.exec(model, request, response); } catch (BeansException e) { diff --git a/src/main/resources/modules/SpringBoot/java/frame/freemarker/Layout.java b/src/main/resources/modules/SpringBoot/java/frame/freemarker/Layout.java index b35e6bc4..b56c424b 100644 --- a/src/main/resources/modules/SpringBoot/java/frame/freemarker/Layout.java +++ b/src/main/resources/modules/SpringBoot/java/frame/freemarker/Layout.java @@ -1,7 +1,7 @@ package ${basePackage}.frame.freemarker; import java.io.File; -import ${basePackage}.config.BeanDefinitionRegistryConfig; +import ${basePackage}.config.ActionConfig; import freemarker.template.TemplateModelException; import org.springframework.beans.BeansException; import org.springframework.beans.factory.annotation.Autowired; @@ -74,7 +74,7 @@ public class Layout { // 查找是否存在对应控制面板执行器 Control controlExec = null; try { - controlExec = LocalData.getApplicationContext().getBean(BeanDefinitionRegistryConfig.CONTROL_PREFIX + "." + control, Control.class); + controlExec = LocalData.getApplicationContext().getBean(ActionConfig.CONTROL_PREFIX + "." + control, Control.class); HttpServletRequest request = LocalData.getRequest(); HttpServletResponse response = LocalData.getResponse();