OMC/be.ems
1
0
Fork 0
Code Issues Releases 3 Activity

Merge remote-tracking branch 'origin/main' into lichang

Browse Source
This commit is contained in:
TsMask
2024-04-15 20:19:30 +08:00
parent c3bf466526 206e1457f4
commit be2e4e6c90
15 changed files with 22 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
captrace/makefile
View File

@@ -1,7 +1,7 @@
# Makefile for rest agent project # Makefile for rest agent project
PROJECT = OMC PROJECT = OMC
VERSION = 2.2404.4 VERSION = 2.2404.3
PLATFORM = amd64 PLATFORM = amd64
ARMPLATFORM = aarch64 ARMPLATFORM = aarch64
BUILDDIR = ../../build BUILDDIR = ../../build

2
crontask/makefile
View File

@@ -1,7 +1,7 @@
# Makefile for OMC-OMC-crontask project # Makefile for OMC-OMC-crontask project
PROJECT = OMC PROJECT = OMC
VERSION = 2.2404.4 VERSION = 2.2404.3
LIBDIR = be.ems/lib LIBDIR = be.ems/lib
BINNAME = crontask BINNAME = crontask

2
data2html/makefile
View File

@@ -1,7 +1,7 @@
# Makefile for rest agent project # Makefile for rest agent project
PROJECT = OMC PROJECT = OMC
VERSION = 2.2404.4 VERSION = 2.2404.3
RelDate = `date +%Y%m%d` RelDate = `date +%Y%m%d`
Release = $(RelDate) Release = $(RelDate)
RelVer = $(VERSION)-$(RelDate) RelVer = $(VERSION)-$(RelDate)

2
makefile
View File

@@ -3,7 +3,7 @@
ProjectL = omc ProjectL = omc
ProjectU = OMC ProjectU = OMC
PROJECT = $(ProjectL) PROJECT = $(ProjectL)
VERSION = 2.2404.4 VERSION = 2.2404.3
RelDate = `date +%Y%m%d` RelDate = `date +%Y%m%d`
Release = $(RelDate) Release = $(RelDate)
RelVer = $(VERSION)-$(RelDate) RelVer = $(VERSION)-$(RelDate)

2
mkpkg.sh
View File

@@ -2,7 +2,7 @@
ProcList="restagent crontask sshsvc captrace data2html" ProcList="restagent crontask sshsvc captrace data2html"
ProjectL=omc ProjectL=omc
VERSION=2.2404.4 VERSION=2.2404.3
RelDate=`date +%Y%m%d` RelDate=`date +%Y%m%d`
Release=${RelDate} Release=${RelDate}
RelVer=${VERSION}-${RelDate} RelVer=${VERSION}-${RelDate}

2
restagent/makefile
View File

@@ -1,7 +1,7 @@
# Makefile for rest agent project # Makefile for rest agent project
PROJECT = OMC PROJECT = OMC
VERSION = 2.2404.4 VERSION = 2.2404.3
PLATFORM = amd64 PLATFORM = amd64
ARMPLATFORM = aarch64 ARMPLATFORM = aarch64
BUILDDIR = ../../build BUILDDIR = ../../build

2
src/framework/config/config/config.default.yaml
View File

@@ -1,7 +1,7 @@
# 项目信息 # 项目信息
framework: framework:
name: "CN EMS" name: "CN EMS"
version: "2.2404.4" version: "2.2404.3"
# 应用服务配置 # 应用服务配置
server: server:

7
src/modules/monitor/repository/sys_job_log.impl.go
View File

