From d309e272f7685bc710e69da7a326fd23743cd375 Mon Sep 17 00:00:00 2001 From: zer0Black Date: Fri, 12 Mar 2021 16:42:18 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=B7=BB=E5=8A=A0=E3=80=91config?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=8C=E6=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OnlCgformApiController.java | 12 ++-- .../convertImpl/LinkDownConverter.java | 2 +- .../online/cgform/{a => link}/LinkDown.java | 2 +- .../cgform/mapper/OnlCgformFieldMapper.java | 2 +- .../service/IOnlCgformFieldService.java | 2 +- .../impl/OnlCgformFieldServiceImpl.java | 2 +- .../impl/OnlCgformHeadServiceImpl.java | 27 ++++---- .../service/impl/OnlineServiceImpl.java | 2 +- .../online/cgform/util/CgformUtil.java | 15 ++-- .../service/a/OnlCgreportHeadServiceImpl.java | 8 +-- .../cgreport/util/CgReportQueryParamUtil.java | 4 +- .../a.java => config/CgformConfigModel.java} | 12 ++-- .../{a/b.java => config/DataBaseConfig.java} | 14 ++-- .../c.java => config/DmDataBaseConfig.java} | 12 ++-- .../config/{a/d.java => config/Druid.java} | 6 +- .../online/config/service/DbTableHandleI.java | 12 ++-- .../a/{c.java => DbTableDmHandleImpl.java} | 20 +++--- .../a/{b.java => DbTableMysqlHandleImpl.java} | 28 ++++---- .../{a.java => DbTableOracleHandleImpl.java} | 19 +++--- ...{d.java => DbTablePostgresHandleImpl.java} | 24 +++---- ...e.java => DbTableSQLServerHandleImpl.java} | 22 +++--- .../config/{b/a.java => util/ColumnMeta.java} | 18 ++--- .../{b/b.java => util/DataBaseConst.java} | 6 +- .../{b/c.java => util/DbTableProcess.java} | 68 +++++++++---------- .../{b/d.java => util/DbTableUtil.java} | 30 ++++---- .../{b/e.java => util/ExtendJsonConvert.java} | 6 +- .../f.java => util/FieldNumComparator.java} | 8 +-- .../{b/g.java => util/FreemarkerHelper.java} | 10 +-- 28 files changed, 199 insertions(+), 194 deletions(-) rename jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/{a => link}/LinkDown.java (99%) rename jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/config/{a/a.java => config/CgformConfigModel.java} (92%) rename jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/config/{a/b.java => config/DataBaseConfig.java} (85%) rename jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/config/{a/c.java => config/DmDataBaseConfig.java} (82%) rename jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/config/{a/d.java => config/Druid.java} (66%) rename jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/config/service/a/{c.java => DbTableDmHandleImpl.java} (88%) rename jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/config/service/a/{b.java => DbTableMysqlHandleImpl.java} (82%) rename jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/config/service/a/{a.java => DbTableOracleHandleImpl.java} (86%) rename jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/config/service/a/{d.java => DbTablePostgresHandleImpl.java} (90%) rename jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/config/service/a/{e.java => DbTableSQLServerHandleImpl.java} (90%) rename jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/config/{b/a.java => util/ColumnMeta.java} (93%) rename jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/config/{b/b.java => util/DataBaseConst.java} (83%) rename jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/config/{b/c.java => util/DbTableProcess.java} (85%) rename jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/config/{b/d.java => util/DbTableUtil.java} (89%) rename jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/config/{b/e.java => util/ExtendJsonConvert.java} (86%) rename jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/config/{b/f.java => util/FieldNumComparator.java} (65%) rename jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/config/{b/g.java => util/FreemarkerHelper.java} (77%) diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/controller/OnlCgformApiController.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/controller/OnlCgformApiController.java index 502df0bd..62631e82 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/controller/OnlCgformApiController.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/controller/OnlCgformApiController.java @@ -42,7 +42,7 @@ import com.jero.common.util.BrowserUtils; import com.jero.common.util.SpringContextUtils; import com.jero.common.util.TokenUtils; import com.jero.common.util.oConvertUtils; -import org.jeecg.modules.online.cgform.a.LinkDown; +import org.jeecg.modules.online.cgform.link.LinkDown; import org.jeecg.modules.online.cgform.converter.ConvertUtil; import org.jeecg.modules.online.cgform.entity.OnlCgformEnhanceJs; import org.jeecg.modules.online.cgform.entity.OnlCgformField; @@ -60,7 +60,7 @@ import org.jeecg.modules.online.cgform.util.CgFormExcelHandler; import org.jeecg.modules.online.cgform.util.CgformUtil; import org.jeecg.modules.online.cgform.util.EnhanceJsUtil; import org.jeecg.modules.online.cgform.util.GenerateCodeFileToZip; -import org.jeecg.modules.online.config.b.d; +import org.jeecg.modules.online.config.util.DbTableUtil; import org.jeecg.modules.online.config.exception.BusinessException; import org.jeecg.modules.online.config.exception.DBException; import org.jeecgframework.poi.excel.ExcelExportUtil; @@ -115,7 +115,7 @@ public class OnlCgformApiController { public Result a(@RequestBody OnlCgformModel var1) { try { String var2 = var1.getHead().getTableName(); - return d.a(var2) ? Result.error("数据库表[" + var2 + "]已存在,请从数据库导入表单") : this.onlCgformHeadService.addAll(var1); + return DbTableUtil.a(var2) ? Result.error("数据库表[" + var2 + "]已存在,请从数据库导入表单") : this.onlCgformHeadService.addAll(var1); } catch (Exception var3) { a.error("OnlCgformApiController.addAll()发生异常：" + var3.getMessage(), var3); return Result.error("操作失败"); @@ -661,7 +661,7 @@ public class OnlCgformApiController { MultipartHttpServletRequest var49 = (MultipartHttpServletRequest)var2; Map var50 = var49.getFileMap(); DataSource var51 = (DataSource)SpringContextUtils.getApplicationContext().getBean(DataSource.class); - String var52 = d.a(var51); + String var52 = DbTableUtil.a(var51); Iterator var53 = var50.entrySet().iterator(); while(true) { @@ -980,7 +980,7 @@ public class OnlCgformApiController { public Result i(@RequestParam("tbname") String var1, @RequestParam("id") String var2) { OnlCgformHead var3; if (oConvertUtils.isEmpty(var2)) { - if (d.a(var1)) { + if (DbTableUtil.a(var1)) { return Result.OK(-1); } @@ -990,7 +990,7 @@ public class OnlCgformApiController { } } else { var3 = (OnlCgformHead)this.onlCgformHeadService.getById(var2); - if (!var1.equals(var3.getTableName()) && d.a(var1)) { + if (!var1.equals(var3.getTableName()) && DbTableUtil.a(var1)) { return Result.OK(-1); } } diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/converter/convertImpl/LinkDownConverter.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/converter/convertImpl/LinkDownConverter.java index d6723106..2466dc9a 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/converter/convertImpl/LinkDownConverter.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/converter/convertImpl/LinkDownConverter.java @@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONObject; import java.util.HashMap; import java.util.Map; -import org.jeecg.modules.online.cgform.a.LinkDown; +import org.jeecg.modules.online.cgform.link.LinkDown; import org.jeecg.modules.online.cgform.converter.convert.ConfigConvert; import org.jeecg.modules.online.cgform.entity.OnlCgformField; diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/a/LinkDown.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/link/LinkDown.java similarity index 99% rename from jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/a/LinkDown.java rename to jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/link/LinkDown.java index a3c70f16..dcb58b24 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/a/LinkDown.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/link/LinkDown.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.online.cgform.a; +package org.jeecg.modules.online.cgform.link; public class LinkDown { private String a; diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/mapper/OnlCgformFieldMapper.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/mapper/OnlCgformFieldMapper.java index c33d6a7c..4d848fb2 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/mapper/OnlCgformFieldMapper.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/mapper/OnlCgformFieldMapper.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.List; import java.util.Map; import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.online.cgform.a.LinkDown; +import org.jeecg.modules.online.cgform.link.LinkDown; import org.jeecg.modules.online.cgform.entity.OnlCgformField; import org.jeecg.modules.online.cgform.model.TreeModel; diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/IOnlCgformFieldService.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/IOnlCgformFieldService.java index 3cf40523..87e0cfce 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/IOnlCgformFieldService.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/IOnlCgformFieldService.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; import java.util.Map; import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.online.cgform.a.LinkDown; +import org.jeecg.modules.online.cgform.link.LinkDown; import org.jeecg.modules.online.cgform.entity.OnlCgformField; import org.jeecg.modules.online.cgform.entity.OnlCgformHead; import org.jeecg.modules.online.cgform.model.TreeModel; diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java index 87fcd5fe..bd074ca8 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java @@ -21,7 +21,7 @@ import org.apache.shiro.SecurityUtils; import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.oConvertUtils; -import org.jeecg.modules.online.cgform.a.LinkDown; +import org.jeecg.modules.online.cgform.link.LinkDown; import org.jeecg.modules.online.cgform.entity.OnlCgformField; import org.jeecg.modules.online.cgform.entity.OnlCgformHead; import org.jeecg.modules.online.cgform.mapper.OnlCgformFieldMapper; diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/OnlCgformHeadServiceImpl.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/OnlCgformHeadServiceImpl.java index 8cf52b95..64d3fc3e 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/OnlCgformHeadServiceImpl.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/OnlCgformHeadServiceImpl.java @@ -51,9 +51,10 @@ import org.jeecg.modules.online.cgform.service.IOnlCgformFieldService; import org.jeecg.modules.online.cgform.service.IOnlCgformHeadService; import org.jeecg.modules.online.cgform.service.IOnlCgformIndexService; import org.jeecg.modules.online.cgform.util.CgformUtil; -import org.jeecg.modules.online.config.a.b; -import org.jeecg.modules.online.config.b.c; -import org.jeecg.modules.online.config.b.d; +import org.jeecg.modules.online.config.config.CgformConfigModel; +import org.jeecg.modules.online.config.config.DataBaseConfig; +import org.jeecg.modules.online.config.util.DbTableProcess; +import org.jeecg.modules.online.config.util.DbTableUtil; import org.jeecg.modules.online.config.exception.BusinessException; import org.jeecg.modules.online.config.exception.DBException; import org.jeecg.modules.online.config.service.DbTableHandleI; @@ -89,7 +90,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl b(a var1) throws DBException, SQLException { - String var2 = d.getDatabaseType(); - String var3 = d.a(var1.getTableName(), var2); + public List b(CgformConfigModel var1) throws DBException, SQLException { + String var2 = DbTableUtil.getDatabaseType(); + String var3 = DbTableUtil.a(var1.getTableName(), var2); String var4 = "alter table " + var3 + " "; ArrayList var5 = new ArrayList(); @@ -146,12 +146,12 @@ public class c { String var10; while(var9.hasNext()) { var10 = (String)var9.next(); - org.jeecg.modules.online.config.b.a var11; + ColumnMeta var11; if (!var6.containsKey(var10)) { - var11 = (org.jeecg.modules.online.config.b.a)var7.get(var10); + var11 = (ColumnMeta)var7.get(var10); String var17 = (String)var8.get(var10); if (var8.containsKey(var10) && var6.containsKey(var17)) { - org.jeecg.modules.online.config.b.a var13 = (org.jeecg.modules.online.config.b.a)var6.get(var17); + ColumnMeta var13 = (ColumnMeta)var6.get(var17); String var14 = c.getReNameFieldName(var11); if ("SQLSERVER".equals(var2)) { var5.add(var14); @@ -178,8 +178,8 @@ public class c { } } } else { - var11 = (org.jeecg.modules.online.config.b.a)var6.get(var10); - org.jeecg.modules.online.config.b.a var12 = (org.jeecg.modules.online.config.b.a)var7.get(var10); + var11 = (ColumnMeta)var6.get(var10); + ColumnMeta var12 = (ColumnMeta)var7.get(var10); if (!var11.a(var12, var2)) { var5.add(var4 + this.a(var12, var11)); } @@ -209,7 +209,7 @@ public class c { return var5; } - private static Map a(a var0, String var1) { + private static Map a(CgformConfigModel var0, String var1) { HashMap var2 = new HashMap(); Iterator var3 = var0.getColumns().iterator(); @@ -223,22 +223,22 @@ public class c { return var2; } - private Map c(String var1, String var2) throws SQLException { + private Map c(String var1, String var2) throws SQLException { HashMap var3 = new HashMap(); Connection var4 = null; try { - var4 = d.getConnection(); + var4 = DbTableUtil.getConnection(); } catch (Exception var21) { a.error(var21.getMessage(), var21); } DatabaseMetaData var5 = var4.getMetaData(); - b var6 = (b)SpringContextUtils.getBean(b.class); + DataBaseConfig var6 = (DataBaseConfig)SpringContextUtils.getBean(DataBaseConfig.class); String var7 = null; try { - var7 = d.getDatabaseType(); + var7 = DbTableUtil.getDatabaseType(); } catch (DBException var20) { var20.printStackTrace(); } @@ -256,7 +256,7 @@ public class c { } while(var9.next()) { - org.jeecg.modules.online.config.b.a var10 = new org.jeecg.modules.online.config.b.a(); + ColumnMeta var10 = new ColumnMeta(); var10.setTableName(var2); String var11 = var9.getString("COLUMN_NAME").toLowerCase(); var10.setColumnName(var11); @@ -281,14 +281,14 @@ public class c { return var3; } - private Map c(a var1) { + private Map c(CgformConfigModel var1) { HashMap var2 = new HashMap(); List var3 = var1.getColumns(); Iterator var5 = var3.iterator(); while(var5.hasNext()) { OnlCgformField var6 = (OnlCgformField)var5.next(); - org.jeecg.modules.online.config.b.a var4 = new org.jeecg.modules.online.config.b.a(); + ColumnMeta var4 = new ColumnMeta(); var4.setTableName(var1.getTableName().toLowerCase()); var4.setColumnId(var6.getId()); var4.setColumnName(var6.getDbFieldName().toLowerCase()); @@ -323,23 +323,23 @@ public class c { return c.getDropColumnSql(var1); } - private String a(org.jeecg.modules.online.config.b.a var1, org.jeecg.modules.online.config.b.a var2) throws DBException { + private String a(ColumnMeta var1, ColumnMeta var2) throws DBException { return c.getUpdateColumnSql(var1, var2); } - private String b(org.jeecg.modules.online.config.b.a var1, org.jeecg.modules.online.config.b.a var2) { + private String b(ColumnMeta var1, ColumnMeta var2) { return c.getSpecialHandle(var1, var2); } - private String a(org.jeecg.modules.online.config.b.a var1) { + private String a(ColumnMeta var1) { return c.getReNameFieldName(var1); } - private String b(org.jeecg.modules.online.config.b.a var1) { + private String b(ColumnMeta var1) { return c.getAddColumnSql(var1); } - private String c(org.jeecg.modules.online.config.b.a var1) { + private String c(ColumnMeta var1) { return c.getCommentSql(var1); } @@ -379,7 +379,7 @@ public class c { ArrayList var3 = new ArrayList(); try { - var1 = d.getConnection(); + var1 = DbTableUtil.getConnection(); DatabaseMetaData var4 = var1.getMetaData(); var2 = var4.getIndexInfo((String)null, (String)null, var0, false, false); ResultSetMetaData var5 = var2.getMetaData(); diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/config/b/d.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/config/util/DbTableUtil.java similarity index 89% rename from jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/config/b/d.java rename to jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/config/util/DbTableUtil.java index 5f6510f7..a0f9f0e2 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/config/b/d.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/config/util/DbTableUtil.java @@ -1,5 +1,5 @@ -package org.jeecg.modules.online.config.b; +package org.jeecg.modules.online.config.util; import java.sql.Connection; import java.sql.DatabaseMetaData; @@ -12,20 +12,22 @@ import javax.sql.DataSource; import org.hibernate.Session; import com.jero.common.util.SpringContextUtils; import com.jero.common.util.oConvertUtils; +import org.jeecg.modules.online.config.config.DataBaseConfig; import org.jeecg.modules.online.config.exception.DBException; import org.jeecg.modules.online.config.service.DbTableHandleI; -import org.jeecg.modules.online.config.service.a.a; -import org.jeecg.modules.online.config.service.a.b; -import org.jeecg.modules.online.config.service.a.c; -import org.jeecg.modules.online.config.service.a.e; +import org.jeecg.modules.online.config.service.a.DbTableDmHandleImpl; +import org.jeecg.modules.online.config.service.a.DbTableMysqlHandleImpl; +import org.jeecg.modules.online.config.service.a.DbTableOracleHandleImpl; +import org.jeecg.modules.online.config.service.a.DbTablePostgresHandleImpl; +import org.jeecg.modules.online.config.service.a.DbTableSQLServerHandleImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class d { - private static final Logger b = LoggerFactory.getLogger(d.class); +public class DbTableUtil { + private static final Logger b = LoggerFactory.getLogger(DbTableUtil.class); public static String a = ""; - public d() { + public DbTableUtil() { } public static DbTableHandleI getTableHandle() throws SQLException, DBException { @@ -61,19 +63,19 @@ public class d { switch(var3) { case 0: - var0 = new b(); + var0 = new DbTableMysqlHandleImpl(); break; case 1: - var0 = new c(); + var0 = new DbTableOracleHandleImpl(); break; case 2: - var0 = new a(); + var0 = new DbTableDmHandleImpl(); break; case 3: - var0 = new e(); + var0 = new DbTableSQLServerHandleImpl(); break; case 4: - var0 = new org.jeecg.modules.online.config.service.a.d(); + var0 = new DbTablePostgresHandleImpl(); } return (DbTableHandleI)var0; @@ -207,7 +209,7 @@ public class d { } String var6 = a(var0, var5); - org.jeecg.modules.online.config.a.b var7 = (org.jeecg.modules.online.config.a.b)SpringContextUtils.getBean(org.jeecg.modules.online.config.a.b.class); + DataBaseConfig var7 = (DataBaseConfig)SpringContextUtils.getBean(DataBaseConfig.class); String var8 = var7.getUsername(); if ("ORACLE".equals(var5) || "DM".equals(var5)) { var8 = var8 != null ? var8.toUpperCase() : null; diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/config/b/e.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/config/util/ExtendJsonConvert.java similarity index 86% rename from jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/config/b/e.java rename to jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/config/util/ExtendJsonConvert.java index d304e2c1..85421b9b 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/config/b/e.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/config/util/ExtendJsonConvert.java @@ -1,14 +1,14 @@ -package org.jeecg.modules.online.config.b; +package org.jeecg.modules.online.config.util; import java.util.HashMap; import java.util.Iterator; import java.util.Map; -public class e { +public class ExtendJsonConvert { protected static Map a = new HashMap(); - public e() { + public ExtendJsonConvert() { } private static String a(String var0, int var1) { diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/config/b/f.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/config/util/FieldNumComparator.java similarity index 65% rename from jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/config/b/f.java rename to jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/config/util/FieldNumComparator.java index 128f767b..174d5d53 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/config/b/f.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/config/util/FieldNumComparator.java @@ -1,14 +1,14 @@ -package org.jeecg.modules.online.config.b; +package org.jeecg.modules.online.config.util; import java.util.Comparator; import org.jeecg.modules.online.cgform.entity.OnlCgformField; -public class f implements Comparator { - public f() { +public class FieldNumComparator implements Comparator { + public FieldNumComparator() { } - public int a(OnlCgformField var1, OnlCgformField var2) { + 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(); diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/config/b/g.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/config/util/FreemarkerHelper.java similarity index 77% rename from jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/config/b/g.java rename to jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/config/util/FreemarkerHelper.java index ec80d347..75e49a79 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/config/b/g.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/config/util/FreemarkerHelper.java @@ -1,5 +1,5 @@ -package org.jeecg.modules.online.config.b; +package org.jeecg.modules.online.config.util; import freemarker.template.Configuration; import freemarker.template.Template; @@ -8,11 +8,11 @@ import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class g { - private static final Logger a = LoggerFactory.getLogger(g.class); +public class FreemarkerHelper { + private static final Logger a = LoggerFactory.getLogger(FreemarkerHelper.class); private static Configuration b; - public g() { + public FreemarkerHelper() { } public static String a(String var0, String var1, Map var2) { @@ -35,6 +35,6 @@ public class g { static { b = new Configuration(Configuration.VERSION_2_3_28); b.setNumberFormat("0.#####################"); - b.setClassForTemplateLoading(g.class, "/"); + b.setClassForTemplateLoading(FreemarkerHelper.class, "/"); } }