From bc1da4cc8776902a2ce0fbb5ce5dd253faac0116 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E7=9E=B3?= <litongpro@163.com>
Date: Mon, 21 Jun 2021 15:05:39 +0800
Subject: [PATCH] update codegen 4.0

---
 .../io/jpress/codegen/ModuleGenerator.java    | 12 +++---
 .../codegen/generator/ModuleUIGenerator.java  |  2 +-
 .../templates/module_listener_template.jf     |  2 +-
 .../codegen/templates/pom_model_template.jf   |  2 +-
 .../codegen/templates/pom_module_template.jf  |  6 +--
 .../pom_service_provider_template.jf          |  8 ++--
 ...pi_template.jf => pom_service_template.jf} |  6 +--
 .../codegen/templates/pom_web_template.jf     | 10 ++---
 .../codegen/templates/ui_edit_template.jf     | 42 ++++++++++++-------
 .../codegen/templates/ui_list_template.jf     | 36 ++++++++++------
 .../codegen/templates/ui_listener_template.jf |  2 +-
 11 files changed, 75 insertions(+), 53 deletions(-)
 rename codegen/src/main/java/io/jpress/codegen/templates/{pom_service_api_template.jf => pom_service_template.jf} (85%)

diff --git a/codegen/src/main/java/io/jpress/codegen/ModuleGenerator.java b/codegen/src/main/java/io/jpress/codegen/ModuleGenerator.java
index 83ce00a63..9ee43b025 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 750f6b6f1..5eeebb05f 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 e449d2fe5..67e1c3df9 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("<i class=\"fa fa-fw fa-file-text\"></i>");
+        menuGroup.setIcon("<i class=\"fas fa-file\"></i>");
         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 bf3989bf2..f28c86f43 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 @@
     <parent>
         <groupId>io.jpress</groupId>
         <artifactId>module-#(moduleName)</artifactId>
-        <version>3.0</version>
+        <version>4.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
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 0d5c1b728..c8464f6a2 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 @@
     <parent>
         <groupId>io.jpress</groupId>
         <artifactId>parent</artifactId>
-        <version>3.0</version>
+        <version>4.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <packaging>pom</packaging>
-    <version>3.0</version>
+    <version>4.0</version>
 
     <groupId>io.jpress</groupId>
     <artifactId>module-#(moduleName)</artifactId>
@@ -23,7 +23,7 @@
     <modules>
         <module>module-#(moduleName)-model</module>
         <module>module-#(moduleName)-web</module>
-        <module>module-#(moduleName)-service-api</module>
+        <module>module-#(moduleName)-service</module>
         <module>module-#(moduleName)-service-provider</module>
     </modules>
 
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 485e81b42..6f820f119 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 @@
     <parent>
         <groupId>io.jpress</groupId>
         <artifactId>module-#(moduleName)</artifactId>
-        <version>3.0</version>
+        <version>4.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>io.jpress</groupId>
             <artifactId>module-#(moduleName)-model</artifactId>
-            <version>3.0</version>
+            <version>4.0</version>
         </dependency>
 
         <dependency>
             <groupId>io.jpress</groupId>
-            <artifactId>module-#(moduleName)-service-api</artifactId>
-            <version>3.0</version>
+            <artifactId>module-#(moduleName)-service</artifactId>
+            <version>4.0</version>
         </dependency>
 
     </dependencies>
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 859a156f8..69b4b35eb 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 @@
     <parent>
         <groupId>io.jpress</groupId>
         <artifactId>module-#(moduleName)</artifactId>
-        <version>3.0</version>
+        <version>4.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>io.jpress</groupId>
-    <artifactId>module-#(moduleName)-service-api</artifactId>
+    <artifactId>module-#(moduleName)-service</artifactId>
 
     <dependencies>
         <dependency>
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>io.jpress</groupId>
             <artifactId>module-#(moduleName)-model</artifactId>
-            <version>3.0</version>
+            <version>4.0</version>
         </dependency>
 
 
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 899b662f9..159b33c4b 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 @@
     <parent>
         <groupId>io.jpress</groupId>
         <artifactId>module-#(moduleName)</artifactId>
-        <version>3.0</version>
+        <version>4.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -27,19 +27,19 @@
         <dependency>
             <groupId>io.jpress</groupId>
             <artifactId>module-#(moduleName)-model</artifactId>
-            <version>3.0</version>
+            <version>4.0</version>
         </dependency>
 
         <dependency>
             <groupId>io.jpress</groupId>
-            <artifactId>module-#(moduleName)-service-api</artifactId>
-            <version>3.0</version>
+            <artifactId>module-#(moduleName)-service</artifactId>
+            <version>4.0</version>
         </dependency>
 
         <dependency>
             <groupId>io.jpress</groupId>
             <artifactId>module-#(moduleName)-service-provider</artifactId>
-            <version>3.0</version>
+            <version>4.0</version>
         </dependency>
 
     </dependencies>
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 e0b1d84df..48103fac5 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()
 
     <section class="content-header">
