From 1d2210d876a69af1ecdb85376bd609975f9843ec Mon Sep 17 00:00:00 2001 From: linquan <349589071@qq.com> Date: Tue, 24 Jun 2025 14:25:13 +0800 Subject: [PATCH] config --- internal/cmd/cmd.go | 10 +++++----- internal/service/email.go | 5 ++--- internal/service/upload.go | 6 +----- internal/serviceGame/game_role.go | 5 ++--- internal/serviceGame/internal/basicinfo.go | 21 +++++++++++---------- internal/serviceGame/loginUrl.go | 8 +++----- internal/serviceGame/order.go | 4 +--- 7 files changed, 25 insertions(+), 34 deletions(-) diff --git a/internal/cmd/cmd.go b/internal/cmd/cmd.go index 7e2f22b..9e8fb62 100644 --- a/internal/cmd/cmd.go +++ b/internal/cmd/cmd.go @@ -23,15 +23,15 @@ var ( router.BindAnotherController(group) }) - //s.SetIndexFolder(true) - //s.SetFileServerEnabled(true) - //s.SetServerRoot("./resource/public/upload_file") - //s.AddStaticPath("/upload_file", "./download/") - s.BindHandler("/upload_file", func(r *ghttp.Request) { log.Printf("upload_file >>>>>> filename: %s", r.GetQuery("filename")) r.Response.ServeFileDownload("./download/" + r.GetQuery("filename").String()) }) + + s.BindHandler("/download_file", func(r *ghttp.Request) { + log.Printf("download_file >>>>>> filename: %s", r.GetQuery("filename")) + r.Response.ServeFileDownload("./download/" + r.GetQuery("filename").String()) + }) enhanceOpenAPIDoc(s) //s.EnableHTTPS("server.crt", "server.key") s.Run() diff --git a/internal/service/email.go b/internal/service/email.go index 05577c4..33df6df 100644 --- a/internal/service/email.go +++ b/internal/service/email.go @@ -61,12 +61,11 @@ func init() { */ func (a *emailServiceTmpl) SendEmail(emailAddr, code string) (err error) { e := email.NewEmail() - e.From = emailConfig.From e.To = []string{emailAddr} - e.Bcc = []string{emailConfig.EmailAddr} e.Subject = emailConfig.Subject - e.HTML = []byte(strings.Replace(emailConfig.HTML, "CODE", code, -1)) + html := strings.Replace(emailConfig.HTML, "TITLE", code, -1) + e.HTML = []byte(strings.Replace(html, "CODE", code, -1)) log.Println("SendEmail: ", gjson.MustEncodeString(emailConfig)) auth := smtp.PlainAuth("", emailConfig.EmailAddr, emailConfig.Password, emailConfig.Smtp) if emailConfig.Port == "25" { diff --git a/internal/service/upload.go b/internal/service/upload.go index 710f761..b3b51e0 100644 --- a/internal/service/upload.go +++ b/internal/service/upload.go @@ -158,7 +158,7 @@ func (s *uploadTmpl) UploadLocal(ctx context.Context, file *ghttp.UploadFile) (r if sp != "" { sp = strings.Trim(sp, "/") } - nowData := time.Now().Format("2006-01-02") + nowData := time.Now().Format(consts.DATE_FORMAT) // 包含静态文件夹的路径 fullDirPath := sp + "/" + p + "/" + nowData fileName, err := file.Save(fullDirPath, true) @@ -214,20 +214,16 @@ func (s *uploadTmpl) UploadLocalDownload(ctx context.Context, file *ghttp.Upload // 检查上传文件大小 func (s *uploadTmpl) CheckSize(ctx context.Context, checkFileType string, file *ghttp.UploadFile) (err error) { - var ( configSize *entity.SysConfig ) - if checkFileType == consts.CheckFileTypeFile { - //获取上传大小配置 configSize, err = s.getUpConfig(ctx, consts.FileSizeKey) if err != nil { return } } else if checkFileType == consts.CheckFileTypeImg { - //获取上传大小配置 configSize, err = s.getUpConfig(ctx, consts.ImgSizeKey) if err != nil { diff --git a/internal/serviceGame/game_role.go b/internal/serviceGame/game_role.go index 08be0f2..9b66c66 100644 --- a/internal/serviceGame/game_role.go +++ b/internal/serviceGame/game_role.go @@ -9,6 +9,7 @@ import ( "github.com/gogf/gf/v2/frame/g" "time" "tyj_admin/api/v1/game" + "tyj_admin/internal/consts" "tyj_admin/internal/serviceGame/internal" ) @@ -83,11 +84,9 @@ func (s *gameRoleImpl) GetOnlineList(ctx context.Context, req *game.RoleOnlineRe return } -var DateFormat = "2006-01-02" - func (s *gameRoleImpl) GetOnlineTopList(ctx context.Context, req *game.RoleOnlineTopReq) (res *game.RoleOnlineTopRes, err error) { res = new(game.RoleOnlineTopRes) - fsql := fmt.Sprintf(`select max(num) as num,server,channel,date from game_online where STR_TO_DATE(date, "%%Y-%%m-%%d")="%s" `, time.Now().Format(DateFormat)) + fsql := fmt.Sprintf(`select max(num) as num,server,channel,date from game_online where STR_TO_DATE(date, "%%Y-%%m-%%d")="%s" `, time.Now().Format(consts.DATE_FORMAT)) if req.ServerId != 0 { fsql += fmt.Sprintf("and server=%d ", req.ServerId) } diff --git a/internal/serviceGame/internal/basicinfo.go b/internal/serviceGame/internal/basicinfo.go index 38121f9..b5039e8 100644 --- a/internal/serviceGame/internal/basicinfo.go +++ b/internal/serviceGame/internal/basicinfo.go @@ -393,20 +393,18 @@ func GetAccountByUid(ctx context.Context, uid int64, server string) (account map if uid != 0 { filtter["_id"] = uid } - log.Println("GetAccountByUid: ", filtter) all1 := make([]map[string]interface{}, 1) mongo, ok := MongoDatabaseList[server] if !ok { - log.Println("GetAccountUid: 获取失败 ", all1, err) + log.Println("GetAccountUid: 数据库不存在 ", server) return account, gerror.New("获取失败") } err = mongo.Collection("Account").Find(ctx, filtter).All(&all1) if err != nil || len(all1) == 0 { - log.Println("GetAccountUid: 获取失败 ", all1, err) + log.Println("GetAccountUid: 获取失败 ", gjson.MustEncodeString(filtter), err) return account, gerror.New("获取失败") } account = all1[0] - log.Println("GetAccountByUid: accountData ", account) return account, err } @@ -415,32 +413,32 @@ func GetAccountUid(ctx context.Context, account string, server string) (uid int, if len(account) > 0 { filtter["AccountName"] = account } - log.Println("GetAccountUid: ", filtter) + //log.Println("GetAccountUid: ", filtter) all1 := make([]map[string]interface{}, 1) err = MongoDatabaseList[server].Collection("Account").Find(ctx, filtter).All(&all1) if len(all1) == 0 { return 0, gerror.New("获取失败") } - log.Println("GetAccountUid: all", all1, all1[0]) + //log.Println("GetAccountUid: all", all1, all1[0]) uid = all1[0]["UniqueId"].(int) - log.Println("GetAccountUid: accountData ", uid) + //log.Println("GetAccountUid: accountData ", uid) return uid, err } func AccountToUids(ctx context.Context, account string) (uid []int64, err error) { - log.Println("GetAccountUid: ", account) + //log.Println("GetAccountUid: ", account) var all1 []*entity.Account err = dao.GameUnit.Ctx(ctx).Where("account=?", account).Scan(&all1) if len(all1) == 0 { return []int64{}, gerror.New("获取失败") } - log.Println("GetAccountUid: all", all1) + //log.Println("GetAccountUid: all", all1) uid = []int64{} for _, e := range all1 { uid = append(uid, e.Uid) } - log.Println("GetAccountUid: accountData ", uid) + log.Println("GetAccountUid: accountData ", gjson.MustEncodeString(uid)) return uid, err } @@ -764,6 +762,9 @@ func GameRegister(ctx context.Context, req *game.RegisterReq) (res *game.Registe err = gerror.New("请填写账号！") return } + if req.Channel == consts.Channel_Editor && !strings.Contains(req.Account, req.Channel) { + req.Account = req.Channel + req.Account + } g.Try(ctx, func(ctx context.Context) { registerData := []entity.GameRegister{} register := dao.GameRegister.Ctx(ctx) diff --git a/internal/serviceGame/loginUrl.go b/internal/serviceGame/loginUrl.go index 0af8931..96c17ba 100644 --- a/internal/serviceGame/loginUrl.go +++ b/internal/serviceGame/loginUrl.go @@ -142,10 +142,8 @@ func (c *gameLoginUrlImpl) GetGameLoginUrl(ctx context.Context, req *game.GetGam list, _ := internal.GetWhiteList(ctx) blackList, _ := internal.GetBlackList(ctx) account := req.Account - if req.Channel == consts.Channel_Editor { - if !strings.Contains(account, req.Channel) { - account = req.Channel + account - } + if req.Channel == consts.Channel_Editor && !strings.Contains(account, req.Channel) { + account = req.Channel + account } g.Log().Debugf(ctx, "GetWhiteList -> ", req.Account, gjson.MustEncodeString(list), ip) @@ -154,7 +152,7 @@ func (c *gameLoginUrlImpl) GetGameLoginUrl(ctx context.Context, req *game.GetGam err = dao.GameLoginUrl.Ctx(ctx).Where("isShow=?", 1).Scan(&LoginUrlList) var unitData []*entity.GameUnit if req.Account != "" { - err = dao.GameUnit.Ctx(ctx).Where("channel=?", req.Channel).Where("account=?", req.Account).Scan(&unitData) + err = dao.GameUnit.Ctx(ctx).Where("channel=?", req.Channel).Where("account=?", account).Scan(&unitData) } if err != nil || len(LoginUrlList) == 0 { diff --git a/internal/serviceGame/order.go b/internal/serviceGame/order.go index 55dfc0f..313f545 100644 --- a/internal/serviceGame/order.go +++ b/internal/serviceGame/order.go @@ -138,8 +138,6 @@ func encryptData(code_data string) string { return str } -var timeFormat = "2006-01-02 15:04:05" - func (o gameOrderImpl) Deposit(ctx context.Context, req *game.OrderDepositReq) (res *game.OrderDepositRes, err error) { gmMessage := Recharge{} //gmMessage.Server = fmt.Sprint(req.ServerId) @@ -151,7 +149,7 @@ func (o gameOrderImpl) Deposit(ctx context.Context, req *game.OrderDepositReq) ( if req.Count == 1 { gmMessage.OrderNo = fmt.Sprintf("G2M%v%v", req.Uid, time.Now().UnixMilli()) } - gmMessage.PayTime = time.Now().Format(timeFormat) + gmMessage.PayTime = time.Now().Format(consts.TIME_FORMAT) gmMessage.Amount = fmt.Sprint(req.Amount) gmMessage.Status = "SUCCESS" unit, err := internal.GetUnitByUid(ctx, req.Uid, req.ServerId)