【fix sonar】config文件夹

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

@@ -23,9 +23,6 @@ public class CgformConfigModel {
     private String o;
     private DataBaseConfig p;
 
-    public CgformConfigModel() {
-    }
-
     public String getTableName() {
         return this.a;
     }

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

@@ -19,8 +19,6 @@ public class DataBaseConfig {
     private String d;
     private Druid e;
 
-    public DataBaseConfig() {
-    }
 
     public Druid getDruid() {
         return this.e == null ? this.dmDataBaseConfig.getDruid() : this.e;

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

@@ -15,9 +15,6 @@ public class DmDataBaseConfig {
     private String d;
     private Druid e;
 
-    public DmDataBaseConfig() {
-    }
-
     public Druid getDruid() {
         return this.e;
     }

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

@@ -4,9 +4,6 @@ package com.jero.generater.modules.online.config.config;
 public class Druid {
     private String a;
 
-    public Druid() {
-    }
-
     public String getPublicKey() {
         return this.a;
     }

jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/config/service/a/DbTableDmHandleImpl.java

@@ -6,35 +6,39 @@ import com.jero.generater.modules.online.config.util.ColumnMeta;
 import com.jero.generater.modules.online.config.service.DbTableHandleI;
 
 public class DbTableDmHandleImpl implements DbTableHandleI {
-    public DbTableDmHandleImpl() {
-    }
 
+    private static final String STRING = "string";
+    private static final String DOUBLE = "double";
+    private static final String NUMBER = " NUMBER(";
+
+
+    @Override
     public String getAddColumnSql(ColumnMeta columnMeta) {
         return " ADD  " + this.a(columnMeta) + "";
     }
-
+    @Override
     public String getReNameFieldName(ColumnMeta columnMeta) {
         return "RENAME COLUMN  " + columnMeta.getOldColumnName() + " TO " + columnMeta.getColumnName() + "";
     }
-
+    @Override
     public String getUpdateColumnSql(ColumnMeta cgformcolumnMeta, ColumnMeta datacolumnMeta) {
         return " MODIFY   " + this.a(cgformcolumnMeta, datacolumnMeta) + "";
     }
-
+    @Override
     public String getMatchClassTypeByDataType(String dataType, int digits) {
         String var3 = "";
         if (dataType.equalsIgnoreCase("varchar2")) {
-            var3 = "string";
+            var3 = STRING;
         }
 
         if (dataType.equalsIgnoreCase("nvarchar2")) {
-            var3 = "string";
+            var3 = STRING;
-        } else if (dataType.equalsIgnoreCase("double")) {
+        } else if (dataType.equalsIgnoreCase(DOUBLE)) {
-            var3 = "double";
+            var3 = DOUBLE;
         } else if (dataType.equalsIgnoreCase("number") && digits == 0) {
             var3 = "int";
         } else if (dataType.equalsIgnoreCase("number") && digits != 0) {
-            var3 = "double";
+            var3 = DOUBLE;
         } else if (dataType.equalsIgnoreCase("int")) {
             var3 = "int";
         } else if (dataType.equalsIgnoreCase("Date")) {
@@ -49,27 +53,27 @@ public class DbTableDmHandleImpl implements DbTableHandleI {
 
         return var3;
     }
-
+    @Override
     public String dropTableSQL(String tableName) {
         return " DROP TABLE  " + tableName.toLowerCase() + " ";
     }
-
+    @Override
     public String getDropColumnSql(String fieldName) {
         return " DROP COLUMN " + fieldName.toUpperCase() + "";
     }
 
     private String a(ColumnMeta var1) {
         String var2 = "";
-        if (var1.getColunmType().equalsIgnoreCase("string")) {
+        if (var1.getColunmType().equalsIgnoreCase(STRING)) {
             var2 = var1.getColumnName() + " varchar2(" + var1.getColumnSize() + ")";
         } else if (var1.getColunmType().equalsIgnoreCase("date")) {
             var2 = var1.getColumnName() + " date";
         } else if (var1.getColunmType().equalsIgnoreCase("int")) {
-            var2 = var1.getColumnName() + " NUMBER(" + var1.getColumnSize() + ")";
+            var2 = var1.getColumnName() + NUMBER + var1.getColumnSize() + ")";
-        } else if (var1.getColunmType().equalsIgnoreCase("double")) {
+        } else if (var1.getColunmType().equalsIgnoreCase(DOUBLE)) {
-            var2 = var1.getColumnName() + " NUMBER(" + var1.getColumnSize() + "," + var1.getDecimalDigits() + ")";
+            var2 = var1.getColumnName() + NUMBER + var1.getColumnSize() + "," + var1.getDecimalDigits() + ")";
         } else if (var1.getColunmType().equalsIgnoreCase("bigdecimal")) {
-            var2 = var1.getColumnName() + " NUMBER(" + var1.getColumnSize() + "," + var1.getDecimalDigits() + ")";
+            var2 = var1.getColumnName() + NUMBER + var1.getColumnSize() + "," + var1.getDecimalDigits() + ")";
         } else if (var1.getColunmType().equalsIgnoreCase("text")) {
             var2 = var1.getColumnName() + " CLOB ";
         } else if (var1.getColunmType().equalsIgnoreCase("blob")) {
@@ -88,16 +92,16 @@ public class DbTableDmHandleImpl implements DbTableHandleI {
             var4 = var1.getIsNullable().equals("Y") ? "NULL" : "NOT NULL";
         }
 
-        if (var1.getColunmType().equalsIgnoreCase("string")) {
+        if (var1.getColunmType().equalsIgnoreCase(STRING)) {
             var3 = var1.getColumnName() + " varchar2(" + var1.getColumnSize() + ")" + var4;
         } else if (var1.getColunmType().equalsIgnoreCase("date")) {
             var3 = var1.getColumnName() + " date " + var4;
         } else if (var1.getColunmType().equalsIgnoreCase("int")) {
-            var3 = var1.getColumnName() + " NUMBER(" + var1.getColumnSize() + ") " + var4;
+            var3 = var1.getColumnName() + NUMBER + var1.getColumnSize() + ") " + var4;
-        } else if (var1.getColunmType().equalsIgnoreCase("double")) {
+        } else if (var1.getColunmType().equalsIgnoreCase(DOUBLE)) {
-            var3 = var1.getColumnName() + " NUMBER(" + var1.getColumnSize() + "," + var1.getDecimalDigits() + ") " + var4;
+            var3 = var1.getColumnName() + NUMBER + var1.getColumnSize() + "," + var1.getDecimalDigits() + ") " + var4;
         } else if (var1.getColunmType().equalsIgnoreCase("bigdecimal")) {
-            var3 = var1.getColumnName() + " NUMBER(" + var1.getColumnSize() + "," + var1.getDecimalDigits() + ") " + var4;
+            var3 = var1.getColumnName() + NUMBER + var1.getColumnSize() + "," + var1.getDecimalDigits() + ") " + var4;
         } else if (var1.getColunmType().equalsIgnoreCase("blob")) {
             var3 = var1.getColumnName() + " BLOB " + var4;
         } else if (var1.getColunmType().equalsIgnoreCase("text")) {
@@ -108,19 +112,22 @@ public class DbTableDmHandleImpl implements DbTableHandleI {
         var3 = var3 + var4;
         return var3;
     }
-
+    @Override
     public String getCommentSql(ColumnMeta columnMeta) {
         return "COMMENT ON COLUMN " + columnMeta.getTableName() + "." + columnMeta.getColumnName() + " IS '" + columnMeta.getComment() + "'";
     }
 
+    @Override
     public String getSpecialHandle(ColumnMeta cgformcolumnMeta, ColumnMeta datacolumnMeta) {
         return null;
     }
 
+    @Override
     public String dropIndexs(String indexName, String tableName) {
         return "DROP INDEX " + indexName;
     }
 
+    @Override
     public String countIndex(String indexName, String tableName) {
         return "select count(*) from user_ind_columns where index_name=upper('" + indexName + "')";
     }

jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/config/service/a/DbTableMysqlHandleImpl.java

@@ -6,27 +6,29 @@ import com.jero.generater.modules.online.config.util.ColumnMeta;
 import com.jero.generater.modules.online.config.service.DbTableHandleI;
 
 public class DbTableMysqlHandleImpl implements DbTableHandleI {
-    public DbTableMysqlHandleImpl() {
-    }
 
+    private static final String DOUBLE = "double";
+    private static final String NOT_NULL = "NOT NULL";
+
+    @Override
     public String getAddColumnSql(ColumnMeta columnMeta) {
         return " ADD COLUMN " + this.a(columnMeta) + ";";
     }
-
+    @Override
     public String getReNameFieldName(ColumnMeta columnMeta) {
         return "CHANGE COLUMN " + columnMeta.getOldColumnName() + " " + this.b(columnMeta) + " ;";
     }
-
+    @Override
     public String getUpdateColumnSql(ColumnMeta cgformcolumnMeta, ColumnMeta datacolumnMeta) {
         return " MODIFY COLUMN " + this.b(cgformcolumnMeta, datacolumnMeta) + ";";
     }
-
+    @Override
     public String getMatchClassTypeByDataType(String dataType, int digits) {
         String var3 = "";
         if (dataType.equalsIgnoreCase("varchar")) {
             var3 = "string";
-        } else if (dataType.equalsIgnoreCase("double")) {
+        } else if (dataType.equalsIgnoreCase(DOUBLE)) {
-            var3 = "double";
+            var3 = DOUBLE;
         } else if (dataType.equalsIgnoreCase("int")) {
             var3 = "int";
         } else if (dataType.equalsIgnoreCase("Date")) {
@@ -43,11 +45,11 @@ public class DbTableMysqlHandleImpl implements DbTableHandleI {
 
         return var3;
     }
-
+    @Override
     public String dropTableSQL(String tableName) {
         return " DROP TABLE IF EXISTS " + tableName + " ;";
     }
-
+    @Override
     public String getDropColumnSql(String fieldName) {
         return " DROP COLUMN " + fieldName + ";";
     }
@@ -55,19 +57,19 @@ public class DbTableMysqlHandleImpl implements DbTableHandleI {
     private String a(ColumnMeta var1, ColumnMeta var2) {
         String var3 = "";
         if (var1.getColunmType().equalsIgnoreCase("string")) {
-            var3 = var1.getColumnName() + " varchar(" + var1.getColumnSize() + ") " + ("Y".equals(var1.getIsNullable()) ? "NULL" : "NOT NULL");
+            var3 = var1.getColumnName() + " varchar(" + var1.getColumnSize() + ") " + ("Y".equals(var1.getIsNullable()) ? "NULL" : NOT_NULL);
         } else if (var1.getColunmType().equalsIgnoreCase("date")) {
-            var3 = var1.getColumnName() + " datetime " + ("Y".equals(var1.getIsNullable()) ? "NULL" : "NOT NULL");
+            var3 = var1.getColumnName() + " datetime " + ("Y".equals(var1.getIsNullable()) ? "NULL" : NOT_NULL);
         } else if (var1.getColunmType().equalsIgnoreCase("int")) {
-            var3 = var1.getColumnName() + " int(" + var1.getColumnSize() + ") " + ("Y".equals(var1.getIsNullable()) ? "NULL" : "NOT NULL");
+            var3 = var1.getColumnName() + " int(" + var1.getColumnSize() + ") " + ("Y".equals(var1.getIsNullable()) ? "NULL" : NOT_NULL);
-        } else if (var1.getColunmType().equalsIgnoreCase("double")) {
+        } else if (var1.getColunmType().equalsIgnoreCase(DOUBLE)) {
-            var3 = var1.getColumnName() + " double(" + var1.getColumnSize() + "," + var1.getDecimalDigits() + ") " + ("Y".equals(var1.getIsNullable()) ? "NULL" : "NOT NULL");
+            var3 = var1.getColumnName() + " double(" + var1.getColumnSize() + "," + var1.getDecimalDigits() + ") " + ("Y".equals(var1.getIsNullable()) ? "NULL" : NOT_NULL);
         } else if (var1.getColunmType().equalsIgnoreCase("bigdecimal")) {
-            var3 = var1.getColumnName() + " decimal(" + var1.getColumnSize() + "," + var1.getDecimalDigits() + ") " + ("Y".equals(var1.getIsNullable()) ? "NULL" : "NOT NULL");
+            var3 = var1.getColumnName() + " decimal(" + var1.getColumnSize() + "," + var1.getDecimalDigits() + ") " + ("Y".equals(var1.getIsNullable()) ? "NULL" : NOT_NULL);
         } else if (var1.getColunmType().equalsIgnoreCase("text")) {
-            var3 = var1.getColumnName() + " text " + ("Y".equals(var1.getIsNullable()) ? "NULL" : "NOT NULL");
+            var3 = var1.getColumnName() + " text " + ("Y".equals(var1.getIsNullable()) ? "NULL" : NOT_NULL);
         } else if (var1.getColunmType().equalsIgnoreCase("blob")) {
-            var3 = var1.getColumnName() + " blob " + ("Y".equals(var1.getIsNullable()) ? "NULL" : "NOT NULL");
+            var3 = var1.getColumnName() + " blob " + ("Y".equals(var1.getIsNullable()) ? "NULL" : NOT_NULL);
         }
 
         var3 = var3 + (StringUtils.isNotEmpty(var1.getComment()) ? " COMMENT '" + var1.getComment() + "'" : " ");
@@ -81,32 +83,29 @@ public class DbTableMysqlHandleImpl implements DbTableHandleI {
     }
 
     private String b(ColumnMeta var1, ColumnMeta var2) {
-        String var3 = this.a(var1, var2);
+        return this.a(var1, var2);
-        return var3;
     }
 
     private String a(ColumnMeta var1) {
-        String var2 = this.a(var1, (ColumnMeta)null);
+        return this.a(var1, null);
-        return var2;
     }
 
     private String b(ColumnMeta var1) {
-        String var2 = this.a(var1, (ColumnMeta)null);
+        return this.a(var1, null);
-        return var2;
     }
-
+    @Override
     public String getCommentSql(ColumnMeta columnMeta) {
         return "";
     }
-
+    @Override
     public String getSpecialHandle(ColumnMeta cgformcolumnMeta, ColumnMeta datacolumnMeta) {
         return null;
     }
-
+    @Override
     public String dropIndexs(String indexName, String tableName) {
         return "DROP INDEX " + indexName + " ON " + tableName;
     }
-
+    @Override
     public String countIndex(String indexName, String tableName) {
         return "select COUNT(*) from information_schema.statistics where table_name = '" + tableName + "'  AND index_name = '" + indexName + "'";
     }

jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/config/service/a/DbTableOracleHandleImpl.java

@@ -6,35 +6,38 @@ import com.jero.generater.modules.online.config.util.ColumnMeta;
 import com.jero.generater.modules.online.config.service.DbTableHandleI;
 
 public class DbTableOracleHandleImpl implements DbTableHandleI {
-    public DbTableOracleHandleImpl() {
-    }
 
+    private static final String STRING = "string";
+    private static final String DOUBLE = "double";
+    private static final String NUMBER = " NUMBER(";
+
+    @Override
     public String getAddColumnSql(ColumnMeta columnMeta) {
         return " ADD  " + this.a(columnMeta) + "";
     }
-
+    @Override
     public String getReNameFieldName(ColumnMeta columnMeta) {
         return "RENAME COLUMN  " + columnMeta.getOldColumnName() + " TO " + columnMeta.getColumnName() + "";
     }
-
+    @Override
     public String getUpdateColumnSql(ColumnMeta cgformcolumnMeta, ColumnMeta datacolumnMeta) {
         return " MODIFY   " + this.a(cgformcolumnMeta, datacolumnMeta) + "";
     }
-
+    @Override
     public String getMatchClassTypeByDataType(String dataType, int digits) {
         String var3 = "";
         if (dataType.equalsIgnoreCase("varchar2")) {
-            var3 = "string";
+            var3 = STRING;
         }
 
         if (dataType.equalsIgnoreCase("nvarchar2")) {
-            var3 = "string";
+            var3 = STRING;
-        } else if (dataType.equalsIgnoreCase("double")) {
+        } else if (dataType.equalsIgnoreCase(DOUBLE)) {
-            var3 = "double";
+            var3 = DOUBLE;
         } else if (dataType.equalsIgnoreCase("number") && digits == 0) {
             var3 = "int";
         } else if (dataType.equalsIgnoreCase("number") && digits != 0) {
-            var3 = "double";
+            var3 = DOUBLE;
         } else if (dataType.equalsIgnoreCase("int")) {
             var3 = "int";
         } else if (dataType.equalsIgnoreCase("Date")) {
@@ -49,27 +52,27 @@ public class DbTableOracleHandleImpl implements DbTableHandleI {
 
         return var3;
     }
-
+    @Override
     public String dropTableSQL(String tableName) {
         return " DROP TABLE  " + tableName.toLowerCase() + " ";
     }
-
+    @Override
     public String getDropColumnSql(String fieldName) {
         return " DROP COLUMN " + fieldName.toUpperCase() + "";
     }
 
     private String a(ColumnMeta var1) {
         String var2 = "";
-        if (var1.getColunmType().equalsIgnoreCase("string")) {
+        if (var1.getColunmType().equalsIgnoreCase(STRING)) {
             var2 = var1.getColumnName() + " varchar2(" + var1.getColumnSize() + ")";
         } else if (var1.getColunmType().equalsIgnoreCase("date")) {
             var2 = var1.getColumnName() + " date";
         } else if (var1.getColunmType().equalsIgnoreCase("int")) {
-            var2 = var1.getColumnName() + " NUMBER(" + var1.getColumnSize() + ")";
+            var2 = var1.getColumnName() + NUMBER + var1.getColumnSize() + ")";
-        } else if (var1.getColunmType().equalsIgnoreCase("double")) {
+        } else if (var1.getColunmType().equalsIgnoreCase(DOUBLE)) {
-            var2 = var1.getColumnName() + " NUMBER(" + var1.getColumnSize() + "," + var1.getDecimalDigits() + ")";
+            var2 = var1.getColumnName() + NUMBER + var1.getColumnSize() + "," + var1.getDecimalDigits() + ")";
         } else if (var1.getColunmType().equalsIgnoreCase("bigdecimal")) {
-            var2 = var1.getColumnName() + " NUMBER(" + var1.getColumnSize() + "," + var1.getDecimalDigits() + ")";
+            var2 = var1.getColumnName() + NUMBER + var1.getColumnSize() + "," + var1.getDecimalDigits() + ")";
         } else if (var1.getColunmType().equalsIgnoreCase("text")) {
             var2 = var1.getColumnName() + " CLOB ";
         } else if (var1.getColunmType().equalsIgnoreCase("blob")) {
@@ -88,16 +91,16 @@ public class DbTableOracleHandleImpl implements DbTableHandleI {
             var4 = var1.getIsNullable().equals("Y") ? "NULL" : "NOT NULL";
         }
 
-        if (var1.getColunmType().equalsIgnoreCase("string")) {
+        if (var1.getColunmType().equalsIgnoreCase(STRING)) {
             var3 = var1.getColumnName() + " varchar2(" + var1.getColumnSize() + ")" + var4;
         } else if (var1.getColunmType().equalsIgnoreCase("date")) {
             var3 = var1.getColumnName() + " date " + var4;
         } else if (var1.getColunmType().equalsIgnoreCase("int")) {
-            var3 = var1.getColumnName() + " NUMBER(" + var1.getColumnSize() + ") " + var4;
+            var3 = var1.getColumnName() + NUMBER + var1.getColumnSize() + ") " + var4;
-        } else if (var1.getColunmType().equalsIgnoreCase("double")) {
+        } else if (var1.getColunmType().equalsIgnoreCase(DOUBLE)) {
-            var3 = var1.getColumnName() + " NUMBER(" + var1.getColumnSize() + "," + var1.getDecimalDigits() + ") " + var4;
+            var3 = var1.getColumnName() + NUMBER + var1.getColumnSize() + "," + var1.getDecimalDigits() + ") " + var4;
         } else if (var1.getColunmType().equalsIgnoreCase("bigdecimal")) {
-            var3 = var1.getColumnName() + " NUMBER(" + var1.getColumnSize() + "," + var1.getDecimalDigits() + ") " + var4;
+            var3 = var1.getColumnName() + NUMBER + var1.getColumnSize() + "," + var1.getDecimalDigits() + ") " + var4;
         } else if (var1.getColunmType().equalsIgnoreCase("blob")) {
             var3 = var1.getColumnName() + " BLOB " + var4;
         } else if (var1.getColunmType().equalsIgnoreCase("text")) {
@@ -108,19 +111,19 @@ public class DbTableOracleHandleImpl implements DbTableHandleI {
         var3 = var3 + var4;
         return var3;
     }
-
+    @Override
     public String getCommentSql(ColumnMeta columnMeta) {
         return "COMMENT ON COLUMN " + columnMeta.getTableName() + "." + columnMeta.getColumnName() + " IS '" + columnMeta.getComment() + "'";
     }
-
+    @Override
     public String getSpecialHandle(ColumnMeta cgformcolumnMeta, ColumnMeta datacolumnMeta) {
         return null;
     }
-
+    @Override
     public String dropIndexs(String indexName, String tableName) {
         return "DROP INDEX " + indexName;
     }
-
+    @Override
     public String countIndex(String indexName, String tableName) {
         return "select count(*) from user_ind_columns where index_name=upper('" + indexName + "')";
     }

jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/config/service/a/DbTablePostgresHandleImpl.java

@@ -7,31 +7,39 @@ import com.jero.generater.modules.online.config.exception.DBException;
 import com.jero.generater.modules.online.config.service.DbTableHandleI;
 
 public class DbTablePostgresHandleImpl implements DbTableHandleI {
-    public DbTablePostgresHandleImpl() {
-    }
 
+    private static final String STRING = "string";
+    private static final String DOUBLE = "double";
+    private static final String BIG_DECIMAL = "bigdecimal";
+    private static final String SET_DEFAULT = " SET DEFAULT ";
+    private static final String DROP_DEFAULT = " DROP DEFAULT";
+
+
+
+    @Override
     public String getAddColumnSql(ColumnMeta columnMeta) {
         return " ADD COLUMN " + this.a(columnMeta) + ";";
     }
 
+    @Override
     public String getReNameFieldName(ColumnMeta columnMeta) {
         return " RENAME  COLUMN  " + columnMeta.getOldColumnName() + " to " + columnMeta.getColumnName() + ";";
     }
-
+    @Override
     public String getUpdateColumnSql(ColumnMeta cgformcolumnMeta, ColumnMeta datacolumnMeta) throws DBException {
         return "  ALTER  COLUMN   " + this.a(cgformcolumnMeta, datacolumnMeta) + ";";
     }
-
+    @Override
     public String getSpecialHandle(ColumnMeta cgformcolumnMeta, ColumnMeta datacolumnMeta) {
         return "  ALTER  COLUMN   " + this.b(cgformcolumnMeta, datacolumnMeta) + ";";
     }
-
+    @Override
     public String getMatchClassTypeByDataType(String dataType, int digits) {
         String var3 = "";
         if (dataType.equalsIgnoreCase("varchar")) {
-            var3 = "string";
+            var3 = STRING;
-        } else if (dataType.equalsIgnoreCase("double")) {
+        } else if (dataType.equalsIgnoreCase(DOUBLE)) {
-            var3 = "double";
+            var3 = DOUBLE;
         } else if (dataType.contains("int")) {
             var3 = "int";
         } else if (dataType.equalsIgnoreCase("Date")) {
@@ -43,31 +51,31 @@ public class DbTablePostgresHandleImpl implements DbTableHandleI {
         } else if (dataType.equalsIgnoreCase("text")) {
             var3 = "text";
         } else if (dataType.equalsIgnoreCase("decimal")) {
-            var3 = "bigdecimal";
+            var3 = BIG_DECIMAL;
         } else if (dataType.equalsIgnoreCase("numeric")) {
-            var3 = "bigdecimal";
+            var3 = BIG_DECIMAL;
         }
 
         return var3;
     }
-
+    @Override
     public String dropTableSQL(String tableName) {
         return " DROP TABLE  " + tableName + " ;";
     }
-
+    @Override
     public String getDropColumnSql(String fieldName) {
         return " DROP COLUMN " + fieldName + ";";
     }
 
     private String a(ColumnMeta var1, ColumnMeta var2) throws DBException {
         String var3 = "";
-        if (var1.getColunmType().equalsIgnoreCase("string")) {
+        if (var1.getColunmType().equalsIgnoreCase(STRING)) {
             var3 = var1.getColumnName() + "  type character varying(" + var1.getColumnSize() + ") ";
         } else if (var1.getColunmType().equalsIgnoreCase("date")) {
             var3 = var1.getColumnName() + "  type timestamp ";
         } else if (var1.getColunmType().equalsIgnoreCase("int")) {
             var3 = var1.getColumnName() + " type int4 ";
-        } else if (var1.getColunmType().equalsIgnoreCase("double")) {
+        } else if (var1.getColunmType().equalsIgnoreCase(DOUBLE)) {
             var3 = var1.getColumnName() + " type  numeric(" + var1.getColumnSize() + "," + var1.getDecimalDigits() + ") ";
         } else if (var1.getColunmType().equalsIgnoreCase("BigDecimal")) {
             var3 = var1.getColumnName() + " type  decimal(" + var1.getColumnSize() + "," + var1.getDecimalDigits() + ") ";
@@ -82,26 +90,11 @@ public class DbTablePostgresHandleImpl implements DbTableHandleI {
 
     private String b(ColumnMeta var1, ColumnMeta var2) {
         String var3 = "";
-        if (!var1.a(var2)) {
+        if (!var1.a(var2) && (var1.getColunmType().equalsIgnoreCase(STRING) || var1.getColunmType().equalsIgnoreCase("date")
-            if (var1.getColunmType().equalsIgnoreCase("string")) {
+        || var1.getColunmType().equalsIgnoreCase("int") || var1.getColunmType().equalsIgnoreCase(DOUBLE)
-                var3 = var1.getColumnName();
+        || var1.getColunmType().equalsIgnoreCase(BIG_DECIMAL) || var1.getColunmType().equalsIgnoreCase("text"))) {
-                var3 = var3 + (StringUtils.isNotEmpty(var1.getFieldDefault()) ? " SET DEFAULT " + var1.getFieldDefault() : " DROP DEFAULT");
+            var3 = var1.getColumnName();
-            } else if (var1.getColunmType().equalsIgnoreCase("date")) {
+            var3 = var3 + (StringUtils.isNotEmpty(var1.getFieldDefault()) ? SET_DEFAULT + var1.getFieldDefault() : DROP_DEFAULT);
-                var3 = var1.getColumnName();
-                var3 = var3 + (StringUtils.isNotEmpty(var1.getFieldDefault()) ? " SET DEFAULT " + var1.getFieldDefault() : " DROP DEFAULT");
-            } else if (var1.getColunmType().equalsIgnoreCase("int")) {
-                var3 = var1.getColumnName();
-                var3 = var3 + (StringUtils.isNotEmpty(var1.getFieldDefault()) ? " SET DEFAULT " + var1.getFieldDefault() : " DROP DEFAULT");
-            } else if (var1.getColunmType().equalsIgnoreCase("double")) {
-                var3 = var1.getColumnName();
-                var3 = var3 + (StringUtils.isNotEmpty(var1.getFieldDefault()) ? " SET DEFAULT " + var1.getFieldDefault() : " DROP DEFAULT");
-            } else if (var1.getColunmType().equalsIgnoreCase("bigdecimal")) {
-                var3 = var1.getColumnName();
-                var3 = var3 + (StringUtils.isNotEmpty(var1.getFieldDefault()) ? " SET DEFAULT " + var1.getFieldDefault() : " DROP DEFAULT");
-            } else if (var1.getColunmType().equalsIgnoreCase("text")) {
-                var3 = var1.getColumnName();
-                var3 = var3 + (StringUtils.isNotEmpty(var1.getFieldDefault()) ? " SET DEFAULT " + var1.getFieldDefault() : " DROP DEFAULT");
-            }
         }
 
         return var3;
@@ -109,15 +102,15 @@ public class DbTablePostgresHandleImpl implements DbTableHandleI {
 
     private String a(ColumnMeta var1) {
         String var2 = "";
-        if (var1.getColunmType().equalsIgnoreCase("string")) {
+        if (var1.getColunmType().equalsIgnoreCase(STRING)) {
             var2 = var1.getColumnName() + " character varying(" + var1.getColumnSize() + ") ";
         } else if (var1.getColunmType().equalsIgnoreCase("date")) {
             var2 = var1.getColumnName() + " timestamp ";
         } else if (var1.getColunmType().equalsIgnoreCase("int")) {
             var2 = var1.getColumnName() + " int4";
-        } else if (var1.getColunmType().equalsIgnoreCase("double")) {
+        } else if (var1.getColunmType().equalsIgnoreCase(DOUBLE)) {
             var2 = var1.getColumnName() + " numeric(" + var1.getColumnSize() + "," + var1.getDecimalDigits() + ") ";
-        } else if (var1.getColunmType().equalsIgnoreCase("bigdecimal")) {
+        } else if (var1.getColunmType().equalsIgnoreCase(BIG_DECIMAL)) {
             var2 = var1.getColumnName() + " decimal(" + var1.getColumnSize() + "," + var1.getDecimalDigits() + ") ";
         } else if (var1.getColunmType().equalsIgnoreCase("blob")) {
             var2 = var1.getColumnName() + " bytea(" + var1.getColumnSize() + ") ";
@@ -131,27 +124,27 @@ public class DbTablePostgresHandleImpl implements DbTableHandleI {
 
     private String b(ColumnMeta var1) {
         String var2 = "";
-        if (var1.getColunmType().equalsIgnoreCase("string")) {
+        if (var1.getColunmType().equalsIgnoreCase(STRING)) {
             var2 = var1.getColumnName() + " character varying(" + var1.getColumnSize() + ") ";
         } else if (var1.getColunmType().equalsIgnoreCase("date")) {
             var2 = var1.getColumnName() + " datetime ";
         } else if (var1.getColunmType().equalsIgnoreCase("int")) {
             var2 = var1.getColumnName() + " int(" + var1.getColumnSize() + ") ";
-        } else if (var1.getColunmType().equalsIgnoreCase("double")) {
+        } else if (var1.getColunmType().equalsIgnoreCase(DOUBLE)) {
             var2 = var1.getColumnName() + " numeric(" + var1.getColumnSize() + "," + var1.getDecimalDigits() + ") ";
         }
 
         return var2;
     }
-
+    @Override
     public String getCommentSql(ColumnMeta columnMeta) {
         return "COMMENT ON COLUMN " + columnMeta.getTableName() + "." + columnMeta.getColumnName() + " IS '" + columnMeta.getComment() + "'";
     }
-
+    @Override
     public String dropIndexs(String indexName, String tableName) {
         return "DROP INDEX " + indexName;
     }
-
+    @Override
     public String countIndex(String indexName, String tableName) {
         return "SELECT count(*) FROM pg_indexes WHERE indexname = '" + indexName + "' and tablename = '" + tableName + "'";
     }

jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/config/service/a/DbTableSQLServerHandleImpl.java

@@ -6,26 +6,35 @@ import com.jero.generater.modules.online.config.util.ColumnMeta;
 import com.jero.generater.modules.online.config.service.DbTableHandleI;
 
 public class DbTableSQLServerHandleImpl implements DbTableHandleI {
-    public DbTableSQLServerHandleImpl() {
-    }
 
+    private static final String STRING = "string";
+    private static final String DOUBLE = "double";
+    private static final String BIG_DECIMAL = "bigdecimal";
+    private static final String NVARCHAR = " nvarchar(";
+    private static final String DATE_TIME = " datetime ";
+    private static final String INT = " int ";
+    private static final String FLOAT = " float ";
+    private static final String NOT_NULL = "NOT NULL";
+
+
+    @Override
     public String getAddColumnSql(ColumnMeta columnMeta) {
         return " ADD  " + this.a(columnMeta) + ";";
     }
-
+    @Override
     public String getReNameFieldName(ColumnMeta columnMeta) {
         return "  sp_rename '" + columnMeta.getTableName() + "." + columnMeta.getOldColumnName() + "', '" + columnMeta.getColumnName() + "', 'COLUMN';";
     }
-
+    @Override
     public String getUpdateColumnSql(ColumnMeta cgformcolumnMeta, ColumnMeta datacolumnMeta) {
         return " ALTER COLUMN  " + this.a(cgformcolumnMeta, datacolumnMeta) + ";";
     }
-
+    @Override
     public String getMatchClassTypeByDataType(String dataType, int digits) {
         String var3 = "";
         if (!dataType.equalsIgnoreCase("varchar") && !dataType.equalsIgnoreCase("nvarchar")) {
             if (dataType.equalsIgnoreCase("float")) {
-                var3 = "double";
+                var3 = DOUBLE;
             } else if (dataType.equalsIgnoreCase("int")) {
                 var3 = "int";
             } else if (dataType.equalsIgnoreCase("Date")) {
@@ -33,7 +42,7 @@ public class DbTableSQLServerHandleImpl implements DbTableHandleI {
             } else if (dataType.equalsIgnoreCase("Datetime")) {
                 var3 = "date";
             } else if (dataType.equalsIgnoreCase("numeric")) {
-                var3 = "bigdecimal";
+                var3 = BIG_DECIMAL;
             } else if (!dataType.equalsIgnoreCase("varbinary") && !dataType.equalsIgnoreCase("image")) {
                 if (dataType.equalsIgnoreCase("text") || dataType.equalsIgnoreCase("ntext")) {
                     var3 = "text";
@@ -42,34 +51,34 @@ public class DbTableSQLServerHandleImpl implements DbTableHandleI {
                 var3 = "blob";
             }
         } else {
-            var3 = "string";
+            var3 = STRING;
         }
 
         return var3;
     }
-
+    @Override
     public String dropTableSQL(String tableName) {
         return " DROP TABLE " + tableName + " ;";
     }
-
+    @Override
     public String getDropColumnSql(String fieldName) {
         return " DROP COLUMN " + fieldName + ";";
     }
 
     private String a(ColumnMeta var1, ColumnMeta var2) {
         String var3 = "";
-        if (var1.getColunmType().equalsIgnoreCase("string")) {
+        if (var1.getColunmType().equalsIgnoreCase(STRING)) {
-            var3 = var1.getColumnName() + " nvarchar(" + var1.getColumnSize() + ") " + ("Y".equals(var1.getIsNullable()) ? "NULL" : "NOT NULL");
+            var3 = var1.getColumnName() + NVARCHAR + var1.getColumnSize() + ") " + ("Y".equals(var1.getIsNullable()) ? "NULL" : NOT_NULL);
         } else if (var1.getColunmType().equalsIgnoreCase("date")) {
-            var3 = var1.getColumnName() + " datetime " + ("Y".equals(var1.getIsNullable()) ? "NULL" : "NOT NULL");
+            var3 = var1.getColumnName() + DATE_TIME + ("Y".equals(var1.getIsNullable()) ? "NULL" : NOT_NULL);
         } else if (var1.getColunmType().equalsIgnoreCase("int")) {
-            var3 = var1.getColumnName() + " int " + ("Y".equals(var1.getIsNullable()) ? "NULL" : "NOT NULL");
+            var3 = var1.getColumnName() + INT + ("Y".equals(var1.getIsNullable()) ? "NULL" : NOT_NULL);
-        } else if (var1.getColunmType().equalsIgnoreCase("double")) {
+        } else if (var1.getColunmType().equalsIgnoreCase(DOUBLE)) {
-            var3 = var1.getColumnName() + " float " + ("Y".equals(var1.getIsNullable()) ? "NULL" : "NOT NULL");
+            var3 = var1.getColumnName() + FLOAT + ("Y".equals(var1.getIsNullable()) ? "NULL" : NOT_NULL);
-        } else if (var1.getColunmType().equalsIgnoreCase("bigdecimal")) {
+        } else if (var1.getColunmType().equalsIgnoreCase(BIG_DECIMAL)) {
-            var3 = var1.getColumnName() + " numeric(" + var1.getColumnSize() + "," + var1.getDecimalDigits() + ") " + ("Y".equals(var1.getIsNullable()) ? "NULL" : "NOT NULL");
+            var3 = var1.getColumnName() + " numeric(" + var1.getColumnSize() + "," + var1.getDecimalDigits() + ") " + ("Y".equals(var1.getIsNullable()) ? "NULL" : NOT_NULL);
         } else if (var1.getColunmType().equalsIgnoreCase("text")) {
-            var3 = var1.getColumnName() + " ntext " + ("Y".equals(var1.getIsNullable()) ? "NULL" : "NOT NULL");
+            var3 = var1.getColumnName() + " ntext " + ("Y".equals(var1.getIsNullable()) ? "NULL" : NOT_NULL);
         } else if (var1.getColunmType().equalsIgnoreCase("blob")) {
             var3 = var1.getColumnName() + " image";
         }
@@ -79,18 +88,18 @@ public class DbTableSQLServerHandleImpl implements DbTableHandleI {
 
     private String a(ColumnMeta var1) {
         String var2 = "";
-        if (var1.getColunmType().equalsIgnoreCase("string")) {
+        if (var1.getColunmType().equalsIgnoreCase(STRING)) {
-            var2 = var1.getColumnName() + " nvarchar(" + var1.getColumnSize() + ") " + ("Y".equals(var1.getIsNullable()) ? "NULL" : "NOT NULL");
+            var2 = var1.getColumnName() + NVARCHAR + var1.getColumnSize() + ") " + ("Y".equals(var1.getIsNullable()) ? "NULL" : NOT_NULL);
         } else if (var1.getColunmType().equalsIgnoreCase("date")) {
-            var2 = var1.getColumnName() + " datetime " + ("Y".equals(var1.getIsNullable()) ? "NULL" : "NOT NULL");
+            var2 = var1.getColumnName() + DATE_TIME + ("Y".equals(var1.getIsNullable()) ? "NULL" : NOT_NULL);
         } else if (var1.getColunmType().equalsIgnoreCase("int")) {
-            var2 = var1.getColumnName() + " int " + ("Y".equals(var1.getIsNullable()) ? "NULL" : "NOT NULL");
+            var2 = var1.getColumnName() + INT + ("Y".equals(var1.getIsNullable()) ? "NULL" : NOT_NULL);
-        } else if (var1.getColunmType().equalsIgnoreCase("double")) {
+        } else if (var1.getColunmType().equalsIgnoreCase(DOUBLE)) {
-            var2 = var1.getColumnName() + " float " + ("Y".equals(var1.getIsNullable()) ? "NULL" : "NOT NULL");
+            var2 = var1.getColumnName() + FLOAT + ("Y".equals(var1.getIsNullable()) ? "NULL" : NOT_NULL);
-        } else if (var1.getColunmType().equalsIgnoreCase("bigdecimal")) {
+        } else if (var1.getColunmType().equalsIgnoreCase(BIG_DECIMAL)) {
-            var2 = var1.getColumnName() + " numeric(" + var1.getColumnSize() + "," + var1.getDecimalDigits() + ") " + ("Y".equals(var1.getIsNullable()) ? "NULL" : "NOT NULL");
+            var2 = var1.getColumnName() + " numeric(" + var1.getColumnSize() + "," + var1.getDecimalDigits() + ") " + ("Y".equals(var1.getIsNullable()) ? "NULL" : NOT_NULL);
         } else if (var1.getColunmType().equalsIgnoreCase("text")) {
-            var2 = var1.getColumnName() + " ntext " + ("Y".equals(var1.getIsNullable()) ? "NULL" : "NOT NULL");
+            var2 = var1.getColumnName() + " ntext " + ("Y".equals(var1.getIsNullable()) ? "NULL" : NOT_NULL);
         } else if (var1.getColunmType().equalsIgnoreCase("blob")) {
             var2 = var1.getColumnName() + " image";
         }
@@ -100,21 +109,21 @@ public class DbTableSQLServerHandleImpl implements DbTableHandleI {
 
     private String b(ColumnMeta var1) {
         String var2 = "";
-        if (var1.getColunmType().equalsIgnoreCase("string")) {
+        if (var1.getColunmType().equalsIgnoreCase(STRING)) {
-            var2 = var1.getColumnName() + " nvarchar(" + var1.getColumnSize() + ") " + ("Y".equals(var1.getIsNullable()) ? "NULL" : "NOT NULL");
+            var2 = var1.getColumnName() + NVARCHAR + var1.getColumnSize() + ") " + ("Y".equals(var1.getIsNullable()) ? "NULL" : NOT_NULL);
         } else if (var1.getColunmType().equalsIgnoreCase("date")) {
-            var2 = var1.getColumnName() + " datetime " + ("Y".equals(var1.getIsNullable()) ? "NULL" : "NOT NULL");
+            var2 = var1.getColumnName() + DATE_TIME + ("Y".equals(var1.getIsNullable()) ? "NULL" : NOT_NULL);
         } else if (var1.getColunmType().equalsIgnoreCase("int")) {
-            var2 = var1.getColumnName() + " int " + ("Y".equals(var1.getIsNullable()) ? "NULL" : "NOT NULL");
+            var2 = var1.getColumnName() + INT + ("Y".equals(var1.getIsNullable()) ? "NULL" : NOT_NULL);
-        } else if (var1.getColunmType().equalsIgnoreCase("double")) {
+        } else if (var1.getColunmType().equalsIgnoreCase(DOUBLE)) {
-            var2 = var1.getColumnName() + " float " + ("Y".equals(var1.getIsNullable()) ? "NULL" : "NOT NULL");
+            var2 = var1.getColumnName() + FLOAT + ("Y".equals(var1.getIsNullable()) ? "NULL" : NOT_NULL);
         }
 
         return var2;
     }
-
+    @Override
     public String getCommentSql(ColumnMeta columnMeta) {
-        StringBuffer var2 = new StringBuffer("EXECUTE ");
+        StringBuilder var2 = new StringBuilder("EXECUTE ");
         if (oConvertUtils.isEmpty(columnMeta.getOldColumnName())) {
             var2.append("sp_addextendedproperty");
         } else {
@@ -129,15 +138,15 @@ public class DbTableSQLServerHandleImpl implements DbTableHandleI {
         var2.append(columnMeta.getColumnName() + "'");
         return var2.toString();
     }
-
+    @Override
     public String getSpecialHandle(ColumnMeta cgformcolumnMeta, ColumnMeta datacolumnMeta) {
         return null;
     }
-
+    @Override
     public String dropIndexs(String indexName, String tableName) {
         return "DROP INDEX " + indexName + " ON " + tableName;
     }
-
+    @Override
     public String countIndex(String indexName, String tableName) {
         return "SELECT count(*) FROM sys.indexes WHERE object_id=OBJECT_ID('" + tableName + "') and NAME= '" + indexName + "'";
     }

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

@@ -16,9 +16,6 @@ public class ColumnMeta {
     private String j;
     private String k;
 
-    public ColumnMeta() {
-    }
-
     public boolean equals(Object obj) {
         if (obj == this) {
             return true;

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

@@ -2,19 +2,6 @@
 package com.jero.generater.modules.online.config.util;
 
 public class DataBaseConst {
-  public static final String a = "BigDecimal";
+  private DataBaseConst() {
-  public static final String b = "Blob";
-  public static final String c = "Date";
-  public static final String d = "datetime";
-  public static final String e = "decimal";
-  public static final String f = "double";
-  public static final String g = "int";
-  public static final String h = "number";
-  public static final String i = "string";
-  public static final String j = "Text";
-  public static final String k = "textarea";
-  public static final String l = "varchar";
-
-  public DataBaseConst() {
   }
 }

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

@@ -12,12 +12,7 @@ import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.sql.SQLSyntaxErrorException;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.EnumSet;
-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;
@@ -39,8 +34,9 @@ import com.jero.generater.modules.online.config.service.DbTableHandleI;
 
 @Slf4j
 public class DbTableProcess {
+    private static final String ORACLE = "ORACLE";
+    private static final String SQL_SERVER = "SQLSERVER";
 
-    private static final String b = "com/jero/generater/modules/online/config/engine/tableTemplate.ftl";
     private static DbTableHandleI c;
 
     public DbTableProcess() throws SQLException, DBException {
@@ -49,7 +45,7 @@ public class DbTableProcess {
 
     public static void a(CgformConfigModel var0) throws IOException, TemplateException, HibernateException, SQLException, DBException {
         String var1 = DbTableUtil.getDatabaseType();
-        if ("ORACLE".equals(var1)) {
+        if (ORACLE.equals(var1)) {
             ArrayList var2 = Lists.newArrayList();
 
             OnlCgformField var4;
@@ -66,7 +62,7 @@ public class DbTableProcess {
 
         String var15 = FreemarkerHelper.a("com/jero/generater/modules/online/config/engine/tableTemplate.ftl", a(var0, var1));
         log.info(var15);
-        HashMap var16 = new HashMap();
+        HashMap var16 = new HashMap<>();
         DataBaseConfig var17 = var0.getDbConfig();
         var16.put("hibernate.connection.driver_class", var17.getDriverClassName());
         var16.put("hibernate.connection.url", var17.getUrl());
@@ -105,7 +101,7 @@ public class DbTableProcess {
 
         while(var11.hasNext()) {
             Exception var12 = (Exception)var11.next();
-            if ("java.sql.SQLSyntaxErrorException".equals(var12.getCause().getClass().getName())) {
+            if (Objects.equals(var12.getCause().getClass().getName(),"java.sql.SQLSyntaxErrorException")) {
                 SQLSyntaxErrorException var13 = (SQLSyntaxErrorException)var12.getCause();
                 if ("42000".equals(var13.getSQLState())) {
                     if (1064 != var13.getErrorCode() && 903 != var13.getErrorCode()) {
@@ -114,7 +110,7 @@ public class DbTableProcess {
 
                     throw new DBException("请确认表名是否为关键字。");
                 }
-            } else if ("com.microsoft.sqlserver.jdbc.SQLServerException".equals(var12.getCause().getClass().getName())) {
+            } else if (Objects.equals("com.microsoft.sqlserver.jdbc.SQLServerException",var12.getCause().getClass().getName())) {
                 if (var12.getCause().toString().indexOf("Incorrect syntax near the keyword") != -1) {
                     var12.printStackTrace();
                     throw new DBException(var12.getCause().getMessage());
@@ -133,7 +129,7 @@ public class DbTableProcess {
         String var2 = DbTableUtil.getDatabaseType();
         String var3 = DbTableUtil.a(var1.getTableName(), var2);
         String var4 = "alter table  " + var3 + " ";
-        ArrayList var5 = new ArrayList();
+        ArrayList var5 = new ArrayList<>();
 
         try {
             Map var6 = this.c((String)null, var3);
@@ -154,7 +150,7 @@ public class DbTableProcess {
                             if (var8.containsKey(var10) && var6.containsKey(var17)) {
                                 ColumnMeta var13 = (ColumnMeta)var6.get(var17);
                                 String var14 = c.getReNameFieldName(var11);
-                                if ("SQLSERVER".equals(var2)) {
+                                if (SQL_SERVER.equals(var2)) {
                                     var5.add(var14);
                                 } else {
                                     var5.add(var4 + var14);
@@ -169,12 +165,12 @@ public class DbTableProcess {
                                     }
                                 }
 
-                                if (!"SQLSERVER".equals(var2) && !var13.b(var11)) {
+                                if (!SQL_SERVER.equals(var2) && !var13.b(var11)) {
                                     var5.add(this.c(var11));
                                 }
                             } else {
                                 var5.add(var4 + this.b(var11));
-                                if (!"SQLSERVER".equals(var2) && StringUtils.isNotEmpty(var11.getComment())) {
+                                if (!SQL_SERVER.equals(var2) && StringUtils.isNotEmpty(var11.getComment())) {
                                     var5.add(this.c(var11));
                                 }
                             }
@@ -185,7 +181,7 @@ public class DbTableProcess {
                                 var5.add(var4 + this.a(var12, var11));
                             }
 
-                            if (!"SQLSERVER".equals(var2) && !"ORACLE".equals(var2) && !var11.b(var12)) {
+                            if (!SQL_SERVER.equals(var2) && !ORACLE.equals(var2) && !var11.b(var12)) {
                                 var5.add(this.c(var12));
                             }
                         }
@@ -235,7 +231,7 @@ public class DbTableProcess {
         }
 
         DatabaseMetaData var5 = var4.getMetaData();
-        DataBaseConfig var6 = (DataBaseConfig)SpringContextUtils.getBean(DataBaseConfig.class);
+        DataBaseConfig var6 = SpringContextUtils.getBean(DataBaseConfig.class);
         String var7 = null;
 
         try {
@@ -245,12 +241,12 @@ public class DbTableProcess {
         }
 
         String var8 = var6.getUsername();
-        if ("ORACLE".equals(var7)) {
+        if (ORACLE.equals(var7)) {
             var8 = var8.toUpperCase();
         }
 
         ResultSet var9 = null;
-        if ("SQLSERVER".equals(var7)) {
+        if (SQL_SERVER.equals(var7)) {
             var9 = var5.getColumns(var4.getCatalog(), (String)null, var2, "%");
         } else {
             var9 = var5.getColumns(var4.getCatalog(), var8, var2, "%");
@@ -283,7 +279,7 @@ public class DbTableProcess {
     }
 
     private Map<String, ColumnMeta> c(CgformConfigModel var1) {
-        HashMap var2 = new HashMap();
+        HashMap var2 = new HashMap<>();
         List var3 = var1.getColumns();
         Iterator var5 = var3.iterator();
 
@@ -309,7 +305,7 @@ public class DbTableProcess {
     }
 
     private Map<String, String> a(List<OnlCgformField> var1) {
-        HashMap var2 = new HashMap();
+        HashMap var2 = new HashMap<>();
         Iterator var3 = var1.iterator();
 
         while(var3.hasNext()) {
@@ -377,13 +373,12 @@ public class DbTableProcess {
     public static List<String> a(String var0) throws SQLException {
         Connection var1 = null;
         ResultSet var2 = null;
-        ArrayList var3 = new ArrayList();
+        ArrayList var3 = new ArrayList<>();
 
         try {
             var1 = DbTableUtil.getConnection();
             DatabaseMetaData var4 = var1.getMetaData();
-            var2 = var4.getIndexInfo((String)null, (String)null, var0, false, false);
+            var2 = var4.getIndexInfo(null, null, var0, false, false);
-            ResultSetMetaData var5 = var2.getMetaData();
 
             while(var2.next()) {
                 String var6 = var2.getString("INDEX_NAME");

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

@@ -10,6 +10,7 @@ import java.util.List;
 import java.util.Map;
 import javax.sql.DataSource;
 
+import com.jero.common.exception.JeroBootException;
 import lombok.extern.slf4j.Slf4j;
 import org.hibernate.Session;
 import com.jero.common.util.SpringContextUtils;
@@ -25,10 +26,14 @@ import com.jero.generater.modules.online.config.service.a.DbTableSQLServerHandle
 
 @Slf4j
 public class DbTableUtil {
+    private static final String ORACLE = "ORACLE";
+    private static final String SQL_SERVER = "SQLSERVER";
+    private static final String POST_GRE_SQL = "POSTGRESQL";
+    private static final String MYSQL = "MYSQL";
 
-    public static String a = "";
+    public static String aConstant = "";
 
-    public DbTableUtil() {
+    private DbTableUtil() {
     }
 
     public static DbTableHandleI getTableHandle() throws SQLException, DBException {
@@ -37,12 +42,12 @@ public class DbTableUtil {
         byte var3 = -1;
         switch(var1.hashCode()) {
             case -1955532418:
-                if (var1.equals("ORACLE")) {
+                if (var1.equals(ORACLE)) {
                     var3 = 1;
                 }
                 break;
             case -1620389036:
-                if (var1.equals("POSTGRESQL")) {
+                if (var1.equals(POST_GRE_SQL)) {
                     var3 = 4;
                 }
                 break;
@@ -52,14 +57,16 @@ public class DbTableUtil {
                 }
                 break;
             case 73844866:
-                if (var1.equals("MYSQL")) {
+                if (var1.equals(MYSQL)) {
                     var3 = 0;
                 }
                 break;
             case 912124529:
-                if (var1.equals("SQLSERVER")) {
+                if (var1.equals(SQL_SERVER)) {
                     var3 = 3;
                 }
+                break;
+            default:break;
         }
 
         switch(var3) {
@@ -77,28 +84,30 @@ public class DbTableUtil {
                 break;
             case 4:
                 var0 = new DbTablePostgresHandleImpl();
+                break;
+            default:break;
         }
 
         return (DbTableHandleI)var0;
     }
 
     public static Connection getConnection() throws SQLException {
-        DataSource var0 = (DataSource)SpringContextUtils.getApplicationContext().getBean(DataSource.class);
+        DataSource var0 = SpringContextUtils.getApplicationContext().getBean(DataSource.class);
         return var0.getConnection();
     }
 
     public static String getDatabaseType() throws SQLException, DBException {
-        if (oConvertUtils.isNotEmpty(a)) {
+        if (oConvertUtils.isNotEmpty(aConstant)) {
-            return a;
+            return aConstant;
         } else {
-            DataSource var0 = (DataSource)SpringContextUtils.getApplicationContext().getBean(DataSource.class);
+            DataSource var0 = SpringContextUtils.getApplicationContext().getBean(DataSource.class);
             return a(var0);
         }
     }
 
     public static boolean a() {
         try {
-            return "ORACLE".equals(getDatabaseType());
+            return ORACLE.equals(getDatabaseType());
         } catch (SQLException var1) {
             var1.printStackTrace();
         } catch (DBException var2) {
@@ -109,28 +118,28 @@ public class DbTableUtil {
     }
 
     public static String a(DataSource var0) throws SQLException, DBException {
-        if ("".equals(a)) {
+        if ("".equals(aConstant)) {
             Connection var1 = var0.getConnection();
 
             try {
                 DatabaseMetaData var2 = var1.getMetaData();
                 String var3 = var2.getDatabaseProductName().toLowerCase();
                 if (var3.indexOf("mysql") >= 0) {
-                    a = "MYSQL";
+                    aConstant = MYSQL;
                 } else if (var3.indexOf("oracle") < 0 && var3.indexOf("dm") < 0) {
                     if (var3.indexOf("dm") >= 0) {
-                        a = "DM";
+                        aConstant = "DM";
                     } else if (var3.indexOf("sqlserver") < 0 && var3.indexOf("sql server") < 0) {
                         if (var3.indexOf("postgresql") < 0) {
                             throw new DBException("数据库类型:[" + var3 + "]不识别!");
                         }
 
-                        a = "POSTGRESQL";
+                        aConstant = POST_GRE_SQL;
                     } else {
-                        a = "SQLSERVER";
+                        aConstant = SQL_SERVER;
                     }
                 } else {
-                    a = "ORACLE";
+                    aConstant = ORACLE;
                 }
             } catch (Exception var7) {
                 log.error(var7.getMessage(), var7);
@@ -139,29 +148,29 @@ public class DbTableUtil {
             }
         }
 
-        return a;
+        return aConstant;
     }
 
     public static String a(Connection var0) throws SQLException, DBException {
-        if ("".equals(a)) {
+        if ("".equals(aConstant)) {
             DatabaseMetaData var1 = var0.getMetaData();
             String var2 = var1.getDatabaseProductName().toLowerCase();
             if (var2.indexOf("mysql") >= 0) {
-                a = "MYSQL";
+                aConstant = MYSQL;
             } else if (var2.indexOf("oracle") >= 0) {
-                a = "ORACLE";
+                aConstant = ORACLE;
             } else if (var2.indexOf("sqlserver") < 0 && var2.indexOf("sql server") < 0) {
                 if (var2.indexOf("postgresql") < 0) {
                     throw new DBException("数据库类型:[" + var2 + "]不识别!");
                 }
 
-                a = "POSTGRESQL";
+                aConstant = POST_GRE_SQL;
             } else {
-                a = "SQLSERVER";
+                aConstant = SQL_SERVER;
             }
         }
 
-        return a;
+        return aConstant;
     }
 
     public static String a(Session var0) throws SQLException, DBException {
@@ -172,14 +181,16 @@ public class DbTableUtil {
         byte var3 = -1;
         switch(var1.hashCode()) {
             case -1955532418:
-                if (var1.equals("ORACLE")) {
+                if (var1.equals(ORACLE)) {
                     var3 = 0;
                 }
                 break;
             case -1620389036:
-                if (var1.equals("POSTGRESQL")) {
+                if (var1.equals(POST_GRE_SQL)) {
                     var3 = 1;
                 }
+                break;
+            default:break;
         }
 
         switch(var3) {
@@ -202,22 +213,17 @@ public class DbTableUtil {
             var1 = getConnection();
             DatabaseMetaData var4 = var1.getMetaData();
             String var5 = null;
-
+            var5 = getDatabaseType();
-            try {
-                var5 = getDatabaseType();
-            } catch (DBException var20) {
-                var20.printStackTrace();
-            }
 
             String var6 = a(var0, var5);
-            DataBaseConfig var7 = (DataBaseConfig)SpringContextUtils.getBean(DataBaseConfig.class);
+            DataBaseConfig var7 = SpringContextUtils.getBean(DataBaseConfig.class);
             String var8 = var7.getUsername();
-            if ("ORACLE".equals(var5) || "DM".equals(var5)) {
+            if (ORACLE.equals(var5) || "DM".equals(var5)) {
                 var8 = var8 != null ? var8.toUpperCase() : null;
             }
 
             var4.getTables(var1.getCatalog(), var8, var6, var3);
-            if ("SQLSERVER".equals(var5)) {
+            if (SQL_SERVER.equals(var5)) {
                 var2 = var4.getTables(var1.getCatalog(), (String)null, var6, var3);
             } else {
                 var2 = var4.getTables(var1.getCatalog(), var8, var6, var3);
@@ -230,8 +236,8 @@ public class DbTableUtil {
             }
 
             var9 = false;
-        } catch (SQLException var21) {
+        } catch (SQLException | DBException var21) {
-            throw new RuntimeException();
+            throw new JeroBootException("异常",var21);
         } finally {
             try {
                 if (var2 != null) {
@@ -251,10 +257,10 @@ public class DbTableUtil {
     }
 
     public static Map<String, Object> a(List<Map<String, Object>> var0) {
-        HashMap var1 = new HashMap();
+        HashMap<String, Object> var1 = new HashMap<>();
 
         for(int var2 = 0; var2 < var0.size(); ++var2) {
-            var1.put(((Map)var0.get(var2)).get("column_name").toString(), var0.get(var2));
+            var1.put(var0.get(var2).get("column_name").toString(), var0.get(var2));
         }
 
         return var1;
@@ -265,17 +271,17 @@ public class DbTableUtil {
         return b(var0);
     }
 
-    public static String b(String var0) throws SQLException, DBException {
+    public static String b(String var0) {
         String var1 = "org.hibernate.dialect.MySQL5InnoDBDialect";
         byte var3 = -1;
         switch(var0.hashCode()) {
             case -1955532418:
-                if (var0.equals("ORACLE")) {
+                if (var0.equals(ORACLE)) {
                     var3 = 2;
                 }
                 break;
             case -1620389036:
-                if (var0.equals("POSTGRESQL")) {
+                if (var0.equals(POST_GRE_SQL)) {
                     var3 = 1;
                 }
                 break;
@@ -285,9 +291,11 @@ public class DbTableUtil {
                 }
                 break;
             case 912124529:
-                if (var0.equals("SQLSERVER")) {
+                if (var0.equals(SQL_SERVER)) {
                     var3 = 0;
                 }
+                break;
+            default:break;
         }
 
         switch(var3) {
@@ -302,6 +310,8 @@ public class DbTableUtil {
                 break;
             case 3:
                 var1 = "org.hibernate.dialect.DmDialect";
+                break;
+            default:break;
         }
 
         return var1;

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

@@ -6,10 +6,10 @@ import java.util.Iterator;
 import java.util.Map;
 
 public class ExtendJsonConvert {
-    protected static Map<String, String> a = new HashMap();
+    private ExtendJsonConvert(){
 
-    public ExtendJsonConvert() {
     }
+    protected static Map<String, String> a = new HashMap<>();
 
     private static String a(String var0, int var1) {
         String var2 = var0;

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

@@ -5,14 +5,14 @@ import java.util.Comparator;
 import com.jero.generater.modules.online.cgform.entity.OnlCgformField;
 
 public class FieldNumComparator implements Comparator<OnlCgformField> {
-    public FieldNumComparator() {
-    }
 
+    @Override
     public int compare(OnlCgformField var1, OnlCgformField var2) {
         if (var1 != null && var1.getOrderNum() != null && var2 != null && var2.getOrderNum() != null) {
             Integer var3 = var1.getOrderNum();
             Integer var4 = var2.getOrderNum();
-            return var3 < var4 ? -1 : (var3 == var4 ? 0 : 1);
+            int s = var3.equals(var4) ? 0 : 1;
+            return var3 < var4 ? -1 : s;
         } else {
             return -1;
         }

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

@@ -13,7 +13,7 @@ public class FreemarkerHelper {
 
     private static Configuration b;
 
-    public FreemarkerHelper() {
+    private FreemarkerHelper() {
     }
 
     public static String a(String var0, String var1, Map<String, Object> var2) {