@@ -6,7 +6,6 @@ import (
"be.ems/src/framework/datasource" "be.ems/src/framework/datasource"
"be.ems/src/framework/logger" "be.ems/src/framework/logger"
"be.ems/src/framework/utils/date"
"be.ems/src/framework/utils/parse" "be.ems/src/framework/utils/parse"
"be.ems/src/framework/utils/repo" "be.ems/src/framework/utils/repo"
"be.ems/src/modules/monitor/model" "be.ems/src/modules/monitor/model"
@@ -80,8 +79,7 @@ func (r *SysJobLogImpl) SelectJobLogPage(query map[string]any) map[string]any {
} }
if ok && beginTime != "" { if ok && beginTime != "" {
conditions = append(conditions, "create_time >= ?") conditions = append(conditions, "create_time >= ?")
beginDate := date.ParseStrToDate(beginTime.(string), date.YYYY_MM_DD) params = append(params, parse.Number(beginTime.(string)))
params = append(params, beginDate.UnixMilli())
} }
endTime, ok := query["endTime"] endTime, ok := query["endTime"]
if !ok { if !ok {
@@ -89,8 +87,7 @@ func (r *SysJobLogImpl) SelectJobLogPage(query map[string]any) map[string]any {
} }
if ok && endTime != "" { if ok && endTime != "" {
conditions = append(conditions, "create_time <= ?") conditions = append(conditions, "create_time <= ?")
endDate := date.ParseStrToDate(endTime.(string), date.YYYY_MM_DD) params = append(params, parse.Number(endTime.(string)))
params = append(params, endDate.UnixMilli())
} }
// 构建查询条件语句 // 构建查询条件语句

7
src/modules/system/repository/sys_config.impl.go
View File

@@ -7,7 +7,6 @@ import (
"be.ems/src/framework/datasource" "be.ems/src/framework/datasource"
"be.ems/src/framework/logger" "be.ems/src/framework/logger"
"be.ems/src/framework/utils/date"
"be.ems/src/framework/utils/parse" "be.ems/src/framework/utils/parse"
"be.ems/src/framework/utils/repo" "be.ems/src/framework/utils/repo"
"be.ems/src/modules/system/model" "be.ems/src/modules/system/model"
@@ -79,8 +78,7 @@ func (r *SysConfigImpl) SelectConfigPage(query map[string]any) map[string]any {
} }
if ok && beginTime != "" { if ok && beginTime != "" {
conditions = append(conditions, "create_time >= ?") conditions = append(conditions, "create_time >= ?")
beginDate := date.ParseStrToDate(beginTime.(string), date.YYYY_MM_DD) params = append(params, parse.Number(beginTime.(string)))
params = append(params, beginDate.UnixMilli())
} }
endTime, ok := query["endTime"] endTime, ok := query["endTime"]
if !ok { if !ok {
@@ -88,8 +86,7 @@ func (r *SysConfigImpl) SelectConfigPage(query map[string]any) map[string]any {
} }
if ok && endTime != "" { if ok && endTime != "" {
conditions = append(conditions, "create_time <= ?") conditions = append(conditions, "create_time <= ?")
endDate := date.ParseStrToDate(endTime.(string), date.YYYY_MM_DD) params = append(params, parse.Number(endTime.(string)))
params = append(params, endDate.UnixMilli())
} }
// 构建查询条件语句 // 构建查询条件语句

7
src/modules/system/repository/sys_dict_type.impl.go
View File

@@ -7,7 +7,6 @@ import (
"be.ems/src/framework/datasource" "be.ems/src/framework/datasource"
"be.ems/src/framework/logger" "be.ems/src/framework/logger"
"be.ems/src/framework/utils/date"
"be.ems/src/framework/utils/parse" "be.ems/src/framework/utils/parse"
"be.ems/src/framework/utils/repo" "be.ems/src/framework/utils/repo"
"be.ems/src/modules/system/model" "be.ems/src/modules/system/model"
@@ -78,8 +77,7 @@ func (r *SysDictTypeImpl) SelectDictTypePage(query map[string]any) map[string]an
} }
if ok && beginTime != "" { if ok && beginTime != "" {
conditions = append(conditions, "create_time >= ?") conditions = append(conditions, "create_time >= ?")
beginDate := date.ParseStrToDate(beginTime.(string), date.YYYY_MM_DD) params = append(params, parse.Number(beginTime.(string)))
params = append(params, beginDate.UnixMilli())
} }
endTime, ok := query["endTime"] endTime, ok := query["endTime"]
if !ok { if !ok {
@@ -87,8 +85,7 @@ func (r *SysDictTypeImpl) SelectDictTypePage(query map[string]any) map[string]an
} }
if ok && endTime != "" { if ok && endTime != "" {
conditions = append(conditions, "create_time <= ?") conditions = append(conditions, "create_time <= ?")
endDate := date.ParseStrToDate(endTime.(string), date.YYYY_MM_DD) params = append(params, parse.Number(endTime.(string)))
params = append(params, endDate.UnixMilli())
} }
// 构建查询条件语句 // 构建查询条件语句

7
src/modules/system/repository/sys_log_login.impl.go
View File

@@ -6,7 +6,6 @@ import (
"be.ems/src/framework/datasource" "be.ems/src/framework/datasource"
"be.ems/src/framework/logger" "be.ems/src/framework/logger"
"be.ems/src/framework/utils/date"
"be.ems/src/framework/utils/parse" "be.ems/src/framework/utils/parse"
"be.ems/src/framework/utils/repo" "be.ems/src/framework/utils/repo"
"be.ems/src/modules/system/model" "be.ems/src/modules/system/model"
@@ -76,8 +75,7 @@ func (r *SysLogLoginImpl) SelectSysLogLoginPage(query map[string]any) map[string
} }
if ok && beginTime != "" { if ok && beginTime != "" {
conditions = append(conditions, "login_time >= ?") conditions = append(conditions, "login_time >= ?")
beginDate := date.ParseStrToDate(beginTime.(string), date.YYYY_MM_DD_HH_MM_SS) params = append(params, parse.Number(beginTime.(string)))
params = append(params, beginDate.UnixMilli())
} }
endTime, ok := query["endTime"] endTime, ok := query["endTime"]
if !ok { if !ok {
@@ -85,8 +83,7 @@ func (r *SysLogLoginImpl) SelectSysLogLoginPage(query map[string]any) map[string
} }
if ok && endTime != "" { if ok && endTime != "" {
conditions = append(conditions, "login_time <= ?") conditions = append(conditions, "login_time <= ?")
endDate := date.ParseStrToDate(endTime.(string), date.YYYY_MM_DD_HH_MM_SS) params = append(params, parse.Number(endTime.(string)))
params = append(params, endDate.UnixMilli())
} }
// 构建查询条件语句 // 构建查询条件语句

7
src/modules/system/repository/sys_log_operate.impl.go
View File

@@ -6,7 +6,6 @@ import (
"be.ems/src/framework/datasource" "be.ems/src/framework/datasource"
"be.ems/src/framework/logger" "be.ems/src/framework/logger"
"be.ems/src/framework/utils/date"
"be.ems/src/framework/utils/parse" "be.ems/src/framework/utils/parse"
"be.ems/src/framework/utils/repo" "be.ems/src/framework/utils/repo"
"be.ems/src/modules/system/model" "be.ems/src/modules/system/model"
@@ -89,8 +88,7 @@ func (r *SysLogOperateImpl) SelectSysLogOperatePage(query map[string]any) map[st
} }
if ok && beginTime != "" { if ok && beginTime != "" {
conditions = append(conditions, "oper_time >= ?") conditions = append(conditions, "oper_time >= ?")
beginDate := date.ParseStrToDate(beginTime.(string), date.YYYY_MM_DD_HH_MM_SS) params = append(params, parse.Number(beginTime.(string)))
params = append(params, beginDate.UnixMilli())
} }
endTime, ok := query["endTime"] endTime, ok := query["endTime"]
if !ok { if !ok {
@@ -98,8 +96,7 @@ func (r *SysLogOperateImpl) SelectSysLogOperatePage(query map[string]any) map[st
} }
if ok && endTime != "" { if ok && endTime != "" {
conditions = append(conditions, "oper_time <= ?") conditions = append(conditions, "oper_time <= ?")
endDate := date.ParseStrToDate(endTime.(string), date.YYYY_MM_DD_HH_MM_SS) params = append(params, parse.Number(endTime.(string)))
params = append(params, endDate.UnixMilli())
} }
// 构建查询条件语句 // 构建查询条件语句

7
src/modules/system/repository/sys_role.impl.go
View File

@@ -7,7 +7,6 @@ import (
"be.ems/src/framework/datasource" "be.ems/src/framework/datasource"
"be.ems/src/framework/logger" "be.ems/src/framework/logger"
"be.ems/src/framework/utils/date"
"be.ems/src/framework/utils/parse" "be.ems/src/framework/utils/parse"
"be.ems/src/framework/utils/repo" "be.ems/src/framework/utils/repo"
"be.ems/src/modules/system/model" "be.ems/src/modules/system/model"
@@ -91,8 +90,7 @@ func (r *SysRoleImpl) SelectRolePage(query map[string]any, dataScopeSQL string)
} }
if ok && beginTime != "" { if ok && beginTime != "" {
conditions = append(conditions, "r.create_time >= ?") conditions = append(conditions, "r.create_time >= ?")
beginDate := date.ParseStrToDate(beginTime.(string), date.YYYY_MM_DD) params = append(params, parse.Number(beginTime.(string)))
params = append(params, beginDate.UnixMilli())
} }
endTime, ok := query["endTime"] endTime, ok := query["endTime"]
if !ok { if !ok {
@@ -100,8 +98,7 @@ func (r *SysRoleImpl) SelectRolePage(query map[string]any, dataScopeSQL string)
} }
if ok && endTime != "" { if ok && endTime != "" {
conditions = append(conditions, "r.create_time <= ?") conditions = append(conditions, "r.create_time <= ?")
endDate := date.ParseStrToDate(endTime.(string), date.YYYY_MM_DD) params = append(params, parse.Number(endTime.(string)))
params = append(params, endDate.UnixMilli())
} }
if v, ok := query["deptId"]; ok && v != "" { if v, ok := query["deptId"]; ok && v != "" {
conditions = append(conditions, `(u.dept_id = ? or u.dept_id in ( conditions = append(conditions, `(u.dept_id = ? or u.dept_id in (

7
src/modules/system/repository/sys_user.impl.go
View File

@@ -8,7 +8,6 @@ import (
"be.ems/src/framework/datasource" "be.ems/src/framework/datasource"
"be.ems/src/framework/logger" "be.ems/src/framework/logger"
"be.ems/src/framework/utils/crypto" "be.ems/src/framework/utils/crypto"
"be.ems/src/framework/utils/date"
"be.ems/src/framework/utils/parse" "be.ems/src/framework/utils/parse"
"be.ems/src/framework/utils/repo" "be.ems/src/framework/utils/repo"
"be.ems/src/modules/system/model" "be.ems/src/modules/system/model"
@@ -156,8 +155,7 @@ func (r *SysUserImpl) SelectUserPage(query map[string]any, dataScopeSQL string)
} }
if ok && beginTime != "" { if ok && beginTime != "" {
conditions = append(conditions, "u.login_date >= ?") conditions = append(conditions, "u.login_date >= ?")
beginDate := date.ParseStrToDate(beginTime.(string), date.YYYY_MM_DD) params = append(params, parse.Number(beginTime.(string)))
params = append(params, beginDate.UnixMilli())
} }
endTime, ok := query["endTime"] endTime, ok := query["endTime"]
if !ok { if !ok {
@@ -165,8 +163,7 @@ func (r *SysUserImpl) SelectUserPage(query map[string]any, dataScopeSQL string)
} }
if ok && endTime != "" { if ok && endTime != "" {
conditions = append(conditions, "u.login_date <= ?") conditions = append(conditions, "u.login_date <= ?")
endDate := date.ParseStrToDate(endTime.(string), date.YYYY_MM_DD) params = append(params, parse.Number(endTime.(string)))
params = append(params, endDate.UnixMilli())
} }
if v, ok := query["deptId"]; ok && v != "" { 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) ))") conditions = append(conditions, "(u.dept_id = ? or u.dept_id in ( select t.dept_id from sys_dept t where find_in_set(?, ancestors) ))")

2
sshsvc/makefile
View File

@@ -1,7 +1,7 @@
# Makefile for OMC-OMC-crontask project # Makefile for OMC-OMC-crontask project
PROJECT = OMC PROJECT = OMC
VERSION = 2.2404.4 VERSION = 2.2404.3
LIBDIR = be.ems/lib LIBDIR = be.ems/lib
BINNAME = sshsvc BINNAME = sshsvc