【添加】代码生成的功能的核心代码引入

jero-boot/jero-boot-base/jero-boot-base-core/pom.xml

@@ -36,6 +36,12 @@
 			<groupId>com.jero.boot</groupId>
 			<artifactId>jero-boot-base-tools</artifactId>
 		</dependency>
+		<!-- 代码生成核心包 -->
+		<dependency>
+			<groupId>com.jero.boot</groupId>
+			<artifactId>jero-boot-base-generater-core</artifactId>
+			<version>${jero.version}</version>
+		</dependency>
 		<!--集成springmvc框架并实现自动配置 -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -190,14 +196,6 @@
 			<artifactId>commons-pool2</artifactId>
 		</dependency>
 
-		<!-- 代码生成器 -->
-		<!-- 如下载失败，请参考此文档  http://doc.jeecg.com/2043876 -->
-		<dependency>
-			<groupId>org.jeecgframework.boot</groupId>
-			<artifactId>codegenerate</artifactId>
-			<version>${codegenerate.version}</version>
-		</dependency>
-
 		<!-- AutoPoi Excel工具类-->
 		<dependency>
 			<groupId>org.jeecgframework</groupId>
@@ -243,6 +241,7 @@
 			<groupId>com.squareup.okhttp3</groupId>
 			<artifactId>okhttp</artifactId>
 		</dependency>
+
 	</dependencies>
 
 </project>

jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/dynamic/db/FreemarkerParseFactory.java

@@ -6,7 +6,7 @@ import freemarker.template.Configuration;
 import freemarker.template.Template;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.jeecgframework.codegenerate.generate.util.SimpleFormat;
+import com.jero.codegenerate.generate.util.SimpleFormat;
 
 import java.io.StringWriter;
 import java.util.Map;

jero-boot/jero-boot-base/jero-boot-base-generater-core/pom.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>jero-boot-base</artifactId>
+        <groupId>com.jero.boot</groupId>
+        <version>2.4.2</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <description>代码生成核心模块</description>
+    <artifactId>jero-boot-base-generater-core</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>${commons.version}</version>
+        </dependency>
+
+        <!-- freemarker -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-freemarker</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/database/CodegenDatasourceConfig.java

@@ -0,0 +1,15 @@
+package com.jero.codegenerate.database;
+
+import com.jero.codegenerate.properties.CodeConfigProperties;
+
+public class CodegenDatasourceConfig {
+    public CodegenDatasourceConfig() {
+    }
+
+    public static void initDbConfig(String DIVERNAME, String URL, String USERNAME, String PASSWORD) {
+        CodeConfigProperties.driverName = DIVERNAME;
+        CodeConfigProperties.databaseUrl = URL;
+        CodeConfigProperties.username = USERNAME;
+        CodeConfigProperties.password = PASSWORD;
+    }
+}

jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/database/DbReadTableUtil.java

@@ -0,0 +1,474 @@
+package com.jero.codegenerate.database;
+
+import java.io.PrintStream;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import com.jero.codegenerate.properties.CodeConfigProperties;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang.StringUtils;
+import com.jero.codegenerate.database.util.CodeStringUtils;
+import com.jero.codegenerate.generate.pojo.ColumnVo;
+import com.jero.codegenerate.generate.util.TableConvert;
+
+@Slf4j
+public class DbReadTableUtil {
+    
+    private static Connection b;
+    private static Statement c;
+
+    public DbReadTableUtil() {
+    }
+
+    public static void main(String[] args) throws SQLException {
+        try {
+            List var1 = a("demo");
+            Iterator var2 = var1.iterator();
+
+            while(var2.hasNext()) {
+                ColumnVo var3 = (ColumnVo)var2.next();
+                System.out.println(var3.getFieldName());
+            }
+        } catch (Exception var4) {
+            var4.printStackTrace();
+        }
+
+        PrintStream var10000 = System.out;
+        new DbReadTableUtil();
+        var10000.println(ArrayUtils.toString(a()));
+    }
+
+    public static List<String> a() throws SQLException {
+        String var1 = null;
+        ArrayList var2 = new ArrayList(0);
+
+        try {
+            Class.forName(CodeConfigProperties.driverName);
+            b = DriverManager.getConnection(CodeConfigProperties.databaseUrl, CodeConfigProperties.username, CodeConfigProperties.password);
+            c = b.createStatement(1005, 1007);
+            String var3 = b.getCatalog();
+            log.info(" connect databaseName : " + var3);
+            if (CodeConfigProperties.databaseType.equals("mysql")) {
+                var1 = MessageFormat.format("select distinct table_name from information_schema.columns where table_schema = {0}", TableConvert.c(var3));
+            }
+
+            if (CodeConfigProperties.databaseType.equals("oracle")) {
+                var1 = " select distinct colstable.table_name as  table_name from user_tab_cols colstable order by colstable.table_name";
+            }
+
+            if (CodeConfigProperties.databaseType.equals("postgresql")) {
+                var1 = "select tablename from pg_tables where schemaname='public'";
+            }
+
+            if (CodeConfigProperties.databaseType.equals("sqlserver")) {
+                var1 = "select distinct c.name as  table_name from sys.objects c where c.type = 'U' ";
+            }
+
+            log.debug("--------------sql-------------" + var1);
+            ResultSet var0 = c.executeQuery(var1);
+
+            while(var0.next()) {
+                String var4 = var0.getString(1);
+                var2.add(var4);
+            }
+        } catch (Exception var13) {
+            var13.printStackTrace();
+        } finally {
+            try {
+                if (c != null) {
+                    c.close();
+                    c = null;
+                    System.gc();
+                }
+
+                if (b != null) {
+                    b.close();
+                    b = null;
+                    System.gc();
+                }
+            } catch (SQLException var12) {
+                throw var12;
+            }
+
+        }
+
+        return var2;
+    }
+
+    public static List<ColumnVo> a(String var0) throws Exception {
+        String var2 = null;
+        ArrayList var3 = new ArrayList();
+
+        int var5;
+        try {
+            Class.forName(com.jero.codegenerate.properties.CodeConfigProperties.driverName);
+            b = DriverManager.getConnection(com.jero.codegenerate.properties.CodeConfigProperties.databaseUrl, com.jero.codegenerate.properties.CodeConfigProperties.username, com.jero.codegenerate.properties.CodeConfigProperties.password);
+            c = b.createStatement(1005, 1007);
+            String var4 = b.getCatalog();
+            log.info(" connect databaseName : " + var4);
+            if (com.jero.codegenerate.properties.CodeConfigProperties.databaseType.equals("mysql")) {
+                var2 = MessageFormat.format("select column_name,data_type,column_comment,numeric_precision,numeric_scale,character_maximum_length,is_nullable nullable from information_schema.columns where table_name = {0} and table_schema = {1} order by ORDINAL_POSITION", TableConvert.c(var0), TableConvert.c(var4));
+            }
+
+            if (com.jero.codegenerate.properties.CodeConfigProperties.databaseType.equals("oracle")) {
+                var2 = MessageFormat.format(" select colstable.column_name column_name, colstable.data_type data_type, commentstable.comments column_comment, colstable.Data_Precision column_precision, colstable.Data_Scale column_scale,colstable.Char_Length,colstable.nullable from user_tab_cols colstable  inner join user_col_comments commentstable  on colstable.column_name = commentstable.column_name  where colstable.table_name = commentstable.table_name  and colstable.table_name = {0}", TableConvert.c(var0.toUpperCase()));
+            }
+
+            if (com.jero.codegenerate.properties.CodeConfigProperties.databaseType.equals("postgresql")) {
+                var2 = MessageFormat.format("select icm.column_name as field,icm.udt_name as type,fieldtxt.descript as comment, icm.numeric_precision_radix as column_precision ,icm.numeric_scale as column_scale ,icm.character_maximum_length as Char_Length,icm.is_nullable as attnotnull from information_schema.columns icm, (SELECT A.attnum,( SELECT description FROM pg_catalog.pg_description WHERE objoid = A.attrelid AND objsubid = A.attnum ) AS descript,A.attname FROM\tpg_catalog.pg_attribute A WHERE A.attrelid = ( SELECT oid FROM pg_class WHERE relname = {0} ) AND A.attnum > 0 AND NOT A.attisdropped  ORDER BY\tA.attnum ) fieldtxt where icm.table_name={1} and fieldtxt.attname = icm.column_name", TableConvert.c(var0), TableConvert.c(var0));
+            }
+
+            if (com.jero.codegenerate.properties.CodeConfigProperties.databaseType.equals("sqlserver")) {
+                var2 = MessageFormat.format("select distinct cast(a.name as varchar(50)) column_name,  cast(b.name as varchar(50)) data_type,  cast(e.value as NVARCHAR(200)) comment,  cast(ColumnProperty(a.object_id,a.Name,'''Precision''') as int) num_precision,  cast(ColumnProperty(a.object_id,a.Name,'''Scale''') as int) num_scale,  a.max_length,  (case when a.is_nullable=1 then '''y''' else '''n''' end) nullable,column_id   from sys.columns a left join sys.types b on a.user_type_id=b.user_type_id left join (select top 1 * from sys.objects where type = '''U''' and name ={0}  order by name) c on a.object_id=c.object_id left join sys.extended_properties e on e.major_id=c.object_id and e.minor_id=a.column_id and e.class=1 where c.name={0} order by a.column_id", TableConvert.c(var0));
+            }
+
+            log.debug("--------------sql-------------" + var2);
+            ResultSet var1 = c.executeQuery(var2);
+            var1.last();
+            var5 = var1.getRow();
+            if (var5 <= 0) {
+                throw new Exception("该表不存在或者表中没有字段");
+            }
+
+            ColumnVo var7 = new ColumnVo();
+            if (com.jero.codegenerate.properties.CodeConfigProperties.k) {
+                var7.setFieldName(e(var1.getString(1).toLowerCase()));
+            } else {
+                var7.setFieldName(var1.getString(1).toLowerCase());
+            }
+
+            var7.setFieldDbName(var1.getString(1).toUpperCase());
+            var7.setFieldType(e(var1.getString(2).toLowerCase()));
+            var7.setFieldDbType(e(var1.getString(2).toLowerCase()));
+            var7.setPrecision(var1.getString(4));
+            var7.setScale(var1.getString(5));
+            var7.setCharmaxLength(var1.getString(6));
+            var7.setNullable(TableConvert.a(var1.getString(7)));
+            a(var7);
+            var7.setFiledComment(StringUtils.isBlank(var1.getString(3)) ? var7.getFieldName() : var1.getString(3));
+            log.debug("columnt.getFieldName() -------------" + var7.getFieldName());
+            String[] var8 = new String[0];
+            if (com.jero.codegenerate.properties.CodeConfigProperties.o != null) {
+                var8 = com.jero.codegenerate.properties.CodeConfigProperties.o.toLowerCase().split(",");
+            }
+
+            if (!com.jero.codegenerate.properties.CodeConfigProperties.l.equals(var7.getFieldName()) && !CodeStringUtils.a(var7.getFieldDbName().toLowerCase(), var8)) {
+                var3.add(var7);
+            }
+
+            while(var1.previous()) {
+                ColumnVo var9 = new ColumnVo();
+                if (com.jero.codegenerate.properties.CodeConfigProperties.k) {
+                    var9.setFieldName(e(var1.getString(1).toLowerCase()));
+                } else {
+                    var9.setFieldName(var1.getString(1).toLowerCase());
+                }
+
+                var9.setFieldDbName(var1.getString(1).toUpperCase());
+                log.debug("columnt.getFieldName() -------------" + var9.getFieldName());
+                if (!com.jero.codegenerate.properties.CodeConfigProperties.l.equals(var9.getFieldName()) && !CodeStringUtils.a(var9.getFieldDbName().toLowerCase(), var8)) {
+                    var9.setFieldType(e(var1.getString(2).toLowerCase()));
+                    var9.setFieldDbType(e(var1.getString(2).toLowerCase()));
+                    log.debug("-----po.setFieldType------------" + var9.getFieldType());
+                    var9.setPrecision(var1.getString(4));
+                    var9.setScale(var1.getString(5));
+                    var9.setCharmaxLength(var1.getString(6));
+                    var9.setNullable(TableConvert.a(var1.getString(7)));
+                    a(var9);
+                    var9.setFiledComment(StringUtils.isBlank(var1.getString(3)) ? var9.getFieldName() : var1.getString(3));
+                    var3.add(var9);
+                }
+            }
+
+            log.debug("读取表成功");
+        } catch (ClassNotFoundException var18) {
+            throw var18;
+        } catch (SQLException var19) {
+            throw var19;
+        } finally {
+            try {
+                if (c != null) {
+                    c.close();
+                    c = null;
+                    System.gc();
+                }
+
+                if (b != null) {
+                    b.close();
+                    b = null;
+                    System.gc();
+                }
+            } catch (SQLException var17) {
+                throw var17;
+            }
+
+        }
+
+        ArrayList var21 = new ArrayList();
+
+        for(var5 = var3.size() - 1; var5 >= 0; --var5) {
+            ColumnVo var6 = (ColumnVo)var3.get(var5);
+            var21.add(var6);
+        }
+
+        return var21;
+    }
+
+    public static List<ColumnVo> b(String var0) throws Exception {
+        ResultSet var1 = null;
+        String var2 = null;
+        ArrayList var3 = new ArrayList();
+
+        int var5;
+        try {
+            Class.forName(com.jero.codegenerate.properties.CodeConfigProperties.driverName);
+            b = DriverManager.getConnection(com.jero.codegenerate.properties.CodeConfigProperties.databaseUrl, com.jero.codegenerate.properties.CodeConfigProperties.username, com.jero.codegenerate.properties.CodeConfigProperties.password);
+            c = b.createStatement(1005, 1007);
+            String var4 = b.getCatalog();
+            log.info(" connect databaseName : " + var4);
+            if (com.jero.codegenerate.properties.CodeConfigProperties.databaseType.equals("mysql")) {
+                var2 = MessageFormat.format("select column_name,data_type,column_comment,numeric_precision,numeric_scale,character_maximum_length,is_nullable nullable from information_schema.columns where table_name = {0} and table_schema = {1} order by ORDINAL_POSITION", TableConvert.c(var0), TableConvert.c(var4));
+            }
+
+            if (com.jero.codegenerate.properties.CodeConfigProperties.databaseType.equals("oracle")) {
+                var2 = MessageFormat.format(" select colstable.column_name column_name, colstable.data_type data_type, commentstable.comments column_comment, colstable.Data_Precision column_precision, colstable.Data_Scale column_scale,colstable.Char_Length,colstable.nullable from user_tab_cols colstable  inner join user_col_comments commentstable  on colstable.column_name = commentstable.column_name  where colstable.table_name = commentstable.table_name  and colstable.table_name = {0}", TableConvert.c(var0.toUpperCase()));
+            }
+
+            if (com.jero.codegenerate.properties.CodeConfigProperties.databaseType.equals("postgresql")) {
+                var2 = MessageFormat.format("select icm.column_name as field,icm.udt_name as type,fieldtxt.descript as comment, icm.numeric_precision_radix as column_precision ,icm.numeric_scale as column_scale ,icm.character_maximum_length as Char_Length,icm.is_nullable as attnotnull from information_schema.columns icm, (SELECT A.attnum,( SELECT description FROM pg_catalog.pg_description WHERE objoid = A.attrelid AND objsubid = A.attnum ) AS descript,A.attname FROM\tpg_catalog.pg_attribute A WHERE A.attrelid = ( SELECT oid FROM pg_class WHERE relname = {0} ) AND A.attnum > 0 AND NOT A.attisdropped  ORDER BY\tA.attnum ) fieldtxt where icm.table_name={1} and fieldtxt.attname = icm.column_name", TableConvert.c(var0), TableConvert.c(var0));
+            }
+
+            if (com.jero.codegenerate.properties.CodeConfigProperties.databaseType.equals("sqlserver")) {
+                var2 = MessageFormat.format("select distinct cast(a.name as varchar(50)) column_name,  cast(b.name as varchar(50)) data_type,  cast(e.value as NVARCHAR(200)) comment,  cast(ColumnProperty(a.object_id,a.Name,'''Precision''') as int) num_precision,  cast(ColumnProperty(a.object_id,a.Name,'''Scale''') as int) num_scale,  a.max_length,  (case when a.is_nullable=1 then '''y''' else '''n''' end) nullable,column_id   from sys.columns a left join sys.types b on a.user_type_id=b.user_type_id left join (select top 1 * from sys.objects where type = '''U''' and name ={0}  order by name) c on a.object_id=c.object_id left join sys.extended_properties e on e.major_id=c.object_id and e.minor_id=a.column_id and e.class=1 where c.name={0} order by a.column_id", TableConvert.c(var0));
+            }
+
+            var1 = c.executeQuery(var2);
+            var1.last();
+            var5 = var1.getRow();
+            if (var5 <= 0) {
+                throw new Exception("该表不存在或者表中没有字段");
+            }
+
+            ColumnVo var7 = new ColumnVo();
+            if (com.jero.codegenerate.properties.CodeConfigProperties.k) {
+                var7.setFieldName(e(var1.getString(1).toLowerCase()));
+            } else {
+                var7.setFieldName(var1.getString(1).toLowerCase());
+            }
+
+            var7.setFieldDbName(var1.getString(1).toUpperCase());
+            var7.setPrecision(TableConvert.b(var1.getString(4)));
+            var7.setScale(TableConvert.b(var1.getString(5)));
+            var7.setCharmaxLength(TableConvert.b(var1.getString(6)));
+            var7.setNullable(TableConvert.a(var1.getString(7)));
+            var7.setFieldType(a(var1.getString(2).toLowerCase(), var7.getPrecision(), var7.getScale()));
+            var7.setFieldDbType(e(var1.getString(2).toLowerCase()));
+            a(var7);
+            var7.setFiledComment(StringUtils.isBlank(var1.getString(3)) ? var7.getFieldName() : var1.getString(3));
+            log.debug("columnt.getFieldName() -------------" + var7.getFieldName());
+            var3.add(var7);
+
+            while(true) {
+                if (!var1.previous()) {
+                    log.debug("读取表成功");
+                    break;
+                }
+
+                ColumnVo var8 = new ColumnVo();
+                if (com.jero.codegenerate.properties.CodeConfigProperties.k) {
+                    var8.setFieldName(e(var1.getString(1).toLowerCase()));
+                } else {
+                    var8.setFieldName(var1.getString(1).toLowerCase());
+                }
+
+                var8.setFieldDbName(var1.getString(1).toUpperCase());
+                var8.setPrecision(TableConvert.b(var1.getString(4)));
+                var8.setScale(TableConvert.b(var1.getString(5)));
+                var8.setCharmaxLength(TableConvert.b(var1.getString(6)));
+                var8.setNullable(TableConvert.a(var1.getString(7)));
+                var8.setFieldType(a(var1.getString(2).toLowerCase(), var8.getPrecision(), var8.getScale()));
+                var8.setFieldDbType(e(var1.getString(2).toLowerCase()));
+                a(var8);
+                var8.setFiledComment(StringUtils.isBlank(var1.getString(3)) ? var8.getFieldName() : var1.getString(3));
+                var3.add(var8);
+            }
+        } catch (ClassNotFoundException var17) {
+            throw var17;
+        } catch (SQLException var18) {
+            throw var18;
+        } finally {
+            try {
+                if (c != null) {
+                    c.close();
+                    c = null;
+                    System.gc();
+                }
+
+                if (b != null) {
+                    b.close();
+                    b = null;
+                    System.gc();
+                }
+            } catch (SQLException var16) {
+                throw var16;
+            }
+
+        }
+
+        ArrayList var20 = new ArrayList();
+
+        for(var5 = var3.size() - 1; var5 >= 0; --var5) {
+            ColumnVo var6 = (ColumnVo)var3.get(var5);
+            var20.add(var6);
+        }
+
+        return var20;
+    }
+
+    public static boolean c(String var0) {
+        String var2 = null;
+
+        try {
+            log.debug("数据库驱动: " + com.jero.codegenerate.properties.CodeConfigProperties.driverName);
+            Class.forName(com.jero.codegenerate.properties.CodeConfigProperties.driverName);
+            b = DriverManager.getConnection(com.jero.codegenerate.properties.CodeConfigProperties.databaseUrl, com.jero.codegenerate.properties.CodeConfigProperties.username, com.jero.codegenerate.properties.CodeConfigProperties.password);
+            c = b.createStatement(1005, 1007);
+            String var3 = b.getCatalog();
+            log.info(" connect databaseName : " + var3);
+            if (com.jero.codegenerate.properties.CodeConfigProperties.databaseType.equals("mysql")) {
+                var2 = "select column_name,data_type,column_comment,0,0 from information_schema.columns where table_name = '" + var0 + "' and table_schema = '" + var3 + "'";
+            }
+
+            if (com.jero.codegenerate.properties.CodeConfigProperties.databaseType.equals("oracle")) {
+                var2 = "select colstable.column_name column_name, colstable.data_type data_type, commentstable.comments column_comment from user_tab_cols colstable  inner join user_col_comments commentstable  on colstable.column_name = commentstable.column_name  where colstable.table_name = commentstable.table_name  and colstable.table_name = '" + var0.toUpperCase() + "'";
+            }
+
+            if (com.jero.codegenerate.properties.CodeConfigProperties.databaseType.equals("postgresql")) {
+                var2 = MessageFormat.format("select icm.column_name as field,icm.udt_name as type,fieldtxt.descript as comment, icm.numeric_precision_radix as column_precision ,icm.numeric_scale as column_scale ,icm.character_maximum_length as Char_Length,icm.is_nullable as attnotnull from information_schema.columns icm, (SELECT A.attnum,( SELECT description FROM pg_catalog.pg_description WHERE objoid = A.attrelid AND objsubid = A.attnum ) AS descript,A.attname FROM\tpg_catalog.pg_attribute A WHERE A.attrelid = ( SELECT oid FROM pg_class WHERE relname = {0} ) AND A.attnum > 0 AND NOT A.attisdropped  ORDER BY\tA.attnum ) fieldtxt where icm.table_name={1} and fieldtxt.attname = icm.column_name", TableConvert.c(var0), TableConvert.c(var0));
+            }
+
+            if (com.jero.codegenerate.properties.CodeConfigProperties.databaseType.equals("sqlserver")) {
+                var2 = MessageFormat.format("select distinct cast(a.name as varchar(50)) column_name,  cast(b.name as varchar(50)) data_type,  cast(e.value as NVARCHAR(200)) comment,  cast(ColumnProperty(a.object_id,a.Name,'''Precision''') as int) num_precision,  cast(ColumnProperty(a.object_id,a.Name,'''Scale''') as int) num_scale,  a.max_length,  (case when a.is_nullable=1 then '''y''' else '''n''' end) nullable,column_id   from sys.columns a left join sys.types b on a.user_type_id=b.user_type_id left join (select top 1 * from sys.objects where type = '''U''' and name ={0}  order by name) c on a.object_id=c.object_id left join sys.extended_properties e on e.major_id=c.object_id and e.minor_id=a.column_id and e.class=1 where c.name={0} order by a.column_id", TableConvert.c(var0));
+            }
+
+            ResultSet var1 = c.executeQuery(var2);
+            var1.last();
+            int var4 = var1.getRow();
+            return var4 > 0;
+        } catch (Exception var5) {
+            var5.printStackTrace();
+            return false;
+        }
+    }
+
+    private static String e(String var0) {
+        String[] var1 = var0.split("_");
+        var0 = "";
+        int var2 = 0;
+
+        for(int var3 = var1.length; var2 < var3; ++var2) {
+            if (var2 > 0) {
+                String var4 = var1[var2].toLowerCase();
+                var4 = var4.substring(0, 1).toUpperCase() + var4.substring(1, var4.length());
+                var0 = var0 + var4;
+            } else {
+                var0 = var0 + var1[var2].toLowerCase();
+            }
+        }
+
+        return var0;
+    }
+
+    public static String d(String var0) {
+        String[] var1 = var0.split("_");
+        var0 = "";
+        int var2 = 0;
+
+        for(int var3 = var1.length; var2 < var3; ++var2) {
+            if (var2 > 0) {
+                String var4 = var1[var2].toLowerCase();
+                var4 = var4.substring(0, 1).toUpperCase() + var4.substring(1, var4.length());
+                var0 = var0 + var4;
+            } else {
+                var0 = var0 + var1[var2].toLowerCase();
+            }
+        }
+
+        var0 = var0.substring(0, 1).toUpperCase() + var0.substring(1);
+        return var0;
+    }
+
+    private static void a(ColumnVo var0) {
+        String var1 = var0.getFieldType();
+        String var2 = var0.getScale();
+        var0.setClassType("inputxt");
+        if ("N".equals(var0.getNullable())) {
+            var0.setOptionType("*");
+        }
+
+        if (!"datetime".equals(var1) && !var1.contains("time")) {
+            if ("date".equals(var1)) {
+                var0.setClassType("easyui-datebox");
+            } else if (var1.contains("int")) {
+                var0.setOptionType("n");
+            } else if ("number".equals(var1)) {
+                if (StringUtils.isNotBlank(var2) && Integer.parseInt(var2) > 0) {
+                    var0.setOptionType("d");
+                }
+            } else if (!"float".equals(var1) && !"double".equals(var1) && !"decimal".equals(var1)) {
+                if ("numeric".equals(var1)) {
+                    var0.setOptionType("d");
+                }
+            } else {
+                var0.setOptionType("d");
+            }
+        } else {
+            var0.setClassType("easyui-datetimebox");
+        }
+
+    }
+
+    private static String a(String var0, String var1, String var2) {
+        if (var0.contains("char")) {
+            var0 = "java.lang.String";
+        } else if (var0.contains("int")) {
+            var0 = "java.lang.Integer";
+        } else if (var0.contains("float")) {
+            var0 = "java.lang.Float";
+        } else if (var0.contains("double")) {
+            var0 = "java.lang.Double";
+        } else if (var0.contains("number")) {
+            if (StringUtils.isNotBlank(var2) && Integer.parseInt(var2) > 0) {
+                var0 = "java.math.BigDecimal";
+            } else if (StringUtils.isNotBlank(var1) && Integer.parseInt(var1) > 10) {
+                var0 = "java.lang.Long";
+            } else {
+                var0 = "java.lang.Integer";
+            }
+        } else if (var0.contains("decimal")) {
+            var0 = "java.math.BigDecimal";
+        } else if (var0.contains("date")) {
+            var0 = "java.util.Date";
+        } else if (var0.contains("time")) {
+            var0 = "java.util.Date";
+        } else if (var0.contains("blob")) {
+            var0 = "byte[]";
+        } else if (var0.contains("clob")) {
+            var0 = "java.sql.Clob";
+        } else if (var0.contains("numeric")) {
+            var0 = "java.math.BigDecimal";
+        } else {
+            var0 = "java.lang.Object";
+        }
+
+        return var0;
+    }
+}

jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/database/util/CodeStringUtils.java

@@ -0,0 +1,74 @@
+package com.jero.codegenerate.database.util;
+
+import java.util.List;
+import org.apache.commons.lang.StringUtils;
+
+public class CodeStringUtils {
+    public CodeStringUtils() {
+    }
+
+    public static String a(String[] var0) {
+        StringBuffer var1 = new StringBuffer();
+        String[] var2 = var0;
+        int var3 = var0.length;
+
+        for(int var4 = 0; var4 < var3; ++var4) {
+            String var5 = var2[var4];
+            if (StringUtils.isNotBlank(var5)) {
+                var1.append(",");
+                var1.append("'");
+                var1.append(var5.trim());
+                var1.append("'");
+            }
+        }
+
+        return var1.toString().substring(1);
+    }
+
+    public static String a(String var0) {
+        if (StringUtils.isNotBlank(var0)) {
+            var0 = var0.substring(0, 1).toLowerCase() + var0.substring(1);
+        }
+
+        return var0;
+    }
+
+    public static Integer a(Integer var0) {
+        return var0 == null ? 0 : var0;
+    }
+
+    public static boolean a(String var0, String[] var1) {
+        if (var1 != null && var1.length != 0) {
+            for(int var2 = 0; var2 < var1.length; ++var2) {
+                String var3 = var1[var2];
+                if (var3.equals(var0)) {
+                    return true;
+                }
+            }
+
+            return false;
+        } else {
+            return false;
+        }
+    }
+
+    public static boolean a(String var0, List<String> var1) {
+        String[] var2 = new String[0];
+        if (var1 != null) {
+            var2 = (String[])((String[])var1.toArray());
+        }
+
+        if (var2 != null && var2.length != 0) {
+            for(int var3 = 0; var3 < var2.length; ++var3) {
+                String var4 = var2[var3];
+                if (var4.equals(var0)) {
+                    return true;
+                }
+            }
+
+            return false;
+        } else {
+            return false;
+        }
+    }
+}

jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/database/util/DbConvertDef.java

@@ -0,0 +1,18 @@
+package com.jero.codegenerate.database.util;
+
+public interface DbConvertDef {
+    String a = "Y";
+    String b = "N";
+    String c = "mysql";
+    String d = "oracle";
+    String e = "sqlserver";
+    String f = "postgresql";
+    String g = "select column_name,data_type,column_comment,numeric_precision,numeric_scale,character_maximum_length,is_nullable nullable from information_schema.columns where table_name = {0} and table_schema = {1} order by ORDINAL_POSITION";
+    String h = " select colstable.column_name column_name, colstable.data_type data_type, commentstable.comments column_comment, colstable.Data_Precision column_precision, colstable.Data_Scale column_scale,colstable.Char_Length,colstable.nullable from user_tab_cols colstable  inner join user_col_comments commentstable  on colstable.column_name = commentstable.column_name  where colstable.table_name = commentstable.table_name  and colstable.table_name = {0}";
+    String i = "select distinct cast(a.name as varchar(50)) column_name,  cast(b.name as varchar(50)) data_type,  cast(e.value as NVARCHAR(200)) comment,  cast(ColumnProperty(a.object_id,a.Name,'''Precision''') as int) num_precision,  cast(ColumnProperty(a.object_id,a.Name,'''Scale''') as int) num_scale,  a.max_length,  (case when a.is_nullable=1 then '''y''' else '''n''' end) nullable,column_id   from sys.columns a left join sys.types b on a.user_type_id=b.user_type_id left join (select top 1 * from sys.objects where type = '''U''' and name ={0}  order by name) c on a.object_id=c.object_id left join sys.extended_properties e on e.major_id=c.object_id and e.minor_id=a.column_id and e.class=1 where c.name={0} order by a.column_id";
+    String j = "select icm.column_name as field,icm.udt_name as type,fieldtxt.descript as comment, icm.numeric_precision_radix as column_precision ,icm.numeric_scale as column_scale ,icm.character_maximum_length as Char_Length,icm.is_nullable as attnotnull from information_schema.columns icm, (SELECT A.attnum,( SELECT description FROM pg_catalog.pg_description WHERE objoid = A.attrelid AND objsubid = A.attnum ) AS descript,A.attname FROM\tpg_catalog.pg_attribute A WHERE A.attrelid = ( SELECT oid FROM pg_class WHERE relname = {0} ) AND A.attnum > 0 AND NOT A.attisdropped  ORDER BY\tA.attnum ) fieldtxt where icm.table_name={1} and fieldtxt.attname = icm.column_name";
+    String k = "select distinct table_name from information_schema.columns where table_schema = {0}";
+    String l = " select distinct colstable.table_name as  table_name from user_tab_cols colstable order by colstable.table_name";
+    String m = "select distinct c.name as  table_name from sys.objects c where c.type = 'U' ";
+    String n = "select tablename from pg_tables where schemaname='public'";
+}

jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/IGenerate.java

@@ -0,0 +1,12 @@
+package com.jero.codegenerate.generate;
+
+import java.util.List;
+import java.util.Map;
+
+public interface IGenerate {
+    Map<String, Object> a() throws Exception;
+
+    List<String> generateCodeFile(String var1) throws Exception;
+
+    List<String> generateCodeFile(String var1, String var2, String var3) throws Exception;
+}

jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/config/CreateFileConfig.java

@@ -0,0 +1,64 @@
+package com.jero.codegenerate.generate.config;
+
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+@Slf4j
+public class CreateFileConfig {
+    private String b;
+    private List<File> c = new ArrayList();
+    private String stylePath;
+
+    public CreateFileConfig(String templatePath) {
+        log.debug("----templatePath-----------------" + templatePath);
+        log.debug("----stylePath-----------------" + this.stylePath);
+        this.b = templatePath;
+    }
+
+    private void a(File var1) {
+        this.a(var1);
+    }
+
+    private void a(File... var1) {
+        this.c = Arrays.asList(var1);
+    }
+
+    public String a() {
+        return this.stylePath;
+    }
+
+    public void a(String var1) {
+        this.stylePath = var1;
+    }
+
+    public List<File> b() {
+        String var1 = this.getClass().getResource(this.b).getFile();
+        var1 = var1.replaceAll("%20", " ");
+        log.debug("-------classpath-------" + var1);
+        if (var1.indexOf("/BOOT-INF/classes!") != -1 || var1.indexOf("/BOOT-INF/lib/") != -1) {
+            var1 = System.getProperty("user.dir") + File.separator + "config/jero/code-template-online/".replace("/", File.separator);
+            log.debug("---JAR--config--classpath-------" + var1);
+        }
+
+        this.a(new File(var1));
+        return this.c;
+    }
+
+    public void a(List<File> var1) {
+        this.c = var1;
+    }
+
+    public String toString() {
+        StringBuilder var1 = new StringBuilder();
+        var1.append("{\"templateRootDirs\":\"");
+        var1.append(this.c);
+        var1.append("\",\"stylePath\":\"");
+        var1.append(this.stylePath);
+        var1.append("\"} ");
+        return var1.toString();
+    }
+}

jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/impl/CodeGenerateOne.java

@@ -0,0 +1,114 @@
+package com.jero.codegenerate.generate.impl;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import com.jero.codegenerate.database.DbReadTableUtil;
+import com.jero.codegenerate.generate.IGenerate;
+import com.jero.codegenerate.generate.config.CreateFileConfig;
+import com.jero.codegenerate.generate.impl.base.BaseCodeGenerate;
+import com.jero.codegenerate.generate.pojo.ColumnVo;
+import com.jero.codegenerate.generate.pojo.TableVo;
+import com.jero.codegenerate.generate.util.NonceUtils;
+
+@Slf4j
+public class CodeGenerateOne extends BaseCodeGenerate implements IGenerate {
+    private TableVo b;
+    private List<ColumnVo> e;
+    private List<ColumnVo> f;
+
+    public CodeGenerateOne(TableVo tableVo) {
+        this.b = tableVo;
+    }
+
+    public CodeGenerateOne(TableVo tableVo, List<ColumnVo> columns, List<ColumnVo> originalColumns) {
+        this.b = tableVo;
+        this.e = columns;
+        this.f = originalColumns;
+    }
+
+    public Map<String, Object> a() throws Exception {
+        HashMap var1 = new HashMap();
+        var1.put("bussiPackage", com.jero.codegenerate.properties.CodeConfigProperties.packageName);
+        var1.put("entityPackage", this.b.getEntityPackage());
+        var1.put("entityName", this.b.getEntityName());
+        var1.put("tableName", this.b.getTableName());
+        var1.put("primaryKeyField", com.jero.codegenerate.properties.CodeConfigProperties.l);
+        if (this.b.getFieldRequiredNum() == null) {
+            this.b.setFieldRequiredNum(StringUtils.isNotEmpty(com.jero.codegenerate.properties.CodeConfigProperties.m) ? Integer.parseInt(com.jero.codegenerate.properties.CodeConfigProperties.m) : -1);
+        }
+
+        if (this.b.getSearchFieldNum() == null) {
+            this.b.setSearchFieldNum(StringUtils.isNotEmpty(com.jero.codegenerate.properties.CodeConfigProperties.n) ? Integer.parseInt(com.jero.codegenerate.properties.CodeConfigProperties.n) : -1);
+        }
+
+        if (this.b.getFieldRowNum() == null) {
+            this.b.setFieldRowNum(Integer.parseInt(com.jero.codegenerate.properties.CodeConfigProperties.p));
+        }
+
+        var1.put("tableVo", this.b);
+
+        try {
+            if (this.e == null || this.e.size() == 0) {
+                this.e = DbReadTableUtil.a(this.b.getTableName());
+            }
+
+            var1.put("columns", this.e);
+            if (this.f == null || this.f.size() == 0) {
+                this.f = DbReadTableUtil.b(this.b.getTableName());
+            }
+
+            var1.put("originalColumns", this.f);
+            Iterator var2 = this.f.iterator();
+
+            while(var2.hasNext()) {
+                ColumnVo var3 = (ColumnVo)var2.next();
+                if (var3.getFieldName().toLowerCase().equals(com.jero.codegenerate.properties.CodeConfigProperties.l.toLowerCase())) {
+                    var1.put("primaryKeyPolicy", var3.getFieldType());
+                }
+            }
+        } catch (Exception var4) {
+            throw var4;
+        }
+
+        long var5 = NonceUtils.c() + NonceUtils.g();
+        var1.put("serialVersionUID", String.valueOf(var5));
+        log.info("load template data: " + var1.toString());
+        return var1;
+    }
+
+    public List<String> generateCodeFile(String stylePath) throws Exception {
+        log.debug("----jero---Code----Generation----[单表模型:" + this.b.getTableName() + "]------- 生成中。。。");
+        String var2 = com.jero.codegenerate.properties.CodeConfigProperties.f;
+        Map var3 = this.a();
+        String var4 = com.jero.codegenerate.properties.CodeConfigProperties.templateUrl;
+        if (a(var4, "/").equals("jero/code-template")) {
+            var4 = "/" + a(var4, "/") + "/one";
+            com.jero.codegenerate.properties.CodeConfigProperties.b(var4);
+        }
+
+        CreateFileConfig var5 = new CreateFileConfig(var4);
+        var5.a(stylePath);
+        this.a(var5, var2, var3);
+        log.info(" ----- jero-boot ---- generate  code  success =======> 表名：" + this.b.getTableName() + " ");
+        return this.d;
+    }
+
+    public List<String> generateCodeFile(String projectPath, String templatePath, String stylePath) throws Exception {
+        if (projectPath != null && !"".equals(projectPath)) {
+            com.jero.codegenerate.properties.CodeConfigProperties.a(projectPath);
+        }
+
+        if (templatePath != null && !"".equals(templatePath)) {
+            com.jero.codegenerate.properties.CodeConfigProperties.b(templatePath);
+        }
+
+        this.generateCodeFile(stylePath);
+        return this.d;
+    }
+
+}

jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/impl/CodeGenerateOneToMany.java

@@ -0,0 +1,153 @@
+package com.jero.codegenerate.generate.impl;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import com.jero.codegenerate.database.DbReadTableUtil;
+import com.jero.codegenerate.generate.IGenerate;
+import com.jero.codegenerate.generate.config.CreateFileConfig;
+import com.jero.codegenerate.generate.impl.base.BaseCodeGenerate;
+import com.jero.codegenerate.generate.pojo.ColumnVo;
+import com.jero.codegenerate.generate.pojo.onetomany.MainTableVo;
+import com.jero.codegenerate.generate.pojo.onetomany.SubTableVo;
+import com.jero.codegenerate.generate.util.NonceUtils;
+
+@Slf4j
+public class CodeGenerateOneToMany extends BaseCodeGenerate implements IGenerate {
+    private static String f;
+    public static String a = "A";
+    public static String b = "B";
+    private MainTableVo g;
+    private List<ColumnVo> h;
+    private List<ColumnVo> i;
+    private List<SubTableVo> j;
+    private static DbReadTableUtil k = new DbReadTableUtil();
+
+    public CodeGenerateOneToMany(MainTableVo mainTableVo, List<SubTableVo> subTables) {
+        this.j = subTables;
+        this.g = mainTableVo;
+    }
+
+    public CodeGenerateOneToMany(MainTableVo mainTableVo, List<ColumnVo> mainColums, List<ColumnVo> originalMainColumns, List<SubTableVo> subTables) {
+        this.g = mainTableVo;
+        this.h = mainColums;
+        this.i = originalMainColumns;
+        this.j = subTables;
+    }
+
+    public Map<String, Object> a() throws Exception {
+        HashMap var1 = new HashMap();
+        var1.put("bussiPackage", com.jero.codegenerate.properties.CodeConfigProperties.packageName);
+        var1.put("entityPackage", this.g.getEntityPackage());
+        var1.put("entityName", this.g.getEntityName());
+        var1.put("tableName", this.g.getTableName());
+        var1.put("ftl_description", this.g.getFtlDescription());
+        var1.put("primaryKeyField", com.jero.codegenerate.properties.CodeConfigProperties.l);
+        if (this.g.getFieldRequiredNum() == null) {
+            this.g.setFieldRequiredNum(StringUtils.isNotEmpty(com.jero.codegenerate.properties.CodeConfigProperties.m) ? Integer.parseInt(com.jero.codegenerate.properties.CodeConfigProperties.m) : -1);
+        }
+
+        if (this.g.getSearchFieldNum() == null) {
+            this.g.setSearchFieldNum(StringUtils.isNotEmpty(com.jero.codegenerate.properties.CodeConfigProperties.n) ? Integer.parseInt(com.jero.codegenerate.properties.CodeConfigProperties.n) : -1);
+        }
+
+        if (this.g.getFieldRowNum() == null) {
+            this.g.setFieldRowNum(Integer.parseInt(com.jero.codegenerate.properties.CodeConfigProperties.p));
+        }
+
+        var1.put("tableVo", this.g);
+
+        try {
+            if (this.h == null || this.h.size() == 0) {
+                this.h = DbReadTableUtil.a(this.g.getTableName());
+            }
+
+            if (this.i == null || this.i.size() == 0) {
+                this.i = DbReadTableUtil.b(this.g.getTableName());
+            }
+
+            var1.put("columns", this.h);
+            var1.put("originalColumns", this.i);
+            Iterator var2 = this.i.iterator();
+
+            while(var2.hasNext()) {
+                ColumnVo var3 = (ColumnVo)var2.next();
+                if (var3.getFieldName().toLowerCase().equals(com.jero.codegenerate.properties.CodeConfigProperties.l.toLowerCase())) {
+                    var1.put("primaryKeyPolicy", var3.getFieldType());
+                }
+            }
+
+            var2 = this.j.iterator();
+
+            while(var2.hasNext()) {
+                SubTableVo var12 = (SubTableVo)var2.next();
+                List var4;
+                if (var12.getColums() == null || var12.getColums().size() == 0) {
+                    var4 = DbReadTableUtil.a(var12.getTableName());
+                    var12.setColums(var4);
+                }
+
+                if (var12.getOriginalColumns() == null || var12.getOriginalColumns().size() == 0) {
+                    var4 = DbReadTableUtil.b(var12.getTableName());
+                    var12.setOriginalColumns(var4);
+                }
+
+                String[] var13 = var12.getForeignKeys();
+                ArrayList var5 = new ArrayList();
+                String[] var6 = var13;
+                int var7 = var13.length;
+
+                for(int var8 = 0; var8 < var7; ++var8) {
+                    String var9 = var6[var8];
+                    var5.add(DbReadTableUtil.d(var9));
+                }
+
+                var12.setForeignKeys((String[])var5.toArray(new String[0]));
+                var12.setOriginalForeignKeys(var13);
+            }
+
+            var1.put("subTables", this.j);
+        } catch (Exception var10) {
+            throw var10;
+        }
+
+        long var11 = NonceUtils.c() + NonceUtils.g();
+        var1.put("serialVersionUID", String.valueOf(var11));
+        log.info("code template data: " + var1.toString());
+        return var1;
+    }
+
+    public List<String> generateCodeFile(String stylePath) throws Exception {
+        String var2 = com.jero.codegenerate.properties.CodeConfigProperties.f;
+        Map var3 = this.a();
+        String var4 = com.jero.codegenerate.properties.CodeConfigProperties.templateUrl;
+        if (a(var4, "/").equals("jero/code-template")) {
+            var4 = "/" + a(var4, "/") + "/onetomany";
+            com.jero.codegenerate.properties.CodeConfigProperties.b(var4);
+        }
+
+        CreateFileConfig var5 = new CreateFileConfig(var4);
+        var5.a(stylePath);
+        this.a(var5, var2, var3);
+        log.info("----- jero-boot ---- generate  code  success =======> 主表名：" + this.g.getTableName());
+        return this.d;
+    }
+
+    public List<String> generateCodeFile(String projectPath, String templatePath, String stylePath) throws Exception {
+        if (projectPath != null && !"".equals(projectPath)) {
+            com.jero.codegenerate.properties.CodeConfigProperties.a(projectPath);
+        }
+
+        if (templatePath != null && !"".equals(templatePath)) {
+            com.jero.codegenerate.properties.CodeConfigProperties.b(templatePath);
+        }
+
+        this.generateCodeFile(stylePath);
+        return this.d;
+    }
+}

jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/impl/base/BaseCodeGenerate.java

@@ -0,0 +1,320 @@
+package com.jero.codegenerate.generate.impl.base;
+
+import freemarker.template.Configuration;
+import freemarker.template.Template;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import com.jero.codegenerate.generate.config.CreateFileConfig;
+import com.jero.codegenerate.generate.util.FileHelper;
+import com.jero.codegenerate.generate.util.FreemarkerHelper;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class BaseCodeGenerate {
+
+    protected static String c = "UTF-8";
+    protected List<String> d = new ArrayList();
+
+    public BaseCodeGenerate() {
+    }
+
+    protected void a(CreateFileConfig var1, String var2, Map<String, Object> var3) throws Exception {
+        log.debug("--------generate----projectPath--------" + var2);
+
+        for(int var4 = 0; var4 < var1.b().size(); ++var4) {
+            File var5 = (File)var1.b().get(var4);
+            this.a(var2, var5, var3, var1);
+        }
+
+    }
+
+    protected void a(String var1, File var2, Map<String, Object> var3, CreateFileConfig var4) throws Exception {
+        if (var2 == null) {
+            throw new IllegalStateException("'templateRootDir' must be not null");
+        } else {
+            log.info("  load template from templateRootDir = '" + var2.getAbsolutePath() + "',stylePath ='" + var4.a() + "',  out GenerateRootDir:" + com.jero.codegenerate.properties.CodeConfigProperties.f);
+            List var5 = FileHelper.a(var2);
+            log.debug("----srcFiles----size-----------" + var5.size());
+            log.debug("----srcFiles----list------------" + var5.toString());
+
+            for(int var6 = 0; var6 < var5.size(); ++var6) {
+                File var7 = (File)var5.get(var6);
+                this.a(var1, var2, var3, var7, var4);
+            }
+
+        }
+    }
+
+    protected void a(String var1, File var2, Map<String, Object> var3, File var4, CreateFileConfig var5) throws Exception {
+        log.debug("-------templateRootDir--" + var2.getPath());
+        log.debug("-------srcFile--" + var4.getPath());
+        String var6 = FileHelper.a(var2, var4);
+
+        try {
+            log.debug("-------templateFile--" + var6);
+            if (var5.a() != null && !"".equals(var5.a()) && !var6.replace(File.separator, ".").startsWith(var5.a())) {
+                return;
+            }
+
+            String var7 = a(var3, var6, var5);
+            log.debug("-------outputFilepath--" + var7);
+            String var8;
+            if (var7.startsWith("java")) {
+                var8 = var1 + File.separator + com.jero.codegenerate.properties.CodeConfigProperties.h.replace(".", File.separator);
+                var7 = var7.substring("java".length());
+                var7 = var8 + var7;
+                log.debug("-------java----outputFilepath--" + var7);
+                this.a(var6, var7, var3, var5);
+            } else if (var7.startsWith("webapp")) {
+                var8 = var1 + File.separator + com.jero.codegenerate.properties.CodeConfigProperties.i.replace(".", File.separator);
+                var7 = var7.substring("webapp".length());
+                var7 = var8 + var7;
+                log.debug("-------webapp---outputFilepath---" + var7);
+                this.a(var6, var7, var3, var5);
+            }
+        } catch (Exception var10) {
+            log.error(var10.toString(), var10);
+        }
+
+    }
+
+    protected void a(String var1, String var2, Map<String, Object> var3, CreateFileConfig var4) throws Exception {
+        if (var2.endsWith("i")) {
+            var2 = var2.substring(0, var2.length() - 1);
+        }
+
+        Template var5 = this.a(var1, var4);
+        var5.setOutputEncoding(c);
+        File var6 = FileHelper.c(var2);
+        log.info("[generate]\t template:" + var1 + " ==> " + var2);
+        FreemarkerHelper.a(var5, var3, var6, c);
+        if (!this.a(var6)) {
+            this.d.add("生成成功：" + var2);
+        }
+
+        if (this.a(var6)) {
+            this.a(var6, "#segment#");
+        }
+
+    }
+
+    protected Template a(String var1, CreateFileConfig var2) throws IOException {
+        return FreemarkerHelper.a(var2.b(), c, var1).getTemplate(var1);
+    }
+
+    protected boolean a(File var1) {
+        return var1.getName().startsWith("[1-n]");
+    }
+
+    protected void a(File var1, String var2) {
+        InputStreamReader var3 = null;
+        BufferedReader var4 = null;
+        ArrayList var5 = new ArrayList();
+        boolean var20 = false;
+
+        int var28;
+        label341: {
+            label342: {
+                try {
+                    var20 = true;
+                    var3 = new InputStreamReader(new FileInputStream(var1), "UTF-8");
+                    var4 = new BufferedReader(var3);
+                    boolean var7 = false;
+                    OutputStreamWriter var8 = null;
+
+                    while(true) {
+                        String var6;
+                        while((var6 = var4.readLine()) != null) {
+                            if (var6.trim().length() > 0 && var6.startsWith(var2)) {
+                                String var9 = var6.substring(var2.length());
+                                String var10 = var1.getParentFile().getAbsolutePath();
+                                var9 = var10 + File.separator + var9;
+                                log.info("[generate]\t split file:" + var1.getAbsolutePath() + " ==> " + var9);
+                                var8 = new OutputStreamWriter(new FileOutputStream(var9), "UTF-8");
+                                var5.add(var8);
+                                this.d.add("生成成功：" + var9);
+                                var7 = true;
+                            } else if (var7) {
+                                var8.append(var6 + "\r\n");
+                            }
+                        }
+
+                        for(int var29 = 0; var29 < var5.size(); ++var29) {
+                            ((Writer)var5.get(var29)).close();
+                        }
+
+                        var4.close();
+                        var3.close();
+                        log.debug("[generate]\t delete file:" + var1.getAbsolutePath());
+                        b(var1);
+                        var20 = false;
+                        break label341;
+                    }
+                } catch (FileNotFoundException var25) {
+                    var25.printStackTrace();
+                    var20 = false;
+                    break label342;
+                } catch (IOException var26) {
+                    var26.printStackTrace();
+                    var20 = false;
+                } finally {
+                    if (var20) {
+                        try {
+                            if (var4 != null) {
+                                var4.close();
+                            }
+
+                            if (var3 != null) {
+                                var3.close();
+                            }
+
+                            if (var5.size() > 0) {
+                                for(int var12 = 0; var12 < var5.size(); ++var12) {
+                                    if (var5.get(var12) != null) {
+                                        ((Writer)var5.get(var12)).close();
+                                    }
+                                }
+                            }
+                        } catch (IOException var21) {
+                            var21.printStackTrace();
+                        }
+
+                    }
+                }
+
+                try {
+                    if (var4 != null) {
+                        var4.close();
+                    }
+
+                    if (var3 != null) {
+                        var3.close();
+                    }
+
+                    if (var5.size() > 0) {
+                        for(var28 = 0; var28 < var5.size(); ++var28) {
+                            if (var5.get(var28) != null) {
+                                ((Writer)var5.get(var28)).close();
+                            }
+                        }
+                    }
+                } catch (IOException var22) {
+                    var22.printStackTrace();
+                }
+
+                return;
+            }
+
+            try {
+                if (var4 != null) {
+                    var4.close();
+                }
+
+                if (var3 != null) {
+                    var3.close();
+                }
+
+                if (var5.size() > 0) {
+                    for(var28 = 0; var28 < var5.size(); ++var28) {
+                        if (var5.get(var28) != null) {
+                            ((Writer)var5.get(var28)).close();
+                        }
+                    }
+                }
+            } catch (IOException var23) {
+                var23.printStackTrace();
+            }
+
+            return;
+        }
+
+        try {
+            if (var4 != null) {
+                var4.close();
+            }
+
+            if (var3 != null) {
+                var3.close();
+            }
+
+            if (var5.size() > 0) {
+                for(var28 = 0; var28 < var5.size(); ++var28) {
+                    if (var5.get(var28) != null) {
+                        ((Writer)var5.get(var28)).close();
+                    }
+                }
+            }
+        } catch (IOException var24) {
+            var24.printStackTrace();
+        }
+
+    }
+
+    protected static String a(Map<String, Object> var0, String var1, CreateFileConfig var2) throws Exception {
+        String var3 = var1;
+        boolean var4 = true;
+        int var9;
+        if ((var9 = var1.indexOf(64)) != -1) {
+            var3 = var1.substring(0, var9);
+            String var5 = var1.substring(var9 + 1);
+            Object var6 = var0.get(var5);
+            if (var6 == null) {
+                System.err.println("[not-generate] WARN: test expression is null by key:[" + var5 + "] on template:[" + var1 + "]");
+                return null;
+            }
+
+            if (!"true".equals(String.valueOf(var6))) {
+                log.error("[not-generate]\t test expression '@" + var5 + "' is false,template:" + var1);
+                return null;
+            }
+        }
+
+        Configuration var10 = FreemarkerHelper.a(var2.b(), c, "/");
+        var3 = FreemarkerHelper.a(var3, var0, var10);
+        String var11 = var2.a();
+        if (var11 != null && var11 != "") {
+            var3 = var3.substring(var11.length() + 1);
+        }
+
+        String var7 = var3.substring(var3.lastIndexOf("."));
+        String var8 = var3.substring(0, var3.lastIndexOf(".")).replace(".", File.separator);
+        var3 = var8 + var7;
+        return var3;
+    }
+
+    protected static boolean b(File var0) {
+        boolean var1 = false;
+
+        for(int var2 = 0; !var1 && var2++ < 10; var1 = var0.delete()) {
+            System.gc();
+        }
+
+        return var1;
+    }
+
+    protected static String a(String var0, String var1) {
+        boolean var2 = true;
+        boolean var3 = true;
+
+        do {
+            int var4 = var0.indexOf(var1) == 0 ? 1 : 0;
+            int var5 = var0.lastIndexOf(var1) + 1 == var0.length() ? var0.lastIndexOf(var1) : var0.length();
+            var0 = var0.substring(var4, var5);
+            var2 = var0.indexOf(var1) == 0;
+            var3 = var0.lastIndexOf(var1) + 1 == var0.length();
+        } while(var2 || var3);
+
+        return var0;
+    }
+}

jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/pojo/CgFormColumnExtendVo.java

@@ -0,0 +1,173 @@
+package com.jero.codegenerate.generate.pojo;
+
+public class CgFormColumnExtendVo {
+    protected Integer fieldLength;
+    protected String fieldHref;
+    protected String fieldValidType;
+    protected String fieldDefault;
+    protected String fieldShowType;
+    protected Integer fieldOrderNum;
+    protected String isKey;
+    protected String isShow;
+    protected String isShowList;
+    protected String isQuery;
+    protected String queryMode;
+    protected String dictField;
+    protected String dictTable;
+    protected String dictText;
+    protected String sort = "N";
+    protected String readonly = "N";
+    protected String defaultVal;
+    protected String uploadnum;
+
+    public CgFormColumnExtendVo() {
+    }
+
+    public String getUploadnum() {
+        return this.uploadnum;
+    }
+
+    public void setUploadnum(String uploadnum) {
+        this.uploadnum = uploadnum;
+    }
+
+    public String getDefaultVal() {
+        return this.defaultVal;
+    }
+
+    public void setDefaultVal(String defaultVal) {
+        this.defaultVal = defaultVal;
+    }
+
+    public String getSort() {
+        return this.sort;
+    }
+
+    public void setSort(String sort) {
+        this.sort = sort;
+    }
+
+    public String getReadonly() {
+        return this.readonly;
+    }
+
+    public void setReadonly(String readonly) {
+        this.readonly = readonly;
+    }
+
+    public String getIsKey() {
+        return this.isKey;
+    }
+
+    public void setIsKey(String isKey) {
+        this.isKey = isKey;
+    }
+
+    public String getFieldDefault() {
+        return this.fieldDefault;
+    }
+
+    public void setFieldDefault(String fieldDefault) {
+        this.fieldDefault = fieldDefault;
+    }
+
+    public String getIsShow() {
+        return this.isShow;
+    }
+
+    public void setIsShow(String isShow) {
+        this.isShow = isShow;
+    }
+
+    public String getIsShowList() {
+        return this.isShowList;
+    }
+
+    public void setIsShowList(String isShowList) {
+        this.isShowList = isShowList;
+    }
+
+    public String getIsQuery() {
+        return this.isQuery;
+    }
+
+    public void setIsQuery(String isQuery) {
+        this.isQuery = isQuery;
+    }
+
+    public Integer getFieldLength() {
+        return this.fieldLength;
+    }
+
+    public void setFieldLength(Integer fieldLength) {
+        this.fieldLength = fieldLength;
+    }
+
+    public String getFieldHref() {
+        return this.fieldHref;
+    }
+
+    public void setFieldHref(String fieldHref) {
+        this.fieldHref = fieldHref;
+    }
+
+    public String getFieldValidType() {
+        return this.fieldValidType;
+    }
+
+    public void setFieldValidType(String fieldValidType) {
+        this.fieldValidType = fieldValidType;
+    }
+
+    public String getQueryMode() {
+        return this.queryMode;
+    }
+
+    public void setQueryMode(String queryMode) {
+        this.queryMode = queryMode;
+    }
+
+    public String getDictField() {
+        return this.dictField;
+    }
+
+    public void setDictField(String dictField) {
+        this.dictField = dictField;
+    }
+
+    public String getDictTable() {
+        return this.dictTable;
+    }
+
+    public void setDictTable(String dictTable) {
+        this.dictTable = dictTable;
+    }
+
+    public String getDictText() {
+        return this.dictText;
+    }
+
+    public void setDictText(String dictText) {
+        this.dictText = dictText;
+    }
+
+    public String getFieldShowType() {
+        return this.fieldShowType;
+    }
+
+    public void setFieldShowType(String fieldShowType) {
+        this.fieldShowType = fieldShowType;
+    }
+
+    public Integer getFieldOrderNum() {
+        return this.fieldOrderNum;
+    }
+
+    public void setFieldOrderNum(Integer fieldOrderNum) {
+        this.fieldOrderNum = fieldOrderNum;
+    }
+
+    public String toString() {
+        return "{}";
+    }
+}

jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/pojo/ColumnVo.java

@@ -0,0 +1,121 @@
+package com.jero.codegenerate.generate.pojo;
+
+public class ColumnVo extends CgFormColumnExtendVo {
+    public static final String OPTION_REQUIRED = "required:true";
+    public static final String OPTION_NUMBER_INSEX = "precision:2,groupSeparator:','";
+    private String fieldDbName;
+    private String fieldName;
+    private String filedComment = "";
+    private String fieldType = "";
+    private String fieldDbType = "";
+    private String charmaxLength = "";
+    private String precision;
+    private String scale;
+    private String nullable;
+    private String classType = "";
+    private String classType_row = "";
+    private String optionType = "";
+
+    public ColumnVo() {
+    }
+
+    public String getFieldDbType() {
+        return this.fieldDbType;
+    }
+
+    public void setFieldDbType(String fieldDbType) {
+        this.fieldDbType = fieldDbType;
+    }
+
+    public String getNullable() {
+        return this.nullable;
+    }
+
+    public void setNullable(String nullable) {
+        this.nullable = nullable;
+    }
+
+    public String getPrecision() {
+        return this.precision;
+    }
+
+    public String getScale() {
+        return this.scale;
+    }
+
+    public void setPrecision(String precision) {
+        this.precision = precision;
+    }
+
+    public void setScale(String scale) {
+        this.scale = scale;
+    }
+
+    public String getOptionType() {
+        return this.optionType;
+    }
+
+    public void setOptionType(String optionType) {
+        this.optionType = optionType;
+    }
+
+    public String getClassType() {
+        return this.classType;
+    }
+
+    public void setClassType(String classType) {
+        this.classType = classType;
+    }
+
+    public String getFieldType() {
+        return this.fieldType;
+    }
+
+    public void setFieldType(String fieldType) {
+        this.fieldType = fieldType;
+    }
+
+    public String getFieldName() {
+        return this.fieldName;
+    }
+
+    public void setFieldName(String fieldName) {
+        this.fieldName = fieldName;
+    }
+
+    public String getFiledComment() {
+        return this.filedComment;
+    }
+
+    public void setFiledComment(String filedComment) {
+        this.filedComment = filedComment;
+    }
+
+    public String getClassType_row() {
+        return this.classType != null && this.classType.indexOf("easyui-") >= 0 ? this.classType.replaceAll("easyui-", "") : this.classType_row;
+    }
+
+    public void setClassType_row(String classType_row) {
+        this.classType_row = classType_row;
+    }
+
+    public String getCharmaxLength() {
+        return this.charmaxLength != null && !"0".equals(this.charmaxLength) ? this.charmaxLength : "";
+    }
+
+    public void setCharmaxLength(String charmaxLength) {
+        this.charmaxLength = charmaxLength;
+    }
+
+    public String getFieldDbName() {
+        return this.fieldDbName;
+    }
+
+    public void setFieldDbName(String fieldDbName) {
+        this.fieldDbName = fieldDbName;
+    }
+
+    public String toString() {
+        return "{\"fieldDbName\":\"" + this.fieldDbName + "\",\"fieldName\":\"" + this.fieldName + "\",\"filedComment\":\"" + this.filedComment + "\",\"fieldType\":\"" + this.fieldType + "\",\"fieldDbType\":\"" + this.fieldDbType + "\",\"classType\":\"" + this.classType + "\",\"classType_row\":\"" + this.classType_row + "\",\"optionType\":\"" + this.optionType + "\",\"charmaxLength\":\"" + this.charmaxLength + "\",\"precision\":\"" + this.precision + "\",\"scale\":\"" + this.scale + "\",\"nullable\":\"" + this.nullable + "\",\"fieldLength\":\"" + this.fieldLength + "\",\"fieldHref\":\"" + this.fieldHref + "\",\"fieldValidType\":\"" + this.fieldValidType + "\",\"fieldDefault\":\"" + this.fieldDefault + "\",\"fieldShowType\":\"" + this.fieldShowType + "\",\"fieldOrderNum\":\"" + this.fieldOrderNum + "\",\"isKey\":\"" + this.isKey + "\",\"isShow\":\"" + this.isShow + "\",\"isShowList\":\"" + this.isShowList + "\",\"isQuery\":\"" + this.isQuery + "\",\"uploadnum\":\"" + this.uploadnum + "\",\"defaultVal\":\"" + this.defaultVal + "\",\"sort\":\"" + this.sort + "\",\"readonly\":\"" + this.readonly + "\",\"queryMode\":\"" + this.queryMode + "\",\"dictField\":\"" + this.dictField + "\",\"dictTable\":\"" + this.dictTable + "\",\"dictText\":\"" + this.dictText + "\"}";
+    }
+}

jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/pojo/TableVo.java

@@ -0,0 +1,103 @@
+package com.jero.codegenerate.generate.pojo;
+
+import java.util.Map;
+
+public class TableVo {
+    private String tableName;
+    private String ftlDescription;
+    private String primaryKeyPolicy;
+    private String sequenceCode;
+    private String entityPackage;
+    private String entityName;
+    private Integer fieldRowNum;
+    private Integer searchFieldNum;
+    private Integer fieldRequiredNum;
+    private Map<?, ?> extendParams;
+
+    public TableVo() {
+    }
+
+    public String getEntityPackage() {
+        return this.entityPackage;
+    }
+
+    public String getTableName() {
+        return this.tableName;
+    }
+
+    public String getEntityName() {
+        return this.entityName;
+    }
+
+    public String getFtlDescription() {
+        return this.ftlDescription;
+    }
+
+    public void setEntityPackage(String entityPackage) {
+        this.entityPackage = entityPackage;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName;
+    }
+
+    public void setEntityName(String entityName) {
+        this.entityName = entityName;
+    }
+
+    public void setFtlDescription(String ftlDescription) {
+        this.ftlDescription = ftlDescription;
+    }
+
+    public String getPrimaryKeyPolicy() {
+        return this.primaryKeyPolicy;
+    }
+
+    public String getSequenceCode() {
+        return this.sequenceCode;
+    }
+
+    public void setPrimaryKeyPolicy(String primaryKeyPolicy) {
+        this.primaryKeyPolicy = primaryKeyPolicy;
+    }
+
+    public void setSequenceCode(String sequenceCode) {
+        this.sequenceCode = sequenceCode;
+    }
+
+    public Integer getFieldRowNum() {
+        return this.fieldRowNum;
+    }
+
+    public void setFieldRowNum(Integer fieldRowNum) {
+        this.fieldRowNum = fieldRowNum;
+    }
+
+    public Integer getSearchFieldNum() {
+        return this.searchFieldNum;
+    }
+
+    public void setSearchFieldNum(Integer searchFieldNum) {
+        this.searchFieldNum = searchFieldNum;
+    }
+
+    public Integer getFieldRequiredNum() {
+        return this.fieldRequiredNum;
+    }
+
+    public void setFieldRequiredNum(Integer fieldRequiredNum) {
+        this.fieldRequiredNum = fieldRequiredNum;
+    }
+
+    public Map<?, ?> getExtendParams() {
+        return this.extendParams;
+    }
+
+    public void setExtendParams(Map<?, ?> extendParams) {
+        this.extendParams = extendParams;
+    }
+
+    public String toString() {
+        return "{\"tableName\":\"" + this.tableName + "\",\"ftlDescription\":\"" + this.ftlDescription + "\",\"primaryKeyPolicy\":\"" + this.primaryKeyPolicy + "\",\"sequenceCode\":\"" + this.sequenceCode + "\",\"entityPackage\":\"" + this.entityPackage + "\",\"entityName\":\"" + this.entityName + "\",\"fieldRowNum\":\"" + this.fieldRowNum + "\",\"searchFieldNum\":\"" + this.searchFieldNum + "\",\"fieldRequiredNum\":\"" + this.fieldRequiredNum + "\"}";
+    }
+}

jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/pojo/onetomany/MainTableVo.java

@@ -0,0 +1,122 @@
+package com.jero.codegenerate.generate.pojo.onetomany;
+
+import java.util.List;
+import java.util.Map;
+
+public class MainTableVo {
+    private String entityPackage;
+    private String tableName;
+    private String entityName;
+    private String ftlDescription;
+    private String primaryKeyPolicy;
+    private String sequenceCode;
+    private String ftl_mode = "A";
+    List<SubTableVo> subTables;
+    public Integer fieldRowNum;
+    public Integer searchFieldNum;
+    public Integer fieldRequiredNum;
+    private Map<?, ?> extendParams;
+
+    public MainTableVo() {
+    }
+
+    public Map<?, ?> getExtendParams() {
+        return this.extendParams;
+    }
+
+    public void setExtendParams(Map<?, ?> extendParams) {
+        this.extendParams = extendParams;
+    }
+
+    public Integer getFieldRowNum() {
+        return this.fieldRowNum;
+    }
+
+    public void setFieldRowNum(Integer fieldRowNum) {
+        this.fieldRowNum = fieldRowNum;
+    }
+
+    public Integer getSearchFieldNum() {
+        return this.searchFieldNum;
+    }
+
+    public void setSearchFieldNum(Integer searchFieldNum) {
+        this.searchFieldNum = searchFieldNum;
+    }
+
+    public Integer getFieldRequiredNum() {
+        return this.fieldRequiredNum;
+    }
+
+    public void setFieldRequiredNum(Integer fieldRequiredNum) {
+        this.fieldRequiredNum = fieldRequiredNum;
+    }
+
+    public List<SubTableVo> getSubTables() {
+        return this.subTables;
+    }
+
+    public void setSubTables(List<SubTableVo> subTables) {
+        this.subTables = subTables;
+    }
+
+    public String getEntityPackage() {
+        return this.entityPackage;
+    }
+
+    public String getTableName() {
+        return this.tableName;
+    }
+
+    public String getEntityName() {
+        return this.entityName;
+    }
+
+    public String getFtlDescription() {
+        return this.ftlDescription;
+    }
+
+    public void setEntityPackage(String entityPackage) {
+        this.entityPackage = entityPackage;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName;
+    }
+
+    public void setEntityName(String entityName) {
+        this.entityName = entityName;
+    }
+
+    public void setFtlDescription(String ftlDescription) {
+        this.ftlDescription = ftlDescription;
+    }
+
+    public String getFtl_mode() {
+        return this.ftl_mode;
+    }
+
+    public void setFtl_mode(String ftl_mode) {
+        this.ftl_mode = ftl_mode;
+    }
+
+    public String getPrimaryKeyPolicy() {
+        return this.primaryKeyPolicy;
+    }
+
+    public String getSequenceCode() {
+        return this.sequenceCode;
+    }
+
+    public void setPrimaryKeyPolicy(String primaryKeyPolicy) {
+        this.primaryKeyPolicy = primaryKeyPolicy;
+    }
+
+    public void setSequenceCode(String sequenceCode) {
+        this.sequenceCode = sequenceCode;
+    }
+
+    public String toString() {
+        return "{\"entityPackage\":\"" + this.entityPackage + "\",\"tableName\":\"" + this.tableName + "\",\"entityName\":\"" + this.entityName + "\",\"ftlDescription\":\"" + this.ftlDescription + "\",\"primaryKeyPolicy\":\"" + this.primaryKeyPolicy + "\",\"sequenceCode\":\"" + this.sequenceCode + "\",\"ftl_mode\":\"" + this.ftl_mode + "\",\"subTables\":" + this.subTables + ",\"fieldRowNum\":\"" + this.fieldRowNum + "\",\"searchFieldNum\":\"" + this.searchFieldNum + "\",\"fieldRequiredNum\":\"" + this.fieldRequiredNum + "\"}";
+    }
+}

jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/pojo/onetomany/SubTableVo.java

@@ -0,0 +1,144 @@
+package com.jero.codegenerate.generate.pojo.onetomany;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import com.jero.codegenerate.generate.pojo.ColumnVo;
+
+public class SubTableVo {
+    private String entityPackage;
+    private String tableName;
+    private String entityName;
+    private String primaryKeyPolicy;
+    private String sequenceCode;
+    private String ftlDescription;
+    private String[] originalForeignKeys;
+    private String[] originalForeignMainKeys;
+    private String[] foreignKeys;
+    private String[] foreignMainKeys;
+    private String foreignRelationType;
+    private List<ColumnVo> colums;
+    private List<ColumnVo> originalColumns;
+    private Map<?, ?> extendParams;
+
+    public SubTableVo() {
+    }
+
+    public Map<?, ?> getExtendParams() {
+        return this.extendParams;
+    }
+
+    public void setExtendParams(Map<?, ?> extendParams) {
+        this.extendParams = extendParams;
+    }
+
+    public String getEntityPackage() {
+        return this.entityPackage;
+    }
+
+    public String getTableName() {
+        return this.tableName;
+    }
+
+    public String getEntityName() {
+        return this.entityName;
+    }
+
+    public String[] getOriginalForeignMainKeys() {
+        return this.originalForeignMainKeys;
+    }
+
+    public void setOriginalForeignMainKeys(String[] originalForeignMainKeys) {
+        this.originalForeignMainKeys = originalForeignMainKeys;
+    }
+
+    public String[] getForeignMainKeys() {
+        return this.foreignMainKeys;
+    }
+
+    public void setForeignMainKeys(String[] foreignMainKeys) {
+        this.foreignMainKeys = foreignMainKeys;
+    }
+
+    public String getFtlDescription() {
+        return this.ftlDescription;
+    }
+
+    public List<ColumnVo> getColums() {
+        return this.colums;
+    }
+
+    public void setColums(List<ColumnVo> colums) {
+        this.colums = colums;
+    }
+
+    public void setEntityPackage(String entityPackage) {
+        this.entityPackage = entityPackage;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName;
+    }
+
+    public void setEntityName(String entityName) {
+        this.entityName = entityName;
+    }
+
+    public void setFtlDescription(String ftlDescription) {
+        this.ftlDescription = ftlDescription;
+    }
+
+    public String[] getForeignKeys() {
+        return this.foreignKeys;
+    }
+
+    public void setForeignKeys(String[] foreignKeys) {
+        this.foreignKeys = foreignKeys;
+    }
+
+    public String getPrimaryKeyPolicy() {
+        return this.primaryKeyPolicy;
+    }
+
+    public String getSequenceCode() {
+        return this.sequenceCode;
+    }
+
+    public void setPrimaryKeyPolicy(String primaryKeyPolicy) {
+        this.primaryKeyPolicy = primaryKeyPolicy;
+    }
+
+    public void setSequenceCode(String sequenceCode) {
+        this.sequenceCode = sequenceCode;
+    }
+
+    public List<ColumnVo> getOriginalColumns() {
+        return this.originalColumns;
+    }
+
+    public void setOriginalColumns(List<ColumnVo> originalColumns) {
+        this.originalColumns = originalColumns;
+    }
+
+    public String[] getOriginalForeignKeys() {
+        return this.originalForeignKeys;
+    }
+
+    /** @deprecated */
+    @Deprecated
+    public void setOriginalForeignKeys(String[] originalForeignKeys) {
+        this.originalForeignKeys = originalForeignKeys;
+    }
+
+    public String getForeignRelationType() {
+        return this.foreignRelationType;
+    }
+
+    public void setForeignRelationType(String foreignRelationType) {
+        this.foreignRelationType = foreignRelationType;
+    }
+
+    public String toString() {
+        return "{\"entityPackage\":\"" + this.entityPackage + "\",\"tableName\":\"" + this.tableName + "\",\"entityName\":\"" + this.entityName + "\",\"primaryKeyPolicy\":\"" + this.primaryKeyPolicy + "\",\"sequenceCode\":\"" + this.sequenceCode + "\",\"ftlDescription\":\"" + this.ftlDescription + "\",\"originalForeignKeys\":\"" + Arrays.toString(this.originalForeignKeys) + "\",\"foreignKeys\":\"" + Arrays.toString(this.foreignKeys) + "\",\"colums\":" + this.colums + ",\"originalColumns\":" + this.originalColumns + "}";
+    }
+}

jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/util/FileHelper.java

