From 164e70519f349a72739fd90ce74d647e2355bbd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=94=E5=BF=B5?= <1@72wo.cn> Date: Thu, 25 Dec 2025 12:14:04 +0800 Subject: [PATCH] =?UTF-8?q?```=20refactor(cool):=20=E4=BF=AE=E5=A4=8DLogge?= =?UTF-8?q?r=E5=8F=98=E9=87=8F=E5=90=8D=E6=8B=BC=E5=86=99=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将全局Logger变量从Loger修正为Logger，统一日志实例命名规范， 确保所有模块中日志记录的一致性。 BREAKING CHANGE: 全局日志实例变量名从Loger改为Logger ``` --- common/cool/cool.go | 10 +++++----- common/cool/ctx.go | 2 +- common/cool/func.go | 8 ++++---- common/cool/global.go | 8 ++++---- common/cool/initdb.go | 12 ++++++------ common/cool/service.go | 2 +- common/rpc/client.go | 2 +- common/rpc/rpc.go | 8 ++++---- common/socket/ServerEvent.go | 6 +++--- common/socket/kick.go | 4 ++-- logic/controller/login_main.go | 4 ++-- logic/service/fight/action.go | 10 +++++----- logic/service/fight/loop.go | 4 ++-- logic/service/player/pack.go | 10 +++++----- logic/service/player/player.go | 2 +- logic/service/player/save.go | 4 ++-- modules/base/base.go | 10 +++++----- modules/base/config/config.go | 2 +- modules/base/controller/admin/base_open.go | 4 ++-- modules/base/controller/app/base_comm.go | 4 ++-- modules/base/funcs/base_sys_log_clear.go | 2 +- modules/base/middleware/authority.go | 18 +++++++++--------- modules/base/service/base_sys_login.go | 6 +++--- modules/blazing/service/info.go | 2 +- modules/dict/dict.go | 4 ++-- modules/space/space.go | 4 ++-- modules/task/funcs/task_testfunc.go | 2 +- modules/task/service/service.go | 8 ++++---- modules/task/service/task_info.go | 4 ++-- modules/task/task.go | 4 ++-- 30 files changed, 85 insertions(+), 85 deletions(-) diff --git a/common/cool/cool.go b/common/cool/cool.go index b2dc87d55..c5d9502c3 100644 --- a/common/cool/cool.go +++ b/common/cool/cool.go @@ -33,7 +33,7 @@ func init() { ctx = gctx.GetInitCtx() redisConfig = &gredis.Config{} ) - Loger.Debug(ctx, "module cool init start ...", gtime.Now()) + Logger.Debug(ctx, "module cool init start ...", gtime.Now()) buildData := gbuild.Data() if _, ok := buildData["mode"]; ok { RunMode = buildData["mode"].(string) @@ -43,7 +43,7 @@ func init() { } redisVar, err := g.Cfg().Get(ctx, "redis.cool") if err != nil { - Loger.Error(ctx, "初始化缓存失败,请检查配置文件") + Logger.Error(ctx, "初始化缓存失败,请检查配置文件") panic(err) } if !redisVar.IsEmpty() { @@ -57,9 +57,9 @@ func init() { g.DB().GetCache().SetAdapter(gcache.NewAdapterRedis(redis)) //设置数据库 } //Logerebug(ctx, "当前运行模式", RunMode) - Loger.Debug(ctx, "当前实例ID:", ProcessFlag) - Loger.Debug(ctx, "是否缓存模式:", IsRedisMode) - Loger.Debug(ctx, "module cool init finished ...") + Logger.Debug(ctx, "当前实例ID:", ProcessFlag) + Logger.Debug(ctx, "是否缓存模式:", IsRedisMode) + Logger.Debug(ctx, "module cool init finished ...") } diff --git a/common/cool/ctx.go b/common/cool/ctx.go index fe570b888..ffca83449 100644 --- a/common/cool/ctx.go +++ b/common/cool/ctx.go @@ -31,7 +31,7 @@ func GetAdmin(ctx context.Context) *Admin { admin := &Admin{} err := gjson.New(r.GetCtxVar("admin").String()).Scan(admin) if err != nil { - Loger.Error(ctx, err) + Logger.Error(ctx, err) } return admin } diff --git a/common/cool/func.go b/common/cool/func.go index e11943e23..d93768151 100644 --- a/common/cool/func.go +++ b/common/cool/func.go @@ -41,7 +41,7 @@ func RunFunc(ctx g.Ctx, funcstring string) (err error) { if !FuncMap[funcName].IsAllWorker() { // 检查当前是否为主进程, 如果不是主进程, 则不执行 if ProcessFlag != CacheManager.MustGetOrSet(ctx, "cool:masterflag", ProcessFlag, 60*time.Second).String() { - Loger.Debug(ctx, "当前进程不是主进程, 不执行单例函数", funcName) + Logger.Debug(ctx, "当前进程不是主进程, 不执行单例函数", funcName) return } } @@ -79,7 +79,7 @@ func ListenFunc(ctx g.Ctx) { for { data, err := conn.Receive(ctx) if err != nil { - Loger.Error(ctx, err) + Logger.Error(ctx, err) time.Sleep(10 * time.Second) continue } @@ -89,10 +89,10 @@ func ListenFunc(ctx g.Ctx) { continue } if dataMap["Channel"] == "cool:func" { - Loger.Debug(ctx, "执行函数", dataMap["Payload"]) + Logger.Debug(ctx, "执行函数", dataMap["Payload"]) err := RunFunc(ctx, dataMap["Payload"]) if err != nil { - Loger.Error(ctx, "执行函数失败", err) + Logger.Error(ctx, "执行函数失败", err) } } } diff --git a/common/cool/global.go b/common/cool/global.go index 6497a7d94..04b3a4213 100644 --- a/common/cool/global.go +++ b/common/cool/global.go @@ -28,8 +28,8 @@ type Cmd struct { var ( CmdCache = &utils.SyncMap[uint32, Cmd]{} //命令缓存 - Loger = glog.New() - Cron = cronex.New() //时间轮 + Logger = glog.New() + Cron = cronex.New() //时间轮 ) var Filter *sensitive.Manager @@ -37,8 +37,8 @@ var DefaultGenerator = utils.NewGen(time.Date(2025, 1, 1, 0, 0, 0, 0, time.UTC), func init() { // 创建 IdGeneratorOptions 对象，可在构造函数中输入 WorkerId： - Loger.SetFlags(glog.F_TIME_STD | glog.F_FILE_LONG | glog.F_ASYNC) //设置flag - Loger.Print(ctx, "初始化日志") + Logger.SetFlags(glog.F_TIME_STD | glog.F_FILE_LONG | glog.F_ASYNC) //设置flag + Logger.Print(ctx, "初始化日志") // for i := 0; i < 600; i++ { // glog.Debug(context.Background(), i, "初始化雪花算法", DefaultGenerator.Get()) // } diff --git a/common/cool/initdb.go b/common/cool/initdb.go index 20c277b89..e4b20af67 100644 --- a/common/cool/initdb.go +++ b/common/cool/initdb.go @@ -66,30 +66,30 @@ func FillInitData(ctx g.Ctx, moduleName string, model IModel, ismod *bool) (bool mInit := g.DB("default").Model("base_sys_init") n, err := mInit.Clone().Where("group", model.GroupName()).Where("table", model.TableName()).Count() if err != nil { - Loger.Error(ctx, "读取表 base_sys_init 失败 ", err.Error()) + Logger.Error(ctx, "读取表 base_sys_init 失败 ", err.Error()) return false, err } if n > 0 { - Loger.Debug(ctx, "分组", model.GroupName(), "中的表", model.TableName(), "已经初始化过,跳过本次初始化.") + Logger.Debug(ctx, "分组", model.GroupName(), "中的表", model.TableName(), "已经初始化过,跳过本次初始化.") return false, err } m := g.DB(model.GroupName()).Model(model.TableName()) jsonData, _ := gjson.LoadContent(gres.GetContent("modules/" + moduleName + "/resource/initjson/" + model.TableName() + ".json")) if jsonData.Var().Clone().IsEmpty() { - Loger.Debug(ctx, "分组", model.GroupName(), "中的表", model.TableName(), "无可用的初始化数据,跳过本次初始化.") + Logger.Debug(ctx, "分组", model.GroupName(), "中的表", model.TableName(), "无可用的初始化数据,跳过本次初始化.") return false, err } _, err = m.Data(jsonData).Insert() if err != nil { - Loger.Error(ctx, err.Error()) + Logger.Error(ctx, err.Error()) return false, err } _, err = mInit.Insert(g.Map{"group": model.GroupName(), "table": model.TableName()}) if err != nil { - Loger.Error(ctx, err.Error()) + Logger.Error(ctx, err.Error()) return false, err } - Loger.Info(ctx, "分组", model.GroupName(), "中的表", model.TableName(), "初始化完成.") + Logger.Info(ctx, "分组", model.GroupName(), "中的表", model.TableName(), "初始化完成.") if ismod != nil { *ismod = true } diff --git a/common/cool/service.go b/common/cool/service.go index abdf60d9d..4dab99e3c 100644 --- a/common/cool/service.go +++ b/common/cool/service.go @@ -243,7 +243,7 @@ func (s *Service) ServiceList(ctx context.Context, req *ListReq) (data interface result, err := m.All() if err != nil { - Loger.Error(ctx, "ServiceList error:", err) + Logger.Error(ctx, "ServiceList error:", err) } if result == nil { data = garray.New() diff --git a/common/rpc/client.go b/common/rpc/client.go index 4b33fdae8..c5c5ed4f5 100644 --- a/common/rpc/client.go +++ b/common/rpc/client.go @@ -35,7 +35,7 @@ func GetServerInfoList() []ServerInfo { t, ok := cool.GetClient(v.Port) if ok { - cool.Loger.Info(context.TODO(), "服务器假踢人") + cool.Logger.Info(context.TODO(), "服务器假踢人") err := t.KickPerson(0) //实现指定服务器踢人 if err == nil { diff --git a/common/rpc/rpc.go b/common/rpc/rpc.go index 1a8c66cd6..0ad522e06 100644 --- a/common/rpc/rpc.go +++ b/common/rpc/rpc.go @@ -24,7 +24,7 @@ type ServerHandler struct{} // 实现踢人 func (h *ServerHandler) Kick(ctx context.Context, userid uint32) error { - cool.Loger.Info(context.TODO(), "服务器收到踢人") + cool.Logger.Info(context.TODO(), "服务器收到踢人") useid1, err := share.ShareManager.GetUserOnline(userid) if err != nil { @@ -43,7 +43,7 @@ func (h *ServerHandler) Kick(ctx context.Context, userid uint32) error { // 注册logic服务器 func (h *ServerHandler) RegisterLogic(ctx context.Context, id, port uint16) error { - cool.Loger.Debug(context.Background(), "注册logic服务器", id, port) + cool.Logger.Debug(context.Background(), "注册logic服务器", id, port) //TODO 待修复滚动更新可能导致的玩家可以同时在旧服务器和新服务器同时在线的bug revClient, ok := jsonrpc.ExtractReverseClient[cool.ClientHandler](ctx) @@ -67,13 +67,13 @@ func StartServer() { rpcServer := jsonrpc.NewServer(jsonrpc.WithReverseClient[cool.ClientHandler]("")) rpcServer.Register("", &ServerHandler{}) - cool.Loger.Debug(context.Background(), "jsonrpc server start", rpcport) + cool.Logger.Debug(context.Background(), "jsonrpc server start", rpcport) // go time.AfterFunc(3000, func() { // testjsonrpc() // }) err := http.ListenAndServe("0.0.0.0:"+rpcport, rpcServer) - cool.Loger.Debug(context.Background(), "jsonrpc server fail", err) + cool.Logger.Debug(context.Background(), "jsonrpc server fail", err) } var closer jsonrpc.ClientCloser diff --git a/common/socket/ServerEvent.go b/common/socket/ServerEvent.go index 4efa9055e..70c0e4d31 100644 --- a/common/socket/ServerEvent.go +++ b/common/socket/ServerEvent.go @@ -44,7 +44,7 @@ func (s *Server) OnClose(c gnet.Conn, err error) (action gnet.Action) { if err := recover(); err != nil { // 恢复 panic，err 为 panic 错误值 // 1. 打印错误信息 - cool.Loger.Error(context.TODO(), "panic 错误：", err) + cool.Logger.Error(context.TODO(), "panic 错误：", err) } }() @@ -111,7 +111,7 @@ func (s *Server) OnTraffic(c gnet.Conn) (action gnet.Action) { if err := recover(); err != nil { // 恢复 panic，err 为 panic 错误值 // 1. 打印错误信息 - cool.Loger.Error(context.TODO(), "panic 错误：", err) + cool.Logger.Error(context.TODO(), "panic 错误：", err) } }() @@ -187,7 +187,7 @@ func (s *Server) handleTcp(conn gnet.Conn) (action gnet.Action) { if conn.InboundBuffered() > 0 { if err := conn.Wake(nil); err != nil { // wake up the connection manually to avoid missing the leftover data - cool.Loger.Errorf(context.Background(), "failed to wake up the connection, %v", err) + cool.Logger.Errorf(context.Background(), "failed to wake up the connection, %v", err) return gnet.Close } } diff --git a/common/socket/kick.go b/common/socket/kick.go index 4836a6abb..5ad63df5f 100644 --- a/common/socket/kick.go +++ b/common/socket/kick.go @@ -12,7 +12,7 @@ type Broadcast struct { } func (h *Server) Broadcast(t string) int { - cool.Loger.Info(context.TODO(), "全服广播", t) + cool.Logger.Info(context.TODO(), "全服广播", t) var count int player.Mainplayer.Range(func(key uint32, value *player.Player) bool { count++ @@ -25,7 +25,7 @@ func (h *Server) Broadcast(t string) int { return count } func (h *Server) KickPerson(a int) error { - cool.Loger.Info(context.TODO(), "检测到踢人请求", a) + cool.Logger.Info(context.TODO(), "检测到踢人请求", a) if a == 0 { return nil } diff --git a/logic/controller/login_main.go b/logic/controller/login_main.go index bbf08bc0c..475d05fa9 100644 --- a/logic/controller/login_main.go +++ b/logic/controller/login_main.go @@ -32,12 +32,12 @@ func (h Controller) Login(data *user.MAIN_LOGIN_IN, c gnet.Conn) (result *user.L fmt.Println("踢人失败", err) } - cool.Loger.Info(context.TODO(), "踢人请求完成，继续登录流程") + cool.Logger.Info(context.TODO(), "踢人请求完成，继续登录流程") share.ShareManager.SetUserOnline(data.Head.UserID, h.Port) //设置用户登录服务器 currentPlayer := player.GetPlayer(c, data.Head.UserID) if currentPlayer == nil { - cool.Loger.Error(context.Background(), "获取玩家失败", data.Head.UserID) + cool.Logger.Error(context.Background(), "获取玩家失败", data.Head.UserID) defer c.Close() return diff --git a/logic/service/fight/action.go b/logic/service/fight/action.go index 0a785595a..cfe7ab9f2 100644 --- a/logic/service/fight/action.go +++ b/logic/service/fight/action.go @@ -30,7 +30,7 @@ func (f *FightC) Compare(a, b action.BattleActionI) (action.BattleActionI, actio // 玩家逃跑/无响应/掉线 func (f *FightC) Over(c common.PlayerI, res info.EnumBattleOverReason) { if f.closefight { - cool.Loger.Debug(context.Background(), " 战斗chan已关闭") + cool.Logger.Debug(context.Background(), " 战斗chan已关闭") return } // case *action.EscapeAction: @@ -56,7 +56,7 @@ func (f *FightC) Over(c common.PlayerI, res info.EnumBattleOverReason) { func (f *FightC) ChangePet(c common.PlayerI, id uint32) { if f.closefight { - cool.Loger.Debug(context.Background(), " 战斗chan已关闭") + cool.Logger.Debug(context.Background(), " 战斗chan已关闭") return } //todo 待实现无法切精灵的情况 @@ -71,7 +71,7 @@ func (f *FightC) ChangePet(c common.PlayerI, id uint32) { // 玩家使用技能 func (f *FightC) UseSkill(c common.PlayerI, id uint32) { if f.closefight { - cool.Loger.Debug(context.Background(), " 战斗chan已关闭") + cool.Logger.Debug(context.Background(), " 战斗chan已关闭") return } ret := &action.SelectSkillAction{ @@ -95,7 +95,7 @@ func (f *FightC) UseSkill(c common.PlayerI, id uint32) { // 玩家使用技能 func (f *FightC) Capture(c common.PlayerI, id uint32) { if f.closefight { - cool.Loger.Debug(context.Background(), " 战斗chan已关闭") + cool.Logger.Debug(context.Background(), " 战斗chan已关闭") return } f.actionChan <- &action.UseItemAction{BaseAction: action.NewBaseAction(c.GetInfo().UserID), ItemID: id} @@ -103,7 +103,7 @@ func (f *FightC) Capture(c common.PlayerI, id uint32) { func (f *FightC) UseItem(c common.PlayerI, cacthid, itemid uint32) { if f.closefight { - cool.Loger.Debug(context.Background(), " 战斗chan已关闭") + cool.Logger.Debug(context.Background(), " 战斗chan已关闭") return } f.actionChan <- &action.UseItemAction{BaseAction: action.NewBaseAction(c.GetInfo().UserID), ItemID: itemid, CacthTime: cacthid} diff --git a/logic/service/fight/loop.go b/logic/service/fight/loop.go index 630684535..b604559a4 100644 --- a/logic/service/fight/loop.go +++ b/logic/service/fight/loop.go @@ -215,7 +215,7 @@ func (f *FightC) handleTimeout(ourID, oppID uint32, actions map[uint32]action.Ba if _, exists := actions[pid]; exists { continue } - cool.Loger.Debug(context.Background(), "玩家超时", pid) + cool.Logger.Debug(context.Background(), "玩家超时", pid) f.Reason = info.BattleOverReason.PlayerOVerTime f.closefight = true @@ -231,7 +231,7 @@ func (f *FightC) handleTimeout(ourID, oppID uint32, actions map[uint32]action.Ba // 根据动作类型执行一回合结算 func (f *FightC) resolveRound(p1Action, p2Action action.BattleActionI) { if p1Action == nil || p2Action == nil { - cool.Loger.Debug(context.Background(), "某方未选择动作，自动跳过结算") + cool.Logger.Debug(context.Background(), "某方未选择动作，自动跳过结算") return } diff --git a/logic/service/player/pack.go b/logic/service/player/pack.go index cbad37fd3..dc90f9423 100644 --- a/logic/service/player/pack.go +++ b/logic/service/player/pack.go @@ -54,7 +54,7 @@ func (h *ClientData) Recv(data common.TomeeHeader) { if err := recover(); err != nil { // 恢复 panic，err 为 panic 错误值 // 1. 打印错误信息 - cool.Loger.Error(context.TODO(), "panic 错误：", err) + cool.Logger.Error(context.TODO(), "panic 错误：", err) } }() @@ -76,7 +76,7 @@ func (h *ClientData) Recv(data common.TomeeHeader) { // fmt.Println(tt1) err := struc.Unpack(bytes.NewBuffer(data.Data), tt1) if err != nil { - cool.Loger.Error(context.Background(), data.UserID, data.CMD, "解包失败,", hex.EncodeToString(data.Data)) + cool.Logger.Error(context.Background(), data.UserID, data.CMD, "解包失败,", hex.EncodeToString(data.Data)) return } //fmt.Println(tt1) @@ -187,7 +187,7 @@ func (h *ClientData) OnEvent(v []byte) { if err := recover(); err != nil { // 恢复 panic，err 为 panic 错误值 // 1. 打印错误信息 - cool.Loger.Error(context.TODO(), "panic 错误：", err) + cool.Logger.Error(context.TODO(), "panic 错误：", err) } }() @@ -210,11 +210,11 @@ func (h *ClientData) OnEvent(v []byte) { } if header.CMD > 1001 { if h.Conn.Context().(*ClientData).Player == nil { - cool.Loger.Error(context.TODO(), header.UserID, "账号未注册") + cool.Logger.Error(context.TODO(), header.UserID, "账号未注册") return } if h.Conn.Context().(*ClientData).Player.Info == nil { - cool.Loger.Error(context.TODO(), header.UserID, "未创建角色") + cool.Logger.Error(context.TODO(), header.UserID, "未创建角色") return } } diff --git a/logic/service/player/player.go b/logic/service/player/player.go index 50d34943c..38c1687db 100644 --- a/logic/service/player/player.go +++ b/logic/service/player/player.go @@ -208,7 +208,7 @@ func (p *Player) ItemAdd(ItemId, ItemCnt uint32) (result bool) { default: itemx, ok := xmlres.ItemsMAP[int(ItemId)] if !ok { - cool.Loger.Error(context.TODO(), "物品不存在", ItemId) + cool.Logger.Error(context.TODO(), "物品不存在", ItemId) t1 := common.NewTomeeHeader(2601, p.Info.UserID) t1.Result = uint32(errorcode.ErrorCodes.ErrSystemError200007) diff --git a/logic/service/player/save.go b/logic/service/player/save.go index 1130a51ec..2ddb5abce 100644 --- a/logic/service/player/save.go +++ b/logic/service/player/save.go @@ -26,7 +26,7 @@ func (p *Player) Save() { if err := recover(); err != nil { // 恢复 panic，err 为 panic 错误值 // 1. 打印错误信息 - cool.Loger.Error(context.TODO(), "panic 错误：", err) + cool.Logger.Error(context.TODO(), "panic 错误：", err) } }() @@ -36,7 +36,7 @@ func (p *Player) Save() { select { case <-p.FightC.GetOverChan(): //等待结束 case <-time.After(time.Second * 5): //等待5秒 - cool.Loger.Error(context.TODO(), "战斗崩溃", p.Info.UserID) + cool.Logger.Error(context.TODO(), "战斗崩溃", p.Info.UserID) } diff --git a/modules/base/base.go b/modules/base/base.go index 13818b3fe..76c45a7a5 100644 --- a/modules/base/base.go +++ b/modules/base/base.go @@ -31,7 +31,7 @@ func init() { var ( ctx = gctx.GetInitCtx() ) - cool.Loger.Debug(ctx, "module base init start ...") + cool.Logger.Debug(ctx, "module base init start ...") var t bool cool.FillInitData(ctx, "base", &model.BaseSysMenu{}, &t) @@ -80,7 +80,7 @@ func init() { // -- 执行函数 // SELECT reset_all_sequences();`, nil) //重置所有序列 - cool.Loger.Debug(ctx, "module base init finished ...") + cool.Logger.Debug(ctx, "module base init finished ...") } @@ -122,7 +122,7 @@ func ResetAllSequences(ctx context.Context) error { maxValueRecord, err := g.DB("default").Query(ctx, maxValueQuery) if err != nil { - cool.Loger.Warning(ctx, fmt.Sprintf("获取表 %s.%s 的最大值失败: %v", + cool.Logger.Warning(ctx, fmt.Sprintf("获取表 %s.%s 的最大值失败: %v", schemaName, tableName, err)) continue } @@ -142,12 +142,12 @@ func ResetAllSequences(ctx context.Context) error { _, err = g.DB("default").Exec(ctx, resetQuery) if err != nil { - cool.Loger.Warning(ctx, fmt.Sprintf("重置序列 %s.%s 失败: %v", + cool.Logger.Warning(ctx, fmt.Sprintf("重置序列 %s.%s 失败: %v", schemaName, sequenceName, err)) continue } - cool.Loger.Info(ctx, fmt.Sprintf("序列 %s.%s 已重置为 %d", + cool.Logger.Info(ctx, fmt.Sprintf("序列 %s.%s 已重置为 %d", schemaName, sequenceName, maxValue)) } diff --git a/modules/base/config/config.go b/modules/base/config/config.go index fb79d2705..38a5b5f22 100644 --- a/modules/base/config/config.go +++ b/modules/base/config/config.go @@ -81,5 +81,5 @@ func init() { if jwtSecret == "cool-admin-go" { Config.Jwt.Secret = cool.ProcessFlag } - cool.Loger.Info(ctx, "jwt secret:", Config.Jwt.Secret) + cool.Logger.Info(ctx, "jwt secret:", Config.Jwt.Secret) } diff --git a/modules/base/controller/admin/base_open.go b/modules/base/controller/admin/base_open.go index ca192eb7a..5ee040a4c 100644 --- a/modules/base/controller/admin/base_open.go +++ b/modules/base/controller/admin/base_open.go @@ -42,13 +42,13 @@ type BaseOpenEpsReq struct { // eps 接口 func (c *BaseOpen) Eps(ctx context.Context, req *BaseOpenEpsReq) (res *cool.BaseRes, err error) { if !cool.Config.Eps { - cool.Loger.Error(ctx, "eps is not open") + cool.Logger.Error(ctx, "eps is not open") res = cool.Ok(nil) return } data, err := c.baseOpenService.AdminEPS(ctx) if err != nil { - cool.Loger.Error(ctx, "eps error", err) + cool.Logger.Error(ctx, "eps error", err) return cool.Fail(err.Error()), err } res = cool.Ok(data) diff --git a/modules/base/controller/app/base_comm.go b/modules/base/controller/app/base_comm.go index 7e66a9304..87737eb5b 100644 --- a/modules/base/controller/app/base_comm.go +++ b/modules/base/controller/app/base_comm.go @@ -34,14 +34,14 @@ type BaseCommControllerEpsReq struct { // eps 接口 func (c *BaseCommController) Eps(ctx context.Context, req *BaseCommControllerEpsReq) (res *cool.BaseRes, err error) { if !cool.Config.Eps { - cool.Loger.Error(ctx, "eps is not open") + cool.Logger.Error(ctx, "eps is not open") res = cool.Ok(nil) return } baseOpenService := service.NewBaseOpenService() data, err := baseOpenService.AppEPS(ctx) if err != nil { - cool.Loger.Error(ctx, "eps error", err) + cool.Logger.Error(ctx, "eps error", err) return cool.Fail(err.Error()), err } res = cool.Ok(data) diff --git a/modules/base/funcs/base_sys_log_clear.go b/modules/base/funcs/base_sys_log_clear.go index a8e0fb023..834953e3a 100644 --- a/modules/base/funcs/base_sys_log_clear.go +++ b/modules/base/funcs/base_sys_log_clear.go @@ -13,7 +13,7 @@ type BaseFuncClearLog struct { // Func func (f *BaseFuncClearLog) Func(ctx g.Ctx, param string) (err error) { - cool.Loger.Info(ctx, "清理日志 BaseFuncClearLog.Func", "param", param) + cool.Logger.Info(ctx, "清理日志 BaseFuncClearLog.Func", "param", param) baseSysLogService := service.NewBaseSysLogService() if param == "true" { err = baseSysLogService.Clear(true) diff --git a/modules/base/middleware/authority.go b/modules/base/middleware/authority.go index 24d0e8905..359adb885 100644 --- a/modules/base/middleware/authority.go +++ b/modules/base/middleware/authority.go @@ -48,7 +48,7 @@ func BaseAuthorityMiddleware(r *ghttp.Request) { return []byte(config.Config.Jwt.Secret), nil }) if err != nil { - cool.Loger.Error(ctx, "BaseAuthorityMiddleware", err) + cool.Logger.Error(ctx, "BaseAuthorityMiddleware", err) statusCode = 401 r.Response.WriteStatusExit(statusCode, g.Map{ "code": 1001, @@ -56,7 +56,7 @@ func BaseAuthorityMiddleware(r *ghttp.Request) { }) } if !token.Valid { - cool.Loger.Error(ctx, "BaseAuthorityMiddleware", "token invalid") + cool.Logger.Error(ctx, "BaseAuthorityMiddleware", "token invalid") statusCode = 401 r.Response.WriteStatusExit(statusCode, g.Map{ "code": 1001, @@ -72,7 +72,7 @@ func BaseAuthorityMiddleware(r *ghttp.Request) { // 超管拥有所有权限 if admin.UserId == 10001 && !admin.IsRefresh { if tokenString != rtoken && config.Config.Jwt.Sso { - cool.Loger.Error(ctx, "BaseAuthorityMiddleware", "token invalid") + cool.Logger.Error(ctx, "BaseAuthorityMiddleware", "token invalid") statusCode = 401 r.Response.WriteStatusExit(statusCode, g.Map{ "code": 1001, @@ -91,7 +91,7 @@ func BaseAuthorityMiddleware(r *ghttp.Request) { } // 如果传的token是refreshToken则校验失败 if admin.IsRefresh { - cool.Loger.Error(ctx, "BaseAuthorityMiddleware", "token invalid") + cool.Logger.Error(ctx, "BaseAuthorityMiddleware", "token invalid") statusCode = 401 r.Response.WriteStatusExit(statusCode, g.Map{ "code": 1001, @@ -101,7 +101,7 @@ func BaseAuthorityMiddleware(r *ghttp.Request) { // 判断密码版本是否正确 passwordV, _ := cool.CacheManager.Get(ctx, "admin:passwordVersion:"+gconv.String(admin.UserId)) if passwordV.Int32() != *admin.PasswordVersion { - cool.Loger.Error(ctx, "BaseAuthorityMiddleware", "passwordV invalid") + cool.Logger.Error(ctx, "BaseAuthorityMiddleware", "passwordV invalid") statusCode = 401 r.Response.WriteStatusExit(statusCode, g.Map{ "code": 1001, @@ -110,7 +110,7 @@ func BaseAuthorityMiddleware(r *ghttp.Request) { } // 如果rtoken为空 if rtoken == "" { - cool.Loger.Error(ctx, "BaseAuthorityMiddleware", "rtoken invalid") + cool.Logger.Error(ctx, "BaseAuthorityMiddleware", "rtoken invalid") statusCode = 401 r.Response.WriteStatusExit(statusCode, g.Map{ "code": 1001, @@ -119,7 +119,7 @@ func BaseAuthorityMiddleware(r *ghttp.Request) { } // 如果rtoken不等于token 且 sso 未开启 if tokenString != rtoken && !config.Config.Jwt.Sso { - cool.Loger.Error(ctx, "BaseAuthorityMiddleware", "token invalid") + cool.Logger.Error(ctx, "BaseAuthorityMiddleware", "token invalid") statusCode = 401 r.Response.WriteStatusExit(statusCode, g.Map{ "code": 1001, @@ -134,7 +134,7 @@ func BaseAuthorityMiddleware(r *ghttp.Request) { perms := garray.NewStrArrayFrom(permsVar) // 如果perms为空 if perms.Len() == 0 { - cool.Loger.Error(ctx, "BaseAuthorityMiddleware", "perms invalid") + cool.Logger.Error(ctx, "BaseAuthorityMiddleware", "perms invalid") statusCode = 403 r.Response.WriteStatusExit(statusCode, g.Map{ "code": 1001, @@ -154,7 +154,7 @@ func BaseAuthorityMiddleware(r *ghttp.Request) { url = gstr.Join(urls, ":") // 如果perms中不包含url 则无权限 if !perms.ContainsI(url) { - cool.Loger.Error(ctx, "BaseAuthorityMiddleware", "perms invalid") + cool.Logger.Error(ctx, "BaseAuthorityMiddleware", "perms invalid") statusCode = 403 r.Response.WriteStatusExit(statusCode, g.Map{ "code": 1001, diff --git a/modules/base/service/base_sys_login.go b/modules/base/service/base_sys_login.go index 969f3243a..541d9de50 100644 --- a/modules/base/service/base_sys_login.go +++ b/modules/base/service/base_sys_login.go @@ -83,7 +83,7 @@ func (*BaseSysLoginService) Captcha(req *v1.BaseOpenCaptchaReq) (interface{}, er result.Data = `data:image/svg+xml;base64,` + svgbase64 result.CaptchaId = guid.S() cool.CacheManager.Set(ctx, "login:"+result.CaptchaId, captchaText, 1800*time.Second) - cool.Loger.Debug(ctx, "验证码", result.CaptchaId, captchaText) + cool.Logger.Debug(ctx, "验证码", result.CaptchaId, captchaText) return result, err } @@ -143,7 +143,7 @@ func (s *BaseSysLoginService) RefreshToken(ctx context.Context, token string) (r func (*BaseSysLoginService) generateToken(ctx context.Context, user *model.BaseSysUser, roleIds []string, exprire uint, isRefresh bool) (token string) { err := cool.CacheManager.Set(ctx, "admin:passwordVersion:"+gconv.String(user.ID), gconv.String(user.PasswordV), 0) if err != nil { - cool.Loger.Error(ctx, "生成token失败", err) + cool.Logger.Error(ctx, "生成token失败", err) } claims := &cool.Claims{ @@ -161,7 +161,7 @@ func (*BaseSysLoginService) generateToken(ctx context.Context, user *model.BaseS token, err = tokenClaims.SignedString([]byte(config.Config.Jwt.Secret)) if err != nil { - cool.Loger.Error(ctx, "生成token失败", err) + cool.Logger.Error(ctx, "生成token失败", err) } return } diff --git a/modules/blazing/service/info.go b/modules/blazing/service/info.go index 24f94664f..0eb8f619e 100644 --- a/modules/blazing/service/info.go +++ b/modules/blazing/service/info.go @@ -111,7 +111,7 @@ func (s *InfoService) Personself() *model.PlayerInfo { func (s *InfoService) Kick(id uint32) { - cool.Loger.Info(context.TODO(), "服务器收到踢人") + cool.Logger.Info(context.TODO(), "服务器收到踢人") useid1, err := share.ShareManager.GetUserOnline(id) if err != nil { diff --git a/modules/dict/dict.go b/modules/dict/dict.go index 4996d112d..37d18ad64 100644 --- a/modules/dict/dict.go +++ b/modules/dict/dict.go @@ -15,8 +15,8 @@ func init() { var ( ctx = gctx.GetInitCtx() ) - cool.Loger.Debug(ctx, "module dict init start ...") + cool.Logger.Debug(ctx, "module dict init start ...") cool.FillInitData(ctx, "dict", &model.DictInfo{}, nil) cool.FillInitData(ctx, "dict", &model.DictType{}, nil) - cool.Loger.Debug(ctx, "module dict init finished ...") + cool.Logger.Debug(ctx, "module dict init finished ...") } diff --git a/modules/space/space.go b/modules/space/space.go index 369db6b29..138e0951a 100644 --- a/modules/space/space.go +++ b/modules/space/space.go @@ -12,6 +12,6 @@ func init() { var ( ctx = gctx.GetInitCtx() ) - cool.Loger.Debug(ctx, "module space init start ...") - cool.Loger.Debug(ctx, "module space init finished ...") + cool.Logger.Debug(ctx, "module space init start ...") + cool.Logger.Debug(ctx, "module space init finished ...") } diff --git a/modules/task/funcs/task_testfunc.go b/modules/task/funcs/task_testfunc.go index 74047f7f2..313e2f147 100644 --- a/modules/task/funcs/task_testfunc.go +++ b/modules/task/funcs/task_testfunc.go @@ -10,7 +10,7 @@ type TaskTest struct { } func (t *TaskTest) Func(ctx g.Ctx, param string) error { - cool.Loger.Info(ctx, "TaskTest Run ~~~~~~~~~~~~~~~~", param) + cool.Logger.Info(ctx, "TaskTest Run ~~~~~~~~~~~~~~~~", param) return nil } func (t *TaskTest) IsSingleton() bool { diff --git a/modules/task/service/service.go b/modules/task/service/service.go index 46b3f0f3d..7da4523f9 100644 --- a/modules/task/service/service.go +++ b/modules/task/service/service.go @@ -24,12 +24,12 @@ func EnableTask(ctx g.Ctx, cronId string, funcstring string, cron string, startD _, err = gcron.AddSingleton(ctx, cron, func(ctx g.Ctx) { nowDate := gtime.Now().Format("Y-m-d H:i:s") if nowDate < startDate { - cool.Loger.Debug(ctx, "当前时间小于启用时间, 不执行单例函数", funcName) + cool.Logger.Debug(ctx, "当前时间小于启用时间, 不执行单例函数", funcName) return } err := cool.RunFunc(ctx, funcstring) if err != nil { - cool.Loger.Error(ctx, err) + cool.Logger.Error(ctx, err) taskInfoService.Record(ctx, cronId, 0, err.Error()) } else { taskInfoService.Record(ctx, cronId, 1, "任务执行成功") @@ -40,12 +40,12 @@ func EnableTask(ctx g.Ctx, cronId string, funcstring string, cron string, startD _, err = gcron.Add(ctx, cron, func(ctx g.Ctx) { nowDate := gtime.Now().Format("Y-m-d H:i:s") if nowDate < startDate { - cool.Loger.Debug(ctx, "当前时间小于启用时间, 不执行函数", funcName) + cool.Logger.Debug(ctx, "当前时间小于启用时间, 不执行函数", funcName) return } err := cool.RunFunc(ctx, funcstring) if err != nil { - cool.Loger.Error(ctx, err) + cool.Logger.Error(ctx, err) taskInfoService.Record(ctx, cronId, 0, gstr.AddSlashes(err.Error())) } else { taskInfoService.Record(ctx, cronId, 1, gstr.AddSlashes("任务执行成功")) diff --git a/modules/task/service/task_info.go b/modules/task/service/task_info.go index 38bf7cc9a..5e0486dad 100644 --- a/modules/task/service/task_info.go +++ b/modules/task/service/task_info.go @@ -32,7 +32,7 @@ func NewTaskInfoService() *TaskInfoService { } func (s *TaskInfoService) ModifyAfter(ctx g.Ctx, method string, param g.MapStrAny) (err error) { - cool.Loger.Info(ctx, "TaskInfoService.ModifyAfter", method, param) + cool.Logger.Info(ctx, "TaskInfoService.ModifyAfter", method, param) if method == "Add" { if gconv.Int(param["status"]) == 1 { id, err := cool.DBM(s.Model).Where("name", param["name"]).Value("id") @@ -169,7 +169,7 @@ func (s *TaskInfoService) SetNextRunTime(ctx g.Ctx, cronId string, cron string) return err } } else { - cool.Loger.Debug(ctx, "获取下次执行时间失败", e) + cool.Logger.Debug(ctx, "获取下次执行时间失败", e) } return nil diff --git a/modules/task/task.go b/modules/task/task.go index 574db47fc..3fbed6a3b 100644 --- a/modules/task/task.go +++ b/modules/task/task.go @@ -18,7 +18,7 @@ func init() { taskInfo = model.NewTaskInfo() ctx = gctx.GetInitCtx() ) - cool.Loger.Debug(ctx, "module task init start ...") + cool.Logger.Debug(ctx, "module task init start ...") cool.FillInitData(ctx, "task", taskInfo, nil) result, err := cool.DBM(taskInfo).Where("status", 1).All() @@ -29,6 +29,6 @@ func init() { id := v["id"].String() cool.RunFunc(ctx, "TaskAddTask("+id+")") } - cool.Loger.Debug(ctx, "module task init finished ...") + cool.Logger.Debug(ctx, "module task init finished ...") }