-        <h1>
-                        编辑/新增
-            <small>Edit</small>
-        </h1>
+        <div class="container-fluid">
+            <div class="row">
+                <div class="col-sm-6">
+
+                    <div class="row mb-2">
+                        <div class="col-sm-12">
+                            <h1>
+                                #(tableMeta.remarks)编辑/新增
+                                <small data-toggle="tooltip" title="" data-placement="right"
+                                       data-trigger="hover"><i class="nav-icon far fa-question-circle"></i></small>
+                                <small> 首页 / #(tableMeta.modelName) / #(tableMeta.remarks)编辑</small>
+                            </h1>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+        </div><!-- /.container-fluid -->
     </section>
 
     <section class="content">
-
         <div class="row">
-            <div class="col-xs-12">
-                <div class="box box-primary">
-                    <div class="box-header ">
-                        <h3 class="box-title"></h3>
-                    </div>
+            <div class="col-12">
+                <div class="card card-outline card-primary">
                     <form class=" form-setting" autocomplete="off"
                           action="#(CPATH)/admin/#(moduleName)/#(tableMeta.name)/doSave"
                           method="POST" id="form">
 
-                        <div class="box-body ">
+                        <div class="card-body ">
 	                        #for(cm : tableMeta.columnMetas)
 	                            #set(modelAttrName=firstCharToLowerCase(tableMeta.modelName)+"."+cm.name)
 	                              #set(modelAttrName_=firstCharToLowerCase(tableMeta.modelName)+"_"+cm.name)
 	                             #if("id"==cm.name)
 	                                <input type="hidden" id="entryId" name="#(modelAttrName)" value="#('#(')#(modelAttrName) ??)">
 	                             #else
-		                            <div class="form-group">
+		                            <div class="form-group row">
 		                                <label class="col-sm-2 col-form-label">#(cm.remarks?? "列名称")</label>
 		                                <div class="col-sm-6">
 
@@ -76,15 +86,15 @@
 				 			#end
 
                         </div>
-                        <!-- /.box-body -->
-                        <div class="box-footer">
+                        <!-- /.card-body -->
+                        <div class="card-footer">
                             <div class="offset-sm-2 col-sm-10 submit-block">
-                                <div class="box-submit">
+                                <div class="card-submit">
                                     <button id="submit" type="button" class="btn btn-primary">提交</button>
                                 </div>
                             </div>
                         </div>
-                        <!-- /.box-footer -->
+                        <!-- /.card-footer -->
                     </form>
                 </div>
             </div>
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 f84163b99..c8b588504 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()
 
     <section class="content-header">
-        <h1>
-            #(tableMeta.remarks)管理
-            <small>Items</small>
-        </h1>
+        <div class="container-fluid">
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="row mb-2">
+                        <div class="col-sm-12">
+                            <h1>
+                                #(tableMeta.remarks)管理
+                                <small data-toggle="tooltip" title="" data-placement="right"
+                                       data-trigger="hover"><i class="nav-icon far fa-question-circle"></i></small>
+                                <small> 首页 / #(tableMeta.modelName) / #(tableMeta.remarks)管理</small>
+                            </h1>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
     </section>
 
     <section class="content">
 
         <div class="row">
-            <div class="col-xs-12">
-                <div class="box box-primary">
-                    <div class="box-header with-border">
+            <div class="col-12">
+                <div class="card card-outline card-primary">
+                    <div class="card-header with-border">
 
                         <div class="row admin-search-panel">
-                            <div class="col-xs-12">
+                            <div class="col-12">
                                 <a href="#(tableMeta.name)/edit" class="btn btn-primary ">
                                     <i class="fas fa-plus"></i> 新建
                                 </a>
@@ -35,8 +47,8 @@
                         </div>
 
                     </div>
-                    <!-- /.box-header -->
-                    <div class="box-body ">
+                    <!-- /.card-header -->
+                    <div class="card-body ">
 
                         <table class="table table-striped">
                             <tbody>
@@ -77,8 +89,8 @@
                             </tbody>
                         </table>
                     </div>
-                    <!-- /.box-body -->
-                    <div class="box-footer">
+                    <!-- /.card-body -->
+                    <div class="card-footer">
                         <div class="row">
                             <div class="col-sm-12">
                             	 #('#')@_paginate()
diff --git a/codegen/src/main/java/io/jpress/codegen/templates/ui_listener_template.jf b/codegen/src/main/java/io/jpress/codegen/templates/ui_listener_template.jf
index d219623c1..05c451322 100644
--- a/codegen/src/main/java/io/jpress/codegen/templates/ui_listener_template.jf
+++ b/codegen/src/main/java/io/jpress/codegen/templates/ui_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("<i class=\"fa fa-fw fa-file-text\"></i>");
+        menuGroup.setIcon("<i class=\"fas fa-file\"></i>");
         menuGroup.setOrder(1);
         adminMenus.add(menuGroup);
     }
-- 
Gitee