@@ -0,0 +1,121 @@
+package com.jero.codegenerate.generate.util;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+
+@Slf4j
+public class FileHelper {
+    public static List<String> a = new ArrayList();
+    public static List<String> b = new ArrayList();
+
+    public FileHelper() {
+    }
+
+    static {
+        a.add(".svn");
+        a.add("CVS");
+        a.add(".cvsignore");
+        a.add(".copyarea.db");
+        a.add("SCCS");
+        a.add("vssver.scc");
+        a.add(".DS_Store");
+        a.add(".git");
+        a.add(".gitignore");
+        b.add(".ftl");
+    }
+
+    public static List<File> a(File var0) throws IOException {
+        ArrayList var1 = new ArrayList();
+        a(var0, (List)var1);
+        Collections.sort(var1, new Comparator<File>() {
+            public int compare(File var1, File var2) {
+                return var1.getAbsolutePath().compareTo(var2.getAbsolutePath());
+            }
+        });
+        return var1;
+    }
+
+    public static void a(File var0, List<File> var1) throws IOException {
+        log.debug("---------dir------------path: " + var0.getPath() + " -- isHidden --: " + var0.isHidden() + " -- isDirectory --: " + var0.isDirectory());
+        if (!var0.isHidden() && var0.isDirectory() && !d(var0)) {
+            File[] var2 = var0.listFiles();
+
+            for(int var3 = 0; var3 < var2.length; ++var3) {
+                a(var2[var3], var1);
+            }
+        } else if (!e(var0) && !d(var0)) {
+            var1.add(var0);
+        }
+
+    }
+
+    public static String a(File var0, File var1) {
+        if (var0.equals(var1)) {
+            return "";
+        } else {
+            return var0.getParentFile() == null ? var1.getAbsolutePath().substring(var0.getAbsolutePath().length()) : var1.getAbsolutePath().substring(var0.getAbsolutePath().length() + 1);
+        }
+    }
+
+    public static boolean b(File var0) {
+        return var0.isDirectory() ? false : a(var0.getName());
+    }
+
+    public static boolean a(String var0) {
+        return !StringUtils.isBlank(b(var0));
+    }
+
+    public static String b(String var0) {
+        if (var0 == null) {
+            return null;
+        } else {
+            int var1 = var0.indexOf(".");
+            return var1 == -1 ? "" : var0.substring(var1 + 1);
+        }
+    }
+
+    public static File c(String var0) {
+        if (var0 == null) {
+            throw new IllegalArgumentException("file must be not null");
+        } else {
+            File var1 = new File(var0);
+            c(var1);
+            return var1;
+        }
+    }
+
+    public static void c(File var0) {
+        if (var0.getParentFile() != null) {
+            var0.getParentFile().mkdirs();
+        }
+
+    }
+
+    private static boolean d(File var0) {
+        for(int var1 = 0; var1 < a.size(); ++var1) {
+            if (var0.getName().equals(a.get(var1))) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    private static boolean e(File var0) {
+        for(int var1 = 0; var1 < b.size(); ++var1) {
+            if (var0.getName().endsWith((String)b.get(var1))) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+}

jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/util/FreemarkerHelper.java

@@ -0,0 +1,97 @@
+package com.jero.codegenerate.generate.util;
+
+import freemarker.cache.FileTemplateLoader;
+import freemarker.cache.MultiTemplateLoader;
+import freemarker.template.Configuration;
+import freemarker.template.Template;
+import freemarker.template.TemplateException;
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.StringTokenizer;
+
+@Slf4j
+public class FreemarkerHelper {
+
+    public FreemarkerHelper() {
+    }
+
+    public static Configuration a(List<File> var0, String var1, String var2) throws IOException {
+        Configuration var3 = new Configuration();
+        log.debug(" FileTemplateLoader[] size " + var0.size());
+        log.debug(" templateRootDirs templateName " + var2);
+        FileTemplateLoader[] var4 = new FileTemplateLoader[var0.size()];
+
+        for(int var5 = 0; var5 < var0.size(); ++var5) {
+            File var6 = (File)var0.get(var5);
+            log.debug(" FileTemplateLoader " + var6.getAbsolutePath());
+            var4[var5] = new FileTemplateLoader(var6);
+        }
+
+        MultiTemplateLoader var7 = new MultiTemplateLoader(var4);
+        var3.setTemplateLoader(var7);
+        var3.setNumberFormat("###############");
+        var3.setBooleanFormat("true,false");
+        var3.setDefaultEncoding(var1);
+        return var3;
+    }
+
+    public static List<String> a(String var0, String var1) {
+        String[] var2 = b(var0, "\\/");
+        ArrayList var3 = new ArrayList();
+        var3.add(var1);
+        var3.add(File.separator + var1);
+        String var4 = "";
+
+        for(int var5 = 0; var5 < var2.length; ++var5) {
+            var4 = var4 + File.separator + var2[var5];
+            var3.add(var4 + File.separator + var1);
+        }
+
+        return var3;
+    }
+
+    public static String[] b(String var0, String var1) {
+        if (var0 == null) {
+            return new String[0];
+        } else {
+            StringTokenizer var2 = new StringTokenizer(var0, var1);
+            ArrayList var3 = new ArrayList();
+
+            while(var2.hasMoreElements()) {
+                Object var4 = var2.nextElement();
+                var3.add(var4.toString());
+            }
+
+            return (String[])var3.toArray(new String[var3.size()]);
+        }
+    }
+
+    public static String a(String var0, Map<String, Object> var1, Configuration var2) {
+        StringWriter var3 = new StringWriter();
+
+        try {
+            Template var4 = new Template("templateString...", new StringReader(var0), var2);
+            var4.process(var1, var3);
+            return var3.toString();
+        } catch (Exception var5) {
+            throw new IllegalStateException("cannot process templateString:" + var0 + " cause:" + var5, var5);
+        }
+    }
+
+    public static void a(Template var0, Map<String, Object> var1, File var2, String var3) throws IOException, TemplateException {
+        BufferedWriter var4 = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(var2), var3));
+        var1.put("Format", new SimpleFormat());
+        var0.process(var1, var4);
+        var4.close();
+    }
+}

jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/util/NonceUtils.java

@@ -0,0 +1,89 @@
+package com.jero.codegenerate.generate.util;
+
+import java.io.IOException;
+import java.security.SecureRandom;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.UUID;
+import org.apache.commons.lang.RandomStringUtils;
+
+public class NonceUtils {
+    private static final SimpleDateFormat a = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
+    private static final String[] b = new String[]{"0", "00", "0000", "00000000"};
+    private static Date c;
+    private static int d = 0;
+
+    public NonceUtils() {
+    }
+
+    public static String a(int var0) {
+        return RandomStringUtils.randomAlphanumeric(var0);
+    }
+
+    public static int a() {
+        return (new SecureRandom()).nextInt();
+    }
+
+    public static String b() {
+        return Integer.toHexString(a());
+    }
+
+    public static long c() {
+        return (new SecureRandom()).nextLong();
+    }
+
+    public static String d() {
+        return Long.toHexString(c());
+    }
+
+    public static String e() {
+        return UUID.randomUUID().toString();
+    }
+
+    public static String f() {
+        Date var0 = new Date();
+        return a.format(var0);
+    }
+
+    public static long g() {
+        return System.currentTimeMillis();
+    }
+
+    public static String h() {
+        return Long.toHexString(g());
+    }
+
+    public static synchronized String i() {
+        Date var0 = new Date();
+        if (var0.equals(c)) {
+            ++d;
+        } else {
+            c = var0;
+            d = 0;
+        }
+
+        return Integer.toHexString(d);
+    }
+
+    public static String a(String var0, int var1) {
+        int var2 = var1 - var0.length();
+
+        StringBuilder var3;
+        for(var3 = new StringBuilder(); var2 >= 8; var2 -= 8) {
+            var3.append(b[3]);
+        }
+
+        for(int var4 = 2; var4 >= 0; --var4) {
+            if ((var2 & 1 << var4) != 0) {
+                var3.append(b[var4]);
+            }
+        }
+
+        var3.append(var0);
+        return var3.toString();
+    }
+
+    public static void main(String[] args) throws IOException {
+        System.out.println(c() + g());
+    }
+}

jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/util/SimpleFormat.java

@@ -0,0 +1,145 @@
+package com.jero.codegenerate.generate.util;
+
+import java.text.DateFormat;
+import java.text.DecimalFormat;
+import java.text.NumberFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+
+public class SimpleFormat {
+    public SimpleFormat() {
+    }
+
+    public static String underlineToHump(String para) {
+        StringBuilder var1 = new StringBuilder();
+        String[] var2 = para.split("_");
+        String[] var3 = var2;
+        int var4 = var2.length;
+
+        for(int var5 = 0; var5 < var4; ++var5) {
+            String var6 = var3[var5];
+            if (!para.contains("_")) {
+                var1.append(var6);
+            } else if (var1.length() == 0) {
+                var1.append(var6.toLowerCase());
+            } else {
+                var1.append(var6.substring(0, 1).toUpperCase());
+                var1.append(var6.substring(1).toLowerCase());
+            }
+        }
+
+        return var1.toString();
+    }
+
+    public static String humpToUnderline(String para) {
+        StringBuilder var1 = new StringBuilder(para);
+        int var2 = 0;
+        if (!para.contains("_")) {
+            for(int var3 = 0; var3 < para.length(); ++var3) {
+                if (Character.isUpperCase(para.charAt(var3))) {
+                    var1.insert(var3 + var2, "_");
+                    ++var2;
+                }
+            }
+        }
+
+        return var1.toString().toLowerCase().startsWith("_") ? var1.toString().toLowerCase().substring(1) : var1.toString().toLowerCase();
+    }
+
+    public static String humpToShortbar(String para) {
+        StringBuilder var1 = new StringBuilder(para);
+        int var2 = 0;
+        if (!para.contains("-")) {
+            for(int var3 = 0; var3 < para.length(); ++var3) {
+                if (Character.isUpperCase(para.charAt(var3))) {
+                    var1.insert(var3 + var2, "-");
+                    ++var2;
+                }
+            }
+        }
+
+        return var1.toString().toLowerCase().startsWith("-") ? var1.toString().toLowerCase().substring(1) : var1.toString().toLowerCase();
+    }
+
+    public String number(Object obj) {
+        obj = obj != null && obj.toString().length() != 0 ? obj : 0;
+        return obj.toString().equalsIgnoreCase("NaN") ? "NaN" : (new DecimalFormat("0.00")).format(Double.parseDouble(obj.toString()));
+    }
+
+    public String number(Object obj, String pattern) {
+        obj = obj != null && obj.toString().length() != 0 ? obj : 0;
+        return obj.toString().equalsIgnoreCase("NaN") ? "NaN" : (new DecimalFormat(pattern)).format(Double.parseDouble(obj.toString()));
+    }
+
+    public String round(Object obj) {
+        obj = obj != null && obj.toString().length() != 0 ? obj : 0;
+        return obj.toString().equalsIgnoreCase("NaN") ? "NaN" : (new DecimalFormat("0")).format(Double.parseDouble(obj.toString()));
+    }
+
+    public String currency(Object obj) {
+        obj = obj != null && obj.toString().length() != 0 ? obj : 0;
+        return NumberFormat.getCurrencyInstance(Locale.CHINA).format(obj);
+    }
+
+    public String timestampToString(Object obj, String pattern) {
+        if (obj == null) {
+            return "";
+        } else {
+            SimpleDateFormat var3 = new SimpleDateFormat("dd-MM月 -yy");
+            SimpleDateFormat var4 = new SimpleDateFormat(pattern);
+            Date var5 = null;
+
+            try {
+                var5 = var3.parse(obj.toString());
+            } catch (ParseException var7) {
+                var7.printStackTrace();
+                return "error";
+            }
+
+            return var4.format(var5);
+        }
+    }
+
+    public String percent(Object obj) {
+        obj = obj != null && obj.toString().length() != 0 ? obj : 0;
+        return obj.toString().equalsIgnoreCase("NaN") ? "" : NumberFormat.getPercentInstance(Locale.CHINA).format(obj);
+    }
+
+    public String date(Object obj, String pattern) {
+        return obj == null ? "" : (new SimpleDateFormat(pattern)).format(obj);
+    }
+
+    public String date(Object obj) {
+        return obj == null ? "" : DateFormat.getDateInstance(1, Locale.CHINA).format(obj);
+    }
+
+    public String time(Object obj) {
+        return obj == null ? "" : DateFormat.getTimeInstance(3, Locale.CHINA).format(obj);
+    }
+
+    public String datetime(Object obj) {
+        return obj == null ? "" : DateFormat.getDateTimeInstance(1, 3, Locale.CHINA).format(obj);
+    }
+
+    public String getInStrs(List<String> params) {
+        StringBuffer var2 = new StringBuffer();
+        Iterator var3 = params.iterator();
+
+        while(var3.hasNext()) {
+            String var4 = (String)var3.next();
+            var2.append("'" + var4 + "',");
+        }
+
+        String var5 = var2.toString();
+        if ("".equals(var5) && !var5.endsWith(",")) {
+            return null;
+        } else {
+            var5 = var5.substring(0, var5.length() - 1);
+            return var5;
+        }
+    }
+}

jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/util/TableConvert.java

@@ -0,0 +1,24 @@
+package com.jero.codegenerate.generate.util;
+
+import org.apache.commons.lang.StringUtils;
+
+public class TableConvert {
+    public TableConvert() {
+    }
+
+    public static String a(String var0) {
+        if (!"YES".equals(var0) && !"yes".equals(var0) && !"y".equals(var0) && !"Y".equals(var0) && !"f".equals(var0)) {
+            return !"NO".equals(var0) && !"N".equals(var0) && !"no".equals(var0) && !"n".equals(var0) && !"t".equals(var0) ? null : "N";
+        } else {
+            return "Y";
+        }
+    }
+
+    public static String b(String var0) {
+        return StringUtils.isBlank(var0) ? "" : var0;
+    }
+
+    public static String c(String var0) {
+        return "'" + var0 + "'";
+    }
+}

jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/properties/CodeConfigProperties.java

@@ -0,0 +1,192 @@
+package com.jero.codegenerate.properties;
+
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.PropertyResourceBundle;
+import java.util.ResourceBundle;
+
+@Slf4j
+public class CodeConfigProperties {
+
+    private static final String dataBaseFileUrl = "jero/jero_database";
+    private static final String configFileUrl = "jero/jero_config";
+    private static ResourceBundle t = getDatasourcePropties(CodeConfigProperties.dataBaseFileUrl);
+    private static ResourceBundle u = getDatasourcePropties(CodeConfigProperties.configFileUrl);
+    public static String databaseType;
+    public static String driverName;
+    public static String databaseUrl;
+    public static String username;
+    public static String password;
+    public static String f;
+    public static String packageName;
+    public static String h;
+    public static String i;
+    public static String templateUrl;
+    public static boolean k;
+    public static String l;
+    public static String m;
+    public static String n;
+    public static String o;
+    public static String p;
+
+    private static ResourceBundle getDatasourcePropties(String var0) {
+        PropertyResourceBundle var1 = null;
+        BufferedInputStream var2 = null;
+        String var3 = System.getProperty("user.dir") + File.separator + "config" + File.separator + var0 + ".properties";
+
+        try {
+            var2 = new BufferedInputStream(new FileInputStream(var3));
+            var1 = new PropertyResourceBundle(var2);
+            var2.close();
+            if (var1 != null) {
+                log.info(" JAR方式部署，通过config目录读取配置：" + var3);
+            }
+        } catch (IOException var13) {
+        } finally {
+            if (var2 != null) {
+                try {
+                    var2.close();
+                } catch (IOException var12) {
+                    var12.printStackTrace();
+                }
+            }
+
+        }
+
+        return var1;
+    }
+
+    public static final String getDriverName() {
+        return t.getString("driver_name");
+    }
+
+    public static final String getDatabaseUrl() {
+        return t.getString("url");
+    }
+
+    public static final String c() {
+        return t.getString("username");
+    }
+
+    public static final String d() {
+        return t.getString("password");
+    }
+
+    public static final String e() {
+        return t.getString("database_name");
+    }
+
+    public static final boolean f() {
+        String var0 = u.getString("db_filed_convert");
+        return !var0.toString().equals("false");
+    }
+
+    private static String o() {
+        return u.getString("bussi_package");
+    }
+
+    private static String getTemplateUrl() {
+        return u.getString("template_path");
+    }
+
+    public static final String g() {
+        return u.getString("source_root_package");
+    }
+
+    public static final String h() {
+        return u.getString("webroot_package");
+    }
+
+    public static final String i() {
+        return u.getString("db_table_id");
+    }
+
+    public static final String j() {
+        return u.getString("page_filter_fields");
+    }
+
+    public static final String k() {
+        return u.getString("page_search_filed_num");
+    }
+
+    public static final String l() {
+        return u.getString("page_field_required_num");
+    }
+
+    public static String m() {
+        String var0 = u.getString("project_path");
+        if (var0 != null && !"".equals(var0)) {
+            f = var0;
+        }
+
+        return f;
+    }
+
+    public static void a(String var0) {
+        f = var0;
+    }
+
+    public static void b(String var0) {
+        templateUrl = var0;
+    }
+
+    static {
+        if (t == null) {
+            t = ResourceBundle.getBundle(CodeConfigProperties.dataBaseFileUrl);
+        }
+
+        if (u == null) {
+            u = ResourceBundle.getBundle(CodeConfigProperties.configFileUrl);
+        }
+
+        databaseType = "mysql";
+        driverName = "com.mysql.jdbc.Driver";
+        databaseUrl = "jdbc:mysql://localhost:3306/jero-boot?useUnicode=true&characterEncoding=UTF-8";
+        username = "root";
+        password = "root";
+        f = "c:/workspace/jero";
+        packageName = "com.jero";
+        h = "src";
+        i = "WebRoot";
+        templateUrl = "/jero/code-template/";
+        k = true;
+        m = "4";
+        n = "3";
+        p = "1";
+        driverName = getDriverName();
+        databaseUrl = getDatabaseUrl();
+        username = c();
+        password = d();
+        h = g();
+        i = h();
+        packageName = o();
+        templateUrl = getTemplateUrl();
+        f = m();
+        l = i();
+        k = f();
+        o = j();
+        n = k();
+        if (databaseUrl.indexOf("mysql") < 0 && databaseUrl.indexOf("MYSQL") < 0) {
+            if (databaseUrl.indexOf("oracle") < 0 && databaseUrl.indexOf("ORACLE") < 0) {
+                if (databaseUrl.indexOf("postgresql") < 0 && databaseUrl.indexOf("POSTGRESQL") < 0) {
+                    if (databaseUrl.indexOf("sqlserver") >= 0 || databaseUrl.indexOf("sqlserver") >= 0) {
+                        databaseType = "sqlserver";
+                    }
+                } else {
+                    databaseType = "postgresql";
+                }
+            } else {
+                databaseType = "oracle";
+            }
+        } else {
+            databaseType = "mysql";
+        }
+
+        h = h.replace(".", "/");
+        i = i.replace(".", "/");
+    }
+}

jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/interceptor/OnlineInterceptor.java

@@ -16,14 +16,12 @@ import com.jero.common.system.util.JwtUtil;
 import com.jero.common.util.SpringContextUtils;
 import com.jero.common.util.oConvertUtils;
 import com.jero.generater.modules.online.cgform.service.IOnlineBaseAPI;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.HandlerInterceptor;
 
-
+@Slf4j
 public class OnlineInterceptor implements HandlerInterceptor {
-    private static final Logger a = LoggerFactory.getLogger(OnlineInterceptor.class);
 
     private IOnlineBaseAPI b;
     private ISysBaseAPI sysBaseAPI;
@@ -43,12 +41,12 @@ public class OnlineInterceptor implements HandlerInterceptor {
             OnlineAuth onlineAuth = (OnlineAuth) ((HandlerMethod) handler).getMethodAnnotation(OnlineAuth.class);
 
             if (onlineAuth != null) {
-                a.debug("===== online 菜单访问拦截器 =====");
+                log.debug("===== online 菜单访问拦截器 =====");
                 String str1 = request.getRequestURI().substring(request.getContextPath().length());
                 str1 = a(str1);
                 String str2 = onlineAuth.value();
                 String str3 = str1.substring(str1.lastIndexOf(str2) + str2.length());
-                a.debug("拦截请求(" + request.getMethod() + ")：" + str1 + ",");
+                log.debug("拦截请求(" + request.getMethod() + ")：" + str1 + ",");
 
                 if ("form".equals(str2) && "DELETE".equals(request.getMethod())) {
                     str3 = str3.substring(0, str3.lastIndexOf("/"));
@@ -79,7 +77,7 @@ public class OnlineInterceptor implements HandlerInterceptor {
                 boolean bool1 = this.sysBaseAPI.hasOnlineAuth(onlineAuthDTO);
 
                 if (!bool1) {
-                    a.info("请求无权限(" + request.getMethod() + ")：" + str1);
+                    log.info("请求无权限(" + request.getMethod() + ")：" + str1);
                     a(response, str2);
                     return false;
                 }
@@ -114,7 +112,7 @@ public class OnlineInterceptor implements HandlerInterceptor {
                 printWriter.print(JSON.toJSON(result));
             }
         } catch (IOException iOException) {
-            a.error(iOException.getMessage());
+            log.error(iOException.getMessage());
         } finally {
             if (printWriter != null)
                  printWriter.close();

jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/auth/controller/OnlCgformAuthController.java

@@ -27,8 +27,7 @@ import com.jero.generater.modules.online.cgform.entity.OnlCgformHead;
 import com.jero.generater.modules.online.cgform.service.IOnlCgformButtonService;
 import com.jero.generater.modules.online.cgform.service.IOnlCgformFieldService;
 import com.jero.generater.modules.online.cgform.service.IOnlCgformHeadService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -43,8 +42,8 @@ import org.springframework.web.bind.annotation.RestController;
 
 @RestController("onlCgformAuthController")
 @RequestMapping({"/online/cgform/api"})
+@Slf4j
 public class OnlCgformAuthController {
-    private static final Logger a = LoggerFactory.getLogger(OnlCgformAuthController.class);
 
     @Autowired
     private IOnlCgformFieldService onlCgformFieldService;
@@ -83,7 +82,7 @@ public class OnlCgformAuthController {
             this.onlAuthDataService.save(paramOnlAuthData);
             result.success("添加成功！");
         } catch (Exception exception) {
-            a.error(exception.getMessage(), exception);
+            log.error(exception.getMessage(), exception);
             result.error500("操作失败");
         }
         return result;
@@ -150,7 +149,7 @@ public class OnlCgformAuthController {
             result.setResult(paramOnlAuthPage);
             result.success("操作成功！");
         } catch (Exception exception) {
-            a.error(exception.getMessage(), exception);
+            log.error(exception.getMessage(), exception);
             result.error500("操作失败");
         }
         return result;
@@ -232,7 +231,7 @@ public class OnlCgformAuthController {
             }
             result.success("操作成功！");
         } catch (Exception exception) {
-            a.error(exception.getMessage(), exception);
+            log.error(exception.getMessage(), exception);
             result.error500("操作失败");
         }
         return result;
@@ -246,7 +245,7 @@ public class OnlCgformAuthController {
             this.onlAuthPageService.switchAuthColumn(paramAuthColumnVO);
             result.success("操作成功！");
         } catch (Exception exception) {
-            a.error(exception.getMessage(), exception);
+            log.error(exception.getMessage(), exception);
             result.error500("操作失败");
         }
         return result;

jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformApiController.java

@@ -30,6 +30,7 @@ import javax.servlet.http.HttpServletResponse;
 import javax.sql.DataSource;
 
 import com.jero.generater.modules.online.auth.service.IOnlAuthPageService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.ss.usermodel.Workbook;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
@@ -68,8 +69,6 @@ import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.jeecgframework.poi.excel.entity.params.ExcelExportEntity;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.jdbc.support.incrementer.OracleSequenceMaxValueIncrementer;
@@ -89,8 +88,9 @@ import org.springframework.web.multipart.MultipartHttpServletRequest;
 
 @RestController("onlCgformApiController")
 @RequestMapping({"/online/cgform/api"})
+@Slf4j
 public class OnlCgformApiController {
-    private static final Logger a = LoggerFactory.getLogger(OnlCgformApiController.class);
+
     @Autowired
     private IOnlCgformHeadService onlCgformHeadService;
     @Autowired
@@ -117,7 +117,7 @@ public class OnlCgformApiController {
             String var2 = var1.getHead().getTableName();
             return DbTableUtil.a(var2) ? Result.error("数据库表[" + var2 + "]已存在,请从数据库导入表单") : this.onlCgformHeadService.addAll(var1);
         } catch (Exception var3) {
-            a.error("OnlCgformApiController.addAll()发生异常：" + var3.getMessage(), var3);
+            log.error("OnlCgformApiController.addAll()发生异常：" + var3.getMessage(), var3);
             return Result.error("操作失败");
         }
     }
@@ -127,7 +127,7 @@ public class OnlCgformApiController {
         try {
             return this.onlCgformHeadService.editAll(var1);
         } catch (Exception var3) {
-            a.error("OnlCgformApiController.editAll()发生异常：" + var3.getMessage(), var3);
+            log.error("OnlCgformApiController.editAll()发生异常：" + var3.getMessage(), var3);
             return Result.error("操作失败");
         }
     }
@@ -177,7 +177,7 @@ public class OnlCgformApiController {
                 this.a(var4, var7);
                 var3.setResult(var7);
             } catch (Exception var8) {
-                a.error(var8.getMessage(), var8);
+                log.error(var8.getMessage(), var8);
                 var3.error500("数据库查询失败，" + var8.getMessage());
             }
 
@@ -319,7 +319,7 @@ public class OnlCgformApiController {
             Map var3 = this.onlCgformHeadService.queryManyFormData(var1, var2);
             return Result.OK(CgformUtil.b(var3));
         } catch (Exception var4) {
-            a.error("Online表单查询异常：" + var4.getMessage(), var4);
+            log.error("Online表单查询异常：" + var4.getMessage(), var4);
             return Result.error("查询失败，" + var4.getMessage());
         }
     }
@@ -330,7 +330,7 @@ public class OnlCgformApiController {
             Map var3 = this.onlCgformHeadService.querySubFormData(var1, var2);
             return Result.OK(CgformUtil.b(var3));
         } catch (Exception var4) {
-            a.error("Online表单查询异常：" + var4.getMessage(), var4);
+            log.error("Online表单查询异常：" + var4.getMessage(), var4);
             return Result.error("查询失败，" + var4.getMessage());
         }
     }
@@ -340,7 +340,7 @@ public class OnlCgformApiController {
         try {
             return Result.OK(this.onlCgformHeadService.queryManySubFormData(var1, var2));
         } catch (Exception var4) {
-            a.error("Online表单查询异常：" + var4.getMessage(), var4);
+            log.error("Online表单查询异常：" + var4.getMessage(), var4);
             return Result.error("查询失败，" + var4.getMessage());
         }
     }
@@ -364,7 +364,7 @@ public class OnlCgformApiController {
                 return var5;
             }
         } catch (Exception var6) {
-            a.error("Online表单查询异常，" + var6.getMessage(), var6);
+            log.error("Online表单查询异常，" + var6.getMessage(), var6);
             return Result.error("查询失败，" + var6.getMessage());
         }
     }
@@ -388,7 +388,7 @@ public class OnlCgformApiController {
             var4.setResult(var5);
             var4.setOnlTable(var7);
         } catch (Exception var8) {
-            a.error("OnlCgformApiController.formAdd()发生异常：", var8);
+            log.error("OnlCgformApiController.formAdd()发生异常：", var8);
             var4.setSuccess(false);
             var4.setMessage("保存失败，" + CgformUtil.a(var8));
         }
@@ -410,7 +410,7 @@ public class OnlCgformApiController {
             var4.setOnlTable(var3);
             return var4;
         } catch (Exception var5) {
-            a.error("OnlCgformApiController.formEdit()发生异常：" + var5.getMessage(), var5);
+            log.error("OnlCgformApiController.formEdit()发生异常：" + var5.getMessage(), var5);
             return Result.error("修改失败，" + CgformUtil.a(var5));
         }
     }
@@ -463,7 +463,7 @@ public class OnlCgformApiController {
                     this.onlCgformFieldService.deleteAutoList("design_form_data", "online_form_data_id", var2);
                 }
             } catch (Exception var12) {
-                a.error("OnlCgformApiController.formEdit()发生异常：" + var12.getMessage(), var12);
+                log.error("OnlCgformApiController.formEdit()发生异常：" + var12.getMessage(), var12);
                 return Result.error("删除失败");
             }
 
@@ -492,7 +492,7 @@ public class OnlCgformApiController {
                     this.onlCgformHeadService.deleteOneTableInfo(var3.getId(), var2);
                 }
             } catch (Exception var5) {
-                a.error("OnlCgformApiController.formEdit()发生异常：" + var5.getMessage(), var5);
+                log.error("OnlCgformApiController.formEdit()发生异常：" + var5.getMessage(), var5);
                 return Result.error("删除失败");
             }
 
@@ -509,7 +509,7 @@ public class OnlCgformApiController {
             List var2 = this.onlCgformFieldService.getAutoListQueryInfo(var1);
             return Result.OK(var2);
         } catch (Exception var3) {
-            a.error("OnlCgformApiController.getQueryInfo()发生异常：" + var3.getMessage(), var3);
+            log.error("OnlCgformApiController.getQueryInfo()发生异常：" + var3.getMessage(), var3);
             return Result.error("查询失败");
         }
     }
