调整 rsa 密钥解析函数

internal/controller/reward/reward_v1_reward_callback.go

@@ -0,0 +1,29 @@
+package reward
+
+import (
+	"context"
+	"fmt"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/glog"
+
+	"github.com/gogf/gf/v2/errors/gcode"
+	"github.com/gogf/gf/v2/errors/gerror"
+
+	"server/api/reward/v1"
+)
+
+func (c *ControllerV1) RewardCallback(ctx context.Context, req *v1.RewardCallbackReq) (res *v1.RewardCallbackRes, err error) {
+	appId := g.RequestFromCtx(ctx).GetHeader("Custom-Data-Appid")
+	timestamp := g.RequestFromCtx(ctx).GetHeader("Custom-Data-Timestamp")
+	nonce := g.RequestFromCtx(ctx).GetHeader("Custom-Data-Nonce")
+	auth := g.RequestFromCtx(ctx).GetHeader("Custom-Data-Auth")
+
+	glog.Infof(ctx, "appId: %s, timestamp: %s, nonce: %s, auth: %s", appId, timestamp, nonce, auth)
+	secret := ""
+	data := fmt.Sprintf("%s%s%s%s%d%d%d%s%s%s#%s", req.UId, req.OrderId, req.PrizeId, req.PrizeChannelId, req.PrizeType, req.PrizeSubType, req.Num, appId, timestamp, nonce, secret)
+	if data != auth {
+
+	}
+
+	return nil, gerror.NewCode(gcode.CodeNotImplemented)
+}

internal/controller/storeAdmin/storeAdmin_v1_info.go

@@ -2,6 +2,7 @@ package storeAdmin
 
 import (
 	"context"
+	"github.com/gogf/gf/v2/frame/g"
 
 	"github.com/gogf/gf/v2/errors/gcode"
 	"github.com/gogf/gf/v2/errors/gerror"
@@ -10,5 +11,6 @@ import (
 )
 
 func (c *ControllerV1) Info(ctx context.Context, req *v1.InfoReq) (res *v1.InfoRes, err error) {
+	g.RequestFromCtx(ctx)
 	return nil, gerror.NewCode(gcode.CodeNotImplemented)
 }

internal/dao/internal/rewards.go

@@ -34,6 +34,7 @@ type RewardsColumns struct {
 	CreatedAt    string // 创建时间
 	UpdatedAt    string // 更新时间
 	DeletedAt    string // 软删除时间戳
+	RemainStock  string // 剩余库存数量
 }
 
 // rewardsColumns holds the columns for the table rewards.
@@ -51,6 +52,7 @@ var rewardsColumns = RewardsColumns{
 	CreatedAt:    "created_at",
 	UpdatedAt:    "updated_at",
 	DeletedAt:    "deleted_at",
+	RemainStock:  "remain_stock",
 }
 
 // NewRewardsDao creates and returns a new DAO object for table data access.

internal/dao/internal/users.go

@@ -27,7 +27,6 @@ type UsersColumns struct {
 	Nickname         string // 昵称
 	Avatar           string // 用户头像URL
 	PasswordHash     string // 密码哈希
-	Email            string // 邮箱地址
 	PhoneNumber      string // 手机号
 	WxPopenId        string // 微信 PopenID
 	QqPopenId        string // QQ PopenID
@@ -48,7 +47,6 @@ var usersColumns = UsersColumns{
 	Nickname:         "nickname",
 	Avatar:           "avatar",
 	PasswordHash:     "password_hash",
-	Email:            "email",
 	PhoneNumber:      "phone_number",
 	WxPopenId:        "wx_popen_id",
 	QqPopenId:        "qq_popen_id",

internal/logic/logic.go

@@ -13,7 +13,6 @@ import (
 	_ "server/internal/logic/reward"
 	_ "server/internal/logic/rewardType"
 	_ "server/internal/logic/role"
-	_ "server/internal/logic/sms"
 	_ "server/internal/logic/store"
 	_ "server/internal/logic/storeAdmin"
 	_ "server/internal/logic/storeRole"

internal/logic/user/user.go

@@ -156,7 +156,6 @@ func (s *sUser) Info(ctx context.Context, in *model.UserInfoIn) (out *model.User
 		Username:    user.Username,
 		Nickname:    user.Nickname,
 		Avatar:      user.Avatar,
-		Email:       user.Email,
 		PhoneNumber: user.PhoneNumber,
 		WxPopenId:   user.WxPopenId,
 		QQPopenId:   user.QqPopenId,

internal/model/do/rewards.go

@@ -25,4 +25,5 @@ type Rewards struct {
 	CreatedAt    *gtime.Time // 创建时间
 	UpdatedAt    *gtime.Time // 更新时间
 	DeletedAt    *gtime.Time // 软删除时间戳
+	RemainStock  interface{} // 剩余库存数量
 }

internal/model/do/users.go

@@ -18,7 +18,6 @@ type Users struct {
 	Nickname         interface{} // 昵称
 	Avatar           interface{} // 用户头像URL
 	PasswordHash     interface{} // 密码哈希
-	Email            interface{} // 邮箱地址
 	PhoneNumber      interface{} // 手机号
 	WxPopenId        interface{} // 微信 PopenID
 	QqPopenId        interface{} // QQ PopenID

internal/model/entity/rewards.go

@@ -23,4 +23,5 @@ type Rewards struct {
 	CreatedAt    *gtime.Time `json:"createdAt"    orm:"created_at"     description:"创建时间"`               // 创建时间
 	UpdatedAt    *gtime.Time `json:"updatedAt"    orm:"updated_at"     description:"更新时间"`               // 更新时间
 	DeletedAt    *gtime.Time `json:"deletedAt"    orm:"deleted_at"     description:"软删除时间戳"`             // 软删除时间戳
+	RemainStock  int         `json:"remainStock"  orm:"remain_stock"   description:"剩余库存数量"`             // 剩余库存数量
 }

internal/model/entity/users.go

@@ -16,7 +16,6 @@ type Users struct {
 	Nickname         string      `json:"nickname"         orm:"nickname"            description:"昵称"`         // 昵称
 	Avatar           string      `json:"avatar"           orm:"avatar"              description:"用户头像URL"`    // 用户头像URL
 	PasswordHash     string      `json:"passwordHash"     orm:"password_hash"       description:"密码哈希"`       // 密码哈希
-	Email            string      `json:"email"            orm:"email"               description:"邮箱地址"`       // 邮箱地址
 	PhoneNumber      string      `json:"phoneNumber"      orm:"phone_number"        description:"手机号"`        // 手机号
 	WxPopenId        string      `json:"wxPopenId"        orm:"wx_popen_id"         description:"微信 PopenID"` // 微信 PopenID
 	QqPopenId        string      `json:"qqPopenId"        orm:"qq_popen_id"         description:"QQ PopenID"` // QQ PopenID