diff --git a/call/task.go b/call/task.go index 9c1cb64..652cdd9 100644 --- a/call/task.go +++ b/call/task.go @@ -22,7 +22,7 @@ func CheckTask(task Task) { uid := task.Uid for _, v := range con { for _, t := range task.Types { - if (t == common.TaskTypeOnceRecharge || t == common.TaskTypeInvite) && v.Type == t { // 单次充值任务 || 首次充值任务 || v.Type == common.TaskTypeFirstRecharge) + if (t == common.TaskTypeOnceRecharge || t == common.TaskTypeInvite || t == common.TaskTypeDownload) && v.Type == t { // 单次充值任务 || 首次充值任务 || v.Type == common.TaskTypeFirstRecharge) data := GetUserTaskDataByTaskID(task.Uid, v.TaskID) if data.ID == 0 { db.Mysql().Create(&common.TaskData{UID: uid, TaskID: v.TaskID, Time: now, Progress: v.Target}) diff --git a/common/task.go b/common/task.go index aab37ae..e4d5340 100644 --- a/common/task.go +++ b/common/task.go @@ -9,6 +9,7 @@ const ( TaskTypePlayGame // 参与一次牌局 TaskTypeBet1000 // 累计下注1000 TaskTypeBet10000 // 累计下注10000 + TaskTypeDownload // app下载 TaskTypeAll ) diff --git a/modules/backend/handler/common/common.go b/modules/backend/handler/common/common.go index c68c9f5..0022e6b 100644 --- a/modules/backend/handler/common/common.go +++ b/modules/backend/handler/common/common.go @@ -132,5 +132,5 @@ func UploadOSS(c *gin.Context) { log.Error("UploadOSS PutObject err:%v", err) return } - rsp.Url = fmt.Sprintf("https://%s/%s", ossConf.Domain, ossConf.ObjectName+req.Folder+file.Filename) + rsp.Url = fmt.Sprintf("https://%s/%s/%s%s", ossConf.Domain, ossConf.ObjectName, req.Folder, file.Filename) } diff --git a/modules/web/app/account.go b/modules/web/app/account.go index f84c3a0..cd2c6c7 100644 --- a/modules/web/app/account.go +++ b/modules/web/app/account.go @@ -82,6 +82,7 @@ func (g *Gin) QueryUser(req values.CommonLogin) (user *common.PlayerDBInfo, isNe g.Code = values.CodeRetry if err.Error() == "ip" { g.Code = values.CodeAccountIPLimit + g.Msg = "ip limit" } return } diff --git a/modules/web/handler/account.go b/modules/web/handler/account.go index b7ee29f..d3b7084 100644 --- a/modules/web/handler/account.go +++ b/modules/web/handler/account.go @@ -44,7 +44,11 @@ func onLogin(user *common.PlayerDBInfo, a *app.Gin, isNew bool) { } // log.Debug("scheme:%v", a.Context.GetHeader("X-Forwarded-Proto")) // if a.Context.Request.URL.Scheme == "https" { - gateURL = "wss://" + gateURL + if config.GetBase().Release { + gateURL = "wss://" + gateURL + } else { + gateURL = "wss://" + gateURL + ":26615" + } // } else { // gateURL = "ws://" + gateURL // } diff --git a/modules/web/handler/activity.go b/modules/web/handler/activity.go index 180ccb4..46e67d5 100644 --- a/modules/web/handler/activity.go +++ b/modules/web/handler/activity.go @@ -1096,7 +1096,7 @@ func ActivitySignNewDraw(c *gin.Context) { if util.IsSameDayTimeStamp(now.Unix(), data.SignTime) { // 已经签到 a.Code = values.CodeParam - a.Msg = "Check-in repetido." + a.Msg = "आज में हस्ताक्षर किए" return } @@ -1174,7 +1174,6 @@ func ActivityBreakGiftInfo(c *gin.Context) { if call.GetUserCurrency(a.UID, common.CurrencyINR) > limit { return } - payData := call.GetPlayerPayData(a.UID) re := call.GetRechargeInfo(a.UID) con := call.GetConfigActivityBreakGiftByRecharge(re.TotalRecharge, payData) @@ -1182,7 +1181,6 @@ func ActivityBreakGiftInfo(c *gin.Context) { if con == nil { return } - if util.SliceContain(payData.SubBreakGift, con.Level) { return } @@ -1759,9 +1757,11 @@ func ActivityBetDrawInfo(c *gin.Context) { } a.GetUID() drawInfo := &common.ActivityBetDrawData{UID: a.UID} - db.Mysql().Get(drawInfo) - if drawInfo.ID == 0 { - db.Mysql().Create(drawInfo) + if a.UID > 0 { + db.Mysql().Get(drawInfo) + if drawInfo.ID == 0 { + db.Mysql().Create(drawInfo) + } } a.Data = &values.ActivityBetDrawInfoResp{ List: call.GetConfigBetDraw(), diff --git a/modules/web/handler/firstpage.go b/modules/web/handler/firstpage.go index 5e1c777..fc1485f 100644 --- a/modules/web/handler/firstpage.go +++ b/modules/web/handler/firstpage.go @@ -97,10 +97,10 @@ func FirstPage(c *gin.Context) { if len(list) > 0 { resp.Esport = list[0] } - // task := call.GetConfigTaskByTaskType(common.TaskTypeDownload) - // if len(task) > 0 { - // resp.DownloadAppReward = task[0].Reward - // } + task := call.GetConfigTaskByTaskType(int(common.TaskTypeDownload)) + if len(task) > 0 { + resp.DownloadAppReward = task[0].Reward + } resp.ShowData = GetFirstShowData() } diff --git a/modules/web/handler/h5.go b/modules/web/handler/h5.go index a627288..5fb4909 100644 --- a/modules/web/handler/h5.go +++ b/modules/web/handler/h5.go @@ -97,4 +97,5 @@ func H5DownloadDraw(c *gin.Context) { // Event: common.CurrencyEventH5Download, // }, // }, true, true) + call.CheckTask(call.Task{Uid: a.UID, Value: 0, Types: []common.TaskType{common.TaskTypeDownload}}) } diff --git a/modules/web/middleware/token.go b/modules/web/middleware/token.go index d3dc042..0a8ccbf 100644 --- a/modules/web/middleware/token.go +++ b/modules/web/middleware/token.go @@ -52,6 +52,8 @@ var ( "/ad/uploadFB": {}, "/activity/slots/info": {}, "/activity/sign/new/info": {}, + "/activity/betDraw/info": {}, + "/activity/betDraw/record": {}, } ) diff --git a/modules/web/routers/routers_activity.go b/modules/web/routers/routers_activity.go index 9ded507..9c412cf 100644 --- a/modules/web/routers/routers_activity.go +++ b/modules/web/routers/routers_activity.go @@ -23,8 +23,8 @@ func activity(e *gin.RouterGroup) { e.POST("/activity/firstRechargeBack/draw", handler.ActivityFirstRechargeBackDraw) e.POST("/activity/luckyCode/info", handler.ActivityLuckyCodeInfo) e.POST("/activity/luckyCode/draw", handler.ActivityLuckyCodeDraw) - e.POST("/activity/sign/info", handler.ActivitySignInfo) - e.POST("/activity/sign/draw", handler.ActivitySignDraw) + // e.POST("/activity/sign/info", handler.ActivitySignInfo) + // e.POST("/activity/sign/draw", handler.ActivitySignDraw) // 新版签到 e.POST("/activity/sign/new/info", handler.ActivitySignNewInfo) e.POST("/activity/sign/new/draw", handler.ActivitySignNewDraw)