generated from root/miduo_server
fix
parent
2407b4186c
commit
7244d655b2
|
|
@ -11,7 +11,6 @@ import javax.servlet.ServletException;
|
||||||
import javax.servlet.http.HttpServlet;
|
import javax.servlet.http.HttpServlet;
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
import java.io.BufferedReader;
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.PrintWriter;
|
import java.io.PrintWriter;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
|
@ -20,7 +19,7 @@ import java.util.Map;
|
||||||
|
|
||||||
public class GetServerListController extends HttpServlet {
|
public class GetServerListController extends HttpServlet {
|
||||||
private final static String _COLLECTION_NAME = "server_info";
|
private final static String _COLLECTION_NAME = "server_info";
|
||||||
|
private final static String _WHITE_LIST = "white_list";
|
||||||
public GetServerListController() {
|
public GetServerListController() {
|
||||||
super();
|
super();
|
||||||
}
|
}
|
||||||
|
|
@ -29,7 +28,7 @@ public class GetServerListController extends HttpServlet {
|
||||||
super.destroy();
|
super.destroy();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 服务器状态 0:不可见 1:维护 2:流畅 3:爆满
|
||||||
public void doGet(HttpServletRequest request, HttpServletResponse response)
|
public void doGet(HttpServletRequest request, HttpServletResponse response)
|
||||||
throws ServletException, IOException {
|
throws ServletException, IOException {
|
||||||
response.setCharacterEncoding("UTF-8");
|
response.setCharacterEncoding("UTF-8");
|
||||||
|
|
@ -41,6 +40,7 @@ public class GetServerListController extends HttpServlet {
|
||||||
String sub_channel = request.getParameter("sub_channel");
|
String sub_channel = request.getParameter("sub_channel");
|
||||||
String plat = request.getParameter("plat");
|
String plat = request.getParameter("plat");
|
||||||
DBObject req = new BasicDBObject();
|
DBObject req = new BasicDBObject();
|
||||||
|
DBObject whiteList = BaseGlobal.getInstance().mongoDBPool.findOne(_WHITE_LIST,openId);
|
||||||
req.put("channel", channel);
|
req.put("channel", channel);
|
||||||
req.put("sub_channel", sub_channel);
|
req.put("sub_channel", sub_channel);
|
||||||
req.put("plat", plat);
|
req.put("plat", plat);
|
||||||
|
|
@ -51,13 +51,26 @@ public class GetServerListController extends HttpServlet {
|
||||||
if (System.currentTimeMillis() < time) {
|
if (System.currentTimeMillis() < time) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
int state = (int) serverInfo.get("state");
|
||||||
|
if (state == 0 ){
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (whiteList != null && state ==1){
|
||||||
|
state = 2;
|
||||||
|
}
|
||||||
DBObject res = new BasicDBObject();
|
DBObject res = new BasicDBObject();
|
||||||
res.put("name", serverInfo.get("name"));
|
res.put("name", serverInfo.get("name"));
|
||||||
res.put("ip", serverInfo.get("ip"));
|
|
||||||
res.put("port", serverInfo.get("port"));
|
|
||||||
res.put("server_id", serverInfo.get("server_id"));
|
res.put("server_id", serverInfo.get("server_id"));
|
||||||
res.put("state", serverInfo.get("state"));
|
res.put("state", state);
|
||||||
res.put("open_time", serverInfo.get("open_time"));
|
res.put("open_time", serverInfo.get("open_time"));
|
||||||
|
Object ip = serverInfo.get("ip");
|
||||||
|
Object port = serverInfo.get("port");
|
||||||
|
if (state ==1){ // 服务器状态为维护的话不传给前端ip端口
|
||||||
|
ip = "";
|
||||||
|
port = "";
|
||||||
|
}
|
||||||
|
res.put("ip",ip );
|
||||||
|
res.put("port",port);
|
||||||
serverList.add(res);
|
serverList.add(res);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -61,7 +61,8 @@ public class GetUserController extends HttpServlet {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
response.setCharacterEncoding("UTF-8");
|
||||||
|
response.setContentType("application/json; charset=utf-8");
|
||||||
DBObject dbObject = new BasicDBObject();
|
DBObject dbObject = new BasicDBObject();
|
||||||
dbObject.put("openId", openId);
|
dbObject.put("openId", openId);
|
||||||
dbObject.put("serverId", serverId);
|
dbObject.put("serverId", serverId);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue