服务器列表新增ios审核参数

RO_Server_Trunk-branch_0.1.39/roweb/serverlist/model/serverlist.go

@@ -39,6 +39,7 @@ const (
 // /获取所有服务器列表
 func GetServerList(c *gin.Context) {
 	getType := c.DefaultQuery("type", "0") ///default 0
+	//param := c.DefaultQuery("buildTag", "0") ///default 0是否是审核服
 	serverListType, err := strconv.Atoi(getType)
 	if err != nil {
 		c.JSON(http.StatusOK, gin.H{
@@ -261,6 +262,26 @@ func GetOpenIDServerList(c *gin.Context) (string, bool) {
 
 	tmpConfig := GetServiceConfig()
 	ip := c.ClientIP()
+	if c.DefaultQuery("buildTag", "") == "IOS_1" {
+		var selfNodeList2 []*SelfServerNodeDetail
+		selfNode := &SelfServerNodeDetail{}
+		for _, v := range tmpConfig.serverSpeList {
+			selfNode.ServerId = int32(v.ServerId)
+			selfNode.ServerName = v.ServerName
+			selfNode.Ip = v.Ip
+			selfNode.Port = v.Port
+			selfNode.Type = v.Type
+			selfNode.STime = v.STime
+
+			selfNode.State = v.State
+
+			selfNode.New = true
+		}
+
+		selfNodeList2 = append(selfNodeList2, selfNode)
+		c.JSON(http.StatusOK, selfNodeList2)
+		return "", true
+	}
 	//黑名单只看到特殊的IP列表
 	bBlack := tmpConfig.IsBlackList(openId, ip, resver)
 	if bBlack {
@@ -364,6 +385,21 @@ func GetDefaultServer(c *gin.Context) {
 	if tmpNode != nil {
 		latestServerNode = *tmpNode
 	}
+	if c.DefaultQuery("buildTag", "") == "IOS_1" {
+		var latestServerNode2 ServerNode
+		for _, v := range tmpConfig.serverSpeList {
+			latestServerNode2.ServerId = v.ServerId
+			latestServerNode2.ServerName = v.ServerName
+			latestServerNode2.Ip = v.Ip
+			latestServerNode2.Port = v.Port
+			latestServerNode2.Type = v.Type
+			latestServerNode2.STime = v.STime
+
+			latestServerNode2.State = v.State
+		}
+		c.JSON(http.StatusOK, latestServerNode2)
+		return
+	}
 	ip := c.ClientIP()
 	openId := c.DefaultQuery("openid", "")     ///default ""
 	platform := c.DefaultQuery("platform", "") ///default ""
@@ -630,12 +666,12 @@ func GetServerDownLoad(c *gin.Context) {
 
 func GetServerState2(c *gin.Context) {
 	platform := c.DefaultQuery("platform", "0")
-	//param := c.DefaultQuery("param", "0")
+	param := c.DefaultQuery("buildTag", "0")
 	if serviceConfig != nil {
 		var url int
 		//默认android中文版
 		url = serviceConfig.DownLoadUrl.AndroidState
-		if platform == "IOS" {
+		if platform == "IOS" && param == "IOS_1" {
 			//默认中文版
 			url = serviceConfig.DownLoadUrl.IosState
 		}

RO_Server_Trunk-branch_0.1.39/roweb/serverlist/model/yamlconfig.go

@@ -111,7 +111,7 @@ func (this *ServerListNode) GetServerById(c *gin.Context, nodeId string) *Server
 
 	var retServerNode ServerNode
 	for idx := 0; idx < len(this.serverSpeList); idx++ {
-		if this.serverSpeList[idx].ServerId == serverId {
+		if (this.serverSpeList[idx].ServerId == serverId) || (c.DefaultQuery("buildTag", "") == "IOS_1") {
 			if bWhite {
 				retServerNode = *this.serverSpeList[idx]
 				//白名单玩家状态修改
@@ -122,7 +122,7 @@ func (this *ServerListNode) GetServerById(c *gin.Context, nodeId string) *Server
 			} else {
 				retServerNode = *this.serverSpeList[idx]
 			}
-			break
+			return &retServerNode
 		}
 	}
 	if serverNode, ok := this.serverMapList[serverId]; ok {
@@ -220,6 +220,7 @@ func (this *ServerListNode) GetServerList(c *gin.Context, pageIdStr string) inte
 	resver := c.DefaultQuery("resver", "")     ///default ""
 	openId := c.DefaultQuery("openid", "")     ///default ""
 	platform := c.DefaultQuery("platform", "") ///default ""
+	param := c.DefaultQuery("buildTag", "")    ///default ""审核服标志
 	openId = ConvertPlatform(openId, platform)
 	tmpConfig := GetServiceConfig()
 	bBlack := tmpConfig.IsBlackList(openId, ip, resver)
@@ -240,7 +241,7 @@ func (this *ServerListNode) GetServerList(c *gin.Context, pageIdStr string) inte
 	bBlockPlatform := tmpConfig.IsPlatformBlackList(subplatform)
 	bWhite := tmpConfig.IsWhiteList(openId, ip, resver)
 
-	serverNum := this.GetServerListNum(bWhite)
+	serverNum := this.GetServerListNum(bWhite, param)
 	if pageId <= 0 {
 		pageId = serverNum / 10
 		if serverNum%10 != 0 {
@@ -256,35 +257,54 @@ func (this *ServerListNode) GetServerList(c *gin.Context, pageIdStr string) inte
 	if eIdx > serverNum {
 		eIdx = serverNum
 	}
-
-	allServerSt.ServerNum = serverNum
-	for idx := sIdx; idx < eIdx; idx++ {
-		tmpNode := *this.serverNormalList[idx]
-		if bWhite {
-			//白名单玩家状态修改
-			//5维护 6待测试
-			if tmpNode.State != 6 {
-				tmpNode.State = 0
+	if param == "IOS_1" {
+		allServerSt.ServerNum = serverNum
+		for idx := 0; idx < len(this.serverSpeList); idx++ {
+			tmpNode := *this.serverSpeList[idx]
+			allServerSt.ServerList = append(allServerSt.ServerList, tmpNode)
+			if tmpNode.ServerId > allServerSt.MaxServerId {
+				allServerSt.MaxServerId = tmpNode.ServerId
 			}
-		} else if bBlockPlatform {
-			tmpNode.State = 5
-		}
-		if !bWhite && tmpNode.Invisible > 0 {
-			continue
 		}
-		allServerSt.ServerList = append(allServerSt.ServerList, tmpNode)
-		if tmpNode.ServerId > allServerSt.MaxServerId {
-			allServerSt.MaxServerId = tmpNode.ServerId
+		allServerSt.MaxServerId = serverNum
+	} else {
+		allServerSt.ServerNum = serverNum
+		for idx := sIdx; idx < eIdx; idx++ {
+			tmpNode := *this.serverNormalList[idx]
+			if bWhite {
+				//白名单玩家状态修改
+				//5维护 6待测试
+				if tmpNode.State != 6 {
+					tmpNode.State = 0
+				}
+			} else if bBlockPlatform {
+				tmpNode.State = 5
+			}
+			if !bWhite && tmpNode.Invisible > 0 {
+				continue
+			}
+			allServerSt.ServerList = append(allServerSt.ServerList, tmpNode)
+			if tmpNode.ServerId > allServerSt.MaxServerId {
+				allServerSt.MaxServerId = tmpNode.ServerId
+			}
 		}
+		allServerSt.MaxServerId = serverNum
 	}
-	allServerSt.MaxServerId = serverNum
 
 	return allServerSt
 }
 
-func (this *ServerListNode) GetServerListNum(bWhite bool) int {
+func (this *ServerListNode) GetServerListNum(bWhite bool, p string) int {
 	if bWhite {
 		return len(this.serverNormalList)
+	} else if p == "IOS_1" {
+		retNum := 0
+		for idx := 0; idx < len(this.serverSpeList); idx++ {
+			if this.serverSpeList[idx].Invisible <= 0 {
+				retNum++
+			}
+		}
+		return retNum
 	} else {
 		retNum := 0
 		for idx := 0; idx < len(this.serverNormalList); idx++ {