From 2e9ee18069141e0a3e14a101ac9a60636710fcfa Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Tue, 16 Apr 2024 21:04:37 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20MML=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E4=B8=AD=E9=97=B4=E4=BB=B6=E7=94=A8=E6=88=B7=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/midware/mml_log.go | 12 ++---------- lib/routes/routes.go | 6 +++--- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/lib/midware/mml_log.go b/lib/midware/mml_log.go index a28be1b5..91711477 100644 --- a/lib/midware/mml_log.go +++ b/lib/midware/mml_log.go @@ -12,7 +12,6 @@ import ( "be.ems/lib/core/datasource" "be.ems/lib/core/utils/ctx" "be.ems/lib/core/utils/date" - "be.ems/lib/dborm" "be.ems/lib/log" ) @@ -50,19 +49,12 @@ func LogMML(next http.Handler) http.Handler { resultStr := fmt.Sprintf(`{"status":"%s","size":"%s","content-type":"%s"}`, status, size, contentType) // 用户名 - username := "-" - accessToken := r.Header.Get("AccessToken") - if accessToken != "" { - // 验证令牌 == 这里直接查数据库session - se, _ := dborm.XormUpdateSessionShakeTime(accessToken) - username = se.AccountId - } - + username := ctx.LoginUserToUserName(r) // 执行插入 sql := "insert into mml_log (user,ip,ne_type,ne_id,mml,result,log_time)values(?,?,?,?,?,?,?)" _, sqlerr := datasource.ExecDB("", sql, []any{username, ipAddr, neType, neId, mmlCmd, resultStr, timeStr}) if sqlerr != nil { - log.Errorf("insert row : %v", err.Error()) + log.Errorf("insert row : %v", sqlerr.Error()) } }) } diff --git a/lib/routes/routes.go b/lib/routes/routes.go index b0fb0a58..bf95fe71 100644 --- a/lib/routes/routes.go +++ b/lib/routes/routes.go @@ -174,11 +174,11 @@ func init() { Register("POST", mml.UriMML, mml.PostMMLToNF, midware.LogMML) Register("POST", mml.UriMMLDiscard, mml.PostMMLToNF, nil) Register("POST", mml.UriOmMmlExt, mml.PostMMLToOMC, midware.LogMML) - Register("POST", mml.CustomUriMML, mml.PostMMLToNF, midware.LogMML) - Register("POST", mml.CustomUriOmMmlExt, mml.PostMMLToOMC, midware.LogMML) + Register("POST", mml.CustomUriMML, mml.PostMMLToNF, nil) + Register("POST", mml.CustomUriOmMmlExt, mml.PostMMLToOMC, nil) // post mml2 (standard upf port=5002) Register("POST", mml.UriMML2, mml.PostMML2ToNF, midware.LogMML) - Register("POST", mml.CustomUriMML2, mml.PostMML2ToNF, midware.LogMML) + Register("POST", mml.CustomUriMML2, mml.PostMML2ToNF, nil) // Northbound Get NRM Register("GET", nbi.GetNRMUri, nbi.NBIGetNRMFromNF, nil)