@@ -519,9 +519,9 @@ public class OnlCgformApiController {
         try {
             long var3 = System.currentTimeMillis();
             this.onlCgformHeadService.doDbSynch(var1, var2);
-            a.info("==同步数据库消耗时间" + (System.currentTimeMillis() - var3) + "毫秒");
+            log.info("==同步数据库消耗时间" + (System.currentTimeMillis() - var3) + "毫秒");
         } catch (Exception var5) {
-            a.error(var5.getMessage(), var5);
+            log.error(var5.getMessage(), var5);
             return Result.error("同步数据库失败，" + CgformUtil.a(var5));
         }
 
@@ -566,7 +566,7 @@ public class OnlCgformApiController {
             try {
                 this.onlCgformHeadService.executeEnhanceExport(var4, (List)var12);
             } catch (BusinessException var31) {
-                a.error("导出java增强处理出错", var31.getMessage());
+                log.error("导出java增强处理出错", var31.getMessage());
             }
 
             List var14 = this.a(fieldList, "id");
@@ -602,13 +602,13 @@ public class OnlCgformApiController {
                 var33.write(var34);
                 var3.flushBuffer();
             } catch (Exception var30) {
-                a.error("--通过流的方式获取文件异常--" + var30.getMessage(), var30);
+                log.error("--通过流的方式获取文件异常--" + var30.getMessage(), var30);
             } finally {
                 if (var34 != null) {
                     try {
                         var34.close();
                     } catch (IOException var29) {
-                        a.error(var29.getMessage(), var29);
+                        log.error(var29.getMessage(), var29);
                     }
                 }
 
@@ -775,7 +775,7 @@ public class OnlCgformApiController {
                         var7 = "文件导入成功！";
                     } else {
                         var7 = "识别模版数据错误";
-                        a.error(var7);
+                        log.error(var7);
                     }
                 }
 
@@ -786,10 +786,10 @@ public class OnlCgformApiController {
         } catch (Exception var46) {
             var6.setSuccess(false);
             var6.setMessage(var46.getMessage());
-            a.error(var46.getMessage(), var46);
+            log.error(var46.getMessage(), var46);
         }
 
-        a.info("=====online导入数据完成,耗时:" + (System.currentTimeMillis() - var4) + "毫秒=====");
+        log.info("=====online导入数据完成,耗时:" + (System.currentTimeMillis() - var4) + "毫秒=====");
         return var6;
     }
 
@@ -803,7 +803,7 @@ public class OnlCgformApiController {
         try {
             this.onlCgformHeadService.executeCustomerButton(var4, var2, var3);
         } catch (Exception var7) {
-            a.error(var7.getMessage(), var7);
+            log.error(var7.getMessage(), var7);
             return Result.error("执行失败!");
         }
 
@@ -826,7 +826,7 @@ public class OnlCgformApiController {
                     try {
                         var4 = var13.nextLongValue();
                     } catch (Exception var12) {
-                        a.error(var12.getMessage(), var12);
+                        log.error(var12.getMessage(), var12);
                     }
                 } else if (oConvertUtils.isNotEmpty(var3) && "postgres".equalsIgnoreCase(var3)) {
                     var7 = new PostgreSQLSequenceMaxValueIncrementer(var2, "HIBERNATE_SEQUENCE");
@@ -834,7 +834,7 @@ public class OnlCgformApiController {
                     try {
                         var4 = var7.nextLongValue();
                     } catch (Exception var11) {
-                        a.error(var11.getMessage(), var11);
+                        log.error(var11.getMessage(), var11);
                     }
                 } else {
                     var4 = null;
@@ -846,7 +846,7 @@ public class OnlCgformApiController {
                     try {
                         var4 = var13.nextLongValue();
                     } catch (Exception var10) {
-                        a.error(var10.getMessage(), var10);
+                        log.error(var10.getMessage(), var10);
                     }
                 } else if (oConvertUtils.isNotEmpty(var3) && "postgres".equalsIgnoreCase(var3)) {
                     var7 = new PostgreSQLSequenceMaxValueIncrementer(var2, var6);
@@ -854,7 +854,7 @@ public class OnlCgformApiController {
                     try {
                         var4 = var7.nextLongValue();
                     } catch (Exception var9) {
-                        a.error(var9.getMessage(), var9);
+                        log.error(var9.getMessage(), var9);
                     }
                 } else {
                     var4 = null;
@@ -968,7 +968,7 @@ public class OnlCgformApiController {
         for(int var15 = 0; var15 < var3.size(); ++var15) {
             var2.put(var9, ((Map)var3.get(var15)).get(var8));
             String var12 = CgformUtil.a(var5.getTableName(), var7, var2);
-            a.info("-----------动态列表查询子表sql》》" + var12);
+            log.info("-----------动态列表查询子表sql》》" + var12);
             List var13 = this.onlCgformHeadService.queryListData(var12);
             ConvertUtil.a(1, var13, var7);
             ((Map)var3.get(var15)).put(var1, CgformUtil.d(var13));
@@ -1080,7 +1080,7 @@ public class OnlCgformApiController {
             }
 
         } else {
-            a.error(" fileList 不合法！！！", var1);
+            log.error(" fileList 不合法！！！", var1);
         }
     }
 
@@ -1121,7 +1121,7 @@ public class OnlCgformApiController {
                 this.a(var4, var11);
                 var3.setResult(var11);
             } catch (Exception var12) {
-                a.error(var12.getMessage(), var12);
+                log.error(var12.getMessage(), var12);
                 var3.error500("数据库查询失败" + var12.getMessage());
             }
 
@@ -1147,7 +1147,7 @@ public class OnlCgformApiController {
             var3.setMessage("保存成功");
             return var3;
         } catch (Exception var5) {
-            a.error("OnlCgformApiController.formAddForDesigner()发生异常：" + var5.getMessage(), var5);
+            log.error("OnlCgformApiController.formAddForDesigner()发生异常：" + var5.getMessage(), var5);
             return Result.error("保存失败");
         }
     }
@@ -1161,7 +1161,7 @@ public class OnlCgformApiController {
             var2.remove("update_time");
             this.onlCgformHeadService.editCrazyFormData(var1, var2);
         } catch (Exception var4) {
-            a.error("OnlCgformApiController.formEditForDesigner()发生异常：" + var4.getMessage(), var4);
+            log.error("OnlCgformApiController.formEditForDesigner()发生异常：" + var4.getMessage(), var4);
             return Result.error("保存失败");
         }
 

jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformButtonController.java

@@ -12,8 +12,7 @@ import com.jero.common.api.vo.Result;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.generater.modules.online.cgform.entity.OnlCgformButton;
 import com.jero.generater.modules.online.cgform.service.IOnlCgformButtonService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -27,8 +26,9 @@ import org.springframework.web.bind.annotation.RestController;
 
 @RestController("onlCgformButtonController")
 @RequestMapping({"/online/cgform/button"})
+@Slf4j
 public class OnlCgformButtonController {
-    private static final Logger a = LoggerFactory.getLogger(OnlCgformButtonController.class);
+
     @Autowired
     private IOnlCgformButtonService onlCgformButtonService;
 
@@ -55,7 +55,7 @@ public class OnlCgformButtonController {
             this.onlCgformButtonService.save(var1);
             var2.success("添加成功！");
         } catch (Exception var4) {
-            a.error(var4.getMessage(), var4);
+            log.error(var4.getMessage(), var4);
             var2.error500("操作失败");
         }
 
@@ -75,7 +75,7 @@ public class OnlCgformButtonController {
 
             var2.success("添加成功！");
         } catch (Exception var6) {
-            a.error(var6.getMessage(), var6);
+            log.error(var6.getMessage(), var6);
             var2.error500("操作失败");
         }
 

jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformFieldController.java

@@ -13,8 +13,7 @@ import com.jero.generater.modules.online.cgform.entity.OnlCgformField;
 import com.jero.generater.modules.online.cgform.entity.OnlCgformHead;
 import com.jero.generater.modules.online.cgform.service.IOnlCgformFieldService;
 import com.jero.generater.modules.online.cgform.service.IOnlCgformHeadService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -27,8 +26,9 @@ import org.springframework.web.bind.annotation.RestController;
 
 @RestController("onlCgformFieldController")
 @RequestMapping({"/online/cgform/field"})
+@Slf4j
 public class OnlCgformFieldController {
-    private static final Logger a = LoggerFactory.getLogger(OnlCgformFieldController.class);
+
     @Autowired
     private IOnlCgformHeadService onlCgformHeadService;
     @Autowired
@@ -73,7 +73,7 @@ public class OnlCgformFieldController {
             this.onlCgformFieldService.save(var1);
             var2.success("添加成功！");
         } catch (Exception var4) {
-            a.error(var4.getMessage(), var4);
+            log.error(var4.getMessage(), var4);
             var2.error500("操作失败");
         }
 

jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformHeadController.java

@@ -20,6 +20,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Properties;
 import javax.servlet.http.HttpServletRequest;
+
+import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.authz.annotation.RequiresRoles;
 import com.jero.common.api.vo.Result;
 import com.jero.common.constant.enums.CgformEnum;
@@ -35,9 +37,7 @@ import com.jero.generater.modules.online.cgform.service.IOnlCgformFieldService;
 import com.jero.generater.modules.online.cgform.service.IOnlCgformHeadService;
 import com.jero.generater.modules.online.cgform.util.CgformUtil;
 import com.jero.generater.modules.online.config.exception.DBException;
-import org.jeecgframework.codegenerate.database.DbReadTableUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.jero.codegenerate.database.DbReadTableUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
@@ -53,8 +53,9 @@ import org.springframework.web.bind.annotation.RestController;
 
 @RestController("onlCgformHeadController")
 @RequestMapping({"/online/cgform/head"})
+@Slf4j
 public class OnlCgformHeadController {
-    private static final Logger a = LoggerFactory.getLogger(OnlCgformHeadController.class);
+
     @Autowired
     private IOnlCgformHeadService onlCgformHeadService;
     @Autowired
@@ -92,7 +93,7 @@ public class OnlCgformHeadController {
             this.onlCgformHeadService.save(var1);
             var2.success("添加成功！");
         } catch (Exception var4) {
-            a.error(var4.getMessage(), var4);
+            log.error(var4.getMessage(), var4);
             var2.error500("操作失败");
         }
 
@@ -184,7 +185,7 @@ public class OnlCgformHeadController {
             this.onlCgformHeadService.saveEnhance(var2);
             return Result.OK("保存成功!");
         } catch (Exception var4) {
-            a.error(var4.getMessage(), var4);
+            log.error(var4.getMessage(), var4);
             return Result.error("保存失败!");
         }
     }
@@ -196,7 +197,7 @@ public class OnlCgformHeadController {
             OnlCgformEnhanceJs var4 = this.onlCgformHeadService.queryEnhance(var1, var3);
             return var4 == null ? Result.error("查询为空") : Result.OK(var4);
         } catch (Exception var5) {
-            a.error(var5.getMessage(), var5);
+            log.error(var5.getMessage(), var5);
             return Result.error("查询失败!");
         }
     }
@@ -208,7 +209,7 @@ public class OnlCgformHeadController {
             this.onlCgformHeadService.editEnhance(var2);
             return Result.OK("保存成功!");
         } catch (Exception var4) {
-            a.error(var4.getMessage(), var4);
+            log.error(var4.getMessage(), var4);
             return Result.error("保存失败!");
         }
     }
@@ -219,7 +220,7 @@ public class OnlCgformHeadController {
             List var3 = this.onlCgformHeadService.queryButtonList(var1);
             return var3 != null && var3.size() != 0 ? Result.OK(var3) : Result.error("查询为空");
         } catch (Exception var4) {
-            a.error(var4.getMessage(), var4);
+            log.error(var4.getMessage(), var4);
             return Result.error("查询失败!");
         }
     }
@@ -242,7 +243,7 @@ public class OnlCgformHeadController {
                 return Result.error("保存失败,该按钮已存在增强配置!");
             }
         } catch (Exception var4) {
-            a.error(var4.getMessage(), var4);
+            log.error(var4.getMessage(), var4);
             return Result.error("保存失败!");
         }
     }
@@ -259,7 +260,7 @@ public class OnlCgformHeadController {
                 return Result.error("保存失败,该按钮已存在增强配置!");
             }
         } catch (Exception var4) {
-            a.error(var4.getMessage(), var4);
+            log.error(var4.getMessage(), var4);
             return Result.error("保存失败!");
         }
     }
@@ -270,7 +271,7 @@ public class OnlCgformHeadController {
             this.onlCgformEnhanceService.deleteEnhanceSql(var1);
             return Result.OK("删除成功");
         } catch (Exception var3) {
-            a.error(var3.getMessage(), var3);
+            log.error(var3.getMessage(), var3);
             return Result.error("删除失败!");
         }
     }
@@ -282,7 +283,7 @@ public class OnlCgformHeadController {
             this.onlCgformEnhanceService.deleteBatchEnhanceSql(var2);
             return Result.OK("删除成功");
         } catch (Exception var3) {
-            a.error(var3.getMessage(), var3);
+            log.error(var3.getMessage(), var3);
             return Result.error("删除失败!");
         }
     }
@@ -308,7 +309,7 @@ public class OnlCgformHeadController {
                 }
             }
         } catch (Exception var4) {
-            a.error(var4.getMessage(), var4);
+            log.error(var4.getMessage(), var4);
             return Result.error("保存失败!");
         }
     }
@@ -328,7 +329,7 @@ public class OnlCgformHeadController {
                 }
             }
         } catch (Exception var4) {
-            a.error(var4.getMessage(), var4);
+            log.error(var4.getMessage(), var4);
             return Result.error("保存失败!");
         }
     }
@@ -339,7 +340,7 @@ public class OnlCgformHeadController {
             this.onlCgformEnhanceService.deleteEnhanceJava(var1);
             return Result.OK("删除成功");
         } catch (Exception var3) {
-            a.error(var3.getMessage(), var3);
+            log.error(var3.getMessage(), var3);
             return Result.error("删除失败!");
         }
     }
@@ -351,7 +352,7 @@ public class OnlCgformHeadController {
             this.onlCgformEnhanceService.deleteBatchEnhanceJava(var2);
             return Result.OK("删除成功");
         } catch (Exception var3) {
-            a.error(var3.getMessage(), var3);
+            log.error(var3.getMessage(), var3);
             return Result.error("删除失败!");
         }
     }
