diff --git a/models/leit_server_log_model.go b/models/base/leit_server_log_model.go similarity index 99% rename from models/leit_server_log_model.go rename to models/base/leit_server_log_model.go index 3a7453e..33c8131 100644 --- a/models/leit_server_log_model.go +++ b/models/base/leit_server_log_model.go @@ -1,4 +1,4 @@ -package models +package base import ( "context" diff --git a/web/controllers/base/base.go b/web/controllers/base/base.go index f773577..d82e9ed 100644 --- a/web/controllers/base/base.go +++ b/web/controllers/base/base.go @@ -6,7 +6,6 @@ import ( "github.com/kataras/iris/v12/core/router" "leit.com/LAPP_CHEERSSON_BACKEND/grmi" svr "leit.com/LAPP_CHEERSSON_BACKEND/services/base" - "leit.com/LAPP_CHEERSSON_BACKEND/web/controllers" ) /****************************************************************************** @@ -637,7 +636,7 @@ func RegisterRoutes() { // 日志管理 logs := party.Party("/logs") - logs.Get("/loglist", controllers.Loglist) + logs.Get("/loglist", Loglist) }) } diff --git a/web/controllers/log_controller.go b/web/controllers/base/log_controller.go similarity index 89% rename from web/controllers/log_controller.go rename to web/controllers/base/log_controller.go index 78ad473..3246b0f 100644 --- a/web/controllers/log_controller.go +++ b/web/controllers/base/log_controller.go @@ -1,8 +1,8 @@ -package controllers +package base import ( "github.com/kataras/iris/v12" - "leit.com/LAPP_CHEERSSON_BACKEND/models" + "leit.com/LAPP_CHEERSSON_BACKEND/models/base" "leit.com/LAPP_CHEERSSON_BACKEND/utils" "leit.com/LAPP_CHEERSSON_BACKEND/web/middleware/jwts" "leit.com/LAPP_CHEERSSON_BACKEND/web/supports" @@ -17,7 +17,7 @@ func Loglist(ctx iris.Context) { return } - search := models.SerchData{} + search := base.SerchData{} search.Userid = user.UserId search.Key = ctx.URLParam("searchKey") search.Val = ctx.URLParam("searchValue") @@ -38,7 +38,7 @@ func Loglist(ctx iris.Context) { limit := int64(pageSize) * (int64(pageIndex)-1) offet := int64(pageSize) * int64(pageIndex) - logs := new(models.LeitServerLog) + logs := new(base.LeitServerLog) result, count := logs.FindLog(search, limit, offet) res := make(map[string]interface{}) res["data"] = result