Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop

machine/action/action_server.go

@@ -10,6 +10,7 @@ import (
 	"mongo.games.com/goserver/core/logger"
 	"mongo.games.com/goserver/core/netlib"
 	"mongo.games.com/goserver/core/timer"
+	"strconv"
 	"sync"
 	"time"
 )
@@ -290,7 +291,7 @@ func SMGetTokenHandler(session *netlib.Session, packetId int, data interface{})
 	var payload string = ""
 
 	//生成token
-	token, err := token04.GenerateToken04(appId, string(userId), serverSecret, effectiveTimeInSeconds, payload)
+	token, err := token04.GenerateToken04(appId, strconv.Itoa(int(userId)), serverSecret, effectiveTimeInSeconds, payload)
 	if err != nil {
 		logger.Logger.Error(err)
 		return err