Browse Source

非通码cdk实现

lt 1 year ago
parent
commit
8066557d19

+ 3 - 1
RO_Server_Trunk-branch_0.1.39/roserver/gmweb/msg/msg.go

@@ -50,7 +50,9 @@ func init() {
 					util.ErrorF("uid:%v cdk get is nil,code:%v error:%v", uuid, code, err)
 					gmmodel.SendSocial(res)
 				}
-				var a *serverproto.SCUseHeadFrameItemAck
+				a := &serverproto.SCUseHeadFrameItemAck{
+					ItemList: make([]*serverproto.KeyValueType, 0),
+				}
 				err = model.GetDecodeMessage(a, award)
 				if err != nil {
 					res.Error = 3

+ 14 - 3
RO_Server_Trunk-branch_0.1.39/roserver/gmweb/msg/web_gmmsg.go

@@ -1012,6 +1012,11 @@ func GetCdk(c *gin.Context) {
 	}
 	awardData := &serverproto.SCUseHeadFrameItemAck{}
 	awardData.ItemList = awardKV
+	err, a2 := model.GetEncodeMessage(awardData)
+	if err != nil {
+		c.JSON(http.StatusOK, err)
+		return
+	}
 	rand.Seed(time.Now().UnixNano())
 	f := excelize.NewFile()
 	sheetName := "Sheet1"
@@ -1019,7 +1024,7 @@ func GetCdk(c *gin.Context) {
 	for i := 0; i < count; i++ {
 		// 生成随机字符串
 		randomString := generateRandomString(length)
-		cdk[randomString] = awardData
+		cdk[randomString] = a2
 		cellName, err := excelize.CoordinatesToCellName(1, i+1)
 		if err != nil {
 			c.JSON(http.StatusOK, err)
@@ -1029,8 +1034,14 @@ func GetCdk(c *gin.Context) {
 		// 设置单元格的值
 		f.SetCellValue(sheetName, cellName, randomString)
 	}
-
-	RedisCdk2.RedisCli().HMSet(dbmodel.CdkNormal, cdk)
+	util.InfoF("aaaa:%v", cdk)
+	_, err2 := RedisCdk2.RedisCli().HMSet(dbmodel.CdkNormal, cdk).Result()
+	if err2 != nil {
+		util.InfoF("aaaa3:%v", err2)
+		c.JSON(http.StatusOK, err2)
+		return
+	}
+	util.InfoF("aaaa2:%v", cdk)
 	// 保存文件
 	filePath := "cdkNormal.xlsx"
 	if err := f.SaveAs(filePath); err != nil {