generated from root/miduo_server
parent
a14021ecb9
commit
fd49891145
|
@ -15,8 +15,6 @@ import java.io.IOException;
|
||||||
import java.io.PrintWriter;
|
import java.io.PrintWriter;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.concurrent.ConcurrentHashMap;
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
import java.util.regex.Matcher;
|
|
||||||
import java.util.regex.Pattern;
|
|
||||||
|
|
||||||
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";
|
||||||
|
@ -40,7 +38,6 @@ public class GetServerListController extends HttpServlet {
|
||||||
response.setCharacterEncoding("UTF-8");
|
response.setCharacterEncoding("UTF-8");
|
||||||
response.setContentType("application/json; charset=utf-8");
|
response.setContentType("application/json; charset=utf-8");
|
||||||
PrintWriter out = response.getWriter();
|
PrintWriter out = response.getWriter();
|
||||||
String regEx="[^0-9]";
|
|
||||||
try {
|
try {
|
||||||
String openId = request.getParameter("openId");
|
String openId = request.getParameter("openId");
|
||||||
String channel = request.getParameter("channel");
|
String channel = request.getParameter("channel");
|
||||||
|
@ -122,15 +119,6 @@ public class GetServerListController extends HttpServlet {
|
||||||
ip = "";
|
ip = "";
|
||||||
port = "";
|
port = "";
|
||||||
}
|
}
|
||||||
String a = (String) serverInfo.get("name");
|
|
||||||
Pattern p = Pattern.compile(regEx);
|
|
||||||
Matcher m = p.matcher(a);
|
|
||||||
String result = m.replaceAll("").trim();
|
|
||||||
if (result.isEmpty()) {
|
|
||||||
res.put("sort", 9999);
|
|
||||||
} else {
|
|
||||||
res.put("sort", Integer.parseInt(result));
|
|
||||||
}
|
|
||||||
res.put("ip", ip);
|
res.put("ip", ip);
|
||||||
res.put("port", port);
|
res.put("port", port);
|
||||||
serverList.add(res);
|
serverList.add(res);
|
||||||
|
@ -166,12 +154,7 @@ public class GetServerListController extends HttpServlet {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Collections.sort(serverList, new Comparator<DBObject>() {
|
|
||||||
@Override
|
|
||||||
public int compare(DBObject dbObject1, DBObject dbObject2) {
|
|
||||||
return Integer.compare((int) dbObject1.get("sort"), (int) dbObject2.get("sort"));
|
|
||||||
}
|
|
||||||
});
|
|
||||||
DBObject resp = new BasicDBObject();
|
DBObject resp = new BasicDBObject();
|
||||||
resp.put("serverList", serverList);
|
resp.put("serverList", serverList);
|
||||||
resp.put("myServerList", myServerList);
|
resp.put("myServerList", myServerList);
|
||||||
|
|
Loading…
Reference in New Issue