diff --git a/codegen/src/main/java/io/jpress/codegen/ModuleGenerator.java b/codegen/src/main/java/io/jpress/codegen/ModuleGenerator.java index 83ce00a63f91893750b55c4a7ff30bb25590a654..9ee43b0250a4e45a1853ff30e26752f57295b470 100644 --- a/codegen/src/main/java/io/jpress/codegen/ModuleGenerator.java +++ b/codegen/src/main/java/io/jpress/codegen/ModuleGenerator.java @@ -57,7 +57,7 @@ public class ModuleGenerator { this.dbTables = dbTables; this.modelPackage = modelPackage; this.servicePackage = servicePackage; - this.basePath = PathKit.getWebRootPath() + "/../module-" + moduleName; + this.basePath = PathKit.getWebRootPath() + "/../../../../module-" + moduleName; } public ModuleGenerator(String moduleName, String dbUrl, String dbUser, String dbPassword, String dbTables, String optionsTables, String modelPackage, String servicePackage) { @@ -69,7 +69,7 @@ public class ModuleGenerator { this.dbTables = dbTables; this.modelPackage = modelPackage; this.servicePackage = servicePackage; - this.basePath = PathKit.getWebRootPath() + "/../module-" + moduleName; + this.basePath = PathKit.getWebRootPath() + "/../../../../module-" + moduleName; } @@ -92,7 +92,7 @@ public class ModuleGenerator { private void genModule() { String modelPath = basePath + "/module-" + moduleName + "-model"; String webPath = basePath + "/module-" + moduleName + "-web"; - String serviceApiPath = basePath + "/module-" + moduleName + "-service-api"; + String serviceApiPath = basePath + "/module-" + moduleName + "-service"; String serviceProviderPath = basePath + "/module-" + moduleName + "-service-provider"; File modelFile = new File(modelPath); @@ -111,7 +111,7 @@ public class ModuleGenerator { String modulePath = basePath; String modelPath = basePath + "/module-" + moduleName + "-model"; String webPath = basePath + "/module-" + moduleName + "-web"; - String serviceApiPath = basePath + "/module-" + moduleName + "-service-api"; + String serviceApiPath = basePath + "/module-" + moduleName + "-service"; String serviceProviderPath = basePath + "/module-" + moduleName + "-service-provider"; @@ -148,7 +148,7 @@ public class ModuleGenerator { File serviceApiPomXmlFile = new File(serviceApiFile, "pom.xml"); if (!serviceApiPomXmlFile.exists()) { - engine.getTemplate("io/jpress/codegen/templates/pom_service_api_template.jf").render(map, serviceApiPomXmlFile); + engine.getTemplate("io/jpress/codegen/templates/pom_service_template.jf").render(map, serviceApiPomXmlFile); } File serviceProviderPomXmlFile = new File(serviceProviderFile, "pom.xml"); @@ -173,7 +173,7 @@ public class ModuleGenerator { private void genCode() { String modelModuleName = "/module-" + moduleName + "-model"; - String serviceApiModuleName = "/module-" + moduleName + "-service-api"; + String serviceApiModuleName = "/module-" + moduleName + "-service"; String serviceProviderModuleName = "/module-" + moduleName + "-service-provider"; JbootApplication.setBootArg("jboot.datasource.url", dbUrl); diff --git a/codegen/src/main/java/io/jpress/codegen/generator/ModuleUIGenerator.java b/codegen/src/main/java/io/jpress/codegen/generator/ModuleUIGenerator.java index 750f6b6f198e0bf2584090b275538e46953498f1..5eeebb05f190f2e3368caa0a2a94eedfe85ec123 100644 --- a/codegen/src/main/java/io/jpress/codegen/generator/ModuleUIGenerator.java +++ b/codegen/src/main/java/io/jpress/codegen/generator/ModuleUIGenerator.java @@ -69,7 +69,7 @@ public class ModuleUIGenerator { this.modelPackage = modelPackage; modulePackage = modelPackage.substring(0, modelPackage.lastIndexOf(".")); - basePath = PathKit.getWebRootPath() + "/../module-" + moduleName; + basePath = PathKit.getWebRootPath() + "/../../../../module-" + moduleName; webPath = basePath + "/module-" + moduleName + "-web"; String upcasedModuleName = StrKit.firstCharToUpperCase(moduleName); diff --git a/codegen/src/main/java/io/jpress/codegen/templates/module_listener_template.jf b/codegen/src/main/java/io/jpress/codegen/templates/module_listener_template.jf index e449d2fe5ac3c98c431e9ab905e936c4d13f9f1c..67e1c3df9ea9f3975348b593f6e0a8ee43406990 100644 --- a/codegen/src/main/java/io/jpress/codegen/templates/module_listener_template.jf +++ b/codegen/src/main/java/io/jpress/codegen/templates/module_listener_template.jf @@ -47,7 +47,7 @@ public class #(upcasedModuleName)ModuleInitializer extends JbootAppListenerBase MenuGroup menuGroup = new MenuGroup(); menuGroup.setId("#(moduleName)"); menuGroup.setText("#(moduleName)"); - menuGroup.setIcon(""); + menuGroup.setIcon(""); menuGroup.setOrder(1); adminMenus.add(menuGroup); } diff --git a/codegen/src/main/java/io/jpress/codegen/templates/pom_model_template.jf b/codegen/src/main/java/io/jpress/codegen/templates/pom_model_template.jf index bf3989bf20b7f767b855c51d18154097d6a0d690..f28c86f4369ccc915d508fd0aa70a90abeff1ea3 100644 --- a/codegen/src/main/java/io/jpress/codegen/templates/pom_model_template.jf +++ b/codegen/src/main/java/io/jpress/codegen/templates/pom_model_template.jf @@ -5,7 +5,7 @@ io.jpress module-#(moduleName) - 3.0 + 4.0 4.0.0 diff --git a/codegen/src/main/java/io/jpress/codegen/templates/pom_module_template.jf b/codegen/src/main/java/io/jpress/codegen/templates/pom_module_template.jf index 0d5c1b728fbb7fd83c879bea5646cbf4b6aa062c..c8464f6a29d5bb899e40505b6890e3fca73e36cf 100644 --- a/codegen/src/main/java/io/jpress/codegen/templates/pom_module_template.jf +++ b/codegen/src/main/java/io/jpress/codegen/templates/pom_module_template.jf @@ -5,12 +5,12 @@ io.jpress parent - 3.0 + 4.0 4.0.0 pom - 3.0 + 4.0 io.jpress module-#(moduleName) @@ -23,7 +23,7 @@ module-#(moduleName)-model module-#(moduleName)-web - module-#(moduleName)-service-api + module-#(moduleName)-service module-#(moduleName)-service-provider diff --git a/codegen/src/main/java/io/jpress/codegen/templates/pom_service_provider_template.jf b/codegen/src/main/java/io/jpress/codegen/templates/pom_service_provider_template.jf index 485e81b42f4c5c25d98d0a0e99fdb594a8fd4146..6f820f119b349781d64543674c697cb7ff92d433 100644 --- a/codegen/src/main/java/io/jpress/codegen/templates/pom_service_provider_template.jf +++ b/codegen/src/main/java/io/jpress/codegen/templates/pom_service_provider_template.jf @@ -5,7 +5,7 @@ io.jpress module-#(moduleName) - 3.0 + 4.0 4.0.0 @@ -27,13 +27,13 @@ io.jpress module-#(moduleName)-model - 3.0 + 4.0 io.jpress - module-#(moduleName)-service-api - 3.0 + module-#(moduleName)-service + 4.0 diff --git a/codegen/src/main/java/io/jpress/codegen/templates/pom_service_api_template.jf b/codegen/src/main/java/io/jpress/codegen/templates/pom_service_template.jf similarity index 85% rename from codegen/src/main/java/io/jpress/codegen/templates/pom_service_api_template.jf rename to codegen/src/main/java/io/jpress/codegen/templates/pom_service_template.jf index 859a156f847149b8122259f9f2fa08570ef90428..69b4b35eb31d118dd2610c71e34026692b2b6811 100644 --- a/codegen/src/main/java/io/jpress/codegen/templates/pom_service_api_template.jf +++ b/codegen/src/main/java/io/jpress/codegen/templates/pom_service_template.jf @@ -5,12 +5,12 @@ io.jpress module-#(moduleName) - 3.0 + 4.0 4.0.0 io.jpress - module-#(moduleName)-service-api + module-#(moduleName)-service @@ -21,7 +21,7 @@ io.jpress module-#(moduleName)-model - 3.0 + 4.0 diff --git a/codegen/src/main/java/io/jpress/codegen/templates/pom_web_template.jf b/codegen/src/main/java/io/jpress/codegen/templates/pom_web_template.jf index 899b662f980de1ae61fa80d0eb9063193d701886..159b33c4bdb57500c15729ba4993a3d5be52f578 100644 --- a/codegen/src/main/java/io/jpress/codegen/templates/pom_web_template.jf +++ b/codegen/src/main/java/io/jpress/codegen/templates/pom_web_template.jf @@ -5,7 +5,7 @@ io.jpress module-#(moduleName) - 3.0 + 4.0 4.0.0 @@ -27,19 +27,19 @@ io.jpress module-#(moduleName)-model - 3.0 + 4.0 io.jpress - module-#(moduleName)-service-api - 3.0 + module-#(moduleName)-service + 4.0 io.jpress module-#(moduleName)-service-provider - 3.0 + 4.0 diff --git a/codegen/src/main/java/io/jpress/codegen/templates/ui_edit_template.jf b/codegen/src/main/java/io/jpress/codegen/templates/ui_edit_template.jf index e0b1d84dff93ac2602037df9c4d88130fa2f45d8..48103fac59eeb42578e39d82e9c2cab355c54232 100644 --- a/codegen/src/main/java/io/jpress/codegen/templates/ui_edit_template.jf +++ b/codegen/src/main/java/io/jpress/codegen/templates/ui_edit_template.jf @@ -31,32 +31,42 @@ #('#')define content()
-

- 编辑/新增 - Edit -

+
+
+
+ +
+
+

+ #(tableMeta.remarks)编辑/新增 + + 首页 / #(tableMeta.modelName) / #(tableMeta.remarks)编辑 +

+
+
+
+
+ +
-
-
-
-
-

-
+
+
-
+
#for(cm : tableMeta.columnMetas) #set(modelAttrName=firstCharToLowerCase(tableMeta.modelName)+"."+cm.name) #set(modelAttrName_=firstCharToLowerCase(tableMeta.modelName)+"_"+cm.name) #if("id"==cm.name) #else -
+
@@ -76,15 +86,15 @@ #end
- - diff --git a/codegen/src/main/java/io/jpress/codegen/templates/ui_list_template.jf b/codegen/src/main/java/io/jpress/codegen/templates/ui_list_template.jf index f84163b9946abd37906ee4d85564bdc5f531b2f9..c8b588504e914a954cd8ccebd8869fcd175dc963 100644 --- a/codegen/src/main/java/io/jpress/codegen/templates/ui_list_template.jf +++ b/codegen/src/main/java/io/jpress/codegen/templates/ui_list_template.jf @@ -13,21 +13,33 @@ #('#')define content()
-

- #(tableMeta.remarks)管理 - Items -

+
+
+
+
+
+

+ #(tableMeta.remarks)管理 + + 首页 / #(tableMeta.modelName) / #(tableMeta.remarks)管理 +

+
+
+
+
+
-
-
-
+
+
+
-
+
新建 @@ -35,8 +47,8 @@
- -
+ +
@@ -77,8 +89,8 @@
- -