@@ -368,7 +369,7 @@ public class OnlCgformHeadController {
             try {
                 var6 = DbReadTableUtil.a();
             } catch (SQLException var12) {
-                a.error(var12.getMessage(), var12);
+                log.error(var12.getMessage(), var12);
                 return Result.error("同步失败，未获取数据库表信息");
             }
 
@@ -411,7 +412,7 @@ public class OnlCgformHeadController {
                 if (oConvertUtils.isNotEmpty(var4[var5])) {
                     int var6 = this.onlCgformHeadService.count((Wrapper)(new LambdaQueryWrapper<OnlCgformHead>()).eq(OnlCgformHead::getTableName, var4[var5]));
                     if (var6 <= 0) {
-                        a.info("[IP] [online数据库导入表]   --表名：" + var4[var5]);
+                        log.info("[IP] [online数据库导入表]   --表名：" + var4[var5]);
                         this.onlCgformHeadService.saveDbTable2Online(var4[var5]);
                     }
                 }
@@ -526,7 +527,7 @@ public class OnlCgformHeadController {
 
             List var14 = CgformEnum.getJspModelList(var13);
             var3.put("jspModeList", var14);
-            var3.put("projectPath", org.jeecgframework.codegenerate.a.a.m());
+            var3.put("projectPath", com.jero.codegenerate.properties.CodeConfigProperties.m());
             return Result.OK(var3);
         }
     }

jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformIndexController.java

@@ -11,8 +11,7 @@ import com.jero.common.constant.CommonConstant;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.generater.modules.online.cgform.entity.OnlCgformIndex;
 import com.jero.generater.modules.online.cgform.service.IOnlCgformIndexService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -25,8 +24,9 @@ import org.springframework.web.bind.annotation.RestController;
 
 @RestController("onlCgformIndexController")
 @RequestMapping({"/online/cgform/index"})
+@Slf4j
 public class OnlCgformIndexController {
-    private static final Logger a = LoggerFactory.getLogger(OnlCgformIndexController.class);
+
     @Autowired
     private IOnlCgformIndexService onlCgformIndexService;
 
@@ -62,7 +62,7 @@ public class OnlCgformIndexController {
             this.onlCgformIndexService.save(var1);
             var2.success("添加成功！");
         } catch (Exception var4) {
-            a.error(var4.getMessage(), var4);
+            log.error(var4.getMessage(), var4);
             var2.error500("操作失败");
         }
 

jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/converter/ConvertFactory.java

@@ -18,11 +18,11 @@ import com.jero.generater.modules.online.cgform.converter.convertImpl.SwitchConv
 import com.jero.generater.modules.online.cgform.converter.convertImpl.TreeSelectConverter;
 import com.jero.generater.modules.online.cgform.converter.convertImpl.UserSelectConverter;
 import com.jero.generater.modules.online.cgform.entity.OnlCgformField;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 
+@Slf4j
 public class ConvertFactory {
-    private static final Logger a = LoggerFactory.getLogger(ConvertFactory.class);
+
     private static final String b = "list";
     private static final String c = "radio";
     private static final String d = "checkbox";
@@ -172,9 +172,9 @@ public class ConvertFactory {
             try {
                 var1 = MyClassLoader.getClassByScn(var0).newInstance();
             } catch (InstantiationException var3) {
-                a.error(var3.getMessage(), var3);
+                log.error(var3.getMessage(), var3);
             } catch (IllegalAccessException var4) {
-                a.error(var4.getMessage(), var4);
+                log.error(var4.getMessage(), var4);
             }
         } else {
             var1 = SpringContextUtils.getBean(var0);

jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/enhance/demo/CgformEnhanceBeanDemo.java

@@ -4,21 +4,20 @@ import com.alibaba.fastjson.JSONObject;
 import java.util.Map;
 import com.jero.generater.modules.online.cgform.enhance.CgformEnhanceJavaInter;
 import com.jero.generater.modules.online.config.exception.BusinessException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
+@Slf4j
 @Component("cgformEnhanceBeanDemo")
 public class CgformEnhanceBeanDemo implements CgformEnhanceJavaInter {
-    private static final Logger a = LoggerFactory.getLogger(CgformEnhanceBeanDemo.class);
 
     public CgformEnhanceBeanDemo() {
     }
 
     public int execute(String tableName, JSONObject json) throws BusinessException {
-        a.info("--------我是自定义java增强测试bean-----------");
-        a.info("--------当前表单 tableName=> " + tableName);
-        a.info("--------当前表单 JSON数据=> " + json.toJSONString());
+        log.info("--------我是自定义java增强测试bean-----------");
+        log.info("--------当前表单 tableName=> " + tableName);
+        log.info("--------当前表单 JSON数据=> " + json.toJSONString());
         if (json.containsKey("phone")) {
             json.put("phone", "18611100000");
         }

jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/enhance/demo/CgformEnhanceImportDemo.java

@@ -6,35 +6,34 @@ import java.util.Map;
 import com.jero.common.util.oConvertUtils;
 import com.jero.generater.modules.online.cgform.enhance.CgformEnhanceJavaInter;
 import com.jero.generater.modules.online.config.exception.BusinessException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
+@Slf4j
 @Component("cgformEnhanceImportDemo")
 public class CgformEnhanceImportDemo implements CgformEnhanceJavaInter {
-    private static final Logger a = LoggerFactory.getLogger(CgformEnhanceImportDemo.class);
 
     public CgformEnhanceImportDemo() {
     }
 
     public int execute(String tableName, JSONObject json) throws BusinessException {
-        a.info("--------当前tableName=>" + tableName);
-        a.info("===============================================================================================================");
-        a.info("--------导入JSON数据=>" + json.toJSONString());
+        log.info("--------当前tableName=>" + tableName);
+        log.info("===============================================================================================================");
+        log.info("--------导入JSON数据=>" + json.toJSONString());
         if (oConvertUtils.isEmpty(json.get("name"))) {
-            a.info("-----变更导入数据，直接返回1----");
+            log.info("-----变更导入数据，直接返回1----");
             json.put("name", "默认值");
             return 1;
         } else if (json.getString("name").equals("error")) {
             json.put("name", "默认值");
             throw new BusinessException("测试抛出异常error");
         } else if (json.getString("name").equals("hello")) {
-            a.info("-----导入数据变更新，直接返回2----");
+            log.info("-----导入数据变更新，直接返回2----");
             json.put("id", "testid123");
             json.put("name", "JAVA导入增强 测试修改");
             return 2;
         } else if (json.getString("name").equals("ok")) {
-            a.info("-----丢弃导入数据，直接返回0----");
+            log.info("-----丢弃导入数据，直接返回0----");
             return 0;
         } else {
             return 1;

jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/enhance/demo/CgformEnhanceJavaDemo.java

@@ -5,21 +5,20 @@ import com.alibaba.fastjson.JSONObject;
 import java.util.Map;
 import com.jero.generater.modules.online.cgform.enhance.CgformEnhanceJavaInter;
 import com.jero.generater.modules.online.config.exception.BusinessException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
+@Slf4j
 @Component("cgformEnhanceJavaDemo")
 public class CgformEnhanceJavaDemo implements CgformEnhanceJavaInter {
-    private static final Logger a = LoggerFactory.getLogger(CgformEnhanceJavaDemo.class);
 
     public CgformEnhanceJavaDemo() {
     }
 
     public int execute(String tableName, JSONObject json) throws BusinessException {
-        a.info("----------我是自定义java增强测试demo类-----------");
-        a.info("--------当前tableName=>" + tableName);
-        a.info("--------当前JSON数据=>" + json.toJSONString());
+        log.info("----------我是自定义java增强测试demo类-----------");
+        log.info("--------当前tableName=>" + tableName);
+        log.info("--------当前JSON数据=>" + json.toJSONString());
         return 1;
     }
 

jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java

@@ -17,6 +17,7 @@ import java.util.Map;
 import com.jero.common.system.util.JeroDataAutorUtils;
 import com.jero.generater.modules.online.auth.mapper.OnlAuthDataMapper;
 import com.jero.generater.modules.online.auth.service.IOnlAuthPageService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
 import com.jero.common.system.api.ISysBaseAPI;
 import com.jero.common.system.vo.LoginUser;
@@ -29,15 +30,14 @@ import com.jero.generater.modules.online.cgform.mapper.OnlCgformHeadMapper;
 import com.jero.generater.modules.online.cgform.model.TreeModel;
 import com.jero.generater.modules.online.cgform.service.IOnlCgformFieldService;
 import com.jero.generater.modules.online.cgform.util.CgformUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+@Slf4j
 @Service("onlCgformFieldServiceImpl")
 public class OnlCgformFieldServiceImpl extends ServiceImpl<OnlCgformFieldMapper, OnlCgformField> implements IOnlCgformFieldService {
-    private static final Logger a = LoggerFactory.getLogger(OnlCgformFieldServiceImpl.class);
+
     @Autowired
     private OnlCgformFieldMapper onlCgformFieldMapper;
     @Autowired
@@ -90,7 +90,7 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl<OnlCgformFieldMapper,
         Integer var20 = params.get("pageSize") == null ? 10 : Integer.parseInt(params.get("pageSize").toString());
         if (var20 == -521) {
             List var21 = this.onlCgformFieldMapper.queryListBySql(var9.toString());
-            a.debug("---Online查询sql 不分页 :>>" + var9.toString());
+            log.debug("---Online查询sql 不分页 :>>" + var9.toString());
             if (var21 != null && var21.size() != 0) {
                 var5.put("total", var21.size());
                 var5.put("fieldList", var8);
@@ -102,7 +102,7 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl<OnlCgformFieldMapper,
         } else {
             Integer var22 = params.get("pageNo") == null ? 1 : Integer.parseInt(params.get("pageNo").toString());
             Page var18 = new Page((long)var22, (long)var20);
-            a.debug("---Online查询sql:>>" + var9.toString());
+            log.debug("---Online查询sql:>>" + var9.toString());
             IPage var19 = this.onlCgformFieldMapper.selectPageBySql(var18, var9.toString());
             var5.put("total", var19.getTotal());
             var5.put("records", CgformUtil.d(var19.getRecords()));
@@ -170,7 +170,7 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl<OnlCgformFieldMapper,
                 }
             }
 
-            a.debug("---Online查询sql 不分页 :>>" + var10.toString());
+            log.debug("---Online查询sql 不分页 :>>" + var10.toString());
             if (var25 != null && ((List)var25).size() != 0) {
                 var6.put("total", ((List)var25).size());
                 var6.put("fieldList", var9);
@@ -182,7 +182,7 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl<OnlCgformFieldMapper,
         } else {
             Integer var26 = params.get("pageNo") == null ? 1 : Integer.parseInt(params.get("pageNo").toString());
             Page var27 = new Page((long)var26, (long)var24);
-            a.debug("---Online查询sql:>>" + var10.toString());
+            log.debug("---Online查询sql:>>" + var10.toString());
             IPage var28 = this.onlCgformFieldMapper.selectPageBySql(var27, var10.toString());
             var6.put("total", var28.getTotal());
             var6.put("records", CgformUtil.d(var28.getRecords()));
@@ -429,7 +429,7 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl<OnlCgformFieldMapper,
 
             String var10 = var5.toString();
             String var11 = "DELETE FROM " + CgformUtil.f(tbname) + " where " + linkField + " in(" + var10.substring(0, var10.length() - 1) + ")";
-            a.debug("--删除sql-->" + var11);
+            log.debug("--删除sql-->" + var11);
             this.onlCgformFieldMapper.deleteAutoList(var11);
         }
 

jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformHeadServiceImpl.java

@@ -21,6 +21,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import java.util.stream.Collectors;
+
+import lombok.extern.slf4j.Slf4j;
 import org.hibernate.HibernateException;
 import com.jero.common.api.vo.Result;
 import com.jero.common.constant.CommonConstant;
@@ -58,15 +60,13 @@ import com.jero.generater.modules.online.config.util.DbTableUtil;
 import com.jero.generater.modules.online.config.exception.BusinessException;
 import com.jero.generater.modules.online.config.exception.DBException;
 import com.jero.generater.modules.online.config.service.DbTableHandleI;
-import org.jeecgframework.codegenerate.database.DbReadTableUtil;
-import org.jeecgframework.codegenerate.generate.impl.CodeGenerateOne;
-import org.jeecgframework.codegenerate.generate.impl.CodeGenerateOneToMany;
-import org.jeecgframework.codegenerate.generate.pojo.ColumnVo;
-import org.jeecgframework.codegenerate.generate.pojo.TableVo;
-import org.jeecgframework.codegenerate.generate.pojo.onetomany.MainTableVo;
-import org.jeecgframework.codegenerate.generate.pojo.onetomany.SubTableVo;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.jero.codegenerate.database.DbReadTableUtil;
+import com.jero.codegenerate.generate.impl.CodeGenerateOne;
+import com.jero.codegenerate.generate.impl.CodeGenerateOneToMany;
+import com.jero.codegenerate.generate.pojo.ColumnVo;
+import com.jero.codegenerate.generate.pojo.TableVo;
+import com.jero.codegenerate.generate.pojo.onetomany.MainTableVo;
+import com.jero.codegenerate.generate.pojo.onetomany.SubTableVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
@@ -74,9 +74,10 @@ import org.springframework.http.MediaType;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+@Slf4j
 @Service("onlCgformHeadServiceImpl")
 public class OnlCgformHeadServiceImpl extends ServiceImpl<OnlCgformHeadMapper, OnlCgformHead> implements IOnlCgformHeadService {
-    private static final Logger a = LoggerFactory.getLogger(OnlCgformHeadServiceImpl.class);
+
     @Autowired
     private IOnlCgformFieldService fieldService;
     @Autowired
@@ -295,7 +296,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl<OnlCgformHeadMapper, O
             if ("normal".equals(synMethod)) {
                 long var8 = System.currentTimeMillis();
                 boolean var10 = DbTableUtil.a(var4);
-                a.info("==判断表是否存在消耗时间" + (System.currentTimeMillis() - var8) + "毫秒");
+                log.info("==判断表是否存在消耗时间" + (System.currentTimeMillis() - var8) + "毫秒");
                 if (var10) {
                     DbTableProcess var11 = new DbTableProcess();
                     List var12 = var11.b(var7);
@@ -327,13 +328,13 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl<OnlCgformHeadMapper, O
                             String var17 = var11.a(var15.getIndexName(), var4);
 
                             try {
-                                a.info("删除索引 executeDDL:" + var17);
+                                log.info("删除索引 executeDDL:" + var17);
                                 ((OnlCgformHeadMapper)this.baseMapper).executeDDL(var17);
                                 if (CommonConstant.DEL_FLAG_1.equals(var15.getDelFlag())) {
                                     this.indexService.removeById(var15.getId());
                                 }
                             } catch (Exception var19) {
-                                a.error("删除表【" + var4 + "】索引(" + var15.getIndexName() + ")失败!", var19);
+                                log.error("删除表【" + var4 + "】索引(" + var15.getIndexName() + ")失败!", var19);
                             }
                         } else if (CommonConstant.DEL_FLAG_1.equals(var15.getDelFlag())) {
                             this.indexService.removeById(var15.getId());
@@ -366,10 +367,10 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl<OnlCgformHeadMapper, O
         } else {
             long var3 = System.currentTimeMillis();
             boolean var5 = DbTableUtil.a(var2.getTableName());
-            a.info("==判断表是否存在消耗时间 " + (System.currentTimeMillis() - var3) + "毫秒");
+            log.info("==判断表是否存在消耗时间 " + (System.currentTimeMillis() - var3) + "毫秒");
             if (var5) {
                 String var6 = DbTableUtil.getTableHandle().dropTableSQL(var2.getTableName());
-                a.info(" 删除表  executeDDL： " + var6);
+                log.info(" 删除表  executeDDL： " + var6);
                 ((OnlCgformHeadMapper)this.baseMapper).executeDDL(var6);
             }
 
@@ -506,7 +507,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl<OnlCgformHeadMapper, O
 
             for(int var6 = 0; var6 < var5.size(); ++var6) {
                 ColumnVo var7 = (ColumnVo)var5.get(var6);
-                a.info("  columnt : " + var7.toString());
+                log.info("  columnt : " + var7.toString());
                 String var8 = var7.getFieldDbName();
                 OnlCgformField var9 = new OnlCgformField();
                 var9.setCgformHeadId(var3);
@@ -590,7 +591,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl<OnlCgformHeadMapper, O
                         try {
                             var9.setDbLength(Integer.valueOf(var7.getCharmaxLength()));
                         } catch (Exception var12) {
-                            a.error(var12.getMessage(), var12);
+                            log.error(var12.getMessage(), var12);
                         }
                     } else {
                         var9.setDbLength(Integer.valueOf(var7.getCharmaxLength()));
@@ -619,7 +620,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl<OnlCgformHeadMapper, O
                 var4.add(var9);
             }
         } catch (Exception var13) {
-            a.error(var13.getMessage(), var13);
+            log.error(var13.getMessage(), var13);
         }
 
         if (oConvertUtils.isEmpty(var2.getFormCategory())) {
@@ -775,10 +776,10 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl<OnlCgformHeadMapper, O
                     JSONObject var25 = (JSONObject)RestUtil.request(var24, HttpMethod.POST, var22, (JSONObject)null, var23, JSONObject.class).getBody();
                     if (var25 != null) {
                         String var26 = var25.getString("result");
-                        a.info("保存流程草稿 dataId : " + var26);
+                        log.info("保存流程草稿 dataId : " + var26);
                     }
                 } catch (Exception var21) {
-                    a.error("保存流程草稿异常, " + var21.getMessage(), var21);
+                    log.error("保存流程草稿异常, " + var21.getMessage(), var21);
                 }
             }
 
@@ -1031,9 +1032,9 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl<OnlCgformHeadMapper, O
                     try {
                         var4 = MyClassLoader.getClassByScn(var3).newInstance();
                     } catch (InstantiationException var6) {
-                        a.error(var6.getMessage(), var6);
+                        log.error(var6.getMessage(), var6);
                     } catch (IllegalAccessException var7) {
-                        a.error(var7.getMessage(), var7);
+                        log.error(var7.getMessage(), var7);
                     }
                 } else if ("spring".equals(var2)) {
                     var4 = SpringContextUtils.getBean(var3);
@@ -1060,7 +1061,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl<OnlCgformHeadMapper, O
             for(int var10 = 0; var10 < var9; ++var10) {
                 String var11 = var8[var10];
                 if (var11 != null && !var11.toLowerCase().trim().equals("")) {
-                    a.info(" online sql 增强： " + var11);
+                    log.info(" online sql 增强： " + var11);
                     ((OnlCgformHeadMapper)this.baseMapper).executeDDL(var11);
                 }
             }

jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformIndexServiceImpl.java

@@ -11,14 +11,14 @@ import com.jero.generater.modules.online.cgform.entity.OnlCgformIndex;
 import com.jero.generater.modules.online.cgform.mapper.OnlCgformHeadMapper;
 import com.jero.generater.modules.online.cgform.mapper.OnlCgformIndexMapper;
 import com.jero.generater.modules.online.cgform.service.IOnlCgformIndexService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+@Slf4j
 @Service("onlCgformIndexServiceImpl")
 public class OnlCgformIndexServiceImpl extends ServiceImpl<OnlCgformIndexMapper, OnlCgformIndex> implements IOnlCgformIndexService {
-    private static final Logger a = LoggerFactory.getLogger(OnlCgformIndexServiceImpl.class);
+
     @Autowired
     private OnlCgformHeadMapper onlCgformHeadMapper;
 
@@ -79,7 +79,7 @@ public class OnlCgformIndexServiceImpl extends ServiceImpl<OnlCgformIndexMapper,
                             var8 = "create " + var11 + var9 + " on " + tbname + "(" + var10 + ")";
                     }
 
-                    a.info(" 创建索引 executeDDL ：" + var8);
+                    log.info(" 创建索引 executeDDL ：" + var8);
                     this.onlCgformHeadMapper.executeDDL(var8);
                     var7.setIsDbSynch("Y");
                     this.updateById(var7);

jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/util/CgformUtil.java

@@ -27,6 +27,8 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletRequest;
+
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import com.jero.common.exception.JeroBootException;
@@ -67,11 +69,10 @@ import com.jero.generater.modules.online.cgform.service.IOnlCgformFieldService;
 import com.jero.generater.modules.online.config.util.DbTableUtil;
 import com.jero.generater.modules.online.config.exception.DBException;
 import org.jeecgframework.poi.excel.entity.params.ExcelExportEntity;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
+@Slf4j
 public class CgformUtil {
-    private static final Logger aw = LoggerFactory.getLogger(CgformUtil.class);
+
     public static final String a = "SELECT ";
     public static final String b = " FROM ";
     public static final String c = " AND ";
@@ -799,7 +800,7 @@ public class CgformUtil {
                     OnlCgformField var12 = (OnlCgformField)var11.next();
                     String var13 = var12.getDbFieldName();
                     if (null == var13) {
-                        aw.info("--------online保存表单数据遇见空名称的字段------->>" + var12.getId());
+                        log.info("--------online保存表单数据遇见空名称的字段------->>" + var12.getId());
                     } else if ("id".equals(var13.toLowerCase())) {
                         var7 = true;
                         var8 = var2.getString(var13);
@@ -848,7 +849,7 @@ public class CgformUtil {
 
                 String var17 = "insert into " + f(var0) + "(" + "id" + var3.toString() + ") values(" + "'" + var8 + "'" + var4.toString() + ")";
                 var6.put("execute_sql_string", var17);
-                aw.info("--动态表单保存sql-->" + var17);
+                log.info("--动态表单保存sql-->" + var17);
                 return var6;
             }
         }
@@ -879,7 +880,7 @@ public class CgformUtil {
                     OnlCgformField var9 = (OnlCgformField)var8.next();
                     String var10 = var9.getDbFieldName();
                     if (null == var10) {
-                        aw.info("--------online修改表单数据遇见空名称的字段------->>" + var9.getId());
+                        log.info("--------online修改表单数据遇见空名称的字段------->>" + var9.getId());
                     } else {
                         a(var9, var6, var2, "UPDATE_BY", "UPDATE_TIME");
                         String var11;
@@ -908,7 +909,7 @@ public class CgformUtil {
                 }
 
                 String var15 = "update " + f(var0) + " set " + var14 + " where  " + "id" + "=" + "'" + var2.getString("id") + "'";
-                aw.info("--动态表单编辑sql-->" + var15);
+                log.info("--动态表单编辑sql-->" + var15);
                 var4.put("execute_sql_string", var15);
                 return var4;
             }
@@ -1140,7 +1141,7 @@ public class CgformUtil {
                     }
                 }
             } catch (Exception var4) {
-                aw.error(var4.getMessage(), var4);
+                log.error(var4.getMessage(), var4);
                 return false;
             }
         }
@@ -1267,7 +1268,7 @@ public class CgformUtil {
                     var4.append(" AND " + var2 + "=" + var7);
                     break;
                 default:
-                    aw.info("--查询规则未匹配到---");
+                    log.info("--查询规则未匹配到---");
             }
 
         }
@@ -1401,7 +1402,7 @@ public class CgformUtil {
     }
 
     public static String d(String var0) {
-        aw.info("最终的增强JS", var0);
+        log.info("最终的增强JS", var0);
         return "class OnlineEnhanceJs{constructor(getAction,postAction,deleteAction){this._getAction=getAction;this._postAction=postAction;this._deleteAction=deleteAction;}" + var0 + "}";
     }
 
@@ -1724,7 +1725,7 @@ public class CgformUtil {
                     OnlCgformField var11 = (OnlCgformField)var10.next();
                     String var12 = var11.getDbFieldName();
                     if (null == var12) {
-                        aw.info("--------online保存表单数据遇见空名称的字段------->>" + var11.getId());
+                        log.info("--------online保存表单数据遇见空名称的字段------->>" + var11.getId());
                     } else if (var2.get(var12) != null || "CREATE_BY".equalsIgnoreCase(var12) || "CREATE_TIME".equalsIgnoreCase(var12) || "SYS_ORG_CODE".equalsIgnoreCase(var12)) {
                         a(var11, var9, var2, "CREATE_BY", "CREATE_TIME", "SYS_ORG_CODE");
                         String var13;
@@ -1752,7 +1753,7 @@ public class CgformUtil {
 
                 String var16 = "insert into " + f(var0) + "(" + "id" + var3.toString() + ") values(" + "'" + var8 + "'" + var4.toString() + ")";
                 var6.put("execute_sql_string", var16);
-                aw.info("--表单设计器表单保存sql-->" + var16);
+                log.info("--表单设计器表单保存sql-->" + var16);
                 return var6;
             }
         }
@@ -1782,7 +1783,7 @@ public class CgformUtil {
                     OnlCgformField var8 = (OnlCgformField)var7.next();
                     String var9 = var8.getDbFieldName();
                     if (null == var9) {
-                        aw.info("--------online修改表单数据遇见空名称的字段------->>" + var8.getId());
+                        log.info("--------online修改表单数据遇见空名称的字段------->>" + var8.getId());
                     } else if (!"id".equals(var9) && (var2.get(var9) != null || "UPDATE_BY".equalsIgnoreCase(var9) || "UPDATE_TIME".equalsIgnoreCase(var9) || "SYS_ORG_CODE".equalsIgnoreCase(var9))) {
                         a(var8, var6, var2, "UPDATE_BY", "UPDATE_TIME", "SYS_ORG_CODE");
                         String var10;
@@ -1804,7 +1805,7 @@ public class CgformUtil {
                 }
 
                 String var14 = "update " + f(var0) + " set " + var13 + " where  " + "id" + "=" + "'" + var2.getString("id") + "'";
-                aw.info("--表单设计器表单编辑sql-->" + var14);
+                log.info("--表单设计器表单编辑sql-->" + var14);
                 var4.put("execute_sql_string", var14);
                 return var4;
             }
@@ -1814,7 +1815,7 @@ public class CgformUtil {
     public static Map<String, Object> a(String var0, String var1, String var2) {
         HashMap var3 = new HashMap();
         String var4 = "update " + f(var0) + " set " + var1 + "=" + "'" + 0 + "'" + " where  " + "id" + "=" + "'" + var2 + "'";
-        aw.info("--修改树节点状态：为无子节点sql-->" + var4);
+        log.info("--修改树节点状态：为无子节点sql-->" + var4);
         var3.put("execute_sql_string", var4);
         return var3;
     }
@@ -1998,7 +1999,7 @@ public class CgformUtil {
                 var2 = var2 + "'%" + var3[var4] + "%" + "'";
             }
 
-            aw.info(" POPUP fieldSql: " + var2);
+            log.info(" POPUP fieldSql: " + var2);
             return var2;
         } else {
             return var2;

jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/util/EnhanceJsUtil.java

@@ -10,11 +10,10 @@ import com.jero.common.util.oConvertUtils;
 import com.jero.generater.modules.online.cgform.entity.OnlCgformButton;
 import com.jero.generater.modules.online.cgform.entity.OnlCgformEnhanceJs;
 import com.jero.generater.modules.online.cgform.entity.OnlCgformField;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 
+@Slf4j
 public class EnhanceJsUtil {
-    private static final Logger a = LoggerFactory.getLogger(EnhanceJsUtil.class);
     private static final String b = "beforeSubmit,beforeAdd,beforeEdit,afterAdd,afterEdit,beforeDelete,afterDelete,mounted,created,show,loaded";
     private static final String c = "\\}\\s*\r*\n*\\s*";
     private static final String d = ",";
@@ -82,7 +81,7 @@ public class EnhanceJsUtil {
     }
 
     public static String a(String var0, List<OnlCgformButton> var1) {
-        a.info("最终的增强JS", var0);
+        log.info("最终的增强JS", var0);
         return "class OnlineEnhanceJs{constructor(getAction,postAction,deleteAction){this._getAction=getAction;this._postAction=postAction;this._deleteAction=deleteAction;}" + var0 + "}";
     }
 
@@ -101,14 +100,14 @@ public class EnhanceJsUtil {
 
     public static String a(String var0) {
         String var1 = "function OnlineEnhanceJs(getAction,postAction,deleteAction){return {_getAction:getAction,_postAction:postAction,_deleteAction:deleteAction," + var0 + "}}";
-        a.info("最终的增强JS", var1);
+        log.info("最终的增强JS", var1);
         return var1;
     }
 
     public static String b(String var0, List<OnlCgformButton> var1) {
         var0 = c(var0, var1);
         String var2 = "function OnlineEnhanceJs(getAction,postAction,deleteAction){return {_getAction:getAction,_postAction:postAction,_deleteAction:deleteAction," + var0 + "}}";
-        a.info("最终的增强JS", var2);
+        log.info("最终的增强JS", var2);
         return var2;
     }
 
@@ -152,11 +151,11 @@ public class EnhanceJsUtil {
     public static void a(OnlCgformEnhanceJs var0, String var1, List<OnlCgformField> var2) {
         if (var0 != null && !oConvertUtils.isEmpty(var0.getCgJs())) {
             String var3 = " " + var0.getCgJs();
-            a.debug("one enhanceJs begin==> " + var3);
+            log.debug("one enhanceJs begin==> " + var3);
             Pattern var4 = Pattern.compile("(\\s{1}onlChange\\s*\\(\\)\\s*\\{)");
             Matcher var5 = var4.matcher(var3);
             if (var5.find()) {
-                a.debug("---JS 增强转换-main--enhanceJsFunctionName----onlChange");
+                log.debug("---JS 增强转换-main--enhanceJsFunctionName----onlChange");
                 var3 = a(var3, "onlChange", "\\s{1}");
 
                 OnlCgformField var7;
@@ -165,20 +164,20 @@ public class EnhanceJsUtil {
                 }
             }
 
-            a.debug("one enhanceJs end==> " + var3);
+            log.debug("one enhanceJs end==> " + var3);
             var0.setCgJs(var3);
         }
     }
 
     public static void b(OnlCgformEnhanceJs var0, String var1, List<OnlCgformField> var2) {
         if (var0 != null && !oConvertUtils.isEmpty(var0.getCgJs())) {
-            a.info(" sub enhanceJs begin==> " + var0);
+            log.info(" sub enhanceJs begin==> " + var0);
             String var3 = var0.getCgJs();
             String var4 = var1 + "_" + "onlChange";
             Pattern var5 = Pattern.compile("(" + var4 + "\\s*\\(\\)\\s*\\{)");
             Matcher var6 = var5.matcher(var3);
             if (var6.find()) {
-                a.info("---JS 增强转换-sub-- enhanceJsFunctionName----" + var4);
+                log.info("---JS 增强转换-sub-- enhanceJsFunctionName----" + var4);
                 var3 = a((String)var3, var4, (String)null);
 
                 OnlCgformField var8;
@@ -187,7 +186,7 @@ public class EnhanceJsUtil {
                 }
             }
 
-            a.info(" sub enhanceJs end==> " + var3);
+            log.info(" sub enhanceJs end==> " + var3);
             var0.setCgJs(var3);
         }
     }

jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/controller/OnlCgreportAPI.java

@@ -20,6 +20,8 @@ import java.util.Map.Entry;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.apache.poi.ss.usermodel.Workbook;
 import com.jero.common.api.vo.Result;
@@ -41,8 +43,6 @@ import com.jero.generater.modules.online.cgreport.util.SqlUtil;
 import org.jeecgframework.poi.excel.ExcelExportUtil;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.params.ExcelExportEntity;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -53,8 +53,9 @@ import org.springframework.web.bind.annotation.RestController;
 
 @RestController("onlCgreportAPI")
 @RequestMapping({"/online/cgreport/api"})
+@Slf4j
 public class OnlCgreportAPI {
-    private static final Logger a = LoggerFactory.getLogger(OnlCgreportAPI.class);
+
     @Autowired
     private OnlCgreportHeadServiceImpl onlCgreportHeadService;
     @Autowired
@@ -243,16 +244,16 @@ public class OnlCgreportAPI {
                 var6.put("getAll", var2.getAttribute("getAll"));
                 Map var7;
                 if (StringUtils.isNotBlank(var5)) {
-                    a.debug("Online报表: 走了多数据源逻辑");
+                    log.debug("Online报表: 走了多数据源逻辑");
                     var7 = this.onlCgreportHeadService.executeSelectSqlDynamic(var5, var4, var6, var3.getId());
                 } else {
-                    a.debug("Online报表: 走了稳定逻辑");
+                    log.debug("Online报表: 走了稳定逻辑");
                     var7 = this.onlCgreportHeadService.executeSelectSql(var4, var3.getId(), var6);
                 }
 
                 return Result.OK(var7);
             } catch (Exception var8) {
-                a.error(var8.getMessage(), var8);
+                log.error(var8.getMessage(), var8);
                 return Result.error("SQL执行失败：" + var8.getMessage());
             }
         }
@@ -264,7 +265,7 @@ public class OnlCgreportAPI {
             List var2 = this.onlCgreportItemService.getAutoListQueryInfo(var1);
             return Result.OK(var2);
         } catch (Exception var3) {
-            a.info(var3.getMessage(), var3);
+            log.info(var3.getMessage(), var3);
             return Result.error("查询失败");
         }
     }
@@ -277,7 +278,7 @@ public class OnlCgreportAPI {
             List var3 = this.onlCgreportParamService.list(var2);
             return Result.OK(var3);
         } catch (Exception var4) {
-            a.info(var4.getMessage(), var4);
+            log.info(var4.getMessage(), var4);
             return Result.error("查询失败");
         }
     }
@@ -491,10 +492,10 @@ public class OnlCgreportAPI {
             var3 = Result.OK("数据库连接成功");
             return var3;
         } catch (ClassNotFoundException var17) {
-            a.error(var17.toString());
+            log.error(var17.toString());
             var4 = Result.error("数据库连接失败：驱动类不存在");
         } catch (Exception var18) {
-            a.error(var18.toString());
+            log.error(var18.toString());
             var4 = Result.error("数据库连接失败：" + var18.getMessage());
             return var4;
         } finally {
@@ -503,7 +504,7 @@ public class OnlCgreportAPI {
                     var2.close();
                 }
             } catch (SQLException var16) {
-                a.error(var16.toString());
+                log.error(var16.toString());
             }
 
         }

jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/controller/OnlCgreportHeadController.java

@@ -11,6 +11,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 
 import com.jero.modules.base.service.BaseCommonService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import com.jero.common.api.vo.Result;
 import com.jero.common.system.api.ISysBaseAPI;
@@ -25,8 +26,6 @@ import com.jero.generater.modules.online.cgreport.model.OnlCgreportModel;
 import com.jero.generater.modules.online.cgreport.service.IOnlCgreportHeadService;
 import com.jero.generater.modules.online.cgreport.service.IOnlCgreportItemService;
 import com.jero.generater.modules.online.cgreport.service.IOnlCgreportParamService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -39,8 +38,9 @@ import org.springframework.web.bind.annotation.RestController;
 
 @RestController("onlCgreportHeadController")
 @RequestMapping({"/online/cgreport/head"})
+@Slf4j
 public class OnlCgreportHeadController {
-    private static final Logger a = LoggerFactory.getLogger(OnlCgreportHeadController.class);
+
     @Autowired
     private ISysBaseAPI sysBaseAPI;
     @Autowired
@@ -71,7 +71,7 @@ public class OnlCgreportHeadController {
         List var7 = null;
 
         try {
-            a.info("Online报表，sql解析：" + var1);
+            log.info("Online报表，sql解析：" + var1);
             this.baseCommonService.addLog("Online报表，sql解析：" + var1, 2, 2);
             SqlInjectionUtil.specialFilterContentForOnlineReport(var1);
             var6 = this.onlCgreportHeadService.getSqlFields(var1, var2);
@@ -106,7 +106,7 @@ public class OnlCgreportHeadController {
             var13.put("params", var5);
             return Result.OK(var13);
         } catch (Exception var12) {
-            a.error(var12.getMessage(), var12);
+            log.error(var12.getMessage(), var12);
             String var9 = "解析失败，";
             int var10 = var12.getMessage().indexOf("Connection refused: connect");
             if (var10 != -1) {
@@ -168,7 +168,7 @@ public class OnlCgreportHeadController {
             this.onlCgreportItemService.saveBatch(var6);
             var2.success("添加成功！");
         } catch (Exception var9) {
-            a.error(var9.getMessage(), var9);
+            log.error(var9.getMessage(), var9);
             var2.error500("操作失败");
         }
 
@@ -180,7 +180,7 @@ public class OnlCgreportHeadController {
         try {
             return this.onlCgreportHeadService.editAll(var1);
         } catch (Exception var3) {
-            a.error(var3.getMessage(), var3);
+            log.error(var3.getMessage(), var3);
             return Result.error("操作失败");
         }
     }

jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/controller/OnlCgreportItemController.java

@@ -11,8 +11,7 @@ import com.jero.common.api.vo.Result;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.generater.modules.online.cgreport.entity.OnlCgreportItem;
 import com.jero.generater.modules.online.cgreport.service.IOnlCgreportItemService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -25,8 +24,9 @@ import org.springframework.web.bind.annotation.RestController;
 
 @RestController("onlCgreportItemController")
 @RequestMapping({"/online/cgreport/item"})
+@Slf4j
 public class OnlCgreportItemController {
-    private static final Logger a = LoggerFactory.getLogger(OnlCgreportItemController.class);
+
     @Autowired
     private IOnlCgreportItemService onlCgreportItemService;
 

jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/controller/OnlCgreportParamController.java

@@ -11,8 +11,7 @@ import com.jero.common.api.vo.Result;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.generater.modules.online.cgreport.entity.OnlCgreportParam;
 import com.jero.generater.modules.online.cgreport.service.IOnlCgreportParamService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -25,8 +24,9 @@ import org.springframework.web.bind.annotation.RestController;
 
 @RestController("onlCgreportParamController")
 @RequestMapping({"/online/cgreport/param"})
+@Slf4j
 public class OnlCgreportParamController {
-    private static final Logger a = LoggerFactory.getLogger(OnlCgreportParamController.class);
+
     @Autowired
     private IOnlCgreportParamService onlCgreportParamService;
 

jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/service/a/CgReportExcelServiceImpl.java

@@ -5,6 +5,8 @@ import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+
+import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.hssf.usermodel.HSSFCellStyle;
 import org.apache.poi.hssf.usermodel.HSSFRichTextString;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
@@ -16,13 +18,11 @@ import org.apache.poi.ss.usermodel.HorizontalAlignment;
 import org.apache.poi.ss.usermodel.IndexedColors;
 import org.apache.poi.ss.usermodel.Row;
 import com.jero.generater.modules.online.cgreport.service.CgReportExcelServiceI;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 @Service("cgReportExcelService")
+@Slf4j
 public class CgReportExcelServiceImpl implements CgReportExcelServiceI {
-    private static final Logger a = LoggerFactory.getLogger(CgReportExcelServiceImpl.class);
 
     public CgReportExcelServiceImpl() {
     }
@@ -82,7 +82,7 @@ public class CgReportExcelServiceImpl implements CgReportExcelServiceI {
                 var5.autoSizeColumn(var22);
             }
         } catch (Exception var20) {
-            a.error(var20.getMessage(), var20);
+            log.error(var20.getMessage(), var20);
         }
 
         return var4;

jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/service/a/OnlCgreportHeadServiceImpl.java

@@ -16,6 +16,8 @@ import java.util.Map;
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import com.jero.common.api.vo.Result;
 import com.jero.common.exception.JeroBootException;
@@ -40,15 +42,14 @@ import com.jero.generater.modules.online.cgreport.util.CgReportQueryParamUtil;
 import com.jero.generater.modules.online.cgreport.util.SqlUtil;
 import com.jero.generater.modules.online.config.util.DbTableUtil;
 import com.jero.generater.modules.online.config.exception.DBException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 @Service("onlCgreportHeadServiceImpl")
+@Slf4j
 public class OnlCgreportHeadServiceImpl extends ServiceImpl<OnlCgreportHeadMapper, OnlCgreportHead> implements IOnlCgreportHeadService {
-    private static final Logger a = LoggerFactory.getLogger(OnlCgreportHeadServiceImpl.class);
+
     @Autowired
     private IOnlCgreportParamService onlCgreportParamService;
     @Autowired
@@ -119,7 +120,7 @@ public class OnlCgreportHeadServiceImpl extends ServiceImpl<OnlCgreportHeadMappe
                 var15 = var15 + " order by jero_rp_temp." + var16.toString() + " " + params.get("order").toString();
             }
 
-            a.info("报表查询sql=>\r\n" + var15);
+            log.info("报表查询sql=>\r\n" + var15);
             Object var17;
             if (Boolean.valueOf(String.valueOf(params.get("getAll")))) {
                 List var18 = this.mapper.executeSelect(var15);
@@ -142,7 +143,7 @@ public class OnlCgreportHeadServiceImpl extends ServiceImpl<OnlCgreportHeadMappe
         String var7 = (String)params.get("column");
         int var8 = oConvertUtils.getInt(params.get("pageNo"), 1);
         int var9 = oConvertUtils.getInt(params.get("pageSize"), 10);
-        a.info("【Online多数据源逻辑】报表查询参数params: " + JSON.toJSONString(params));
+        log.info("【Online多数据源逻辑】报表查询参数params: " + JSON.toJSONString(params));
         LambdaQueryWrapper<OnlCgreportParam> var10 = new LambdaQueryWrapper();
         var10.eq(OnlCgreportParam::getCgrheadId, onlCgreportHeadId);
         List var11 = this.onlCgreportParamService.list(var10);
@@ -184,9 +185,9 @@ public class OnlCgreportHeadServiceImpl extends ServiceImpl<OnlCgreportHeadMappe
                 var20 = SqlUtils.createPageSqlByDBType(var5.getDbType(), var17, var8, var9);
             }
 
-            a.info("多数据源 报表查询sql=>querySql: " + var17);
-            a.info("多数据源 报表查询sql=>pageSQL: " + var20);
-            a.info("多数据源 报表查询sql=>countSql: " + var18);
+            log.info("多数据源 报表查询sql=>querySql: " + var17);
+            log.info("多数据源 报表查询sql=>pageSQL: " + var20);
+            log.info("多数据源 报表查询sql=>countSql: " + var18);
             HashMap var21 = new HashMap();
             Map var22 = (Map)DynamicDBUtil.findOne(dbKey, var18, new Object[0]);
             var21.put("total", var22.get("total"));
@@ -315,7 +316,7 @@ public class OnlCgreportHeadServiceImpl extends ServiceImpl<OnlCgreportHeadMappe
             var1 = SqlUtil.a(var1);
             Set var3;
             if (StringUtils.isNotBlank(var2)) {
-                a.info("parse sql : " + var1);
+                log.info("parse sql : " + var1);
                 DynamicDataSourceModel var4 = DataSourceCachePool.getCacheDynamicDataSourceModel(var2);
                 if (ReUtil.contains(" order\\s+by ", var1.toLowerCase()) && "3".equalsIgnoreCase(var4.getDbType())) {
                     throw new JeroBootException("SqlServer不支持SQL内排序!");
@@ -329,7 +330,7 @@ public class OnlCgreportHeadServiceImpl extends ServiceImpl<OnlCgreportHeadMappe
                     var1 = "SELECT TOP 1 * FROM (" + var1 + ") temp";
                 }
 
-                a.info("parse sql with page : " + var1);
+                log.info("parse sql with page : " + var1);
                 Map var5 = (Map)DynamicDBUtil.findOne(var2, var1, new Object[0]);
                 if (var5 == null) {
                     throw new JeroBootException("该报表sql没有数据");
@@ -337,7 +338,7 @@ public class OnlCgreportHeadServiceImpl extends ServiceImpl<OnlCgreportHeadMappe
 
                 var3 = var5.keySet();
             } else {
-                a.info("parse sql: " + var1);
+                log.info("parse sql: " + var1);
                 String var8 = null;
 
                 try {

jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/util/CgReportQueryParamUtil.java

@@ -19,11 +19,10 @@ import com.jero.generater.modules.online.cgform.util.CgformUtil;
 import com.jero.generater.modules.online.cgreport.entity.OnlCgreportItem;
 import com.jero.generater.modules.online.config.util.DbTableUtil;
 import com.jero.generater.modules.online.config.exception.DBException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 
+@Slf4j
 public class CgReportQueryParamUtil {
-    private static final Logger a = LoggerFactory.getLogger(CgReportQueryParamUtil.class);
 
     public CgReportQueryParamUtil() {
     }
@@ -49,7 +48,7 @@ public class CgReportQueryParamUtil {
                     var7 = var9;
                 }
             } catch (UnsupportedEncodingException var10) {
-                a.error(var10.getMessage(), var10);
+                log.error(var10.getMessage(), var10);
                 return;
             }
 

jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/util/SqlUtil.java

@@ -11,11 +11,11 @@ import java.util.regex.Pattern;
 import javax.servlet.http.HttpServletRequest;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.common.util.oConvertUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 
+@Slf4j
 public class SqlUtil {
-    private static final Logger m = LoggerFactory.getLogger(SqlUtil.class);
+
     public static final String a = "select * from ( {0}) sel_tab00 limit {1},{2}";
     public static final String b = "select * from ( {0}) sel_tab00 limit {2} offset {1}";
     public static final String c = "select * from (select row_.*,rownum rownum_ from ({0}) row_ where rownum <= {1}) where rownum_>{2}";
@@ -140,9 +140,9 @@ public class SqlUtil {
         String var1 = "(\\w|\\.)+ *\\S+ *\\S*\\$\\{\\w+\\}\\S*";
         Pattern var2 = Pattern.compile(var1);
 
-        for(Matcher var3 = var2.matcher(var0); var3.find(); m.info("${}替换后结果 ==>" + var0)) {
+        for(Matcher var3 = var2.matcher(var0); var3.find(); log.info("${}替换后结果 ==>" + var0)) {
             String var4 = var3.group();
-            m.info("${}匹配带参SQL片段 ==>" + var4);
+            log.info("${}匹配带参SQL片段 ==>" + var4);
             if (var4.indexOf("where") != -1) {
                 var0 = var0.replace(var4, "where 1=1");
             } else if (var4.indexOf("and") != -1) {

jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/config/util/DbTableProcess.java

@@ -18,6 +18,8 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.hibernate.HibernateException;
 import org.hibernate.Session;
@@ -34,11 +36,10 @@ import com.jero.generater.modules.online.config.config.CgformConfigModel;
 import com.jero.generater.modules.online.config.config.DataBaseConfig;
 import com.jero.generater.modules.online.config.exception.DBException;
 import com.jero.generater.modules.online.config.service.DbTableHandleI;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
+@Slf4j
 public class DbTableProcess {
-    private static final Logger a = LoggerFactory.getLogger(DbTableProcess.class);
+
     private static final String b = "com/jero/generater/modules/online/config/engine/tableTemplate.ftl";
     private static DbTableHandleI c;
 
@@ -64,18 +65,18 @@ public class DbTableProcess {
         }
 
         String var15 = FreemarkerHelper.a("com/jero/generater/modules/online/config/engine/tableTemplate.ftl", a(var0, var1));
-        a.info(var15);
+        log.info(var15);
         HashMap var16 = new HashMap();
         DataBaseConfig var17 = var0.getDbConfig();
         var16.put("hibernate.connection.driver_class", var17.getDriverClassName());
         var16.put("hibernate.connection.url", var17.getUrl());
         var16.put("hibernate.connection.username", var17.getUsername());
         if (var17.getDruid() != null && oConvertUtils.isNotEmpty(var17.getDruid().getPublicKey())) {
-            a.info(" dbconfig.getDruid().getPublicKey() = " + var17.getDruid().getPublicKey());
+            log.info(" dbconfig.getDruid().getPublicKey() = " + var17.getDruid().getPublicKey());
 
             try {
                 String var5 = ConfigTools.decrypt(var17.getDruid().getPublicKey(), var17.getPassword());
-                a.info(" 解密密码 decryptPassword = " + var5);
+                log.info(" 解密密码 decryptPassword = " + var5);
                 var16.put("hibernate.connection.password", var5);
             } catch (Exception var14) {
                 var14.printStackTrace();
@@ -119,7 +120,7 @@ public class DbTableProcess {
                     throw new DBException(var12.getCause().getMessage());
                 }
 
-                a.error(var12.getMessage());
+                log.error(var12.getMessage());
                 continue;
             }
 
@@ -205,7 +206,7 @@ public class DbTableProcess {
             throw new RuntimeException();
         }
 
-        a.info(" db update sql : " + var5.toString());
+        log.info(" db update sql : " + var5.toString());
         return var5;
     }
 
@@ -230,7 +231,7 @@ public class DbTableProcess {
         try {
             var4 = DbTableUtil.getConnection();
         } catch (Exception var21) {
-            a.error(var21.getMessage(), var21);
+            log.error(var21.getMessage(), var21);
         }
 
         DatabaseMetaData var5 = var4.getMetaData();
@@ -274,7 +275,7 @@ public class DbTableProcess {
             String var18 = var9.getString("COLUMN_DEF");
             String var19 = c(var18) == null ? "" : c(var18);
             var10.setFieldDefault(var19);
-            a.info("getColumnMetadataFormDataBase --->COLUMN_NAME:" + var11.toUpperCase() + " TYPE_NAME :" + var12 + " DECIMAL_DIGITS:" + var13 + " COLUMN_SIZE:" + var15);
+            log.info("getColumnMetadataFormDataBase --->COLUMN_NAME:" + var11.toUpperCase() + " TYPE_NAME :" + var12 + " DECIMAL_DIGITS:" + var13 + " COLUMN_SIZE:" + var15);
             var3.put(var11, var10);
         }
 
@@ -300,7 +301,7 @@ public class DbTableProcess {
             var4.setFieldDefault(c(var6.getDbDefaultVal()));
             var4.setPkType(var1.getJformPkType() == null ? "UUID" : var1.getJformPkType());
             var4.setOldColumnName(var6.getDbFieldNameOld() != null ? var6.getDbFieldNameOld().toLowerCase() : null);
-            a.info("getColumnMetadataFormCgForm ----> DbFieldName: " + var6.getDbFieldName().toLowerCase() + " | DbType: " + var6.getDbType().toLowerCase() + " | DbPointLength:" + var6.getDbPointLength() + " | DbLength:" + var6.getDbLength());
+            log.info("getColumnMetadataFormCgForm ----> DbFieldName: " + var6.getDbFieldName().toLowerCase() + " | DbType: " + var6.getDbType().toLowerCase() + " | DbPointLength:" + var6.getDbPointLength() + " | DbLength:" + var6.getDbLength());
             var2.put(var6.getDbFieldName().toLowerCase(), var4);
         }
 
@@ -395,7 +396,7 @@ public class DbTableProcess {
                 }
             }
         } catch (SQLException var10) {
-            a.error(var10.getMessage(), var10);
+            log.error(var10.getMessage(), var10);
         } finally {
             if (var1 != null) {
                 var1.close();

jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/config/util/DbTableUtil.java

@@ -9,6 +9,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import javax.sql.DataSource;
+
+import lombok.extern.slf4j.Slf4j;
 import org.hibernate.Session;
 import com.jero.common.util.SpringContextUtils;
 import com.jero.common.util.oConvertUtils;
@@ -20,11 +22,10 @@ import com.jero.generater.modules.online.config.service.a.DbTableMysqlHandleImpl
 import com.jero.generater.modules.online.config.service.a.DbTableOracleHandleImpl;
 import com.jero.generater.modules.online.config.service.a.DbTablePostgresHandleImpl;
 import com.jero.generater.modules.online.config.service.a.DbTableSQLServerHandleImpl;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
+@Slf4j
 public class DbTableUtil {
-    private static final Logger b = LoggerFactory.getLogger(DbTableUtil.class);
+
     public static String a = "";
 
     public DbTableUtil() {
@@ -132,7 +133,7 @@ public class DbTableUtil {
                     a = "ORACLE";
                 }
             } catch (Exception var7) {
-                b.error(var7.getMessage(), var7);
+                log.error(var7.getMessage(), var7);
             } finally {
                 var1.close();
             }
@@ -223,7 +224,7 @@ public class DbTableUtil {
             }
 
             if (var2.next()) {
-                b.info("数据库表：【" + var0 + "】已存在");
+                log.info("数据库表：【" + var0 + "】已存在");
                 var9 = true;
                 return var9;
             }
@@ -241,7 +242,7 @@ public class DbTableUtil {
                     var1.close();
                 }
             } catch (SQLException var19) {
-                b.error(var19.getMessage(), var19);
+                log.error(var19.getMessage(), var19);
             }
 
         }

jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/config/util/FreemarkerHelper.java

@@ -3,13 +3,14 @@ package com.jero.generater.modules.online.config.util;
 
 import freemarker.template.Configuration;
 import freemarker.template.Template;
+import lombok.extern.slf4j.Slf4j;
+
 import java.io.StringWriter;
 import java.util.Map;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
+@Slf4j
 public class FreemarkerHelper {
-    private static final Logger a = LoggerFactory.getLogger(FreemarkerHelper.class);
+
     private static Configuration b;
 
     public FreemarkerHelper() {
@@ -23,7 +24,7 @@ public class FreemarkerHelper {
             var4.process(var2, var3);
             return var3.toString();
         } catch (Exception var5) {
-            a.error(var5.getMessage(), var5);
+            log.error(var5.getMessage(), var5);
             return var5.toString();
         }
     }

jero-boot/jero-boot-base/pom.xml

@@ -17,7 +17,7 @@
         <module>jero-boot-base-core</module>
         <module>jero-boot-base-tools</module>
         <module>jero-boot-base-generater</module>
+        <module>jero-boot-base-generater-core</module>
     </modules>
 
-
 </project>

jero-boot/jero-boot-single-startup/src/main/resources/jero/jero_config.properties

@@ -13,7 +13,7 @@ source_root_package=src.main.java
 webroot_package=src.main.webapp
 
 #ftl resource url
-templatepath=/jero/code-template
+template_path=/jero/code-template
 system_encoding=utf-8
 
 #db Table id [User defined] 

jero-boot/jero-boot-single-startup/src/main/resources/jero/jero_database.properties

@@ -1,5 +1,5 @@
 #mysql
-diver_name=com.mysql.cj.jdbc.Driver
+driver_name=com.mysql.cj.jdbc.Driver
 url=jdbc:mysql://localhost:3306/jero-boot?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
 username=root
 password=root

jero-boot/pom.xml

@@ -39,7 +39,6 @@
 		<shiro.version>1.7.1</shiro.version>
 		<java-jwt.version>3.11.0</java-jwt.version>
 		<shiro-redis.version>3.1.0</shiro-redis.version>
-		<codegenerate.version>1.3.1</codegenerate.version>
 		<autopoi-web.version>1.2.5</autopoi-web.version>
 		<minio.version>8.0.3</minio.version>
 		<justauth-spring-boot-starter.version>1.3.4</justauth-spring-boot-starter.version>
@@ -54,7 +53,6 @@
 		<module>jero-boot-starter</module>
 		<!-- 单体应用启动类 -->
 		<module>jero-boot-single-startup</module>
-		<module>untitled</module>
 		<!--   需要微服务，请打开注释吗，并刷新maven
 		<module>jero-cloud-module</module>
 		-->