wip:web框架修改

services/activity/award/service.go

@@ -4,7 +4,6 @@ import (
 	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 	"app.yhyue.com/moapp/message/handler/award"
 	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/net/ghttp"
 	"github.com/gogf/gf/v2/util/gconv"
 )
 
@@ -13,13 +12,13 @@ type AwardRouter struct {
 	myAward xweb.Mapper `xweb:"/myAward"`
 }
 
-func (a *AwardRouter) Awardlist(r *ghttp.Request) {
+func (a *AwardRouter) Awardlist() {
 	rdata := map[string]interface{}{}
-	code := r.Get("code").String() //inviteRegister:邀请注册 freePlan:投标人专属免费计划
+	code := a.GetString("code") //inviteRegister:邀请注册 freePlan:投标人专属免费计划
 	userid := gconv.String(a.GetSession("userId"))
-	aw := r.Get("award").String()
-	pSize := r.Get("pageSize").Int()
-	pNum := r.Get("pageNum").Int()
+	aw := a.GetString("award")
+	pSize := gconv.Int(a.GetString("pageSize"))
+	pNum := gconv.Int(a.GetString("pageNum"))
 	if pSize == 0 && pNum == 0 {
 		pSize = -1
 		pNum = 1
@@ -28,7 +27,7 @@ func (a *AwardRouter) Awardlist(r *ghttp.Request) {
 	rdata["list"] = data
 	rdata["total"] = total
 	rdata["hasNext"] = hasNext
-	r.Response.WriteJson(g.Map{
+	a.ServeJson(g.Map{
 		"error_code": 0,
 		"error_msg":  "",
 		"data":       rdata,

services/activity/bidderPlan/services.go

@@ -5,7 +5,7 @@ import (
 	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 	"app.yhyue.com/moapp/message/handler/activity"
 	"fmt"
-	"github.com/gogf/gf/v2/net/ghttp"
+	"github.com/gogf/gf/v2/util/gconv"
 	"log"
 )
 
@@ -19,8 +19,8 @@ type Activity struct {
 
 // Period 活动周期
 // url：/jyActivity/bidderPlan/period
-func (act *Activity) Period(r *ghttp.Request) {
-	userId := r.GetHeader("userId")
+func (act *Activity) Period() {
+	userId := gconv.String(act.GetSession("userId"))
 	rData, errMsg := func() (map[string]interface{}, error) {
 		return map[string]interface{}{
 			"start": activity.JyBidderPlan.St.Unix(),
@@ -30,13 +30,13 @@ func (act *Activity) Period(r *ghttp.Request) {
 	if errMsg != nil {
 		log.Printf("Activity BidderPlan Schedule  %s error:%s\n", userId, errMsg.Error())
 	}
-	_ = r.Response.WriteJson(NewResult(rData, errMsg))
+	act.ServeJson(NewResult(rData, errMsg))
 }
 
 // Schedule 活动进度
 // url /jyActivity/bidderPlan/schedule
-func (act *Activity) Schedule(r *ghttp.Request) {
-	userId := r.GetHeader("userId")
+func (act *Activity) Schedule() {
+	userId := gconv.String(act.GetSession("userId"))
 	rData, errMsg := func() (map[string]interface{}, error) {
 		//校验是否达标
 		return map[string]interface{}{
@@ -55,23 +55,23 @@ func (act *Activity) Schedule(r *ghttp.Request) {
 	if errMsg != nil {
 		log.Printf("Activity BidderPlan Schedule  %s error:%s\n", userId, errMsg.Error())
 	}
-	_ = r.Response.WriteJson(NewResult(rData, errMsg))
+	act.ServeJson(NewResult(rData, errMsg))
 }
 
 // Receive 领取奖励
 // url:  /jyActivity/bidderPlan/receive
-func (act *Activity) Receive(r *ghttp.Request) {
-	userId := r.GetHeader("userId")
+func (act *Activity) Receive() {
+	userId := gconv.String(act.GetSession("userId"))
 	rData, errMsg := func() (bool, error) {
 		//连点处理
 		if !activity.JyBidderPlan.FastClickCheck(userId) {
 			return false, fmt.Errorf("操作频繁")
 		}
 		//校验是否达标
-		t := r.Get("type", "mission").String()
+		t := act.GetString("type")
 		var err error
 		if t == "mission" { //任务奖励
-			switch r.Get("value").String() {
+			switch act.GetString("value") {
 			case "subscribe":
 				err = activity.JyBidderPlan.MissionsSubscribeGiven(userId)
 			case "invite":
@@ -82,7 +82,7 @@ func (act *Activity) Receive(r *ghttp.Request) {
 				return false, fmt.Errorf("未知请求")
 			}
 		} else { //活动进度额外奖励
-			err = activity.JyBidderPlan.ScheduleGiven(userId, r.Get("value").Int())
+			err = activity.JyBidderPlan.ScheduleGiven(userId, gconv.Int(act.GetString("value")))
 		}
 		if err != nil {
 			return false, err
@@ -92,5 +92,5 @@ func (act *Activity) Receive(r *ghttp.Request) {
 	if errMsg != nil {
 		log.Printf("Activity BidderPlan Receive  %s error:%s\n", userId, errMsg.Error())
 	}
-	_ = r.Response.WriteJson(NewResult(rData, errMsg))
+	act.ServeJson(NewResult(rData, errMsg))
 }