diff --git a/maxkey-core/src/main/java/org/maxkey/web/BasicController.java b/maxkey-core/src/main/java/org/maxkey/web/BasicController.java index 8119a6e8f..2183d64f5 100644 --- a/maxkey-core/src/main/java/org/maxkey/web/BasicController.java +++ b/maxkey-core/src/main/java/org/maxkey/web/BasicController.java @@ -26,17 +26,17 @@ import org.springframework.web.servlet.ModelAndView; public interface BasicController { - public JpaPageResults pageResults(@ModelAttribute("modelAttr") T modelAttr); + public JpaPageResults pageResults(@ModelAttribute("modelAttribute") T modelAttribute); - public ModelAndView forwardAdd(@ModelAttribute("modelAttr") T modelAttr); + public ModelAndView forwardAdd(@ModelAttribute("modelAttribute") T modelAttribute); - public Message insert(@ModelAttribute("modelAttr") T modelAttr); + public Message insert(@ModelAttribute("modelAttribute") T modelAttribute); public ModelAndView forwardUpdate(@PathVariable("id") String id); - public Message update(@ModelAttribute("modelAttr") T modelAttr); + public Message update(@ModelAttribute("modelAttribute") T modelAttribute); - public Message delete(@ModelAttribute("modelAttr") T modelAttr) ; + public Message delete(@ModelAttribute("modelAttribute") T modelAttribute) ; } diff --git a/maxkey-core/src/main/java/org/maxkey/web/ConfigurerFreeMarker.java b/maxkey-core/src/main/java/org/maxkey/web/ConfigurerFreeMarker.java index 405586b19..7ab6150a9 100644 --- a/maxkey-core/src/main/java/org/maxkey/web/ConfigurerFreeMarker.java +++ b/maxkey-core/src/main/java/org/maxkey/web/ConfigurerFreeMarker.java @@ -37,6 +37,7 @@ import freemarker.template.TemplateException; @Component public class ConfigurerFreeMarker implements ApplicationContextAware { private static final Logger _logger = LoggerFactory.getLogger(ConfigurerFreeMarker.class); + ApplicationContext applicationContext ; @Autowired diff --git a/maxkey-core/src/test/java/org/maxkey/util/SqlPrettyTest.java b/maxkey-core/src/test/java/org/maxkey/util/SqlPrettyTest.java index aec5b31a3..c666a18f9 100644 --- a/maxkey-core/src/test/java/org/maxkey/util/SqlPrettyTest.java +++ b/maxkey-core/src/test/java/org/maxkey/util/SqlPrettyTest.java @@ -17,6 +17,7 @@ package org.maxkey.util; +import org.junit.Test; import org.maxkey.pretty.PrettyFactory; public class SqlPrettyTest { @@ -24,8 +25,9 @@ public class SqlPrettyTest { public SqlPrettyTest() { } - - public static void main(String[] args) { + + @Test + public void testSqlFormat() { String sqlString="select * from userinfo where t='111' order by t,s,t"; System.out.println(PrettyFactory.getSqlPretty().format(sqlString)); }