|
|
@@ -47,7 +47,7 @@ public class GetServerListController extends HttpServlet {
|
|
|
String openId = request.getParameter("openId"); //登录账号
|
|
|
String channel = request.getParameter("channel"); //pc
|
|
|
String sub_channel = request.getParameter("sub_channel"); //1
|
|
|
- String server_version = request.getParameter("server_version"); //1
|
|
|
+ String server_version = String.valueOf(request.getParameter("server_version")); //1
|
|
|
String plat = request.getParameter("plat"); //android
|
|
|
//判断非空
|
|
|
if (StringUtils.checkIsEmpty(openId) || StringUtils.checkIsEmpty(channel) ||
|
|
|
@@ -60,7 +60,8 @@ public class GetServerListController extends HttpServlet {
|
|
|
req.put("channel", channel);
|
|
|
req.put("sub_channel", sub_channel);
|
|
|
req.put("plat", plat);
|
|
|
- req.put("server_version", Integer.valueOf(server_version));
|
|
|
+ //req.put("server_version", server_version);
|
|
|
+ //req.put("server_version", Integer.valueOf(server_version));
|
|
|
|
|
|
List<DBObject> serverList = new ArrayList<>();
|
|
|
long local = System.currentTimeMillis();
|
|
|
@@ -83,12 +84,22 @@ public class GetServerListController extends HttpServlet {
|
|
|
SortedSet<String> newServerList = new TreeSet<>();
|
|
|
String maxNumServerId = "";
|
|
|
int maxNum = 0;
|
|
|
+ int shenheNum = 0; //记录 审核服数量
|
|
|
+ for (DBObject serverInfo : serverInfoList) {
|
|
|
+ String server_version1 = serverInfo.get("server_version").toString();
|
|
|
+ if(server_version.equals(server_version1)) {
|
|
|
+ shenheNum += 1;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
for (DBObject serverInfo : serverInfoList) {
|
|
|
int state = Integer.parseInt(serverInfo.get("state").toString());
|
|
|
//opentime
|
|
|
long time = Long.parseLong(serverInfo.get("open_time").toString());
|
|
|
//state
|
|
|
String server_id = serverInfo.get("server_id").toString();
|
|
|
+ //server_version
|
|
|
+ String server_version2 = serverInfo.get("server_version").toString();
|
|
|
int num = getOnlineNum(server_id);
|
|
|
if (whiteList != null && whiteList.size() > 0 && (state == -1 || state == 1 || state == 0)) {
|
|
|
state = 2;
|
|
|
@@ -116,6 +127,18 @@ public class GetServerListController extends HttpServlet {
|
|
|
maxNumServerId = server_id;
|
|
|
}
|
|
|
|
|
|
+ //判断版本号,0=普通服，!=0 审核服
|
|
|
+ if(!server_version2.equals("0")){ //审核服
|
|
|
+ if(!server_version.equals(server_version2)) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ }else {
|
|
|
+ //shenheNum >=1 表示是审核服
|
|
|
+ if(shenheNum >= 1){
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
//new
|
|
|
int isnew = 0;
|
|
|
if (serverInfo.containsField("is_new"))
|
ming