From 2f01b41c1ef92315ca161da2baac1c30180ae166 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 8 Jun 2020 13:41:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E5=8F=B0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java index b9e2fea..def59a3 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java @@ -54,7 +54,7 @@ public class SysLogConsole extends BaseBean { private Integer logPort; @Column(name="LOG_GROUP") - @ApiParam(value ="日志分组(控制台日志,操作日志,系统日志,定任务日志)") + @ApiParam(value ="日志分组(日志记录器名称，getLogger方法的参数值)") private String logGroup; @Column(name="LOG_LEVEL") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 3d7d445..499d89b 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -456,7 +456,7 @@ public class CoreHqlPack { * @return */ public static DdlPackBean packHqlSysFile(SysFile file) { - DdlPackBean result = DdlPackBean.getDdlPackBean(); + DdlPackBean result = DdlPackBean.getDdlPackBean(file); // hql拼接 DdlPreparedPack.getStringLikerPack(file.getFileOriginalName(), "fileOriginalName", result); @@ -466,9 +466,6 @@ public class CoreHqlPack { DdlPreparedPack.getStringLikerPack(file.getFileCode(), "fileCode", result); DdlPreparedPack.timeBuilder(file.getCreateDatetime(), "createDatetime", result, false, false); - // 添加默认排序 - DdlPreparedPack.getOrderDefault(file); - return result; }