From 88af476a41900a1bfc8d1c284e476226e6b4ed40 Mon Sep 17 00:00:00 2001 From: simonzhangsz Date: Mon, 15 Apr 2024 18:42:23 +0800 Subject: [PATCH 1/2] fix:... --- captrace/makefile | 2 +- crontask/makefile | 2 +- data2html/makefile | 2 +- makefile | 2 +- mkpkg.sh | 2 +- restagent/makefile | 2 +- src/framework/config/config/config.default.yaml | 2 +- sshsvc/makefile | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/captrace/makefile b/captrace/makefile index e348ac42..5367c1ef 100644 --- a/captrace/makefile +++ b/captrace/makefile @@ -1,7 +1,7 @@ # Makefile for rest agent project PROJECT = OMC -VERSION = 2.2404.4 +VERSION = 2.2404.3 PLATFORM = amd64 ARMPLATFORM = aarch64 BUILDDIR = ../../build diff --git a/crontask/makefile b/crontask/makefile index 6cd26d4c..5ac64ee1 100644 --- a/crontask/makefile +++ b/crontask/makefile @@ -1,7 +1,7 @@ # Makefile for OMC-OMC-crontask project PROJECT = OMC -VERSION = 2.2404.4 +VERSION = 2.2404.3 LIBDIR = be.ems/lib BINNAME = crontask diff --git a/data2html/makefile b/data2html/makefile index 3cd144fa..fb450557 100644 --- a/data2html/makefile +++ b/data2html/makefile @@ -1,7 +1,7 @@ # Makefile for rest agent project PROJECT = OMC -VERSION = 2.2404.4 +VERSION = 2.2404.3 RelDate = `date +%Y%m%d` Release = $(RelDate) RelVer = $(VERSION)-$(RelDate) diff --git a/makefile b/makefile index 283c4bed..7f4451ab 100644 --- a/makefile +++ b/makefile @@ -3,7 +3,7 @@ ProjectL = omc ProjectU = OMC PROJECT = $(ProjectL) -VERSION = 2.2404.4 +VERSION = 2.2404.3 RelDate = `date +%Y%m%d` Release = $(RelDate) RelVer = $(VERSION)-$(RelDate) diff --git a/mkpkg.sh b/mkpkg.sh index 210a0c31..d73cc656 100644 --- a/mkpkg.sh +++ b/mkpkg.sh @@ -2,7 +2,7 @@ ProcList="restagent crontask sshsvc captrace data2html" ProjectL=omc -VERSION=2.2404.4 +VERSION=2.2404.3 RelDate=`date +%Y%m%d` Release=${RelDate} RelVer=${VERSION}-${RelDate} diff --git a/restagent/makefile b/restagent/makefile index f4e810b0..9740485a 100644 --- a/restagent/makefile +++ b/restagent/makefile @@ -1,7 +1,7 @@ # Makefile for rest agent project PROJECT = OMC -VERSION = 2.2404.4 +VERSION = 2.2404.3 PLATFORM = amd64 ARMPLATFORM = aarch64 BUILDDIR = ../../build diff --git a/src/framework/config/config/config.default.yaml b/src/framework/config/config/config.default.yaml index f0032b97..1c0abbf8 100644 --- a/src/framework/config/config/config.default.yaml +++ b/src/framework/config/config/config.default.yaml @@ -1,7 +1,7 @@ # 项目信息 framework: name: "CN EMS" - version: "2.2404.4" + version: "2.2404.3" # 应用服务配置 server: diff --git a/sshsvc/makefile b/sshsvc/makefile index 8de556bb..1630b19d 100644 --- a/sshsvc/makefile +++ b/sshsvc/makefile @@ -1,7 +1,7 @@ # Makefile for OMC-OMC-crontask project PROJECT = OMC -VERSION = 2.2404.4 +VERSION = 2.2404.3 LIBDIR = be.ems/lib BINNAME = sshsvc From 206e1457f4b57d79ac67ebafc9235760304f2745 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Mon, 15 Apr 2024 20:18:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E6=9F=A5=E8=AF=A2=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=80=BC=E4=B8=BA=E6=97=B6=E9=97=B4=E6=88=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/monitor/repository/sys_job_log.impl.go | 7 ++----- src/modules/system/repository/sys_config.impl.go | 7 ++----- src/modules/system/repository/sys_dict_type.impl.go | 7 ++----- src/modules/system/repository/sys_log_login.impl.go | 7 ++----- src/modules/system/repository/sys_log_operate.impl.go | 7 ++----- src/modules/system/repository/sys_role.impl.go | 7 ++----- src/modules/system/repository/sys_user.impl.go | 7 ++----- 7 files changed, 14 insertions(+), 35 deletions(-) diff --git a/src/modules/monitor/repository/sys_job_log.impl.go b/src/modules/monitor/repository/sys_job_log.impl.go index fc01e61f..1f8a0d95 100644 --- a/src/modules/monitor/repository/sys_job_log.impl.go +++ b/src/modules/monitor/repository/sys_job_log.impl.go @@ -6,7 +6,6 @@ import ( "be.ems/src/framework/datasource" "be.ems/src/framework/logger" - "be.ems/src/framework/utils/date" "be.ems/src/framework/utils/parse" "be.ems/src/framework/utils/repo" "be.ems/src/modules/monitor/model" @@ -80,8 +79,7 @@ func (r *SysJobLogImpl) SelectJobLogPage(query map[string]any) map[string]any { } if ok && beginTime != "" { conditions = append(conditions, "create_time >= ?") - beginDate := date.ParseStrToDate(beginTime.(string), date.YYYY_MM_DD) - params = append(params, beginDate.UnixMilli()) + params = append(params, parse.Number(beginTime.(string))) } endTime, ok := query["endTime"] if !ok { @@ -89,8 +87,7 @@ func (r *SysJobLogImpl) SelectJobLogPage(query map[string]any) map[string]any { } if ok && endTime != "" { conditions = append(conditions, "create_time <= ?") - endDate := date.ParseStrToDate(endTime.(string), date.YYYY_MM_DD) - params = append(params, endDate.UnixMilli()) + params = append(params, parse.Number(endTime.(string))) } // 构建查询条件语句 diff --git a/src/modules/system/repository/sys_config.impl.go b/src/modules/system/repository/sys_config.impl.go index 9e499ca0..4b323772 100644 --- a/src/modules/system/repository/sys_config.impl.go +++ b/src/modules/system/repository/sys_config.impl.go @@ -7,7 +7,6 @@ import ( "be.ems/src/framework/datasource" "be.ems/src/framework/logger" - "be.ems/src/framework/utils/date" "be.ems/src/framework/utils/parse" "be.ems/src/framework/utils/repo" "be.ems/src/modules/system/model" @@ -79,8 +78,7 @@ func (r *SysConfigImpl) SelectConfigPage(query map[string]any) map[string]any { } if ok && beginTime != "" { conditions = append(conditions, "create_time >= ?") - beginDate := date.ParseStrToDate(beginTime.(string), date.YYYY_MM_DD) - params = append(params, beginDate.UnixMilli()) + params = append(params, parse.Number(beginTime.(string))) } endTime, ok := query["endTime"] if !ok { @@ -88,8 +86,7 @@ func (r *SysConfigImpl) SelectConfigPage(query map[string]any) map[string]any { } if ok && endTime != "" { conditions = append(conditions, "create_time <= ?") - endDate := date.ParseStrToDate(endTime.(string), date.YYYY_MM_DD) - params = append(params, endDate.UnixMilli()) + params = append(params, parse.Number(endTime.(string))) } // 构建查询条件语句 diff --git a/src/modules/system/repository/sys_dict_type.impl.go b/src/modules/system/repository/sys_dict_type.impl.go index dc76f752..1da01121 100644 --- a/src/modules/system/repository/sys_dict_type.impl.go +++ b/src/modules/system/repository/sys_dict_type.impl.go @@ -7,7 +7,6 @@ import ( "be.ems/src/framework/datasource" "be.ems/src/framework/logger" - "be.ems/src/framework/utils/date" "be.ems/src/framework/utils/parse" "be.ems/src/framework/utils/repo" "be.ems/src/modules/system/model" @@ -78,8 +77,7 @@ func (r *SysDictTypeImpl) SelectDictTypePage(query map[string]any) map[string]an } if ok && beginTime != "" { conditions = append(conditions, "create_time >= ?") - beginDate := date.ParseStrToDate(beginTime.(string), date.YYYY_MM_DD) - params = append(params, beginDate.UnixMilli()) + params = append(params, parse.Number(beginTime.(string))) } endTime, ok := query["endTime"] if !ok { @@ -87,8 +85,7 @@ func (r *SysDictTypeImpl) SelectDictTypePage(query map[string]any) map[string]an } if ok && endTime != "" { conditions = append(conditions, "create_time <= ?") - endDate := date.ParseStrToDate(endTime.(string), date.YYYY_MM_DD) - params = append(params, endDate.UnixMilli()) + params = append(params, parse.Number(endTime.(string))) } // 构建查询条件语句 diff --git a/src/modules/system/repository/sys_log_login.impl.go b/src/modules/system/repository/sys_log_login.impl.go index 9a719778..178a745e 100644 --- a/src/modules/system/repository/sys_log_login.impl.go +++ b/src/modules/system/repository/sys_log_login.impl.go @@ -6,7 +6,6 @@ import ( "be.ems/src/framework/datasource" "be.ems/src/framework/logger" - "be.ems/src/framework/utils/date" "be.ems/src/framework/utils/parse" "be.ems/src/framework/utils/repo" "be.ems/src/modules/system/model" @@ -76,8 +75,7 @@ func (r *SysLogLoginImpl) SelectSysLogLoginPage(query map[string]any) map[string } if ok && beginTime != "" { conditions = append(conditions, "login_time >= ?") - beginDate := date.ParseStrToDate(beginTime.(string), date.YYYY_MM_DD_HH_MM_SS) - params = append(params, beginDate.UnixMilli()) + params = append(params, parse.Number(beginTime.(string))) } endTime, ok := query["endTime"] if !ok { @@ -85,8 +83,7 @@ func (r *SysLogLoginImpl) SelectSysLogLoginPage(query map[string]any) map[string } if ok && endTime != "" { conditions = append(conditions, "login_time <= ?") - endDate := date.ParseStrToDate(endTime.(string), date.YYYY_MM_DD_HH_MM_SS) - params = append(params, endDate.UnixMilli()) + params = append(params, parse.Number(endTime.(string))) } // 构建查询条件语句 diff --git a/src/modules/system/repository/sys_log_operate.impl.go b/src/modules/system/repository/sys_log_operate.impl.go index a858aaa3..649c3123 100644 --- a/src/modules/system/repository/sys_log_operate.impl.go +++ b/src/modules/system/repository/sys_log_operate.impl.go @@ -6,7 +6,6 @@ import ( "be.ems/src/framework/datasource" "be.ems/src/framework/logger" - "be.ems/src/framework/utils/date" "be.ems/src/framework/utils/parse" "be.ems/src/framework/utils/repo" "be.ems/src/modules/system/model" @@ -89,8 +88,7 @@ func (r *SysLogOperateImpl) SelectSysLogOperatePage(query map[string]any) map[st } if ok && beginTime != "" { conditions = append(conditions, "oper_time >= ?") - beginDate := date.ParseStrToDate(beginTime.(string), date.YYYY_MM_DD_HH_MM_SS) - params = append(params, beginDate.UnixMilli()) + params = append(params, parse.Number(beginTime.(string))) } endTime, ok := query["endTime"] if !ok { @@ -98,8 +96,7 @@ func (r *SysLogOperateImpl) SelectSysLogOperatePage(query map[string]any) map[st } if ok && endTime != "" { conditions = append(conditions, "oper_time <= ?") - endDate := date.ParseStrToDate(endTime.(string), date.YYYY_MM_DD_HH_MM_SS) - params = append(params, endDate.UnixMilli()) + params = append(params, parse.Number(endTime.(string))) } // 构建查询条件语句 diff --git a/src/modules/system/repository/sys_role.impl.go b/src/modules/system/repository/sys_role.impl.go index 4ec519aa..8fe89fa3 100644 --- a/src/modules/system/repository/sys_role.impl.go +++ b/src/modules/system/repository/sys_role.impl.go @@ -7,7 +7,6 @@ import ( "be.ems/src/framework/datasource" "be.ems/src/framework/logger" - "be.ems/src/framework/utils/date" "be.ems/src/framework/utils/parse" "be.ems/src/framework/utils/repo" "be.ems/src/modules/system/model" @@ -91,8 +90,7 @@ func (r *SysRoleImpl) SelectRolePage(query map[string]any, dataScopeSQL string) } if ok && beginTime != "" { conditions = append(conditions, "r.create_time >= ?") - beginDate := date.ParseStrToDate(beginTime.(string), date.YYYY_MM_DD) - params = append(params, beginDate.UnixMilli()) + params = append(params, parse.Number(beginTime.(string))) } endTime, ok := query["endTime"] if !ok { @@ -100,8 +98,7 @@ func (r *SysRoleImpl) SelectRolePage(query map[string]any, dataScopeSQL string) } if ok && endTime != "" { conditions = append(conditions, "r.create_time <= ?") - endDate := date.ParseStrToDate(endTime.(string), date.YYYY_MM_DD) - params = append(params, endDate.UnixMilli()) + params = append(params, parse.Number(endTime.(string))) } if v, ok := query["deptId"]; ok && v != "" { conditions = append(conditions, `(u.dept_id = ? or u.dept_id in ( diff --git a/src/modules/system/repository/sys_user.impl.go b/src/modules/system/repository/sys_user.impl.go index 671d8fbb..bbcbe849 100644 --- a/src/modules/system/repository/sys_user.impl.go +++ b/src/modules/system/repository/sys_user.impl.go @@ -8,7 +8,6 @@ import ( "be.ems/src/framework/datasource" "be.ems/src/framework/logger" "be.ems/src/framework/utils/crypto" - "be.ems/src/framework/utils/date" "be.ems/src/framework/utils/parse" "be.ems/src/framework/utils/repo" "be.ems/src/modules/system/model" @@ -156,8 +155,7 @@ func (r *SysUserImpl) SelectUserPage(query map[string]any, dataScopeSQL string) } if ok && beginTime != "" { conditions = append(conditions, "u.login_date >= ?") - beginDate := date.ParseStrToDate(beginTime.(string), date.YYYY_MM_DD) - params = append(params, beginDate.UnixMilli()) + params = append(params, parse.Number(beginTime.(string))) } endTime, ok := query["endTime"] if !ok { @@ -165,8 +163,7 @@ func (r *SysUserImpl) SelectUserPage(query map[string]any, dataScopeSQL string) } if ok && endTime != "" { conditions = append(conditions, "u.login_date <= ?") - endDate := date.ParseStrToDate(endTime.(string), date.YYYY_MM_DD) - params = append(params, endDate.UnixMilli()) + params = append(params, parse.Number(endTime.(string))) } if v, ok := query["deptId"]; ok && v != "" { conditions = append(conditions, "(u.dept_id = ? or u.dept_id in ( select t.dept_id from sys_dept t where find_in_set(?, ancestors) ))")