11

RO_Server_Trunk-branch_0.1.39/roserver/auth/model/auth_msg.go

@@ -831,7 +831,7 @@ func DoLoginHwQuickVerifySign(res *SDKHwQuickLoginAuthCheckResp) {
 		loginNtf.Error = int32(serverproto.ErrorCode_ERROR_OK)
 		loginNtf.ClientId = res.ClientId
 		loginNtf.ConnInfo = &connInfo
-		loginNtf.SdkParam = res.Guid
+		//loginNtf.SdkParam = res.Guid
 		gateSession.Send(loginNtf)
 	} else {
 		LoginRetSDK(gateSession, res.ClientId, int32(serverproto.ErrorCode_ERROR_FAIL))

RO_Server_Trunk-branch_0.1.39/roserver/auth/model/auth_proc.go

@@ -97,11 +97,11 @@ func saveUserConnInfo(connInfo *serverproto.UserConnectInfo, openId, platform, s
 	if err != nil {
 		util.WarnF("[initUserConnInfo] save userConnectionInfo err:%v", err)
 	}
-	ret, err := service.GetRedis().Set(PlatformOpenIdConnectInfoPrefix2+openId, sdkjson, 0).Result()
-	if err != nil {
-		util.ErrorF("SetMessageToRedis err=%v ret=%v", PlatformOpenIdConnectInfoPrefix2+openId, ret)
-
-	}
+	//ret, err := service.GetRedis().Set(PlatformOpenIdConnectInfoPrefix2+openId, sdkjson, 0).Result()
+	//if err != nil {
+	//	util.ErrorF("SetMessageToRedis err=%v ret=%v", PlatformOpenIdConnectInfoPrefix2+openId, ret)
+	//
+	//}
 }
 
 func checkAuthMode(activeCode string) {

RO_Server_Trunk-branch_0.1.39/roserver/db/model/role_msg.go

@@ -97,12 +97,12 @@ func init() {
 		util.InfoF("SSAccountGetRoleListReq openid=%v zone=%v", msg.OpenId, msg.ZoneId)
 
 		ack := &serverproto.SSAccountGetRoleListAck{}
-		op := model.ConvertPlatform(msg.OpenId, msg.Platform)
-		ret, err2 := service.GetRedis().Get(PlatformOpenIdConnectInfoPrefix2 + op).Result()
-		if err2 != nil {
-			util.ErrorF("GetxiaoqiFromRedis get key=%v err=%v\n", PlatformOpenIdConnectInfoPrefix2+op, err2)
-		}
-		ack.SdkJson = ret
+		//op := model.ConvertPlatform(msg.OpenId, msg.Platform)
+		//ret, err2 := service.GetRedis().Get(PlatformOpenIdConnectInfoPrefix2 + op).Result()
+		//if err2 != nil {
+		//	util.ErrorF("GetxiaoqiFromRedis get key=%v err=%v\n", PlatformOpenIdConnectInfoPrefix2+op, err2)
+		//}
+		//ack.SdkJson = ret
 		isCloseRegister := IsServerCloseRegister()
 		ack.IsCloseRegister = isCloseRegister
 		err := GetRoleListFromRedis(msg.OpenId, msg.ZoneId, ack)

RO_Server_Trunk-branch_0.1.39/roserver/game/msg/login_msg.go

@@ -76,6 +76,7 @@ func init() {
 			util.ErrorF("auth login json Unmarshal err:%v", err)
 		}
 		msg.OpenId = resRu.Data.Guid
+		gguid, _ := json.Marshal(resRu.Data)
 		if msg.OpenId == "" {
 			ack := &serverproto.SCLoginAck{
 				Error: int32(serverproto.ErrorCode_ERROR_FAIL),
@@ -128,6 +129,7 @@ func init() {
 		role.SetClientIP(msg.Ip)
 		role.SetSelectZone(msg.SelectZone) //客户端登陆时选择的服务器zone
 		role.SetHardFight(0)
+		role.SetSdkJson(string(gguid))
 
 		//利用缓存数据
 		if bHas {
@@ -324,8 +326,8 @@ func init() {
 		} //这边必须要做判断
 
 		roleInfo := role.(*model2.Role)
-		util.ErrorF("openid:%v,sdkjson:%v", role.GetOpenId(), msg.SdkJson)
-		roleInfo.SetSdkJson(msg.SdkJson)
+		//util.ErrorF("openid:%v,sdkjson:%v", role.GetOpenId(), msg.SdkJson)
+		//roleInfo.SetSdkJson(msg.SdkJson)
 		if len(roleInfo.UuidList) <= 0 && len(msg.Roles) > 0 {
 			for _, dbRole := range msg.Roles {
 				roleInfo.UuidList = append(roleInfo.UuidList, dbRole.Uid)

RO_Server_Trunk-branch_0.1.39/roserver/gate/model/ss_msg.go

@@ -71,7 +71,7 @@ func init() {
 				OpenId:   cliUser.OpenId,
 				Platform: cliUser.Platform,
 				ConnInfo: msg.ConnInfo,
-				SdkJson:  msg.SdkParam,
+				//SdkJson:  msg.SdkParam,
 			}
 			saveMsg.ConnInfo.TimeStamp = util.GetTimeSeconds()
 			err = cliUser.Client2Backend(model2.SERVICE_NODE_TYPE_AUTH_STR, saveMsg)
@@ -104,7 +104,7 @@ func init() {
 				OpenId:   cliUser.OpenId,
 				Platform: cliUser.Platform,
 				ConnInfo: msg.ConnInfo,
-				SdkJson:  msg.SdkParam,
+				//SdkJson:  msg.SdkParam,
 			}
 			saveMsg.ConnInfo.TimeStamp = util.GetTimeSeconds()
 			saveMsg.ConnInfo.LogicNode = gameNodeStr