소스 검색

代码提交

wucan 8 달 전
부모
커밋
1f62b05800
10개의 변경된 파일423개의 추가작업 그리고 32개의 파일을 삭제
  1. 12 10
      app/common/response/response.go
  2. 22 0
      bootstrap/mongodb.go
  3. 125 0
      controller/v1/behavior.go
  4. 117 7
      controller/v1/user.go
  5. 2 0
      global/app.go
  6. 12 4
      go.mod
  7. 48 10
      go.sum
  8. 9 0
      main.go
  9. 74 1
      model/user.go
  10. 2 0
      route/api.go

+ 12 - 10
app/common/response/response.go

@@ -39,9 +39,9 @@ func Success(c *gin.Context, data gin.H) {
 	//
 	//}
 	data["code"] = 0
-	if data["data"] == nil {
-		data["data"] = "success"
-	}
+	//if data["data"] == nil {
+	//	data["data"] = nil
+	//}
 	if data["msg"] == nil {
 		data["msg"] = "success"
 	}
@@ -81,16 +81,18 @@ func Fail(c *gin.Context, errorCode int, e interface{}) {
 
 	if len(stack) > 0 {
 		c.JSON(http.StatusOK, gin.H{
-			"code":  errorCode,
-			"msg":   msg,
-			"data":  "",
-			"stack": stack,
+			"code":      errorCode,
+			"msg":       msg,
+			"data":      "",
+			"stack":     stack,
+			"timestamp": time.Now().Unix(),
 		})
 	} else {
 		c.JSON(http.StatusOK, gin.H{
-			"data": "",
-			"code": errorCode,
-			"msg":  msg,
+			"data":      "",
+			"code":      errorCode,
+			"msg":       msg,
+			"timestamp": time.Now().Unix(),
 		})
 	}
 

+ 22 - 0
bootstrap/mongodb.go

@@ -0,0 +1,22 @@
+package bootstrap
+
+import (
+	"context"
+	"designs/global"
+	"go.mongodb.org/mongo-driver/v2/mongo"
+	"go.mongodb.org/mongo-driver/v2/mongo/readpref"
+	"go.uber.org/zap"
+)
+import mongoOption "go.mongodb.org/mongo-driver/v2/mongo/options"
+
+func InitializeMongo() *mongo.Client {
+	client, _ := mongo.Connect(mongoOption.Client().ApplyURI("mongodb://localhost:27017"))
+
+	err := client.Ping(context.Background(), readpref.Primary())
+	if err != nil {
+		global.App.Log.Error("mongoDB connect ping failed, err:", zap.Any("err", err))
+		return nil
+	}
+
+	return client
+}

+ 125 - 0
controller/v1/behavior.go

@@ -0,0 +1,125 @@
+package v1
+
+import (
+	"context"
+	"designs/app/common/request"
+	"designs/app/common/response"
+	"designs/global"
+	"github.com/gin-gonic/gin"
+	"go.mongodb.org/mongo-driver/v2/bson"
+)
+
+type AdData struct {
+	Pid           string `json:"pid"`
+	Aid           string `json:"aid"`
+	Cid           string `json:"cid"`
+	ReportUrl     string `json:"reportUrl"`
+	Reported      bool   `json:"reported"`
+	Duration      int64  `json:"duration"`
+	AdReqCount    uint8  `json:"adReqCount"`
+	AdEposedcount uint8  `json:"adEposedcount"`
+	CreateTime    int    `json:"createTime"`
+}
+
+type UserBehavior struct {
+	Id                 string      `bson:"_id,omitempty"`
+	Gid                string      `bson:"gid"`
+	Pf                 string      `bson:"pf"`
+	OpenId             string      `bson:"openId"`
+	AdData             interface{} `bson:"adData"`
+	AdFromCount        int         `bson:"adFromCount"`
+	TotalDuration      int         `bson:"totalDuration"`
+	TotalAdReqCount    int         `bson:"totalAdReqCount"`
+	TotalAdEposedCount int         `bson:"totalAdEposedCount"`
+}
+
+func ReceiveUserBehavior(c *gin.Context) {
+	form := request.Check(c, &struct {
+		Gid                string      `form:"gid" json:"gid" binding:"required"`
+		Pf                 string      `form:"pf" json:"pf" binding:"required"`
+		OpenId             string      `form:"openId" json:"openId" binding:"required"`
+		AdData             interface{} `form:"adData" json:"adData" binding:""`
+		AdFromCount        int         `form:"adFromCount" json:"adFromCount" binding:""`
+		TotalDuration      int         `form:"totalDuration" json:"totalDuration" binding:""`
+		TotalAdReqCount    int         `form:"totalAdReqCount" json:"totalAdReqCount" binding:""`
+		TotalAdEposedCount int         `form:"totalAdEposedCount" json:"totalAdEposedCount" binding:""`
+	}{})
+
+	behavior := UserBehavior{
+		Id:                 form.Gid + "|" + form.Pf + "|" + form.OpenId,
+		Gid:                form.Gid,
+		Pf:                 form.Pf,
+		OpenId:             form.OpenId,
+		AdData:             form.AdData,
+		AdFromCount:        form.AdFromCount,
+		TotalDuration:      form.TotalDuration,
+		TotalAdReqCount:    form.TotalAdReqCount,
+		TotalAdEposedCount: form.TotalAdEposedCount,
+	}
+	collection := global.App.MongoDB.Database("chunhao").Collection("userBehavior")
+	//
+	filter := bson.M{"_id": behavior.Id}
+	result := make(map[string]interface{})
+	err := collection.FindOne(context.Background(), filter).Decode(&result)
+
+	if len(result) == 0 {
+		//新增
+		_, err = collection.InsertOne(context.Background(), behavior)
+		if err != nil {
+			response.Fail(c, 1003, "写入数据失败"+err.Error())
+			return
+		}
+	} else {
+		//更新到MongoDB 中
+		update := bson.M{
+			"$set": struct {
+				Gid                string      `bson:"gid"`
+				Pf                 string      `bson:"pf"`
+				OpenId             string      `bson:"openId"`
+				AdData             interface{} `bson:"adData"`
+				AdFromCount        int         `bson:"adFromCount"`
+				TotalDuration      int         `bson:"totalDuration"`
+				TotalAdReqCount    int         `bson:"totalAdReqCount"`
+				TotalAdEposedCount int         `bson:"totalAdEposedCount"`
+			}{
+				Gid:                behavior.Gid,
+				Pf:                 behavior.Pf,
+				OpenId:             behavior.OpenId,
+				AdData:             behavior.AdData,
+				AdFromCount:        behavior.AdFromCount,
+				TotalDuration:      behavior.TotalDuration,
+				TotalAdReqCount:    behavior.TotalAdReqCount,
+				TotalAdEposedCount: behavior.TotalAdEposedCount,
+			},
+		}
+		_, err = collection.UpdateOne(context.Background(), filter, update)
+		if err != nil {
+			response.Fail(c, 1003, "写入数据失败"+err.Error())
+			return
+		}
+	}
+
+	response.Success(c, gin.H{})
+}
+
+func CheckUserBehavior(c *gin.Context) {
+	gid := c.GetString("gid")
+	pf := c.GetString("pf")
+	openId := c.GetString("openid")
+
+	collection := global.App.MongoDB.Database("chunhao").Collection("userBehavior")
+	//
+	filter := bson.M{"_id": gid + "|" + pf + "|" + openId}
+	result := make(map[string]interface{})
+	collection.FindOne(context.Background(), filter).Decode(&result)
+
+	if len(result) == 0 {
+		response.Success(c, gin.H{
+			"data": nil,
+		})
+	} else {
+		response.Success(c, gin.H{
+			"data": result,
+		})
+	}
+}

+ 117 - 7
controller/v1/user.go

@@ -7,9 +7,11 @@ import (
 	"designs/config"
 	"designs/global"
 	"designs/model"
+	"designs/utils"
+	"encoding/json"
+	"fmt"
 	"github.com/gin-gonic/gin"
 	"github.com/pkg/errors"
-	"gorm.io/gorm"
 	"strconv"
 	"strings"
 	"time"
@@ -30,6 +32,8 @@ func ReceiveGameMsg(c *gin.Context) {
 		Action    string `form:"action" json:"action" binding:"required"`
 		Timestamp int64  `form:"timestamp" json:"timestamp" binding:"required"`
 
+		Data string `form:"data" json:"data" binding:""`
+
 		AdsId    string `form:"adsId" json:"adsId" binding:""`
 		AdsType  string `form:"adsType" json:"adsType" binding:""`
 		AdsScene string `form:"adsScene" json:"adsScene" binding:""`
@@ -53,6 +57,10 @@ func ReceiveGameMsg(c *gin.Context) {
 	} else if form.Action == "seeAds" {
 		//观看广告
 		err = seeAds(gid, pf, form.UserId, now, form.AdsId, form.AdsType, form.AdsScene, form.AdsState)
+	} else {
+		//自定义类型
+		//查询有无对应的行为记录
+		err = action(gid, pf, form.Action, form.UserId, now, form.Data)
 	}
 
 	if err != nil {
@@ -63,10 +71,74 @@ func ReceiveGameMsg(c *gin.Context) {
 	response.Success(c, gin.H{})
 }
 
+func action(gid string, pf string, gameActionId string, userId int, now time.Time, option string) error {
+	//fmt.Print(gameActionId)
+	var gameAction model.GameAction
+	err := global.App.DB.Table("game_action").
+		Where("gid", gid).
+		Where("actionId", gameActionId).
+		First(&gameAction).Error
+	if err != nil {
+		return errors.New("该行为记录不存在")
+	}
+	if gameAction.Status == 0 {
+		return errors.New("该行为记录未启用")
+	}
+
+	var userActionOption []model.UserActionOption
+	if option != "" {
+		optionMap := make(map[string]interface{})
+		err = json.Unmarshal([]byte(option), &optionMap)
+		if err != nil {
+			return errors.New("选项解析错误")
+		}
+		for k, v := range optionMap {
+			userActionOption = append(userActionOption, model.UserActionOption{
+				OptionId: k,
+				Value:    fmt.Sprintf("%v", v),
+				CreatedAt: model.XTime{
+					Time: now,
+				},
+			})
+		}
+	}
+
+	userAction := model.UserAction{
+		UserId:    userId,
+		Gid:       gid,
+		Pf:        pf,
+		ActionId:  gameActionId,
+		CreatedAt: model.XTime{Time: now},
+	}
+
+	err = global.App.DB.Transaction(func(tx *utils.WtDB) error {
+		err := tx.Table("user_action").Create(&userAction).Error
+		if err != nil {
+			return err
+		}
+		if len(userActionOption) > 0 {
+			for _, option := range userActionOption {
+				option.UserActionId = userAction.ID
+				err = tx.Table("user_action_option").Create(&option).Error
+				if err != nil {
+					return err
+				}
+			}
+		}
+
+		return nil
+	})
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
 func login(gid string, pf string, userId int, now time.Time) error {
 	var user model.User
-	err := global.App.DB.Table("user").Where("id", gid).Where("pf", pf).Where("userId", userId).Find(&user).Error
-	if errors.Is(err, gorm.ErrRecordNotFound) {
+	err := global.App.DB.Table("user").Where("gid", gid).Where("pf", pf).Where("userId", userId).First(&user).Error
+	if user.ID == 0 {
 		//没有用户,需要新增
 		user.UserId = userId
 		user.Gid = gid
@@ -176,8 +248,8 @@ func InitUser(c *gin.Context) {
 	for _, key := range keys {
 		gid := strings.Split(key, ":")[1]
 		userKeyWeb := gid + ":" + "web" + ":" + config.Get("app.user_table_key") + "*"
-		//userKeyTt := gid + ":" + "tt" + ":" + config.Get("app.user_table_key")
-		//userKeyWx := gid + ":" + "wx" + ":" + config.Get("app.user_table_key")
+		userKeyTt := gid + ":" + "tt" + ":" + config.Get("app.user_table_key") + "*"
+		userKeyWx := gid + ":" + "wx" + ":" + config.Get("app.user_table_key") + "*"
 
 		webKey, _ := global.App.Redis.Keys(context.Background(), userKeyWeb).Result()
 		for _, v := range webKey {
@@ -186,15 +258,53 @@ func InitUser(c *gin.Context) {
 				continue
 			}
 			userId, _ := strconv.Atoi(res["userId"])
+			registerTimeUnix, _ := strconv.Atoi(res["registerTime"])
+			registerTime := time.Unix(int64(registerTimeUnix), 0)
+			global.App.DB.Table("user").Create(&model.User{
+				Gid:       res["gid"],
+				Pf:        res["pf"],
+				UserId:    userId,
+				CreatedAt: registerTime,
+			})
+
+		}
+
+		ttKey, _ := global.App.Redis.Keys(context.Background(), userKeyTt).Result()
+		for _, v := range ttKey {
+			res, err2 := global.App.Redis.HGetAll(context.Background(), v).Result()
+			if err2 != nil {
+				continue
+			}
+			userId, _ := strconv.Atoi(res["userId"])
+			registerTimeUnix, _ := strconv.Atoi(res["registerTime"])
+			registerTime := time.Unix(int64(registerTimeUnix), 0)
 			global.App.DB.Table("user").Create(&model.User{
 				Gid:       res["gid"],
 				Pf:        res["pf"],
 				UserId:    userId,
-				CreatedAt: time.Now(),
+				CreatedAt: registerTime,
+			})
+
+		}
+
+		wxKey, _ := global.App.Redis.Keys(context.Background(), userKeyWx).Result()
+		for _, v := range wxKey {
+			res, err2 := global.App.Redis.HGetAll(context.Background(), v).Result()
+			if err2 != nil {
+				continue
+			}
+			userId, _ := strconv.Atoi(res["userId"])
+			registerTimeUnix, _ := strconv.Atoi(res["registerTime"])
+			registerTime := time.Unix(int64(registerTimeUnix), 0)
+			global.App.DB.Table("user").Create(&model.User{
+				Gid:       res["gid"],
+				Pf:        res["pf"],
+				UserId:    userId,
+				CreatedAt: registerTime,
 			})
 
 		}
 	}
 
-	response.Success(c, gin.H{})
+	response.Success(c, gin.H{"data": "success"})
 }

+ 2 - 0
global/app.go

@@ -3,6 +3,7 @@ package global
 import (
 	"designs/utils"
 	"github.com/go-redis/redis/v8"
+	"go.mongodb.org/mongo-driver/v2/mongo"
 	"go.uber.org/zap"
 	"io"
 )
@@ -27,6 +28,7 @@ type Application struct {
 	//日志
 	Log       *zap.SugaredLogger
 	LogWriter io.Writer
+	MongoDB   *mongo.Client
 
 	PwdPath string
 }

+ 12 - 4
go.mod

@@ -7,14 +7,14 @@ require (
 	github.com/go-ini/ini v1.67.0
 	github.com/go-playground/validator/v10 v10.22.0
 	github.com/go-redis/redis/v8 v8.11.5
-	github.com/goccy/go-json v0.10.3
 	github.com/golang-jwt/jwt/v5 v5.2.1
 	github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible
 	github.com/lionsoul2014/ip2region/binding/golang v0.0.0-20240510055607-89e20ab7b6c6
 	github.com/pkg/errors v0.9.1
 	github.com/sirupsen/logrus v1.9.3
+	go.mongodb.org/mongo-driver/v2 v2.0.0-beta2
 	go.uber.org/zap v1.27.0
-	golang.org/x/crypto v0.25.0
+	golang.org/x/crypto v0.27.0
 	gorm.io/driver/mysql v1.5.7
 	gorm.io/gorm v1.25.11
 )
@@ -32,10 +32,13 @@ require (
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/go-sql-driver/mysql v1.8.1 // indirect
+	github.com/goccy/go-json v0.10.3 // indirect
+	github.com/golang/snappy v0.0.4 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/jonboulle/clockwork v0.4.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/klauspost/compress v1.13.6 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.8 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect
 	github.com/lestrrat-go/strftime v1.0.6 // indirect
@@ -45,11 +48,16 @@ require (
 	github.com/pelletier/go-toml/v2 v2.2.2 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.12 // indirect
+	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
+	github.com/xdg-go/scram v1.1.2 // indirect
+	github.com/xdg-go/stringprep v1.0.4 // indirect
+	github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
 	go.uber.org/multierr v1.10.0 // indirect
 	golang.org/x/arch v0.8.0 // indirect
 	golang.org/x/net v0.27.0 // indirect
-	golang.org/x/sys v0.22.0 // indirect
-	golang.org/x/text v0.17.0 // indirect
+	golang.org/x/sync v0.8.0 // indirect
+	golang.org/x/sys v0.25.0 // indirect
+	golang.org/x/text v0.18.0 // indirect
 	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

+ 48 - 10
go.sum

@@ -42,8 +42,10 @@ github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA=
 github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
 github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk=
 github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
-github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
+github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
@@ -53,6 +55,8 @@ github.com/jonboulle/clockwork v0.4.0 h1:p4Cf1aMWXnXAUh8lVfewRBx1zaTSYKrKMF2g3ST
 github.com/jonboulle/clockwork v0.4.0/go.mod h1:xgRqUGwRcjKCO1vbZUEtSLrqKoPSsUpK7fnezOII0kc=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
+github.com/klauspost/compress v1.13.6 h1:P76CopJELS0TiO2mebmnzgWaajssP/EszplttgQxcgc=
+github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
 github.com/klauspost/cpuid/v2 v2.2.8 h1:+StwCXwm9PdpiEkPyzBXIy+M9KUb4ODm0Zarf1kS5BM=
 github.com/klauspost/cpuid/v2 v2.2.8/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
@@ -104,6 +108,17 @@ github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS
 github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
 github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=
 github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
+github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c=
+github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
+github.com/xdg-go/scram v1.1.2 h1:FHX5I5B4i4hKRVRBCFRxq1iQRej7WO3hhBuJf+UUySY=
+github.com/xdg-go/scram v1.1.2/go.mod h1:RT/sEzTbU5y00aCK8UOx6R7YryM0iF1N2MOmC3kKLN4=
+github.com/xdg-go/stringprep v1.0.4 h1:XLI/Ng3O1Atzq0oBs3TWm+5ZVgkq2aqdlvP9JtoZ6c8=
+github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM=
+github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 h1:ilQV1hzziu+LLM3zUTJ0trRztfwgjqKnBWNtSRkbmwM=
+github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78/go.mod h1:aL8wCCfTfSfmXjznFBSZNN13rSJjlIOI1fUNAtF7rmI=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+go.mongodb.org/mongo-driver/v2 v2.0.0-beta2 h1:PRtbRKwblE8ZfI8qOhofcjn9y8CmKZI7trS5vDMeJX0=
+go.mongodb.org/mongo-driver/v2 v2.0.0-beta2/go.mod h1:UGLb3ZgEzaY0cCbJpH9UFt9B6gEXiTPzsnJS38nBeoU=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ=
@@ -113,19 +128,42 @@ go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
 golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
 golang.org/x/arch v0.8.0 h1:3wRIsP3pM4yUptoR96otTUOXI367OS0+c9eeRi9doIc=
 golang.org/x/arch v0.8.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
-golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30=
-golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
+golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys=
 golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
+golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
-golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
-golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
+golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
+golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
+golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
 google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=

+ 9 - 0
main.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"context"
 	"designs/bootstrap"
 	"designs/global"
 	"designs/utils"
@@ -50,6 +51,14 @@ func main() {
 		}
 	}()
 
+	//初始化mongodb
+	global.App.MongoDB = bootstrap.InitializeMongo()
+	defer func() {
+		if global.App.MongoDB != nil {
+			global.App.MongoDB.Disconnect(context.Background())
+		}
+	}()
+
 	bootstrap.RunServer()
 	// ginServer.RunTLS(":443", "your_certificate.crt", "your_private_key.key")
 }

+ 74 - 1
model/user.go

@@ -1,6 +1,10 @@
 package model
 
-import "time"
+import (
+	"database/sql/driver"
+	"fmt"
+	"time"
+)
 
 /* code 结构体 */
 type CodeData struct {
@@ -58,3 +62,72 @@ type UserSeeAds struct {
 	AdsScene  string    `json:"adsScene" gorm:"not null;column:adsScene;"`
 	AdsState  int       `json:"adsState" gorm:"not null;column:adsState;"`
 }
+
+// 1. 创建 time.Time 类型的副本 XTime;
+type XTime struct {
+	time.Time
+}
+
+// 2. 为 Xtime 重写 MarshaJSON 方法,在此方法中实现自定义格式的转换;
+func (t XTime) MarshalJSON() ([]byte, error) {
+	output := fmt.Sprintf("\"%s\"", t.Format("2006-01-02 15:04:05"))
+	return []byte(output), nil
+}
+
+// 3. 为 Xtime 实现 Value 方法,写入数据库时会调用该方法将自定义时间类型转换并写入数据库;
+func (t XTime) Value() (driver.Value, error) {
+	var zeroTime time.Time
+	if t.Time.UnixNano() == zeroTime.UnixNano() {
+		return nil, nil
+	}
+	return t.Time, nil
+}
+
+// 4. 为 Xtime 实现 Scan 方法,读取数据库时会调用该方法将时间数据转换成自定义时间类型;
+func (t *XTime) Scan(v interface{}) error {
+	value, ok := v.(time.Time)
+	if ok {
+		*t = XTime{Time: value}
+		return nil
+	}
+	return fmt.Errorf("can not convert %v to timestamp", v)
+}
+
+type GameAction struct {
+	ID         int    `json:"id" gorm:"not null;"`
+	Gid        string `json:"gid" gorm:"not null;"`
+	ActionId   string `json:"actionId" gorm:"not null;column:actionId;"`
+	ActionName string `json:"actionName" gorm:"not null;column:actionName;"`
+	Status     int    `json:"status" gorm:"not null;column:status;"`
+	Remark     string `json:"remark" gorm:"not null;column:remark;"`
+	CreatedAt  XTime  `json:"createdAt" gorm:"column:createdAt;type:date;"`
+	UpdatedAt  XTime  `json:"updatedAt" gorm:"column:updatedAt;type:date;"`
+}
+
+type GameActionOption struct {
+	ID         int    `json:"id" gorm:"not null;"`
+	ActionId   int    `json:"actionId" gorm:"not null;column:actionId;"`
+	OptionId   string `json:"optionId" gorm:"not null;column:optionId;"`
+	OptionName string `json:"optionName" gorm:"not null;column:optionName;"`
+	OptionType string `json:"optionType" gorm:"not null;column:optionType;"`
+	Status     int    `json:"status" gorm:"not null;column:status;"`
+	CreatedAt  XTime  `json:"createdAt" gorm:"column:createdAt;"`
+	UpdatedAt  XTime  `json:"updatedAt" gorm:"column:updatedAt;"`
+}
+
+type UserAction struct {
+	ID        int    `json:"id" gorm:"not null;"`
+	Pf        string `json:"pf" gorm:"not null;"`
+	Gid       string `json:"gid" gorm:"not null;"`
+	ActionId  string `json:"actionId" gorm:"not null;column:actionId;"`
+	UserId    int    `json:"userId" gorm:"not null;column:userId;"`
+	CreatedAt XTime  `json:"createdAt" gorm:"column:createdAt;type:date;"`
+}
+
+type UserActionOption struct {
+	ID           int    `json:"id" gorm:"not null;"`
+	OptionId     string `json:"optionId" gorm:"not null;column:optionId;"`
+	UserActionId int    `json:"userActionId" gorm:"not null;column:userActionId;"`
+	CreatedAt    XTime  `json:"createdAt" gorm:"column:createdAt;type:date;"`
+	Value        string `json:"value" gorm:"not null;column:value;"`
+}

+ 2 - 0
route/api.go

@@ -16,5 +16,7 @@ func SetApiGroupRoutes(router *gin.RouterGroup) {
 	GroupV1.Use(middleware.TokenAuthMiddleware()).Use()
 	{
 		GroupV1.POST("/user/receiveGameMsg", v1.ReceiveGameMsg)
+		GroupV1.POST("/user/receiveUserBehavior", v1.ReceiveUserBehavior)
+		GroupV1.POST("/user/checkUserBehavior", v1.CheckUserBehavior)
 	}
 }