Merge branch 'main' of http://192.168.2.166:3180/OMC/ems_backend

2023-10-20 19:27:47 +08:00
parent 92a9c4f1d6 3100ea1356
commit f955d109d2
3 changed files with 32 additions and 31 deletions
--- a/features/udm_user/api_udm_user.go
+++ b/features/udm_user/api_udm_user.go
@@ -20,6 +20,7 @@ import (
 	"ems.agt/lib/midware"
 	"ems.agt/lib/services"
 	"ems.agt/restagent/config"
+	"ems.agt/src/framework/middleware/collectlogs"
 )

 // UDM 用户信息接口添加到路由
@@ -31,7 +32,7 @@ func Routers() []services.RouterItem {
 	}

 	rs := [...]services.RouterItem{
-		// UDM签约用户
+		// UDM鉴权用户
 		{
 			Method:     "GET",
 			Pattern:    "/auths",
@@ -42,7 +43,7 @@ func Routers() []services.RouterItem {
 			Method:     "POST",
 			Pattern:    "/authSave/{neId}",
 			Handler:    apis.UdmAuthUserSave,
-			Middleware: midware.Authorize(nil),
+			Middleware: midware.LogOperate(collectlogs.OptionNew("UDM Authentication User", collectlogs.BUSINESS_TYPE_INSERT)),
 		},
 		{
 			Method:     "GET",
@@ -54,43 +55,43 @@ func Routers() []services.RouterItem {
 			Method:     "POST",
 			Pattern:    "/auth/{neId}",
 			Handler:    apis.UdmAuthUserAdd,
-			Middleware: midware.Authorize(nil),
+			Middleware: midware.LogOperate(collectlogs.OptionNew("UDM Authentication User", collectlogs.BUSINESS_TYPE_INSERT)),
 		},
 		{
 			Method:     "POST",
 			Pattern:    "/auth/{neId}/{num}",
 			Handler:    apis.UdmAuthUserAdds,
-			Middleware: midware.Authorize(nil),
+			Middleware: midware.LogOperate(collectlogs.OptionNew("UDM Authentication User", collectlogs.BUSINESS_TYPE_INSERT)),
 		},
 		{
 			Method:     "PUT",
 			Pattern:    "/auth/{neId}",
 			Handler:    apis.UdmAuthUserEdit,
-			Middleware: midware.Authorize(nil),
+			Middleware: midware.LogOperate(collectlogs.OptionNew("UDM Authentication User", collectlogs.BUSINESS_TYPE_UPDATE)),
 		},
 		{
 			Method:     "DELETE",
 			Pattern:    "/auth/{neId}/{imsi}",
 			Handler:    apis.UdmAuthUserRemove,
-			Middleware: midware.Authorize(nil),
+			Middleware: midware.LogOperate(collectlogs.OptionNew("UDM Authentication User", collectlogs.BUSINESS_TYPE_DELETE)),
 		},
 		{
 			Method:     "DELETE",
 			Pattern:    "/auth/{neId}/{imsi}/{num}",
 			Handler:    apis.UdmAuthUserRemoves,
-			Middleware: midware.Authorize(nil),
+			Middleware: midware.LogOperate(collectlogs.OptionNew("UDM Authentication User", collectlogs.BUSINESS_TYPE_DELETE)),
 		},
 		{
 			Method:     "POST",
 			Pattern:    "/authExport",
 			Handler:    apis.UdmAuthUserExport,
-			Middleware: midware.Authorize(nil),
+			Middleware: midware.LogOperate(collectlogs.OptionNew("UDM Authentication User", collectlogs.BUSINESS_TYPE_EXPORT)),
 		},
 		{
 			Method:     "POST",
 			Pattern:    "/authImport/{neId}",
 			Handler:    apis.UdmAuthUserImport,
-			Middleware: midware.Authorize(nil),
+			Middleware: midware.LogOperate(collectlogs.OptionNew("UDM Authentication User", collectlogs.BUSINESS_TYPE_IMPORT)),
 		},
 		// UDM签约用户
 		{
@@ -103,7 +104,7 @@ func Routers() []services.RouterItem {
 			Method:     "POST",
 			Pattern:    "/subSave/{neId}",
 			Handler:    apis.UdmSubUserSave,
-			Middleware: midware.Authorize(nil),
+			Middleware: midware.LogOperate(collectlogs.OptionNew("UDM contracted users", collectlogs.BUSINESS_TYPE_INSERT)),
 		},
 		{
 			Method:     "GET",
@@ -115,55 +116,55 @@ func Routers() []services.RouterItem {
 			Method:     "POST",
 			Pattern:    "/sub/{neId}",
 			Handler:    apis.UdmSubUserAdd,
-			Middleware: midware.Authorize(nil),
+			Middleware: midware.LogOperate(collectlogs.OptionNew("UDM contracted users", collectlogs.BUSINESS_TYPE_INSERT)),
 		},
 		{
 			Method:     "POST",
 			Pattern:    "/sub/{neId}/{num}",
 			Handler:    apis.UdmSubUserAdds,
-			Middleware: midware.Authorize(nil),
+			Middleware: midware.LogOperate(collectlogs.OptionNew("UDM contracted users", collectlogs.BUSINESS_TYPE_INSERT)),
 		},
 		{
 			Method:     "PUT",
 			Pattern:    "/sub/{neId}",
 			Handler:    apis.UdmSubUserEdit,
-			Middleware: midware.Authorize(nil),
+			Middleware: midware.LogOperate(collectlogs.OptionNew("UDM contracted users", collectlogs.BUSINESS_TYPE_UPDATE)),
 		},
 		{
 			Method:     "PUT",
 			Pattern:    "/sub4gIP/{neId}",
 			Handler:    apis.UdmSubUser4GIP,
-			Middleware: midware.Authorize(nil),
+			Middleware: midware.LogOperate(collectlogs.OptionNew("UDM contracted users", collectlogs.BUSINESS_TYPE_UPDATE)),
 		},
 		{
 			Method:     "PUT",
 			Pattern:    "/subSmData/{neId}",
 			Handler:    apis.UdmSubUserSmData,
-			Middleware: midware.Authorize(nil),
+			Middleware: midware.LogOperate(collectlogs.OptionNew("UDM contracted users", collectlogs.BUSINESS_TYPE_UPDATE)),
 		},
 		{
 			Method:     "DELETE",
 			Pattern:    "/sub/{neId}/{imsi}",
 			Handler:    apis.UdmSubUserRemove,
-			Middleware: midware.Authorize(nil),
+			Middleware: midware.LogOperate(collectlogs.OptionNew("UDM contracted users", collectlogs.BUSINESS_TYPE_DELETE)),
 		},
 		{
 			Method:     "DELETE",
 			Pattern:    "/sub/{neId}/{imsi}/{num}",
 			Handler:    apis.UdmSubUserRemoves,
-			Middleware: midware.Authorize(nil),
+			Middleware: midware.LogOperate(collectlogs.OptionNew("UDM contracted users", collectlogs.BUSINESS_TYPE_DELETE)),
 		},
 		{
 			Method:     "POST",
 			Pattern:    "/subExport",
 			Handler:    apis.UdmSubUserExport,
-			Middleware: midware.Authorize(nil),
+			Middleware: midware.LogOperate(collectlogs.OptionNew("UDM contracted users", collectlogs.BUSINESS_TYPE_EXPORT)),
 		},
 		{
 			Method:     "POST",
 			Pattern:    "/subImport/{neId}",
 			Handler:    apis.UdmSubUserImport,
-			Middleware: midware.Authorize(nil),
+			Middleware: midware.LogOperate(collectlogs.OptionNew("UDM contracted users", collectlogs.BUSINESS_TYPE_IMPORT)),
 		},
 		// 添加更多的 Router 对象...
 	}
--- a/lib/routes/routes.go
+++ b/lib/routes/routes.go
@@ -219,25 +219,25 @@ func init() {
 	Register("POST", cm.CustomUriLicense, cm.UploadLicenseFileData, nil)
 	Register("POST", cm.CustomUriLicenseExt, cm.UploadLicenseFileData, nil)

-	// Trace management
-	Register("POST", trace.UriTraceTask, trace.PostTraceTaskToNF, midware.LogOperate(collectlogs.OptionNew("跟踪任务", collectlogs.BUSINESS_TYPE_INSERT)))
-	Register("PUT", trace.UriTraceTask, trace.PutTraceTaskToNF, midware.LogOperate(collectlogs.OptionNew("跟踪任务", collectlogs.BUSINESS_TYPE_UPDATE)))
-	Register("DELETE", trace.UriTraceTask, trace.DeleteTraceTaskToNF, midware.LogOperate(collectlogs.OptionNew("跟踪任务", collectlogs.BUSINESS_TYPE_DELETE)))
+	// Trace management 跟踪任务
+	Register("POST", trace.UriTraceTask, trace.PostTraceTaskToNF, midware.LogOperate(collectlogs.OptionNew("Trace Task", collectlogs.BUSINESS_TYPE_INSERT)))
+	Register("PUT", trace.UriTraceTask, trace.PutTraceTaskToNF, midware.LogOperate(collectlogs.OptionNew("Trace Task", collectlogs.BUSINESS_TYPE_UPDATE)))
+	Register("DELETE", trace.UriTraceTask, trace.DeleteTraceTaskToNF, midware.LogOperate(collectlogs.OptionNew("Trace Task", collectlogs.BUSINESS_TYPE_DELETE)))
 	Register("GET", trace.UriTraceDecMsg, trace.ParseRawMsg2Html, nil)

 	Register("POST", trace.CustomUriTraceTask, trace.PostTraceTaskToNF, nil)
 	Register("PUT", trace.CustomUriTraceTask, trace.PutTraceTaskToNF, nil)
 	Register("DELETE", trace.CustomUriTraceTask, trace.DeleteTraceTaskToNF, nil)

-	// 网元发送执行 pcap抓包
-	Register("POST", trace.UriTcpdumpTask, trace.TcpdumpNeTask, midware.LogOperate(collectlogs.OptionNew("抓包任务", collectlogs.BUSINESS_TYPE_INSERT)))
-	Register("POST", trace.CustomUriTcpdumpTask, trace.TcpdumpNeTask, midware.LogOperate(collectlogs.OptionNew("抓包任务", collectlogs.BUSINESS_TYPE_INSERT)))
+	// 网元发送执行 pcap抓包任务
+	Register("POST", trace.UriTcpdumpTask, trace.TcpdumpNeTask, midware.LogOperate(collectlogs.OptionNew("Packet capturing task", collectlogs.BUSINESS_TYPE_INSERT)))
+	Register("POST", trace.CustomUriTcpdumpTask, trace.TcpdumpNeTask, midware.LogOperate(collectlogs.OptionNew("Packet capturing task", collectlogs.BUSINESS_TYPE_INSERT)))
 	// 网元发送执行 抓包下载pcap文件
-	Register("POST", trace.UriTcpdumpPcapDownload, trace.TcpdumpPcapDownload, midware.LogOperate(collectlogs.OptionNew("抓包任务", collectlogs.BUSINESS_TYPE_EXPORT)))
-	Register("POST", trace.CustomUriTcpdumpPcapDownload, trace.TcpdumpPcapDownload, midware.LogOperate(collectlogs.OptionNew("抓包任务", collectlogs.BUSINESS_TYPE_EXPORT)))
+	Register("POST", trace.UriTcpdumpPcapDownload, trace.TcpdumpPcapDownload, midware.LogOperate(collectlogs.OptionNew("Packet capturing task", collectlogs.BUSINESS_TYPE_EXPORT)))
+	Register("POST", trace.CustomUriTcpdumpPcapDownload, trace.TcpdumpPcapDownload, midware.LogOperate(collectlogs.OptionNew("Packet capturing task", collectlogs.BUSINESS_TYPE_EXPORT)))
 	// 网元发送执行UPF pcap抓包
-	Register("POST", trace.UriTcpdumpNeUPFTask, trace.TcpdumpNeUPFTask, midware.LogOperate(collectlogs.OptionNew("抓包任务", collectlogs.BUSINESS_TYPE_INSERT)))
-	Register("POST", trace.CustomUriTcpdumpNeUPFTask, trace.TcpdumpNeUPFTask, midware.LogOperate(collectlogs.OptionNew("抓包任务", collectlogs.BUSINESS_TYPE_INSERT)))
+	Register("POST", trace.UriTcpdumpNeUPFTask, trace.TcpdumpNeUPFTask, midware.LogOperate(collectlogs.OptionNew("Packet capturing task", collectlogs.BUSINESS_TYPE_INSERT)))
+	Register("POST", trace.CustomUriTcpdumpNeUPFTask, trace.TcpdumpNeUPFTask, midware.LogOperate(collectlogs.OptionNew("Packet capturing task", collectlogs.BUSINESS_TYPE_INSERT)))

 	// file management
 	Register("POST", file.UriFile, file.UploadFile, nil)
--- a/src/modules/common/controller/account.go
+++ b/src/modules/common/controller/account.go
@@ -134,7 +134,7 @@ func (s *AccountController) Logout(c *gin.Context) {
 			os, browser := ctxUtils.UaOsBrowser(c)
 			// 创建系统访问记录
 			s.sysLogLoginService.NewSysLogLogin(
-				userName, commonConstants.STATUS_NO, "退出成功",
+				userName, commonConstants.STATUS_YES, "退出成功",
 				ipaddr, location, os, browser,
 			)
 		}