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

captrace/makefile

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

crontask/makefile

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

data2html/makefile

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

makefile

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

misc/actpkg.sh

@@ -27,6 +27,7 @@ case "${extension}" in
 EOF
         if [ ${neType} == "OMC" ]; then
             ${omcBin}/setomc.sh -m upgrade >> ${logFile}
+            ${omcBin}/omcsvc.sh restart
         fi
         ;;
     rpm)
@@ -42,6 +43,7 @@ EOF
 EOF
         if [ ${neType} == "OMC" ]; then
             ${omcBin}/setomc.sh -m upgrade >> ${logFile}
+            ${omcBin}/omcsvc.sh restart
         fi
         ;;
    *)

misc/rbkpkg.sh

@@ -27,6 +27,7 @@ case "${extension}" in
 EOF
         if [ ${neType} == "OMC" ]; then
             ${omcBin}/setomc.sh -m upgrade >> ${logFile}
+            ${omcBin}/omcsvc.sh restart
         fi
         ;;
     rpm)
@@ -42,6 +43,7 @@ EOF
 EOF
         if [ ${neType} == "OMC" ]; then
             ${omcBin}/setomc.sh -m upgrade >> ${logFile}
+            ${omcBin}/omcsvc.sh restart
         fi
         ;;
    *)

mkpkg.sh

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

restagent/makefile

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

src/framework/config/config/config.default.yaml

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

src/modules/monitor/controller/sys_job.go

@@ -40,12 +40,17 @@ type SysJobController struct {
 //
 // GET /list
 func (s *SysJobController) List(c *gin.Context) {
-	querys := ctx.QueryMap(c)
-	data := s.sysJobService.SelectJobPage(querys)
-
-	rows := data["rows"].([]model.SysJob)
-	// 闭包函数处理多语言
 	language := ctx.AcceptLanguage(c)
+	querys := ctx.QueryMap(c)
+	// 多语言值转key查询
+	if v, ok := querys["jobName"]; ok && v != "" {
+		querys["jobName"] = i18n.TFindKeyPrefix(language, "job", v.(string))
+	}
+
+	data := s.sysJobService.SelectJobPage(querys)
+	rows := data["rows"].([]model.SysJob)
+
+	// 闭包函数处理多语言
 	converI18n := func(language string, arr *[]model.SysJob) {
 		for i := range *arr {
 			(*arr)[i].JobName = i18n.TKey(language, (*arr)[i].JobName)

src/modules/monitor/controller/sys_job_log.go

@@ -39,6 +39,7 @@ type SysJobLogController struct {
 //
 // GET /list
 func (s *SysJobLogController) List(c *gin.Context) {
+	language := ctx.AcceptLanguage(c)
 	// 查询参数转换map
 	querys := ctx.QueryMap(c)
 	// 任务ID优先级更高
@@ -47,11 +48,15 @@ func (s *SysJobLogController) List(c *gin.Context) {
 		querys["jobName"] = jobInfo.JobName
 		querys["jobGroup"] = jobInfo.JobGroup
 	}
-	data := s.sysJobLogService.SelectJobLogPage(querys)
+	// 多语言值转key查询
+	if v, ok := querys["jobName"]; ok && v != "" {
+		querys["jobName"] = i18n.TFindKeyPrefix(language, "job", v.(string))
+	}
 
+	data := s.sysJobLogService.SelectJobLogPage(querys)
 	rows := data["rows"].([]model.SysJobLog)
+
 	// 闭包函数处理多语言
-	language := ctx.AcceptLanguage(c)
 	converI18n := func(language string, arr *[]model.SysJobLog) {
 		for i := range *arr {
 			(*arr)[i].JobName = i18n.TKey(language, (*arr)[i].JobName)

src/modules/system/controller/sys_dept.go

@@ -35,13 +35,13 @@ func (s *SysDeptController) List(c *gin.Context) {
 	language := ctx.AcceptLanguage(c)
 	var querys struct {
 		// 部门ID
-		DeptID string `json:"deptId"`
+		DeptID string `form:"deptId"`
 		// 父部门ID
-		ParentID string `json:"parentId" `
+		ParentID string `form:"parentId" `
 		// 部门名称
-		DeptName string `json:"deptName" `
+		DeptName string `form:"deptName" `
 		// 部门状态（0正常 1停用）
-		Status string `json:"status"`
+		Status string `form:"status"`
 	}
 	err := c.ShouldBindQuery(&querys)
 	if err != nil {

src/modules/system/controller/sys_menu.go

@@ -33,9 +33,10 @@ type SysMenuController struct {
 //
 // GET /list
 func (s *SysMenuController) List(c *gin.Context) {
+	language := ctx.AcceptLanguage(c)
 	query := model.SysMenu{}
 	if v, ok := c.GetQuery("menuName"); ok && v != "" {
-		query.MenuName = v
+		query.MenuName = i18n.TFindKeyPrefix(language, "menu", v)
 	}
 	if v, ok := c.GetQuery("status"); ok && v != "" {
 		query.Status = v
@@ -48,7 +49,6 @@ func (s *SysMenuController) List(c *gin.Context) {
 	data := s.sysMenuService.SelectMenuList(query, userId)
 
 	// 闭包函数处理多语言
-	language := ctx.AcceptLanguage(c)
 	var converI18n func(language string, arr *[]model.SysMenu)
 	converI18n = func(language string, arr *[]model.SysMenu) {
 		for i := range *arr {

sshsvc/makefile

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