From 274c4e6afea7c51613221ad5486a3f92bdcaa521 Mon Sep 17 00:00:00 2001 From: linquan <349589071@qq.com> Date: Mon, 28 Apr 2025 09:54:28 +0800 Subject: [PATCH] debug --- api/v1/game/cdKey.go | 11 +-- api/v1/game/manage.go | 7 +- api/v1/game/order.go | 21 +++++ api/v1/game/pub.go | 30 +++---- internal/controller/game_order.go | 5 ++ internal/controller/game_pub.go | 9 --- internal/dao/internal/advertisement.go | 4 +- internal/dao/internal/casbin_rule.go | 4 +- internal/dao/internal/game_black_list.go | 4 +- internal/dao/internal/game_bug.go | 4 +- internal/dao/internal/game_bug_client.go | 4 +- internal/dao/internal/game_ccd_url.go | 4 +- internal/dao/internal/game_ccd_url_copy_1.go | 4 +- internal/dao/internal/game_ccd_version.go | 4 +- internal/dao/internal/game_cd_key.go | 4 +- internal/dao/internal/game_cd_password.go | 4 +- internal/dao/internal/game_channel_list.go | 4 +- internal/dao/internal/game_gift_exchange.go | 4 +- internal/dao/internal/game_login_url.go | 4 +- internal/dao/internal/game_mail.go | 4 +- internal/dao/internal/game_notice.go | 4 +- internal/dao/internal/game_notice_log.go | 4 +- internal/dao/internal/game_notice_model.go | 4 +- internal/dao/internal/game_online.go | 4 +- internal/dao/internal/game_recharge.go | 4 +- .../dao/internal/game_recharge_control.go | 4 +- internal/dao/internal/game_recharge_copy_1.go | 4 +- internal/dao/internal/game_recharge_log.go | 4 +- internal/dao/internal/game_recharge_rebate.go | 4 +- internal/dao/internal/game_register.go | 4 +- internal/dao/internal/game_router.go | 4 +- .../dao/internal/game_server_json_general.go | 4 +- internal/dao/internal/game_shop_log.go | 4 +- internal/dao/internal/game_unit.go | 4 +- internal/dao/internal/game_unit_copy_1.go | 4 +- internal/dao/internal/game_version.go | 4 +- internal/dao/internal/game_white_list.go | 4 +- internal/dao/internal/gm_operate_log.go | 4 +- .../internal/item_income_expense_records.go | 4 +- internal/dao/internal/login_logout_info.go | 64 ++++++++------- internal/dao/internal/login_out_log.go | 4 +- internal/dao/internal/sys_auth_rule.go | 4 +- internal/dao/internal/sys_config.go | 4 +- internal/dao/internal/sys_dept.go | 4 +- internal/dao/internal/sys_dict_data.go | 4 +- internal/dao/internal/sys_dict_type.go | 4 +- internal/dao/internal/sys_login_log.go | 4 +- internal/dao/internal/sys_oper_log.go | 4 +- internal/dao/internal/sys_post.go | 4 +- internal/dao/internal/sys_role.go | 4 +- internal/dao/internal/sys_role_dept.go | 4 +- internal/dao/internal/sys_user.go | 4 +- internal/dao/internal/sys_user_online.go | 4 +- internal/dao/internal/sys_user_post.go | 4 +- internal/dao/internal/web_operate_log.go | 4 +- internal/model/do/advertisement.go | 2 +- internal/model/do/casbin_rule.go | 2 +- internal/model/do/game_black_list.go | 2 +- internal/model/do/game_bug.go | 2 +- internal/model/do/game_bug_client.go | 2 +- internal/model/do/game_ccd_url.go | 2 +- internal/model/do/game_ccd_url_copy_1.go | 2 +- internal/model/do/game_ccd_version.go | 2 +- internal/model/do/game_cd_key.go | 2 +- internal/model/do/game_cd_password.go | 2 +- internal/model/do/game_channel_list.go | 2 +- internal/model/do/game_gift_exchange.go | 2 +- internal/model/do/game_login_url.go | 2 +- internal/model/do/game_mail.go | 2 +- internal/model/do/game_notice.go | 2 +- internal/model/do/game_notice_log.go | 2 +- internal/model/do/game_notice_model.go | 2 +- internal/model/do/game_online.go | 2 +- internal/model/do/game_recharge.go | 2 +- internal/model/do/game_recharge_control.go | 2 +- internal/model/do/game_recharge_copy_1.go | 2 +- internal/model/do/game_recharge_log.go | 2 +- internal/model/do/game_recharge_rebate.go | 2 +- internal/model/do/game_register.go | 2 +- internal/model/do/game_router.go | 2 +- internal/model/do/game_server_json_general.go | 2 +- internal/model/do/game_shop_log.go | 2 +- internal/model/do/game_unit.go | 2 +- internal/model/do/game_unit_copy_1.go | 2 +- internal/model/do/game_version.go | 2 +- internal/model/do/game_white_list.go | 2 +- internal/model/do/gm_operate_log.go | 2 +- .../model/do/item_income_expense_records.go | 2 +- internal/model/do/login_logout_info.go | 34 ++++---- internal/model/do/login_out_log.go | 2 +- internal/model/do/sys_auth_rule.go | 2 +- internal/model/do/sys_config.go | 2 +- internal/model/do/sys_dept.go | 2 +- internal/model/do/sys_dict_data.go | 2 +- internal/model/do/sys_dict_type.go | 2 +- internal/model/do/sys_login_log.go | 2 +- internal/model/do/sys_oper_log.go | 2 +- internal/model/do/sys_post.go | 2 +- internal/model/do/sys_role.go | 2 +- internal/model/do/sys_role_dept.go | 2 +- internal/model/do/sys_user.go | 2 +- internal/model/do/sys_user_online.go | 2 +- internal/model/do/sys_user_post.go | 2 +- internal/model/do/web_operate_log.go | 2 +- internal/model/entity/advertisement.go | 2 +- internal/model/entity/casbin_rule.go | 2 +- internal/model/entity/game_black_list.go | 2 +- internal/model/entity/game_bug.go | 2 +- internal/model/entity/game_bug_client.go | 2 +- internal/model/entity/game_ccd_url.go | 2 +- internal/model/entity/game_ccd_url_copy_1.go | 2 +- internal/model/entity/game_ccd_version.go | 2 +- internal/model/entity/game_cd_key.go | 2 +- internal/model/entity/game_cd_password.go | 2 +- internal/model/entity/game_channel_list.go | 2 +- internal/model/entity/game_gift_exchange.go | 2 +- internal/model/entity/game_login_url.go | 2 +- internal/model/entity/game_mail.go | 2 +- internal/model/entity/game_notice.go | 2 +- internal/model/entity/game_notice_log.go | 2 +- internal/model/entity/game_notice_model.go | 2 +- internal/model/entity/game_online.go | 2 +- internal/model/entity/game_recharge.go | 2 +- .../model/entity/game_recharge_control.go | 2 +- internal/model/entity/game_recharge_copy_1.go | 2 +- internal/model/entity/game_recharge_log.go | 2 +- internal/model/entity/game_recharge_rebate.go | 2 +- internal/model/entity/game_register.go | 2 +- internal/model/entity/game_router.go | 2 +- .../model/entity/game_server_json_general.go | 2 +- internal/model/entity/game_shop_log.go | 2 +- internal/model/entity/game_unit.go | 2 +- internal/model/entity/game_unit_copy_1.go | 2 +- internal/model/entity/game_version.go | 2 +- internal/model/entity/game_white_list.go | 2 +- internal/model/entity/gm_operate_log.go | 2 +- .../entity/item_income_expense_records.go | 2 +- internal/model/entity/login_logout_info.go | 32 ++++---- internal/model/entity/login_out_log.go | 2 +- internal/model/entity/sys_auth_rule.go | 2 +- internal/model/entity/sys_config.go | 2 +- internal/model/entity/sys_dept.go | 2 +- internal/model/entity/sys_dict_data.go | 2 +- internal/model/entity/sys_dict_type.go | 2 +- internal/model/entity/sys_login_log.go | 2 +- internal/model/entity/sys_oper_log.go | 2 +- internal/model/entity/sys_post.go | 2 +- internal/model/entity/sys_role.go | 2 +- internal/model/entity/sys_role_dept.go | 2 +- internal/model/entity/sys_user.go | 2 +- internal/model/entity/sys_user_online.go | 2 +- internal/model/entity/sys_user_post.go | 2 +- internal/model/entity/web_operate_log.go | 2 +- internal/serviceGame/ccd.go | 8 +- internal/serviceGame/internal/basicinfo.go | 59 +++++++++++--- internal/serviceGame/internal/cdKey.go | 3 + internal/serviceGame/internal/manage.go | 78 ++++++++----------- internal/serviceGame/internal/whiteList.go | 47 +---------- internal/serviceGame/order.go | 41 +++++++++- internal/serviceGame/whiteList.go | 2 - 160 files changed, 445 insertions(+), 390 deletions(-) diff --git a/api/v1/game/cdKey.go b/api/v1/game/cdKey.go index bfd8b55..3c147b7 100644 --- a/api/v1/game/cdKey.go +++ b/api/v1/game/cdKey.go @@ -44,11 +44,12 @@ type GetGiftExchangeListRes struct { type UpdateGiftExchangeReq struct { g.Meta `path:"/cdKey/updateGiftExchange" tags:"cdKey" method:"get" summary:"修改兑换表"` - Id int32 `p:"configId" v:"required#id不能为空"` - Channel string `p:"channel"` - StartTime string `p:"startTime"` - StopTime string `p:"stopTime"` - Times int32 `p:"times"` + Id int32 `p:"configId" v:"required#id不能为空"` + Channel string `p:"channel"` + StartTime string `p:"startTime"` + StopTime string `p:"stopTime"` + Times int32 `p:"times"` + Awards []Award `p:"awards"` } type UpdateGiftExchangeRes struct { diff --git a/api/v1/game/manage.go b/api/v1/game/manage.go index 68eb184..a5029f5 100644 --- a/api/v1/game/manage.go +++ b/api/v1/game/manage.go @@ -46,9 +46,10 @@ type ListGmRes struct { } type SetGmToClientReq struct { - g.Meta `path:"/mange/setclientgm" tags:"账号" method:"get" summary:"开GM权限"` - Uids string `p:"uids"` - State int `p:"state"` + g.Meta `path:"/mange/setclientgm" tags:"账号" method:"get" summary:"开GM权限"` + ServerId int `p:"serverId"` + Uids string `p:"uids"` + State int `p:"state"` } type SetGmToClientRes struct { diff --git a/api/v1/game/order.go b/api/v1/game/order.go index eda5025..e896d05 100644 --- a/api/v1/game/order.go +++ b/api/v1/game/order.go @@ -2,6 +2,7 @@ package game import ( "github.com/gogf/gf/v2/frame/g" + "tyj_admin/api/v1/common" "tyj_admin/internal/model/entity" ) @@ -181,3 +182,23 @@ type ChangeOrderStateRes struct { g.Meta `mime:"application/json"` ResData int `json:"data"` } + +// 修改订单状态 +type GetGMOrderListReq struct { + g.Meta `path:"/order/gmList" tags:"订单" method:"get" summary:"获取订单"` + Uid int32 `p:"uid"` + ServerId int32 `p:"server"` + Config int32 `p:"config"` + TradeNo string `p:"tradeNo"` + CTime string `p:"cTime"` + ETime string `p:"eTime"` + User string `p:"user"` + Channel string `p:"channel"` + common.PageReq +} + +type GetGMOrderListRes struct { + g.Meta `mime:"application/json"` + List []entity.GameRechargeLog `json:"list"` + common.ListRes +} diff --git a/api/v1/game/pub.go b/api/v1/game/pub.go index 6739610..81b4e90 100644 --- a/api/v1/game/pub.go +++ b/api/v1/game/pub.go @@ -93,19 +93,23 @@ type GetOutIdRes struct { } type LoginOutReq struct { - g.Meta `path:"/loginOut" tags:"外部接口" method:"post" summary:"添加登录登出记录"` - Uid int64 `p:"uid"` - State int `p:"state"` - Day int `p:"day"` - GameTime int `p:"gameTime"` - Scale int `p:"scale"` - VillagerNum int `p:"villagerNum"` - Prosperity int `p:"prosperity"` - Copper int `p:"copper"` - GoldIngot int `p:"goldIngot"` - BaseFood int `p:"baseFood"` - Server int `p:"serverId"` - Name string `p:"valleyName"` + g.Meta `path:"/loginOut" tags:"外部接口" method:"post" summary:"添加登录登出记录"` + Uid int64 `p:"uid"` + State int `p:"state"` + Day int `p:"day"` + GameTime int `p:"gameTime"` + Scale int `p:"scale"` + VillagerNum int `p:"villagerNum"` + Prosperity int `p:"prosperity"` + Copper int `p:"copper"` + GoldIngot int `p:"goldIngot"` + BaseFood int `p:"baseFood"` + Server int `p:"serverId"` + Name string `p:"valleyName"` + VouchersNum int `p:"vouchersNum"` + RechargeTotal int `p:"rechargeTotal"` + StoreSum int `p:"storeSum"` + StoneAmount int `p:"stoneAmount"` } type LoginOutRes struct { diff --git a/internal/controller/game_order.go b/internal/controller/game_order.go index 40b4e23..1288c5f 100644 --- a/internal/controller/game_order.go +++ b/internal/controller/game_order.go @@ -75,3 +75,8 @@ func (c *orderController) ChangeOrderState(ctx context.Context, req *game.Change res, err = serviceGame.GameOrder().ChangeOrderState(ctx, req) return res, err } + +func (c *orderController) GetGMOrderList(ctx context.Context, req *game.GetGMOrderListReq) (res *game.GetGMOrderListRes, err error) { + res, err = serviceGame.GameOrder().GetGMOrderList(ctx, req) + return res, err +} diff --git a/internal/controller/game_pub.go b/internal/controller/game_pub.go index c673664..7cc53e8 100644 --- a/internal/controller/game_pub.go +++ b/internal/controller/game_pub.go @@ -41,15 +41,6 @@ func (c *pubController) GetLoginUrl(ctx context.Context, req *game.GetGameLoginU } func (c *pubController) GetCCD(ctx context.Context, req *game.GetGameCCDReq) (res *game.GetGameCCDRes, err error) { - //req1 := new(game.GetGameNoticeReq) - //res1 := new(game.GetGameNoticeRes) - //req1.NoticeType = 3 - //req1.Channel = req.ChannelType - //res1, err = serviceGame.GameNotice().GetGameNotice(ctx, req1) - //if res1.Status != 1 { - // return nil, gerror.New("ip黑名单！") - //} - var set map[string]struct{} set = make(map[string]struct{}) set["Android"] = struct{}{} diff --git a/internal/dao/internal/advertisement.go b/internal/dao/internal/advertisement.go index 4b3ad94..9a6c699 100644 --- a/internal/dao/internal/advertisement.go +++ b/internal/dao/internal/advertisement.go @@ -1,5 +1,5 @@ // ========================================================================== -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ========================================================================== package internal @@ -116,6 +116,6 @@ func (dao *AdvertisementDao) Ctx(ctx context.Context) *gdb.Model { // // Note that, you should not Commit or Rollback the transaction in function f // as it is automatically handled by this function. -func (dao *AdvertisementDao) Transaction(ctx context.Context, f func(ctx context.Context, tx *gdb.TX) error) (err error) { +func (dao *AdvertisementDao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) { return dao.Ctx(ctx).Transaction(ctx, f) } diff --git a/internal/dao/internal/casbin_rule.go b/internal/dao/internal/casbin_rule.go index 1de410f..86220b0 100644 --- a/internal/dao/internal/casbin_rule.go +++ b/internal/dao/internal/casbin_rule.go @@ -1,5 +1,5 @@ // ========================================================================== -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ========================================================================== package internal @@ -80,6 +80,6 @@ func (dao *CasbinRuleDao) Ctx(ctx context.Context) *gdb.Model { // // Note that, you should not Commit or Rollback the transaction in function f // as it is automatically handled by this function. -func (dao *CasbinRuleDao) Transaction(ctx context.Context, f func(ctx context.Context, tx *gdb.TX) error) (err error) { +func (dao *CasbinRuleDao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) { return dao.Ctx(ctx).Transaction(ctx, f) } diff --git a/internal/dao/internal/game_black_list.go b/internal/dao/internal/game_black_list.go index 8541290..e36b862 100644 --- a/internal/dao/internal/game_black_list.go +++ b/internal/dao/internal/game_black_list.go @@ -1,5 +1,5 @@ // ========================================================================== -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ========================================================================== package internal @@ -70,6 +70,6 @@ func (dao *GameBlackListDao) Ctx(ctx context.Context) *gdb.Model { // // Note that, you should not Commit or Rollback the transaction in function f // as it is automatically handled by this function. -func (dao *GameBlackListDao) Transaction(ctx context.Context, f func(ctx context.Context, tx *gdb.TX) error) (err error) { +func (dao *GameBlackListDao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) { return dao.Ctx(ctx).Transaction(ctx, f) } diff --git a/internal/dao/internal/game_bug.go b/internal/dao/internal/game_bug.go index edb28c3..8d4b73a 100644 --- a/internal/dao/internal/game_bug.go +++ b/internal/dao/internal/game_bug.go @@ -1,5 +1,5 @@ // ========================================================================== -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ========================================================================== package internal @@ -84,6 +84,6 @@ func (dao *GameBugDao) Ctx(ctx context.Context) *gdb.Model { // // Note that, you should not Commit or Rollback the transaction in function f // as it is automatically handled by this function. -func (dao *GameBugDao) Transaction(ctx context.Context, f func(ctx context.Context, tx *gdb.TX) error) (err error) { +func (dao *GameBugDao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) { return dao.Ctx(ctx).Transaction(ctx, f) } diff --git a/internal/dao/internal/game_bug_client.go b/internal/dao/internal/game_bug_client.go index 6f27bda..6bf4763 100644 --- a/internal/dao/internal/game_bug_client.go +++ b/internal/dao/internal/game_bug_client.go @@ -1,5 +1,5 @@ // ========================================================================== -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ========================================================================== package internal @@ -92,6 +92,6 @@ func (dao *GameBugClientDao) Ctx(ctx context.Context) *gdb.Model { // // Note that, you should not Commit or Rollback the transaction in function f // as it is automatically handled by this function. -func (dao *GameBugClientDao) Transaction(ctx context.Context, f func(ctx context.Context, tx *gdb.TX) error) (err error) { +func (dao *GameBugClientDao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) { return dao.Ctx(ctx).Transaction(ctx, f) } diff --git a/internal/dao/internal/game_ccd_url.go b/internal/dao/internal/game_ccd_url.go index 828e6d4..c000443 100644 --- a/internal/dao/internal/game_ccd_url.go +++ b/internal/dao/internal/game_ccd_url.go @@ -1,5 +1,5 @@ // ========================================================================== -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ========================================================================== package internal @@ -86,6 +86,6 @@ func (dao *GameCcdUrlDao) Ctx(ctx context.Context) *gdb.Model { // // Note that, you should not Commit or Rollback the transaction in function f // as it is automatically handled by this function. -func (dao *GameCcdUrlDao) Transaction(ctx context.Context, f func(ctx context.Context, tx *gdb.TX) error) (err error) { +func (dao *GameCcdUrlDao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) { return dao.Ctx(ctx).Transaction(ctx, f) } diff --git a/internal/dao/internal/game_ccd_url_copy_1.go b/internal/dao/internal/game_ccd_url_copy_1.go index 1808d3d..9fe1d78 100644 --- a/internal/dao/internal/game_ccd_url_copy_1.go +++ b/internal/dao/internal/game_ccd_url_copy_1.go @@ -1,5 +1,5 @@ // ========================================================================== -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ========================================================================== package internal @@ -86,6 +86,6 @@ func (dao *GameCcdUrlCopy1Dao) Ctx(ctx context.Context) *gdb.Model { // // Note that, you should not Commit or Rollback the transaction in function f // as it is automatically handled by this function. -func (dao *GameCcdUrlCopy1Dao) Transaction(ctx context.Context, f func(ctx context.Context, tx *gdb.TX) error) (err error) { +func (dao *GameCcdUrlCopy1Dao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) { return dao.Ctx(ctx).Transaction(ctx, f) } diff --git a/internal/dao/internal/game_ccd_version.go b/internal/dao/internal/game_ccd_version.go index a8f762e..ab24483 100644 --- a/internal/dao/internal/game_ccd_version.go +++ b/internal/dao/internal/game_ccd_version.go @@ -1,5 +1,5 @@ // ========================================================================== -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ========================================================================== package internal @@ -70,6 +70,6 @@ func (dao *GameCcdVersionDao) Ctx(ctx context.Context) *gdb.Model { // // Note that, you should not Commit or Rollback the transaction in function f // as it is automatically handled by this function. -func (dao *GameCcdVersionDao) Transaction(ctx context.Context, f func(ctx context.Context, tx *gdb.TX) error) (err error) { +func (dao *GameCcdVersionDao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) { return dao.Ctx(ctx).Transaction(ctx, f) } diff --git a/internal/dao/internal/game_cd_key.go b/internal/dao/internal/game_cd_key.go index 244df02..c2b3dce 100644 --- a/internal/dao/internal/game_cd_key.go +++ b/internal/dao/internal/game_cd_key.go @@ -1,5 +1,5 @@ // ========================================================================== -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ========================================================================== package internal @@ -80,6 +80,6 @@ func (dao *GameCdKeyDao) Ctx(ctx context.Context) *gdb.Model { // // Note that, you should not Commit or Rollback the transaction in function f // as it is automatically handled by this function. -func (dao *GameCdKeyDao) Transaction(ctx context.Context, f func(ctx context.Context, tx *gdb.TX) error) (err error) { +func (dao *GameCdKeyDao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) { return dao.Ctx(ctx).Transaction(ctx, f) } diff --git a/internal/dao/internal/game_cd_password.go b/internal/dao/internal/game_cd_password.go index e64255e..9369b70 100644 --- a/internal/dao/internal/game_cd_password.go +++ b/internal/dao/internal/game_cd_password.go @@ -1,5 +1,5 @@ // ========================================================================== -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ========================================================================== package internal @@ -74,6 +74,6 @@ func (dao *GameCdPasswordDao) Ctx(ctx context.Context) *gdb.Model { // // Note that, you should not Commit or Rollback the transaction in function f // as it is automatically handled by this function. -func (dao *GameCdPasswordDao) Transaction(ctx context.Context, f func(ctx context.Context, tx *gdb.TX) error) (err error) { +func (dao *GameCdPasswordDao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) { return dao.Ctx(ctx).Transaction(ctx, f) } diff --git a/internal/dao/internal/game_channel_list.go b/internal/dao/internal/game_channel_list.go index ea3d96d..af59908 100644 --- a/internal/dao/internal/game_channel_list.go +++ b/internal/dao/internal/game_channel_list.go @@ -1,5 +1,5 @@ // ========================================================================== -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ========================================================================== package internal @@ -72,6 +72,6 @@ func (dao *GameChannelListDao) Ctx(ctx context.Context) *gdb.Model { // // Note that, you should not Commit or Rollback the transaction in function f // as it is automatically handled by this function. -func (dao *GameChannelListDao) Transaction(ctx context.Context, f func(ctx context.Context, tx *gdb.TX) error) (err error) { +func (dao *GameChannelListDao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) { return dao.Ctx(ctx).Transaction(ctx, f) } diff --git a/internal/dao/internal/game_gift_exchange.go b/internal/dao/internal/game_gift_exchange.go index 35f1d22..a9eb8dd 100644 --- a/internal/dao/internal/game_gift_exchange.go +++ b/internal/dao/internal/game_gift_exchange.go @@ -1,5 +1,5 @@ // ========================================================================== -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ========================================================================== package internal @@ -90,6 +90,6 @@ func (dao *GameGiftExchangeDao) Ctx(ctx context.Context) *gdb.Model { // // Note that, you should not Commit or Rollback the transaction in function f // as it is automatically handled by this function. -func (dao *GameGiftExchangeDao) Transaction(ctx context.Context, f func(ctx context.Context, tx *gdb.TX) error) (err error) { +func (dao *GameGiftExchangeDao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) { return dao.Ctx(ctx).Transaction(ctx, f) } diff --git a/internal/dao/internal/game_login_url.go b/internal/dao/internal/game_login_url.go index 8f0a22c..6c2a301 100644 --- a/internal/dao/internal/game_login_url.go +++ b/internal/dao/internal/game_login_url.go @@ -1,5 +1,5 @@ // ========================================================================== -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ========================================================================== package internal @@ -108,6 +108,6 @@ func (dao *GameLoginUrlDao) Ctx(ctx context.Context) *gdb.Model { // // Note that, you should not Commit or Rollback the transaction in function f // as it is automatically handled by this function. -func (dao *GameLoginUrlDao) Transaction(ctx context.Context, f func(ctx context.Context, tx *gdb.TX) error) (err error) { +func (dao *GameLoginUrlDao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) { return dao.Ctx(ctx).Transaction(ctx, f) } diff --git a/internal/dao/internal/game_mail.go b/internal/dao/internal/game_mail.go index 15d3193..f115e7d 100644 --- a/internal/dao/internal/game_mail.go +++ b/internal/dao/internal/game_mail.go @@ -1,5 +1,5 @@ // ========================================================================== -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ========================================================================== package internal @@ -94,6 +94,6 @@ func (dao *GameMailDao) Ctx(ctx context.Context) *gdb.Model { // // Note that, you should not Commit or Rollback the transaction in function f // as it is automatically handled by this function. -func (dao *GameMailDao) Transaction(ctx context.Context, f func(ctx context.Context, tx *gdb.TX) error) (err error) { +func (dao *GameMailDao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) { return dao.Ctx(ctx).Transaction(ctx, f) } diff --git a/internal/dao/internal/game_notice.go b/internal/dao/internal/game_notice.go index fa72849..5bc77eb 100644 --- a/internal/dao/internal/game_notice.go +++ b/internal/dao/internal/game_notice.go @@ -1,5 +1,5 @@ // ========================================================================== -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ========================================================================== package internal @@ -78,6 +78,6 @@ func (dao *GameNoticeDao) Ctx(ctx context.Context) *gdb.Model { // // Note that, you should not Commit or Rollback the transaction in function f // as it is automatically handled by this function. -func (dao *GameNoticeDao) Transaction(ctx context.Context, f func(ctx context.Context, tx *gdb.TX) error) (err error) { +func (dao *GameNoticeDao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) { return dao.Ctx(ctx).Transaction(ctx, f) } diff --git a/internal/dao/internal/game_notice_log.go b/internal/dao/internal/game_notice_log.go index 7072b17..7117646 100644 --- a/internal/dao/internal/game_notice_log.go +++ b/internal/dao/internal/game_notice_log.go @@ -1,5 +1,5 @@ // ========================================================================== -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ========================================================================== package internal @@ -88,6 +88,6 @@ func (dao *GameNoticeLogDao) Ctx(ctx context.Context) *gdb.Model { // // Note that, you should not Commit or Rollback the transaction in function f // as it is automatically handled by this function. -func (dao *GameNoticeLogDao) Transaction(ctx context.Context, f func(ctx context.Context, tx *gdb.TX) error) (err error) { +func (dao *GameNoticeLogDao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) { return dao.Ctx(ctx).Transaction(ctx, f) } diff --git a/internal/dao/internal/game_notice_model.go b/internal/dao/internal/game_notice_model.go index 56d043f..6f52670 100644 --- a/internal/dao/internal/game_notice_model.go +++ b/internal/dao/internal/game_notice_model.go @@ -1,5 +1,5 @@ // ========================================================================== -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ========================================================================== package internal @@ -76,6 +76,6 @@ func (dao *GameNoticeModelDao) Ctx(ctx context.Context) *gdb.Model { // // Note that, you should not Commit or Rollback the transaction in function f // as it is automatically handled by this function. -func (dao *GameNoticeModelDao) Transaction(ctx context.Context, f func(ctx context.Context, tx *gdb.TX) error) (err error) { +func (dao *GameNoticeModelDao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) { return dao.Ctx(ctx).Transaction(ctx, f) } diff --git a/internal/dao/internal/game_online.go b/internal/dao/internal/game_online.go index 910a5bf..6c01550 100644 --- a/internal/dao/internal/game_online.go +++ b/internal/dao/internal/game_online.go @@ -1,5 +1,5 @@ // ========================================================================== -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ========================================================================== package internal @@ -76,6 +76,6 @@ func (dao *GameOnlineDao) Ctx(ctx context.Context) *gdb.Model { // // Note that, you should not Commit or Rollback the transaction in function f // as it is automatically handled by this function. -func (dao *GameOnlineDao) Transaction(ctx context.Context, f func(ctx context.Context, tx *gdb.TX) error) (err error) { +func (dao *GameOnlineDao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) { return dao.Ctx(ctx).Transaction(ctx, f) } diff --git a/internal/dao/internal/game_recharge.go b/internal/dao/internal/game_recharge.go index 751f106..2872d49 100644 --- a/internal/dao/internal/game_recharge.go +++ b/internal/dao/internal/game_recharge.go @@ -1,5 +1,5 @@ // ========================================================================== -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ========================================================================== package internal @@ -102,6 +102,6 @@ func (dao *GameRechargeDao) Ctx(ctx context.Context) *gdb.Model { // // Note that, you should not Commit or Rollback the transaction in function f // as it is automatically handled by this function. -func (dao *GameRechargeDao) Transaction(ctx context.Context, f func(ctx context.Context, tx *gdb.TX) error) (err error) { +func (dao *GameRechargeDao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) { return dao.Ctx(ctx).Transaction(ctx, f) } diff --git a/internal/dao/internal/game_recharge_control.go b/internal/dao/internal/game_recharge_control.go index fee760a..a1153b2 100644 --- a/internal/dao/internal/game_recharge_control.go +++ b/internal/dao/internal/game_recharge_control.go @@ -1,5 +1,5 @@ // ========================================================================== -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ========================================================================== package internal @@ -70,6 +70,6 @@ func (dao *GameRechargeControlDao) Ctx(ctx context.Context) *gdb.Model { // // Note that, you should not Commit or Rollback the transaction in function f // as it is automatically handled by this function. -func (dao *GameRechargeControlDao) Transaction(ctx context.Context, f func(ctx context.Context, tx *gdb.TX) error) (err error) { +func (dao *GameRechargeControlDao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) { return dao.Ctx(ctx).Transaction(ctx, f) } diff --git a/internal/dao/internal/game_recharge_copy_1.go b/internal/dao/internal/game_recharge_copy_1.go index 6fa31ce..3a142b0 100644 --- a/internal/dao/internal/game_recharge_copy_1.go +++ b/internal/dao/internal/game_recharge_copy_1.go @@ -1,5 +1,5 @@ // ========================================================================== -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ========================================================================== package internal @@ -98,6 +98,6 @@ func (dao *GameRechargeCopy1Dao) Ctx(ctx context.Context) *gdb.Model { // // Note that, you should not Commit or Rollback the transaction in function f // as it is automatically handled by this function. -func (dao *GameRechargeCopy1Dao) Transaction(ctx context.Context, f func(ctx context.Context, tx *gdb.TX) error) (err error) { +func (dao *GameRechargeCopy1Dao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) { return dao.Ctx(ctx).Transaction(ctx, f) } diff --git a/internal/dao/internal/game_recharge_log.go b/internal/dao/internal/game_recharge_log.go index 625327d..be787c6 100644 --- a/internal/dao/internal/game_recharge_log.go +++ b/internal/dao/internal/game_recharge_log.go @@ -1,5 +1,5 @@ // ========================================================================== -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ========================================================================== package internal @@ -86,6 +86,6 @@ func (dao *GameRechargeLogDao) Ctx(ctx context.Context) *gdb.Model { // // Note that, you should not Commit or Rollback the transaction in function f // as it is automatically handled by this function. -func (dao *GameRechargeLogDao) Transaction(ctx context.Context, f func(ctx context.Context, tx *gdb.TX) error) (err error) { +func (dao *GameRechargeLogDao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) { return dao.Ctx(ctx).Transaction(ctx, f) } diff --git a/internal/dao/internal/game_recharge_rebate.go b/internal/dao/internal/game_recharge_rebate.go index 18fbb9c..2c44c5e 100644 --- a/internal/dao/internal/game_recharge_rebate.go +++ b/internal/dao/internal/game_recharge_rebate.go @@ -1,5 +1,5 @@ // ========================================================================== -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ========================================================================== package internal @@ -72,6 +72,6 @@ func (dao *GameRechargeRebateDao) Ctx(ctx context.Context) *gdb.Model { // // Note that, you should not Commit or Rollback the transaction in function f // as it is automatically handled by this function. -func (dao *GameRechargeRebateDao) Transaction(ctx context.Context, f func(ctx context.Context, tx *gdb.TX) error) (err error) { +func (dao *GameRechargeRebateDao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) { return dao.Ctx(ctx).Transaction(ctx, f) } diff --git a/internal/dao/internal/game_register.go b/internal/dao/internal/game_register.go index 340866a..2aa356d 100644 --- a/internal/dao/internal/game_register.go +++ b/internal/dao/internal/game_register.go @@ -1,5 +1,5 @@ // ========================================================================== -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ========================================================================== package internal @@ -80,6 +80,6 @@ func (dao *GameRegisterDao) Ctx(ctx context.Context) *gdb.Model { // // Note that, you should not Commit or Rollback the transaction in function f // as it is automatically handled by this function. -func (dao *GameRegisterDao) Transaction(ctx context.Context, f func(ctx context.Context, tx *gdb.TX) error) (err error) { +func (dao *GameRegisterDao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) { return dao.Ctx(ctx).Transaction(ctx, f) } diff --git a/internal/dao/internal/game_router.go b/internal/dao/internal/game_router.go index 8a5373a..62f614a 100644 --- a/internal/dao/internal/game_router.go +++ b/internal/dao/internal/game_router.go @@ -1,5 +1,5 @@ // ========================================================================== -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ========================================================================== package internal @@ -84,6 +84,6 @@ func (dao *GameRouterDao) Ctx(ctx context.Context) *gdb.Model { // // Note that, you should not Commit or Rollback the transaction in function f // as it is automatically handled by this function. -func (dao *GameRouterDao) Transaction(ctx context.Context, f func(ctx context.Context, tx *gdb.TX) error) (err error) { +func (dao *GameRouterDao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) { return dao.Ctx(ctx).Transaction(ctx, f) } diff --git a/internal/dao/internal/game_server_json_general.go b/internal/dao/internal/game_server_json_general.go index b567446..74f4079 100644 --- a/internal/dao/internal/game_server_json_general.go +++ b/internal/dao/internal/game_server_json_general.go @@ -1,5 +1,5 @@ // ========================================================================== -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ========================================================================== package internal @@ -80,6 +80,6 @@ func (dao *GameServerJsonGeneralDao) Ctx(ctx context.Context) *gdb.Model { // // Note that, you should not Commit or Rollback the transaction in function f // as it is automatically handled by this function. -func (dao *GameServerJsonGeneralDao) Transaction(ctx context.Context, f func(ctx context.Context, tx *gdb.TX) error) (err error) { +func (dao *GameServerJsonGeneralDao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) { return dao.Ctx(ctx).Transaction(ctx, f) } diff --git a/internal/dao/internal/game_shop_log.go b/internal/dao/internal/game_shop_log.go index f33685d..12c92b8 100644 --- a/internal/dao/internal/game_shop_log.go +++ b/internal/dao/internal/game_shop_log.go @@ -1,5 +1,5 @@ // ========================================================================== -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ========================================================================== package internal @@ -80,6 +80,6 @@ func (dao *GameShopLogDao) Ctx(ctx context.Context) *gdb.Model { // // Note that, you should not Commit or Rollback the transaction in function f // as it is automatically handled by this function. -func (dao *GameShopLogDao) Transaction(ctx context.Context, f func(ctx context.Context, tx *gdb.TX) error) (err error) { +func (dao *GameShopLogDao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) { return dao.Ctx(ctx).Transaction(ctx, f) } diff --git a/internal/dao/internal/game_unit.go b/internal/dao/internal/game_unit.go index 3f8e1f8..e984759 100644 --- a/internal/dao/internal/game_unit.go +++ b/internal/dao/internal/game_unit.go @@ -1,5 +1,5 @@ // ========================================================================== -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ========================================================================== package internal @@ -98,6 +98,6 @@ func (dao *GameUnitDao) Ctx(ctx context.Context) *gdb.Model { // // Note that, you should not Commit or Rollback the transaction in function f // as it is automatically handled by this function. -func (dao *GameUnitDao) Transaction(ctx context.Context, f func(ctx context.Context, tx *gdb.TX) error) (err error) { +func (dao *GameUnitDao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) { return dao.Ctx(ctx).Transaction(ctx, f) } diff --git a/internal/dao/internal/game_unit_copy_1.go b/internal/dao/internal/game_unit_copy_1.go index e612678..da847ee 100644 --- a/internal/dao/internal/game_unit_copy_1.go +++ b/internal/dao/internal/game_unit_copy_1.go @@ -1,5 +1,5 @@ // ========================================================================== -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ========================================================================== package internal @@ -96,6 +96,6 @@ func (dao *GameUnitCopy1Dao) Ctx(ctx context.Context) *gdb.Model { // // Note that, you should not Commit or Rollback the transaction in function f // as it is automatically handled by this function. -func (dao *GameUnitCopy1Dao) Transaction(ctx context.Context, f func(ctx context.Context, tx *gdb.TX) error) (err error) { +func (dao *GameUnitCopy1Dao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) { return dao.Ctx(ctx).Transaction(ctx, f) } diff --git a/internal/dao/internal/game_version.go b/internal/dao/internal/game_version.go index 9ea1040..4ca16d4 100644 --- a/internal/dao/internal/game_version.go +++ b/internal/dao/internal/game_version.go @@ -1,5 +1,5 @@ // ========================================================================== -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ========================================================================== package internal @@ -72,6 +72,6 @@ func (dao *GameVersionDao) Ctx(ctx context.Context) *gdb.Model { // // Note that, you should not Commit or Rollback the transaction in function f // as it is automatically handled by this function. -func (dao *GameVersionDao) Transaction(ctx context.Context, f func(ctx context.Context, tx *gdb.TX) error) (err error) { +func (dao *GameVersionDao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) { return dao.Ctx(ctx).Transaction(ctx, f) } diff --git a/internal/dao/internal/game_white_list.go b/internal/dao/internal/game_white_list.go index 13f6431..4ef9ffd 100644 --- a/internal/dao/internal/game_white_list.go +++ b/internal/dao/internal/game_white_list.go @@ -1,5 +1,5 @@ // ========================================================================== -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ========================================================================== package internal @@ -70,6 +70,6 @@ func (dao *GameWhiteListDao) Ctx(ctx context.Context) *gdb.Model { // // Note that, you should not Commit or Rollback the transaction in function f // as it is automatically handled by this function. -func (dao *GameWhiteListDao) Transaction(ctx context.Context, f func(ctx context.Context, tx *gdb.TX) error) (err error) { +func (dao *GameWhiteListDao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) { return dao.Ctx(ctx).Transaction(ctx, f) } diff --git a/internal/dao/internal/gm_operate_log.go b/internal/dao/internal/gm_operate_log.go index 95ab71c..4dcc2ca 100644 --- a/internal/dao/internal/gm_operate_log.go +++ b/internal/dao/internal/gm_operate_log.go @@ -1,5 +1,5 @@ // ========================================================================== -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ========================================================================== package internal @@ -88,6 +88,6 @@ func (dao *GmOperateLogDao) Ctx(ctx context.Context) *gdb.Model { // // Note that, you should not Commit or Rollback the transaction in function f // as it is automatically handled by this function. -func (dao *GmOperateLogDao) Transaction(ctx context.Context, f func(ctx context.Context, tx *gdb.TX) error) (err error) { +func (dao *GmOperateLogDao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) { return dao.Ctx(ctx).Transaction(ctx, f) } diff --git a/internal/dao/internal/item_income_expense_records.go b/internal/dao/internal/item_income_expense_records.go index 4928db1..32dea92 100644 --- a/internal/dao/internal/item_income_expense_records.go +++ b/internal/dao/internal/item_income_expense_records.go @@ -1,5 +1,5 @@ // ========================================================================== -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ========================================================================== package internal @@ -84,6 +84,6 @@ func (dao *ItemIncomeExpenseRecordsDao) Ctx(ctx context.Context) *gdb.Model { // // Note that, you should not Commit or Rollback the transaction in function f // as it is automatically handled by this function. -func (dao *ItemIncomeExpenseRecordsDao) Transaction(ctx context.Context, f func(ctx context.Context, tx *gdb.TX) error) (err error) { +func (dao *ItemIncomeExpenseRecordsDao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) { return dao.Ctx(ctx).Transaction(ctx, f) } diff --git a/internal/dao/internal/login_logout_info.go b/internal/dao/internal/login_logout_info.go index b9afede..90dd30d 100644 --- a/internal/dao/internal/login_logout_info.go +++ b/internal/dao/internal/login_logout_info.go @@ -1,5 +1,5 @@ // ========================================================================== -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ========================================================================== package internal @@ -20,36 +20,44 @@ type LoginLogoutInfoDao struct { // LoginLogoutInfoColumns defines and stores column names for table login_logout_info. type LoginLogoutInfoColumns struct { - Id string // - Uid string // - State string // 1: 登录，2: 登出 - CDate string // - GameTime string // 游戏时间 - Scale string // 规模 - VillagerNum string // 村民数量 - Prosperity string // 繁荣值 - Copper string // 铜币 - GoldIngot string // 桃花石 - BaseFood string // 基础食物 - Day string // 游戏天数 - Server string // 区服 + Id string // + Uid string // + State string // 1: 登录，2: 登出 + CDate string // + GameTime string // 游戏时间 + Scale string // 规模 + VillagerNum string // 村民数量 + Prosperity string // 繁荣值 + Copper string // 铜币 + GoldIngot string // 桃花石 + BaseFood string // 基础食物 + Day string // 游戏天数 + Server string // 区服 + VouchersNum string // + RechargeTotal string // + StoreSum string // + StoneAmount string // } // loginLogoutInfoColumns holds the columns for table login_logout_info. var loginLogoutInfoColumns = LoginLogoutInfoColumns{ - Id: "id", - Uid: "uid", - State: "state", - CDate: "c_date", - GameTime: "game_time", - Scale: "scale", - VillagerNum: "villager_num", - Prosperity: "prosperity", - Copper: "copper", - GoldIngot: "goldIngot", - BaseFood: "base_food", - Day: "day", - Server: "server", + Id: "id", + Uid: "uid", + State: "state", + CDate: "c_date", + GameTime: "game_time", + Scale: "scale", + VillagerNum: "villager_num", + Prosperity: "prosperity", + Copper: "copper", + GoldIngot: "goldIngot", + BaseFood: "base_food", + Day: "day", + Server: "server", + VouchersNum: "vouchersNum", + RechargeTotal: "rechargeTotal", + StoreSum: "storeSum", + StoneAmount: "stoneAmount", } // NewLoginLogoutInfoDao creates and returns a new DAO object for table data access. @@ -92,6 +100,6 @@ func (dao *LoginLogoutInfoDao) Ctx(ctx context.Context) *gdb.Model { // // Note that, you should not Commit or Rollback the transaction in function f // as it is automatically handled by this function. -func (dao *LoginLogoutInfoDao) Transaction(ctx context.Context, f func(ctx context.Context, tx *gdb.TX) error) (err error) { +func (dao *LoginLogoutInfoDao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) { return dao.Ctx(ctx).Transaction(ctx, f) } diff --git a/internal/dao/internal/login_out_log.go b/internal/dao/internal/login_out_log.go index 1f7d327..1d77281 100644 --- a/internal/dao/internal/login_out_log.go +++ b/internal/dao/internal/login_out_log.go @@ -1,5 +1,5 @@ // ========================================================================== -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ========================================================================== package internal @@ -76,6 +76,6 @@ func (dao *LoginOutLogDao) Ctx(ctx context.Context) *gdb.Model { // // Note that, you should not Commit or Rollback the transaction in function f // as it is automatically handled by this function. -func (dao *LoginOutLogDao) Transaction(ctx context.Context, f func(ctx context.Context, tx *gdb.TX) error) (err error) { +func (dao *LoginOutLogDao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) { return dao.Ctx(ctx).Transaction(ctx, f) } diff --git a/internal/dao/internal/sys_auth_rule.go b/internal/dao/internal/sys_auth_rule.go index ba9c811..6c2e7ba 100644 --- a/internal/dao/internal/sys_auth_rule.go +++ b/internal/dao/internal/sys_auth_rule.go @@ -1,5 +1,5 @@ // ========================================================================== -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ========================================================================== package internal @@ -110,6 +110,6 @@ func (dao *SysAuthRuleDao) Ctx(ctx context.Context) *gdb.Model { // // Note that, you should not Commit or Rollback the transaction in function f // as it is automatically handled by this function. -func (dao *SysAuthRuleDao) Transaction(ctx context.Context, f func(ctx context.Context, tx *gdb.TX) error) (err error) { +func (dao *SysAuthRuleDao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) { return dao.Ctx(ctx).Transaction(ctx, f) } diff --git a/internal/dao/internal/sys_config.go b/internal/dao/internal/sys_config.go index 4e64e31..d0555d0 100644 --- a/internal/dao/internal/sys_config.go +++ b/internal/dao/internal/sys_config.go @@ -1,5 +1,5 @@ // ========================================================================== -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ========================================================================== package internal @@ -86,6 +86,6 @@ func (dao *SysConfigDao) Ctx(ctx context.Context) *gdb.Model { // // Note that, you should not Commit or Rollback the transaction in function f // as it is automatically handled by this function. -func (dao *SysConfigDao) Transaction(ctx context.Context, f func(ctx context.Context, tx *gdb.TX) error) (err error) { +func (dao *SysConfigDao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) { return dao.Ctx(ctx).Transaction(ctx, f) } diff --git a/internal/dao/internal/sys_dept.go b/internal/dao/internal/sys_dept.go index 5d43885..3cdc760 100644 --- a/internal/dao/internal/sys_dept.go +++ b/internal/dao/internal/sys_dept.go @@ -1,5 +1,5 @@ // ========================================================================== -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ========================================================================== package internal @@ -94,6 +94,6 @@ func (dao *SysDeptDao) Ctx(ctx context.Context) *gdb.Model { // // Note that, you should not Commit or Rollback the transaction in function f // as it is automatically handled by this function. -func (dao *SysDeptDao) Transaction(ctx context.Context, f func(ctx context.Context, tx *gdb.TX) error) (err error) { +func (dao *SysDeptDao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) { return dao.Ctx(ctx).Transaction(ctx, f) } diff --git a/internal/dao/internal/sys_dict_data.go b/internal/dao/internal/sys_dict_data.go index a853755..e2f6185 100644 --- a/internal/dao/internal/sys_dict_data.go +++ b/internal/dao/internal/sys_dict_data.go @@ -1,5 +1,5 @@ // ========================================================================== -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ========================================================================== package internal @@ -94,6 +94,6 @@ func (dao *SysDictDataDao) Ctx(ctx context.Context) *gdb.Model { // // Note that, you should not Commit or Rollback the transaction in function f // as it is automatically handled by this function. -func (dao *SysDictDataDao) Transaction(ctx context.Context, f func(ctx context.Context, tx *gdb.TX) error) (err error) { +func (dao *SysDictDataDao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) { return dao.Ctx(ctx).Transaction(ctx, f) } diff --git a/internal/dao/internal/sys_dict_type.go b/internal/dao/internal/sys_dict_type.go index 32a680f..436c968 100644 --- a/internal/dao/internal/sys_dict_type.go +++ b/internal/dao/internal/sys_dict_type.go @@ -1,5 +1,5 @@ // ========================================================================== -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ========================================================================== package internal @@ -84,6 +84,6 @@ func (dao *SysDictTypeDao) Ctx(ctx context.Context) *gdb.Model { // // Note that, you should not Commit or Rollback the transaction in function f // as it is automatically handled by this function. -func (dao *SysDictTypeDao) Transaction(ctx context.Context, f func(ctx context.Context, tx *gdb.TX) error) (err error) { +func (dao *SysDictTypeDao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) { return dao.Ctx(ctx).Transaction(ctx, f) } diff --git a/internal/dao/internal/sys_login_log.go b/internal/dao/internal/sys_login_log.go index abc22b6..2236e12 100644 --- a/internal/dao/internal/sys_login_log.go +++ b/internal/dao/internal/sys_login_log.go @@ -1,5 +1,5 @@ // ========================================================================== -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ========================================================================== package internal @@ -86,6 +86,6 @@ func (dao *SysLoginLogDao) Ctx(ctx context.Context) *gdb.Model { // // Note that, you should not Commit or Rollback the transaction in function f // as it is automatically handled by this function. -func (dao *SysLoginLogDao) Transaction(ctx context.Context, f func(ctx context.Context, tx *gdb.TX) error) (err error) { +func (dao *SysLoginLogDao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) { return dao.Ctx(ctx).Transaction(ctx, f) } diff --git a/internal/dao/internal/sys_oper_log.go b/internal/dao/internal/sys_oper_log.go index 7d790f3..76f9d8d 100644 --- a/internal/dao/internal/sys_oper_log.go +++ b/internal/dao/internal/sys_oper_log.go @@ -1,5 +1,5 @@ // ========================================================================== -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ========================================================================== package internal @@ -98,6 +98,6 @@ func (dao *SysOperLogDao) Ctx(ctx context.Context) *gdb.Model { // // Note that, you should not Commit or Rollback the transaction in function f // as it is automatically handled by this function. -func (dao *SysOperLogDao) Transaction(ctx context.Context, f func(ctx context.Context, tx *gdb.TX) error) (err error) { +func (dao *SysOperLogDao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) { return dao.Ctx(ctx).Transaction(ctx, f) } diff --git a/internal/dao/internal/sys_post.go b/internal/dao/internal/sys_post.go index c7ec214..3ede10b 100644 --- a/internal/dao/internal/sys_post.go +++ b/internal/dao/internal/sys_post.go @@ -1,5 +1,5 @@ // ========================================================================== -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ========================================================================== package internal @@ -88,6 +88,6 @@ func (dao *SysPostDao) Ctx(ctx context.Context) *gdb.Model { // // Note that, you should not Commit or Rollback the transaction in function f // as it is automatically handled by this function. -func (dao *SysPostDao) Transaction(ctx context.Context, f func(ctx context.Context, tx *gdb.TX) error) (err error) { +func (dao *SysPostDao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) { return dao.Ctx(ctx).Transaction(ctx, f) } diff --git a/internal/dao/internal/sys_role.go b/internal/dao/internal/sys_role.go index e009ff7..758d1cd 100644 --- a/internal/dao/internal/sys_role.go +++ b/internal/dao/internal/sys_role.go @@ -1,5 +1,5 @@ // ========================================================================== -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ========================================================================== package internal @@ -82,6 +82,6 @@ func (dao *SysRoleDao) Ctx(ctx context.Context) *gdb.Model { // // Note that, you should not Commit or Rollback the transaction in function f // as it is automatically handled by this function. -func (dao *SysRoleDao) Transaction(ctx context.Context, f func(ctx context.Context, tx *gdb.TX) error) (err error) { +func (dao *SysRoleDao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) { return dao.Ctx(ctx).Transaction(ctx, f) } diff --git a/internal/dao/internal/sys_role_dept.go b/internal/dao/internal/sys_role_dept.go index a2a7e5c..d209777 100644 --- a/internal/dao/internal/sys_role_dept.go +++ b/internal/dao/internal/sys_role_dept.go @@ -1,5 +1,5 @@ // ========================================================================== -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ========================================================================== package internal @@ -70,6 +70,6 @@ func (dao *SysRoleDeptDao) Ctx(ctx context.Context) *gdb.Model { // // Note that, you should not Commit or Rollback the transaction in function f // as it is automatically handled by this function. -func (dao *SysRoleDeptDao) Transaction(ctx context.Context, f func(ctx context.Context, tx *gdb.TX) error) (err error) { +func (dao *SysRoleDeptDao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) { return dao.Ctx(ctx).Transaction(ctx, f) } diff --git a/internal/dao/internal/sys_user.go b/internal/dao/internal/sys_user.go index e85461c..eb08526 100644 --- a/internal/dao/internal/sys_user.go +++ b/internal/dao/internal/sys_user.go @@ -1,5 +1,5 @@ // ========================================================================== -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ========================================================================== package internal @@ -108,6 +108,6 @@ func (dao *SysUserDao) Ctx(ctx context.Context) *gdb.Model { // // Note that, you should not Commit or Rollback the transaction in function f // as it is automatically handled by this function. -func (dao *SysUserDao) Transaction(ctx context.Context, f func(ctx context.Context, tx *gdb.TX) error) (err error) { +func (dao *SysUserDao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) { return dao.Ctx(ctx).Transaction(ctx, f) } diff --git a/internal/dao/internal/sys_user_online.go b/internal/dao/internal/sys_user_online.go index 290beb2..c611b61 100644 --- a/internal/dao/internal/sys_user_online.go +++ b/internal/dao/internal/sys_user_online.go @@ -1,5 +1,5 @@ // ========================================================================== -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ========================================================================== package internal @@ -82,6 +82,6 @@ func (dao *SysUserOnlineDao) Ctx(ctx context.Context) *gdb.Model { // // Note that, you should not Commit or Rollback the transaction in function f // as it is automatically handled by this function. -func (dao *SysUserOnlineDao) Transaction(ctx context.Context, f func(ctx context.Context, tx *gdb.TX) error) (err error) { +func (dao *SysUserOnlineDao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) { return dao.Ctx(ctx).Transaction(ctx, f) } diff --git a/internal/dao/internal/sys_user_post.go b/internal/dao/internal/sys_user_post.go index 40b57ac..c1390f2 100644 --- a/internal/dao/internal/sys_user_post.go +++ b/internal/dao/internal/sys_user_post.go @@ -1,5 +1,5 @@ // ========================================================================== -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ========================================================================== package internal @@ -70,6 +70,6 @@ func (dao *SysUserPostDao) Ctx(ctx context.Context) *gdb.Model { // // Note that, you should not Commit or Rollback the transaction in function f // as it is automatically handled by this function. -func (dao *SysUserPostDao) Transaction(ctx context.Context, f func(ctx context.Context, tx *gdb.TX) error) (err error) { +func (dao *SysUserPostDao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) { return dao.Ctx(ctx).Transaction(ctx, f) } diff --git a/internal/dao/internal/web_operate_log.go b/internal/dao/internal/web_operate_log.go index d9dbc20..68c9628 100644 --- a/internal/dao/internal/web_operate_log.go +++ b/internal/dao/internal/web_operate_log.go @@ -1,5 +1,5 @@ // ========================================================================== -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ========================================================================== package internal @@ -82,6 +82,6 @@ func (dao *WebOperateLogDao) Ctx(ctx context.Context) *gdb.Model { // // Note that, you should not Commit or Rollback the transaction in function f // as it is automatically handled by this function. -func (dao *WebOperateLogDao) Transaction(ctx context.Context, f func(ctx context.Context, tx *gdb.TX) error) (err error) { +func (dao *WebOperateLogDao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) { return dao.Ctx(ctx).Transaction(ctx, f) } diff --git a/internal/model/do/advertisement.go b/internal/model/do/advertisement.go index 26e1931..691e943 100644 --- a/internal/model/do/advertisement.go +++ b/internal/model/do/advertisement.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package do diff --git a/internal/model/do/casbin_rule.go b/internal/model/do/casbin_rule.go index 3e9ec42..0cf6108 100644 --- a/internal/model/do/casbin_rule.go +++ b/internal/model/do/casbin_rule.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package do diff --git a/internal/model/do/game_black_list.go b/internal/model/do/game_black_list.go index 74d08a7..2576ac8 100644 --- a/internal/model/do/game_black_list.go +++ b/internal/model/do/game_black_list.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package do diff --git a/internal/model/do/game_bug.go b/internal/model/do/game_bug.go index 164ba8d..8ffff3b 100644 --- a/internal/model/do/game_bug.go +++ b/internal/model/do/game_bug.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package do diff --git a/internal/model/do/game_bug_client.go b/internal/model/do/game_bug_client.go index be768bf..d2a9616 100644 --- a/internal/model/do/game_bug_client.go +++ b/internal/model/do/game_bug_client.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package do diff --git a/internal/model/do/game_ccd_url.go b/internal/model/do/game_ccd_url.go index 347a4f7..ee60932 100644 --- a/internal/model/do/game_ccd_url.go +++ b/internal/model/do/game_ccd_url.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package do diff --git a/internal/model/do/game_ccd_url_copy_1.go b/internal/model/do/game_ccd_url_copy_1.go index 988253c..6a17014 100644 --- a/internal/model/do/game_ccd_url_copy_1.go +++ b/internal/model/do/game_ccd_url_copy_1.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package do diff --git a/internal/model/do/game_ccd_version.go b/internal/model/do/game_ccd_version.go index c32072a..d0778d3 100644 --- a/internal/model/do/game_ccd_version.go +++ b/internal/model/do/game_ccd_version.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package do diff --git a/internal/model/do/game_cd_key.go b/internal/model/do/game_cd_key.go index 0e6d7ed..36251a9 100644 --- a/internal/model/do/game_cd_key.go +++ b/internal/model/do/game_cd_key.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package do diff --git a/internal/model/do/game_cd_password.go b/internal/model/do/game_cd_password.go index 8623db3..a4e7797 100644 --- a/internal/model/do/game_cd_password.go +++ b/internal/model/do/game_cd_password.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package do diff --git a/internal/model/do/game_channel_list.go b/internal/model/do/game_channel_list.go index 1facc33..4de7005 100644 --- a/internal/model/do/game_channel_list.go +++ b/internal/model/do/game_channel_list.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package do diff --git a/internal/model/do/game_gift_exchange.go b/internal/model/do/game_gift_exchange.go index b8b67bd..3459d16 100644 --- a/internal/model/do/game_gift_exchange.go +++ b/internal/model/do/game_gift_exchange.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package do diff --git a/internal/model/do/game_login_url.go b/internal/model/do/game_login_url.go index 7e59e66..3527f7c 100644 --- a/internal/model/do/game_login_url.go +++ b/internal/model/do/game_login_url.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package do diff --git a/internal/model/do/game_mail.go b/internal/model/do/game_mail.go index d432111..e8a9f9c 100644 --- a/internal/model/do/game_mail.go +++ b/internal/model/do/game_mail.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package do diff --git a/internal/model/do/game_notice.go b/internal/model/do/game_notice.go index 15a56c4..3286c62 100644 --- a/internal/model/do/game_notice.go +++ b/internal/model/do/game_notice.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package do diff --git a/internal/model/do/game_notice_log.go b/internal/model/do/game_notice_log.go index b2f7657..cecfd3d 100644 --- a/internal/model/do/game_notice_log.go +++ b/internal/model/do/game_notice_log.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package do diff --git a/internal/model/do/game_notice_model.go b/internal/model/do/game_notice_model.go index 6697a4f..26caae6 100644 --- a/internal/model/do/game_notice_model.go +++ b/internal/model/do/game_notice_model.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package do diff --git a/internal/model/do/game_online.go b/internal/model/do/game_online.go index 508c9a5..aa49835 100644 --- a/internal/model/do/game_online.go +++ b/internal/model/do/game_online.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package do diff --git a/internal/model/do/game_recharge.go b/internal/model/do/game_recharge.go index a538bfa..b5e811b 100644 --- a/internal/model/do/game_recharge.go +++ b/internal/model/do/game_recharge.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package do diff --git a/internal/model/do/game_recharge_control.go b/internal/model/do/game_recharge_control.go index 1a9936d..8071048 100644 --- a/internal/model/do/game_recharge_control.go +++ b/internal/model/do/game_recharge_control.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package do diff --git a/internal/model/do/game_recharge_copy_1.go b/internal/model/do/game_recharge_copy_1.go index fdfa5c0..3c00435 100644 --- a/internal/model/do/game_recharge_copy_1.go +++ b/internal/model/do/game_recharge_copy_1.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package do diff --git a/internal/model/do/game_recharge_log.go b/internal/model/do/game_recharge_log.go index f919ba5..30985d6 100644 --- a/internal/model/do/game_recharge_log.go +++ b/internal/model/do/game_recharge_log.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package do diff --git a/internal/model/do/game_recharge_rebate.go b/internal/model/do/game_recharge_rebate.go index 3004105..4163964 100644 --- a/internal/model/do/game_recharge_rebate.go +++ b/internal/model/do/game_recharge_rebate.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package do diff --git a/internal/model/do/game_register.go b/internal/model/do/game_register.go index 38f1da4..9698d22 100644 --- a/internal/model/do/game_register.go +++ b/internal/model/do/game_register.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package do diff --git a/internal/model/do/game_router.go b/internal/model/do/game_router.go index 63e1d1f..d2b5eb6 100644 --- a/internal/model/do/game_router.go +++ b/internal/model/do/game_router.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package do diff --git a/internal/model/do/game_server_json_general.go b/internal/model/do/game_server_json_general.go index fcd301d..b520e9d 100644 --- a/internal/model/do/game_server_json_general.go +++ b/internal/model/do/game_server_json_general.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package do diff --git a/internal/model/do/game_shop_log.go b/internal/model/do/game_shop_log.go index 4af391a..bbe684a 100644 --- a/internal/model/do/game_shop_log.go +++ b/internal/model/do/game_shop_log.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package do diff --git a/internal/model/do/game_unit.go b/internal/model/do/game_unit.go index 1cb0add..8bfac61 100644 --- a/internal/model/do/game_unit.go +++ b/internal/model/do/game_unit.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package do diff --git a/internal/model/do/game_unit_copy_1.go b/internal/model/do/game_unit_copy_1.go index b526e64..36d523d 100644 --- a/internal/model/do/game_unit_copy_1.go +++ b/internal/model/do/game_unit_copy_1.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package do diff --git a/internal/model/do/game_version.go b/internal/model/do/game_version.go index ffdb54e..2c0d17a 100644 --- a/internal/model/do/game_version.go +++ b/internal/model/do/game_version.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package do diff --git a/internal/model/do/game_white_list.go b/internal/model/do/game_white_list.go index a2360bf..d519b08 100644 --- a/internal/model/do/game_white_list.go +++ b/internal/model/do/game_white_list.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package do diff --git a/internal/model/do/gm_operate_log.go b/internal/model/do/gm_operate_log.go index cb19a3d..39b4e58 100644 --- a/internal/model/do/gm_operate_log.go +++ b/internal/model/do/gm_operate_log.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package do diff --git a/internal/model/do/item_income_expense_records.go b/internal/model/do/item_income_expense_records.go index 11f7676..87ca1aa 100644 --- a/internal/model/do/item_income_expense_records.go +++ b/internal/model/do/item_income_expense_records.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package do diff --git a/internal/model/do/login_logout_info.go b/internal/model/do/login_logout_info.go index 1e38d5b..7354924 100644 --- a/internal/model/do/login_logout_info.go +++ b/internal/model/do/login_logout_info.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package do @@ -11,18 +11,22 @@ import ( // LoginLogoutInfo is the golang structure of table login_logout_info for DAO operations like Where/Data. type LoginLogoutInfo struct { - g.Meta `orm:"table:login_logout_info, do:true"` - Id interface{} // - Uid interface{} // - State interface{} // 1: 登录，2: 登出 - CDate *gtime.Time // - GameTime interface{} // 游戏时间 - Scale interface{} // 规模 - VillagerNum interface{} // 村民数量 - Prosperity interface{} // 繁荣值 - Copper interface{} // 铜币 - GoldIngot interface{} // 桃花石 - BaseFood interface{} // 基础食物 - Day interface{} // 游戏天数 - Server interface{} // 区服 + g.Meta `orm:"table:login_logout_info, do:true"` + Id interface{} // + Uid interface{} // + State interface{} // 1: 登录，2: 登出 + CDate *gtime.Time // + GameTime interface{} // 游戏时间 + Scale interface{} // 规模 + VillagerNum interface{} // 村民数量 + Prosperity interface{} // 繁荣值 + Copper interface{} // 铜币 + GoldIngot interface{} // 桃花石 + BaseFood interface{} // 基础食物 + Day interface{} // 游戏天数 + Server interface{} // 区服 + VouchersNum interface{} // + RechargeTotal interface{} // + StoreSum interface{} // + StoneAmount interface{} // } diff --git a/internal/model/do/login_out_log.go b/internal/model/do/login_out_log.go index 308c8de..c430b76 100644 --- a/internal/model/do/login_out_log.go +++ b/internal/model/do/login_out_log.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package do diff --git a/internal/model/do/sys_auth_rule.go b/internal/model/do/sys_auth_rule.go index 3efd7af..67c9f7e 100644 --- a/internal/model/do/sys_auth_rule.go +++ b/internal/model/do/sys_auth_rule.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package do diff --git a/internal/model/do/sys_config.go b/internal/model/do/sys_config.go index caa8e08..0b5aae5 100644 --- a/internal/model/do/sys_config.go +++ b/internal/model/do/sys_config.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package do diff --git a/internal/model/do/sys_dept.go b/internal/model/do/sys_dept.go index 6139fbc..c4711c1 100644 --- a/internal/model/do/sys_dept.go +++ b/internal/model/do/sys_dept.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package do diff --git a/internal/model/do/sys_dict_data.go b/internal/model/do/sys_dict_data.go index 8f81b0b..1d90f4f 100644 --- a/internal/model/do/sys_dict_data.go +++ b/internal/model/do/sys_dict_data.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package do diff --git a/internal/model/do/sys_dict_type.go b/internal/model/do/sys_dict_type.go index 7522b84..b30a8df 100644 --- a/internal/model/do/sys_dict_type.go +++ b/internal/model/do/sys_dict_type.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package do diff --git a/internal/model/do/sys_login_log.go b/internal/model/do/sys_login_log.go index 8fd6538..908d73a 100644 --- a/internal/model/do/sys_login_log.go +++ b/internal/model/do/sys_login_log.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package do diff --git a/internal/model/do/sys_oper_log.go b/internal/model/do/sys_oper_log.go index d8180e6..ae6e6e6 100644 --- a/internal/model/do/sys_oper_log.go +++ b/internal/model/do/sys_oper_log.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package do diff --git a/internal/model/do/sys_post.go b/internal/model/do/sys_post.go index a8e067d..7178126 100644 --- a/internal/model/do/sys_post.go +++ b/internal/model/do/sys_post.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package do diff --git a/internal/model/do/sys_role.go b/internal/model/do/sys_role.go index 47e9599..6ba12cd 100644 --- a/internal/model/do/sys_role.go +++ b/internal/model/do/sys_role.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package do diff --git a/internal/model/do/sys_role_dept.go b/internal/model/do/sys_role_dept.go index df1a1ad..c3795b6 100644 --- a/internal/model/do/sys_role_dept.go +++ b/internal/model/do/sys_role_dept.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package do diff --git a/internal/model/do/sys_user.go b/internal/model/do/sys_user.go index d4934ee..51a5e30 100644 --- a/internal/model/do/sys_user.go +++ b/internal/model/do/sys_user.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package do diff --git a/internal/model/do/sys_user_online.go b/internal/model/do/sys_user_online.go index f47ec4b..ed329ea 100644 --- a/internal/model/do/sys_user_online.go +++ b/internal/model/do/sys_user_online.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package do diff --git a/internal/model/do/sys_user_post.go b/internal/model/do/sys_user_post.go index a06c02d..5702e16 100644 --- a/internal/model/do/sys_user_post.go +++ b/internal/model/do/sys_user_post.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package do diff --git a/internal/model/do/web_operate_log.go b/internal/model/do/web_operate_log.go index 21d701e..25edb9f 100644 --- a/internal/model/do/web_operate_log.go +++ b/internal/model/do/web_operate_log.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package do diff --git a/internal/model/entity/advertisement.go b/internal/model/entity/advertisement.go index 455247b..7da7e45 100644 --- a/internal/model/entity/advertisement.go +++ b/internal/model/entity/advertisement.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package entity diff --git a/internal/model/entity/casbin_rule.go b/internal/model/entity/casbin_rule.go index 99ad458..7b215ac 100644 --- a/internal/model/entity/casbin_rule.go +++ b/internal/model/entity/casbin_rule.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package entity diff --git a/internal/model/entity/game_black_list.go b/internal/model/entity/game_black_list.go index e169ce1..6e0f1dd 100644 --- a/internal/model/entity/game_black_list.go +++ b/internal/model/entity/game_black_list.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package entity diff --git a/internal/model/entity/game_bug.go b/internal/model/entity/game_bug.go index b46ad8d..943611c 100644 --- a/internal/model/entity/game_bug.go +++ b/internal/model/entity/game_bug.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package entity diff --git a/internal/model/entity/game_bug_client.go b/internal/model/entity/game_bug_client.go index 22de061..3f6f865 100644 --- a/internal/model/entity/game_bug_client.go +++ b/internal/model/entity/game_bug_client.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package entity diff --git a/internal/model/entity/game_ccd_url.go b/internal/model/entity/game_ccd_url.go index a81728c..4075bb3 100644 --- a/internal/model/entity/game_ccd_url.go +++ b/internal/model/entity/game_ccd_url.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package entity diff --git a/internal/model/entity/game_ccd_url_copy_1.go b/internal/model/entity/game_ccd_url_copy_1.go index 98a9029..df65783 100644 --- a/internal/model/entity/game_ccd_url_copy_1.go +++ b/internal/model/entity/game_ccd_url_copy_1.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package entity diff --git a/internal/model/entity/game_ccd_version.go b/internal/model/entity/game_ccd_version.go index 8011d9b..e6f2aea 100644 --- a/internal/model/entity/game_ccd_version.go +++ b/internal/model/entity/game_ccd_version.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package entity diff --git a/internal/model/entity/game_cd_key.go b/internal/model/entity/game_cd_key.go index 2810256..9d300cb 100644 --- a/internal/model/entity/game_cd_key.go +++ b/internal/model/entity/game_cd_key.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package entity diff --git a/internal/model/entity/game_cd_password.go b/internal/model/entity/game_cd_password.go index 9c6addf..ecfa14e 100644 --- a/internal/model/entity/game_cd_password.go +++ b/internal/model/entity/game_cd_password.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package entity diff --git a/internal/model/entity/game_channel_list.go b/internal/model/entity/game_channel_list.go index f24574a..cdf8889 100644 --- a/internal/model/entity/game_channel_list.go +++ b/internal/model/entity/game_channel_list.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package entity diff --git a/internal/model/entity/game_gift_exchange.go b/internal/model/entity/game_gift_exchange.go index 583ca16..147ee30 100644 --- a/internal/model/entity/game_gift_exchange.go +++ b/internal/model/entity/game_gift_exchange.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package entity diff --git a/internal/model/entity/game_login_url.go b/internal/model/entity/game_login_url.go index 2efb53a..2447893 100644 --- a/internal/model/entity/game_login_url.go +++ b/internal/model/entity/game_login_url.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package entity diff --git a/internal/model/entity/game_mail.go b/internal/model/entity/game_mail.go index 1974c48..257d459 100644 --- a/internal/model/entity/game_mail.go +++ b/internal/model/entity/game_mail.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package entity diff --git a/internal/model/entity/game_notice.go b/internal/model/entity/game_notice.go index 7dd37ba..b5f5caf 100644 --- a/internal/model/entity/game_notice.go +++ b/internal/model/entity/game_notice.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package entity diff --git a/internal/model/entity/game_notice_log.go b/internal/model/entity/game_notice_log.go index a946d37..21e67ab 100644 --- a/internal/model/entity/game_notice_log.go +++ b/internal/model/entity/game_notice_log.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package entity diff --git a/internal/model/entity/game_notice_model.go b/internal/model/entity/game_notice_model.go index 87f9f5e..aa990d0 100644 --- a/internal/model/entity/game_notice_model.go +++ b/internal/model/entity/game_notice_model.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package entity diff --git a/internal/model/entity/game_online.go b/internal/model/entity/game_online.go index fd4688c..4b11ab3 100644 --- a/internal/model/entity/game_online.go +++ b/internal/model/entity/game_online.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package entity diff --git a/internal/model/entity/game_recharge.go b/internal/model/entity/game_recharge.go index 28505c7..bfaf91a 100644 --- a/internal/model/entity/game_recharge.go +++ b/internal/model/entity/game_recharge.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package entity diff --git a/internal/model/entity/game_recharge_control.go b/internal/model/entity/game_recharge_control.go index 01438a3..60ca57f 100644 --- a/internal/model/entity/game_recharge_control.go +++ b/internal/model/entity/game_recharge_control.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package entity diff --git a/internal/model/entity/game_recharge_copy_1.go b/internal/model/entity/game_recharge_copy_1.go index 143b70d..8348983 100644 --- a/internal/model/entity/game_recharge_copy_1.go +++ b/internal/model/entity/game_recharge_copy_1.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package entity diff --git a/internal/model/entity/game_recharge_log.go b/internal/model/entity/game_recharge_log.go index 5c71ced..7dcabf7 100644 --- a/internal/model/entity/game_recharge_log.go +++ b/internal/model/entity/game_recharge_log.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package entity diff --git a/internal/model/entity/game_recharge_rebate.go b/internal/model/entity/game_recharge_rebate.go index 394cafc..6134ff8 100644 --- a/internal/model/entity/game_recharge_rebate.go +++ b/internal/model/entity/game_recharge_rebate.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package entity diff --git a/internal/model/entity/game_register.go b/internal/model/entity/game_register.go index 0a1e86a..568372d 100644 --- a/internal/model/entity/game_register.go +++ b/internal/model/entity/game_register.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package entity diff --git a/internal/model/entity/game_router.go b/internal/model/entity/game_router.go index 85c5b15..3218ea0 100644 --- a/internal/model/entity/game_router.go +++ b/internal/model/entity/game_router.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package entity diff --git a/internal/model/entity/game_server_json_general.go b/internal/model/entity/game_server_json_general.go index 55bf105..24e97aa 100644 --- a/internal/model/entity/game_server_json_general.go +++ b/internal/model/entity/game_server_json_general.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package entity diff --git a/internal/model/entity/game_shop_log.go b/internal/model/entity/game_shop_log.go index afff62c..6255cb4 100644 --- a/internal/model/entity/game_shop_log.go +++ b/internal/model/entity/game_shop_log.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package entity diff --git a/internal/model/entity/game_unit.go b/internal/model/entity/game_unit.go index c0fce88..60a3b4c 100644 --- a/internal/model/entity/game_unit.go +++ b/internal/model/entity/game_unit.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package entity diff --git a/internal/model/entity/game_unit_copy_1.go b/internal/model/entity/game_unit_copy_1.go index e90e887..026fdd1 100644 --- a/internal/model/entity/game_unit_copy_1.go +++ b/internal/model/entity/game_unit_copy_1.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package entity diff --git a/internal/model/entity/game_version.go b/internal/model/entity/game_version.go index 40c5913..28f2ccb 100644 --- a/internal/model/entity/game_version.go +++ b/internal/model/entity/game_version.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package entity diff --git a/internal/model/entity/game_white_list.go b/internal/model/entity/game_white_list.go index d72b1b5..233742d 100644 --- a/internal/model/entity/game_white_list.go +++ b/internal/model/entity/game_white_list.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package entity diff --git a/internal/model/entity/gm_operate_log.go b/internal/model/entity/gm_operate_log.go index fd9cd7e..6e443a4 100644 --- a/internal/model/entity/gm_operate_log.go +++ b/internal/model/entity/gm_operate_log.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package entity diff --git a/internal/model/entity/item_income_expense_records.go b/internal/model/entity/item_income_expense_records.go index 4b082c6..c18eadd 100644 --- a/internal/model/entity/item_income_expense_records.go +++ b/internal/model/entity/item_income_expense_records.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package entity diff --git a/internal/model/entity/login_logout_info.go b/internal/model/entity/login_logout_info.go index d68d76d..529319d 100644 --- a/internal/model/entity/login_logout_info.go +++ b/internal/model/entity/login_logout_info.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package entity @@ -10,17 +10,21 @@ import ( // LoginLogoutInfo is the golang structure for table login_logout_info. type LoginLogoutInfo struct { - Id int64 `json:"id" description:""` - Uid int64 `json:"uid" description:""` - State int `json:"state" description:"1: 登录，2: 登出"` - CDate *gtime.Time `json:"cDate" description:""` - GameTime int `json:"gameTime" description:"游戏时间"` - Scale int `json:"scale" description:"规模"` - VillagerNum int `json:"villagerNum" description:"村民数量"` - Prosperity int `json:"prosperity" description:"繁荣值"` - Copper int `json:"copper" description:"铜币"` - GoldIngot int `json:"goldIngot" description:"桃花石"` - BaseFood int `json:"baseFood" description:"基础食物"` - Day int `json:"day" description:"游戏天数"` - Server int `json:"server" description:"区服"` + Id int64 `json:"id" description:""` + Uid int64 `json:"uid" description:""` + State int `json:"state" description:"1: 登录，2: 登出"` + CDate *gtime.Time `json:"cDate" description:""` + GameTime int `json:"gameTime" description:"游戏时间"` + Scale int `json:"scale" description:"规模"` + VillagerNum int `json:"villagerNum" description:"村民数量"` + Prosperity int `json:"prosperity" description:"繁荣值"` + Copper int `json:"copper" description:"铜币"` + GoldIngot int `json:"goldIngot" description:"桃花石"` + BaseFood int `json:"baseFood" description:"基础食物"` + Day int `json:"day" description:"游戏天数"` + Server int `json:"server" description:"区服"` + VouchersNum int `json:"vouchersNum" description:""` + RechargeTotal int `json:"rechargeTotal" description:""` + StoreSum int `json:"storeSum" description:""` + StoneAmount int `json:"stoneAmount" description:""` } diff --git a/internal/model/entity/login_out_log.go b/internal/model/entity/login_out_log.go index a368a27..2ce0a13 100644 --- a/internal/model/entity/login_out_log.go +++ b/internal/model/entity/login_out_log.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package entity diff --git a/internal/model/entity/sys_auth_rule.go b/internal/model/entity/sys_auth_rule.go index b4d8197..cb3ab1c 100644 --- a/internal/model/entity/sys_auth_rule.go +++ b/internal/model/entity/sys_auth_rule.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package entity diff --git a/internal/model/entity/sys_config.go b/internal/model/entity/sys_config.go index fd49bcb..d1ad7c9 100644 --- a/internal/model/entity/sys_config.go +++ b/internal/model/entity/sys_config.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package entity diff --git a/internal/model/entity/sys_dept.go b/internal/model/entity/sys_dept.go index acbc258..f42bfa7 100644 --- a/internal/model/entity/sys_dept.go +++ b/internal/model/entity/sys_dept.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package entity diff --git a/internal/model/entity/sys_dict_data.go b/internal/model/entity/sys_dict_data.go index e5363fc..b889445 100644 --- a/internal/model/entity/sys_dict_data.go +++ b/internal/model/entity/sys_dict_data.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package entity diff --git a/internal/model/entity/sys_dict_type.go b/internal/model/entity/sys_dict_type.go index 1556460..f238c3a 100644 --- a/internal/model/entity/sys_dict_type.go +++ b/internal/model/entity/sys_dict_type.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package entity diff --git a/internal/model/entity/sys_login_log.go b/internal/model/entity/sys_login_log.go index 3a7b961..f6b7b32 100644 --- a/internal/model/entity/sys_login_log.go +++ b/internal/model/entity/sys_login_log.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package entity diff --git a/internal/model/entity/sys_oper_log.go b/internal/model/entity/sys_oper_log.go index c68385d..d617d3a 100644 --- a/internal/model/entity/sys_oper_log.go +++ b/internal/model/entity/sys_oper_log.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package entity diff --git a/internal/model/entity/sys_post.go b/internal/model/entity/sys_post.go index 8301eb8..aaf5ba7 100644 --- a/internal/model/entity/sys_post.go +++ b/internal/model/entity/sys_post.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package entity diff --git a/internal/model/entity/sys_role.go b/internal/model/entity/sys_role.go index c98e802..94920f4 100644 --- a/internal/model/entity/sys_role.go +++ b/internal/model/entity/sys_role.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package entity diff --git a/internal/model/entity/sys_role_dept.go b/internal/model/entity/sys_role_dept.go index c795ca0..2e5483d 100644 --- a/internal/model/entity/sys_role_dept.go +++ b/internal/model/entity/sys_role_dept.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package entity diff --git a/internal/model/entity/sys_user.go b/internal/model/entity/sys_user.go index bd87afd..06972d3 100644 --- a/internal/model/entity/sys_user.go +++ b/internal/model/entity/sys_user.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package entity diff --git a/internal/model/entity/sys_user_online.go b/internal/model/entity/sys_user_online.go index a286995..723efb0 100644 --- a/internal/model/entity/sys_user_online.go +++ b/internal/model/entity/sys_user_online.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package entity diff --git a/internal/model/entity/sys_user_post.go b/internal/model/entity/sys_user_post.go index 8de724c..7b8f1bf 100644 --- a/internal/model/entity/sys_user_post.go +++ b/internal/model/entity/sys_user_post.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package entity diff --git a/internal/model/entity/web_operate_log.go b/internal/model/entity/web_operate_log.go index 45f0817..427098a 100644 --- a/internal/model/entity/web_operate_log.go +++ b/internal/model/entity/web_operate_log.go @@ -1,5 +1,5 @@ // ================================================================================= -// Code generated by GoFrame CLI tool. DO NOT EDIT. +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. // ================================================================================= package entity diff --git a/internal/serviceGame/ccd.go b/internal/serviceGame/ccd.go index d9cef16..31bad08 100644 --- a/internal/serviceGame/ccd.go +++ b/internal/serviceGame/ccd.go @@ -36,7 +36,7 @@ func GameCCD() IGameCCD { func (c *gameCCDImpl) GetCCD(ctx context.Context, req *game.GetCCDReq) (res *game.GetCCDRes, err error) { //ip := libUtils.GetClientIp(ctx) //fmt.Println("ip: ", ip) - g.Try(ctx, func(ctx context.Context) { + err = g.Try(ctx, func(ctx context.Context) { res = new(game.GetCCDRes) model := dao.GameCcdUrl.Ctx(ctx) if req.Platform != "" { @@ -120,7 +120,7 @@ func getStateRes(platform string, state int) (res string) { func (c *gameCCDImpl) GetGameCCD(ctx context.Context, req *game.GetGameCCDReq) (res *game.GetGameCCDRes, err error) { res = new(game.GetGameCCDRes) ip := libUtils.GetClientIp(ctx) - g.Log().Debugf(ctx, "0 ip= ", req.Platform, req.ChannelType, gjson.MustEncodeString(req)) + g.Log().Infof(ctx, "0 ip= ", req.Platform, req.ChannelType, gjson.MustEncodeString(req)) if req.ChannelType == "000005000000" { res.AuditMode = 1 } @@ -150,7 +150,7 @@ func (c *gameCCDImpl) GetGameCCD(ctx context.Context, req *game.GetGameCCDReq) ( model = model.Order("ip, versionName, channelType DESC") var ccdList []*entity.GameCcdUrl err = model.Scan(&ccdList) - g.Log().Debugf(ctx, "1 ip="+ip, len(ccdList)) + g.Log().Infof(ctx, "1 ip="+ip, len(ccdList)) //res.Version = GameVersion().GetVersion(ctx, req.ChannelType) ccdLen := len(ccdList) if err != nil || ccdLen == 0 { @@ -216,7 +216,7 @@ func (c *gameCCDImpl) GetGameCCD1(ctx context.Context, req *game.GetGameCCD1Req) model = model.Order("ip, versionName, channelType DESC") var ccdList []*entity.GameCcdUrl err = model.Scan(&ccdList) - g.Log().Debugf(ctx, "1 ip="+ip, len(ccdList)) + g.Log().Debugf(ctx, "1 ip=%s", ip, len(ccdList)) //res.Version = GameVersion().GetVersion(ctx, req.ChannelType) ccdLen := len(ccdList) if err != nil || ccdLen == 0 { diff --git a/internal/serviceGame/internal/basicinfo.go b/internal/serviceGame/internal/basicinfo.go index 23e659e..ea90e8a 100644 --- a/internal/serviceGame/internal/basicinfo.go +++ b/internal/serviceGame/internal/basicinfo.go @@ -225,6 +225,39 @@ func GetUnitByUid(ctx context.Context, uid int64, serverId int) (unit *entity.Ga return &units[0], err } +func GetUnitByStringUid(ctx context.Context, uid string, serverId int) (unit *entity.GameUnit, err error) { + srcId, err1 := GetStringIdToUid(ctx, uid) + if err1 != nil { + g.Log().Error(ctx, "GetUnit 获取账号ID err : ", err1) + return nil, err1 + } + if g.IsEmpty(srcId) { + g.Log().Error(ctx, "GetUnit 账号ID不存在 : ", fmt.Sprint(srcId)+"-"+fmt.Sprint(uid)) + return nil, gerror.New("IDIsNull") + } + units := []entity.GameUnit{} + err = dao.GameUnit.Ctx(ctx).Where("uid=?", srcId).Scan(&units) + if err != nil { + g.Log().Error(ctx, "GetUnit scan 1 : ", srcId, gjson.MustEncodeString(units)) + return nil, err + } + if len(units) == 0 { + g.Log().Errorf(ctx, "[%d]GetUnit unit is null, %s", srcId, gjson.MustEncodeString(units)) + return nil, errors.New("UnitIsNull") + } + serverList := "" + for _, v := range units { + if v.Server == serverId { + return &v, err + } + serverList += fmt.Sprint(v.Server) + ";" + } + if len(units) > 1 { + return nil, errors.New("查询失败，包含多个用户,区服在：" + serverList) + } + return &units[0], err +} + func GetUnitById(ctx context.Context, srcId int64, serverId int) (unit *entity.GameUnit, err error) { if g.IsEmpty(srcId) { g.Log().Error(ctx, "GetAccount 账号ID不存在 : ", fmt.Sprint(srcId)) @@ -812,17 +845,21 @@ func LoginOut(ctx context.Context, req *game.LoginOutReq) (res *game.LoginOutRes model := dao.LoginLogoutInfo.Ctx(ctx) _, err = model.Insert(&do.LoginLogoutInfo{ - Uid: req.Uid, - State: req.State, - Day: req.Day, - GameTime: req.GameTime, - Scale: req.Scale, - VillagerNum: req.VillagerNum, - Copper: req.Copper, - GoldIngot: req.GoldIngot, - BaseFood: req.BaseFood, - Prosperity: req.Prosperity, - Server: req.Server, + Uid: req.Uid, + State: req.State, + Day: req.Day, + GameTime: req.GameTime, + Scale: req.Scale, + VillagerNum: req.VillagerNum, + Copper: req.Copper, + GoldIngot: req.GoldIngot, + BaseFood: req.BaseFood, + Prosperity: req.Prosperity, + Server: req.Server, + VouchersNum: req.VouchersNum, + RechargeTotal: req.RechargeTotal, + StoreSum: req.StoreSum, + StoneAmount: req.StoneAmount, }) } if gtime.Timestamp()-online[req.Server] > 2 { diff --git a/internal/serviceGame/internal/cdKey.go b/internal/serviceGame/internal/cdKey.go index 7a86439..10aff8e 100644 --- a/internal/serviceGame/internal/cdKey.go +++ b/internal/serviceGame/internal/cdKey.go @@ -163,6 +163,9 @@ func UpdateGiftExchangeConfig(ctx context.Context, req *game.UpdateGiftExchangeR if req.Times != 0 { data.Times = req.Times } + if len(req.Awards) > 0 { + data.Rewards = req.Awards + } if req.StartTime == "" && req.StopTime == "" && req.Times == 0 { data.StartTime = time.Now().Format(consts.TIME_FORMAT) data.StopTime = time.Now().Format(consts.TIME_FORMAT) diff --git a/internal/serviceGame/internal/manage.go b/internal/serviceGame/internal/manage.go index 7b87742..e100ed8 100644 --- a/internal/serviceGame/internal/manage.go +++ b/internal/serviceGame/internal/manage.go @@ -9,7 +9,6 @@ import ( "github.com/gogf/gf/v2/errors/gerror" "github.com/gogf/gf/v2/frame/g" "go.mongodb.org/mongo-driver/bson" - "strings" "time" "tyj_admin/api/v1/game" "tyj_admin/internal/consts" @@ -86,57 +85,42 @@ func SetGmToClient(ctx context.Context, req *game.SetGmToClientReq) (res *game.S res = new(game.SetGmToClientRes) srcCharset := "UTF-8" g.Client().SetHeader("Content-Type", "application/json;charset=UTF-8") - errdata := "" - owners := strings.Split(req.Uids, ";") - owner := map[string]string{} - if req.Uids != "" { - for _, v := range owners { - uid, _ := GetStringIdToUid(ctx, v) - if uid == "" { - errdata += "uid:" + v + "不存在！" - continue - } - server, _ := UidToServer(ctx, uid) - if server == 0 { - continue - } - data, ok := owner[fmt.Sprint(server)] - if !ok { - owner[fmt.Sprint(server)] = "" - } - if len(data) > 0 { - owner[fmt.Sprint(server)] += ";" + if req.Uids == "" { + return nil, errors.New("uid为空！") + } + unit, err := GetUnitByStringUid(ctx, req.Uids, req.ServerId) + if err != nil { + fmt.Println("GetAccount:", err) + return nil, err + } + if req.ServerId != unit.Server { + var serverInfo entity.GameLoginUrl + for _, v := range ServerList { + if v.Id == unit.Server { + serverInfo = v + break } - owner[fmt.Sprint(server)] += uid - } - if len(owner) == 0 { - return } + return nil, errors.New("区服选择错误！当前区服在<" + fmt.Sprint(serverInfo.Id) + "><" + serverInfo.Name + ">区") } - g.Log().Info(ctx, "SendToGame - ServerConfig: ", gjson.MustEncodeString(ServerConfig)) - for k, v := range owner { - ip := ServerConfig[k] - //g.Log().Info(ctx, "sendMail - ServerConfig: ", v, gjson.MustEncodeString(ServerConfig)) - url := "http://" + ip + "/GM?Ids=" + v + "&State=" + fmt.Sprint(req.State) - - g.Log().Info(ctx, "SendToGame - req: ", url) - bytes := g.Client().GetBytes(ctx, url) - src := string(bytes) - if g.IsEmpty(src) { - continue - } - - tmp, _ := gcharset.ToUTF8(srcCharset, src) - json, err1 := gjson.DecodeToJson(tmp) - if err1 != nil { - continue - } - if json.Get("Error").Int() != 200 { - continue - } + g.Log().Info(ctx, "SetGmToClient - ServerConfig: ", gjson.MustEncodeString(ServerConfig)) + ip := ServerConfig[fmt.Sprint(req.ServerId)] + url := "http://" + ip + "/GM?Ids=" + fmt.Sprint(unit.Uid) + "&State=" + fmt.Sprint(req.State) + g.Log().Info(ctx, "SetGmToClient - req: ", url) + bytes := g.Client().GetBytes(ctx, url) + src := string(bytes) + if g.IsEmpty(src) { + return + } - g.Log().Info(ctx, "SendToGame - errdata2: ", url, errdata) + tmp, _ := gcharset.ToUTF8(srcCharset, src) + json, err1 := gjson.DecodeToJson(tmp) + if err1 != nil { + return nil, err1 + } + if json.Get("Error").Int() != 200 { + return nil, errors.New("发送错误： " + json.Get("Error").String()) } return } diff --git a/internal/serviceGame/internal/whiteList.go b/internal/serviceGame/internal/whiteList.go index 3c6cec6..3649803 100644 --- a/internal/serviceGame/internal/whiteList.go +++ b/internal/serviceGame/internal/whiteList.go @@ -2,7 +2,6 @@ package internal import ( "context" - "fmt" "tyj_admin/api/v1/game" "tyj_admin/internal/dao" "tyj_admin/internal/model/do" @@ -11,18 +10,6 @@ import ( ) func GetWhiteListByPage(ctx context.Context, req *game.GetListWhiteListReq) (res *game.GetListWhiteListRes, err error) { - //rdbTop := RedisDbList[0] - //rdbTop.Do(ctx, "select", 0) - //var m []string - //result := rdbTop.Get(ctx, "ipWhiteList") - //json.Unmarshal([]byte(result.Val()), &m) - //start := (req.PageNum - 1) * req.PageSize - //end := req.PageNum * req.PageSize - //fmt.Println("GetWhiteListByPage: ", start, end, len(m)) - //if end >= len(m) { - // return m[start:], len(m), result.Err() - //} - //return m[start:end], len(m), result.Err() res = new(game.GetListWhiteListRes) model := dao.GameWhiteList.Ctx(ctx) res.Total, err = model.Count() @@ -32,24 +19,15 @@ func GetWhiteListByPage(ctx context.Context, req *game.GetListWhiteListReq) (res } func UpdateWhiteList(ctx context.Context, req *game.UpdateWhiteListReq) (res *game.UpdateWhiteListRes, err error) { - model := dao.GameWhiteList.Ctx(ctx) var list []*entity.GameWhiteList err = model.Where("ip=? ", req.Ip).Scan(&list) if err != nil { return } - - if len(list) > 0 { - return - } else { - //if req.Id > 0 { - // _, err = model.Where("id=", req.Id).Data(&do.GameWhiteList{Ip: req.Ip}).Update() - // return - //} + if len(list) == 0 { _, err = model.Insert(&do.GameWhiteList{Ip: req.Ip}) } - return } @@ -72,26 +50,3 @@ func GetWhiteList(ctx context.Context) (list []*entity.GameWhiteList, err error) err = model.Scan(&list) return } - -func GetWhiteLock(ctx context.Context) (string, error) { - rdbTop := RedisDbList[0] - rdbTop.Do(ctx, "select", 0) - //var m string - result := rdbTop.Get(ctx, "ipWhiteLock") - - fmt.Println("GetWhiteLock ---》 ipWhiteLock: ", result.Val()) - - return result.Val(), result.Err() -} - -func SetWhiteLock(ctx context.Context, lock int32) error { - rdbTop := RedisDbList[0] - rdbTop.Do(ctx, "select", 0) - //var m string - result := rdbTop.Set(ctx, "ipWhiteLock", lock, 0) - - fmt.Println("GetWhiteLock ---》 ipWhiteLock: ", result.Val()) - //json.Unmarshal(byte(result.Val()), &m) - - return result.Err() -} diff --git a/internal/serviceGame/order.go b/internal/serviceGame/order.go index 8277a79..5c88d1b 100644 --- a/internal/serviceGame/order.go +++ b/internal/serviceGame/order.go @@ -13,6 +13,7 @@ import ( "log" "time" "tyj_admin/api/v1/game" + "tyj_admin/internal/consts" "tyj_admin/internal/dao" "tyj_admin/internal/model/do" "tyj_admin/internal/model/entity" @@ -25,7 +26,6 @@ type IGameOrder interface { GetOrderCount(ctx context.Context, req *game.OrderCountReq) (res *game.OrderCountRes, err error) ChangeCoin(ctx context.Context, req *game.AddCoinReq) (res *game.AddCoinRes, err error) Deposit(ctx context.Context, req *game.OrderDepositReq) (res *game.OrderDepositRes, err error) - //IosDeposit(ctx context.Context, req *game.OrderDepositReq) (res *game.OrderDepositRes, err error) GetOrderLog(ctx context.Context, req *game.OrderLogReq) (res *game.OrderLogRes, err error) GetOrderBehavior(ctx context.Context, req *game.OrderBehaviorReq) (res *game.OrderBehaviorRes, err error) GetRechargePer(ctx context.Context, req *game.RechargePerReq) (res *game.RechargePerRes, err error) @@ -34,6 +34,7 @@ type IGameOrder interface { AddRechargeControl(ctx context.Context, req *game.AddRechargeControlReq) (res *game.AddRechargeControlRes, err error) DeleteRechargeControl(ctx context.Context, req *game.DeleteRechargeControlReq) (res *game.DeleteRechargeControlRes, err error) ChangeOrderState(ctx context.Context, req *game.ChangeOrderStateReq) (res *game.ChangeOrderStateRes, err error) + GetGMOrderList(ctx context.Context, req *game.GetGMOrderListReq) (res *game.GetGMOrderListRes, err error) } type gameOrderImpl struct { @@ -442,3 +443,41 @@ func (o gameOrderImpl) ChangeOrderState(ctx context.Context, req *game.ChangeOrd } return } + +func (o gameOrderImpl) GetGMOrderList(ctx context.Context, req *game.GetGMOrderListReq) (res *game.GetGMOrderListRes, err error) { + res = new(game.GetGMOrderListRes) + model := dao.GameRechargeLog.Ctx(ctx) + if req.Uid != 0 { + id, _ := internal.GetIdToUid(ctx, int64(req.Uid)) + model = model.Where("unitId=?", id) + } + if req.ServerId != 0 { + model = model.Where("server=?", req.ServerId) + } + if req.TradeNo != "" { + model = model.Where("tradeNo=?", req.TradeNo) + } + if req.CTime != "" { + t, _ := time.ParseInLocation(consts.TIME_FORMAT, req.CTime, time.Local) + model = model.Where("UNIX_TIMESTAMP(create_time)>=?", t.Unix()) + } + if req.ETime != "" { + t, _ := time.ParseInLocation(consts.TIME_FORMAT, req.ETime, time.Local) + model = model.Where("createTime<=?", t.Unix()) + } + if req.User != "" { + model = model.Where("user=?", req.User) + } + if req.Config != 0 { + model = model.Where("config=?", req.Config) + } + if req.Channel != "" { + model = model.Where("channel=?", req.Channel) + } + res.Total, err = model.Count() + if err != nil { + return nil, err + } + err = model.Page(req.PageNum, req.PageSize).Scan(&res.List) + return +} diff --git a/internal/serviceGame/whiteList.go b/internal/serviceGame/whiteList.go index 1995c05..b13c4f0 100644 --- a/internal/serviceGame/whiteList.go +++ b/internal/serviceGame/whiteList.go @@ -26,7 +26,6 @@ func GameWhiteList() IGameWhiteList { return &gameWhiteListService } func (c *gameWhiteListImpl) Get(ctx context.Context, req *game.GetListWhiteListReq) (res *game.GetListWhiteListRes, err error) { - //fmt.Println("GetWhiteListReq: ", req) g.Try(ctx, func(ctx context.Context) { res, err = internal.GetWhiteListByPage(ctx, req) }) @@ -34,7 +33,6 @@ func (c *gameWhiteListImpl) Get(ctx context.Context, req *game.GetListWhiteListR } func (c *gameWhiteListImpl) Update(ctx context.Context, req *game.UpdateWhiteListReq) (res *game.UpdateWhiteListRes, err error) { - //fmt.Println("UpdateWhiteListReq: ", req) g.Try(ctx, func(ctx context.Context) { res, err = internal.UpdateWhiteList(ctx, req) if err != nil {