diff --git a/src/main/resources/modules/SpringBoot/java/action/GlobalController.java b/src/main/resources/modules/SpringBoot/java/action/GlobalController.java index 35d5e3ae..91bcaaa6 100644 --- a/src/main/resources/modules/SpringBoot/java/action/GlobalController.java +++ b/src/main/resources/modules/SpringBoot/java/action/GlobalController.java @@ -145,7 +145,7 @@ public class GlobalController implements ErrorController { String servletPath = request.getServletPath();// /**/*.htm String layout = "/layout/default"; - String action = "";// **/* + String action = LocalData.getAction();// **/* Pattern compile = Pattern.compile("^/(.+)\\.htm"); Matcher matcher = compile.matcher(servletPath); @@ -256,7 +256,7 @@ public class GlobalController implements ErrorController { BaseResponse baseResponse = null; try { - Object ajax = LocalData.getApplicationContext().getBean(ActionConfig.AJAX_PREFIX + "." + module + "." + target); + Object ajax = LocalData.getApplicationContext().getBean(ActionConfig.AJAX_PREFIX + module + "." + target); Class ajaxClass = ajax.getClass(); Method methodC = ajaxClass.getMethod(method, String.class); diff --git a/src/main/resources/modules/SpringBoot/java/config/ActionConfig.java b/src/main/resources/modules/SpringBoot/java/config/ActionConfig.java index 0f5d78f3..f0dbd0dc 100644 --- a/src/main/resources/modules/SpringBoot/java/config/ActionConfig.java +++ b/src/main/resources/modules/SpringBoot/java/config/ActionConfig.java @@ -28,16 +28,17 @@ import java.io.IOException; */ @Configuration public class ActionConfig implements BeanDefinitionRegistryPostProcessor { - public static final String SCREEN_PREFIX = "screen"; - public static final String CONTROL_PREFIX = "control"; - public static final String AJAX_PREFIX = "ajax"; + + public static String SCREEN_PREFIX = "/screen/"; + public static String CONTROL_PREFIX = "/control/"; + public static String AJAX_PREFIX = "/ajax/"; @Override public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry beanDefinitionRegistry) throws BeansException { String aPackage = this.getClass().getPackage().getName(); - int i = registryScreen("${basePackage}.action.screen", beanDefinitionRegistry); - int i1 = registryControl("${basePackage}.action.control", beanDefinitionRegistry); - int i2 = registryAjax("${basePackage}.action.ajax", beanDefinitionRegistry); + int i = registryScreen("${basePackage}.action.screen.", beanDefinitionRegistry); + int i1 = registryControl("${basePackage}.action.control.", beanDefinitionRegistry); + int i2 = registryAjax("${basePackage}.action.ajax.", beanDefinitionRegistry); System.out.println(); } diff --git a/src/main/resources/modules/SpringBoot/java/config/FreeMarkerConfig.java b/src/main/resources/modules/SpringBoot/java/config/FreeMarkerConfig.java index ae73f3c1..2acf9881 100644 --- a/src/main/resources/modules/SpringBoot/java/config/FreeMarkerConfig.java +++ b/src/main/resources/modules/SpringBoot/java/config/FreeMarkerConfig.java @@ -2,6 +2,9 @@ package ${basePackage}.config; import ${basePackage}.frame.auth.LocalData; import ${basePackage}.frame.base.Control; +import ${basePackage}.frame.utils.UrlUtil; +import static ${basePackage}.config.ActionConfig.CONTROL_PREFIX; +import static ${basePackage}.config.ActionConfig.SCREEN_PREFIX; import freemarker.template.SimpleScalar; import freemarker.template.TemplateMethodModelEx; import freemarker.template.TemplateModelException; @@ -32,8 +35,7 @@ public class FreeMarkerConfig { private freemarker.template.Configuration configuration; @Value("${r'${server.servlet.context-path}'}") private String context; - private String screenPrefix = "/screen/"; - private String controlPrefix = "/control/"; + private String suffix = ".ftl"; @PostConstruct @@ -42,6 +44,7 @@ public class FreeMarkerConfig { configuration.setSharedVariable("context", context); configuration.setSharedVariable("screenHolder", new ScreenHolder()); configuration.setSharedVariable("controlHolder", new ControlHolder()); + configuration.setSharedVariable("UrlUtil", new UrlUtil()); } private class ScreenHolder implements TemplateMethodModelEx { @@ -72,7 +75,7 @@ public class FreeMarkerConfig { if (view == null) { return ""; } else { - return screenPrefix + servletPath + suffix; + return SCREEN_PREFIX + servletPath + suffix; } } catch (Exception e) { e.printStackTrace(); @@ -97,7 +100,7 @@ public class FreeMarkerConfig { // 查找是否存在对应控制面板执行器 Control controlExec = null; try { - controlExec = LocalData.getApplicationContext().getBean(ActionConfig.CONTROL_PREFIX + "." + control, Control.class); + controlExec = LocalData.getApplicationContext().getBean(CONTROL_PREFIX + control, Control.class); HttpServletRequest request = LocalData.getRequest(); HttpServletResponse response = LocalData.getResponse(); @@ -113,7 +116,7 @@ public class FreeMarkerConfig { } control = control.replaceAll("/", File.separator); - return controlPrefix + control + suffix; + return CONTROL_PREFIX + control + suffix; } } }