From fd49891145180ba5e1fa253a01a83c07f974a0d8 Mon Sep 17 00:00:00 2001 From: jiahuiwen Date: Wed, 13 Oct 2021 09:58:34 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E6=A0=B9=E6=8D=AE=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=99=A8=E5=90=8D=E6=8E=92=E5=BA=8F"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit a14021ecb914ff161c6c06006a57a042b9f44a7d. --- .../controller/GetServerListController.java | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/src/main/java/com/ljsd/controller/GetServerListController.java b/src/main/java/com/ljsd/controller/GetServerListController.java index 858a55e..552a673 100644 --- a/src/main/java/com/ljsd/controller/GetServerListController.java +++ b/src/main/java/com/ljsd/controller/GetServerListController.java @@ -15,8 +15,6 @@ import java.io.IOException; import java.io.PrintWriter; import java.util.*; import java.util.concurrent.ConcurrentHashMap; -import java.util.regex.Matcher; -import java.util.regex.Pattern; public class GetServerListController extends HttpServlet { private final static String _COLLECTION_NAME = "server_info"; @@ -40,7 +38,6 @@ public class GetServerListController extends HttpServlet { response.setCharacterEncoding("UTF-8"); response.setContentType("application/json; charset=utf-8"); PrintWriter out = response.getWriter(); - String regEx="[^0-9]"; try { String openId = request.getParameter("openId"); String channel = request.getParameter("channel"); @@ -122,15 +119,6 @@ public class GetServerListController extends HttpServlet { ip = ""; 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("port", port); serverList.add(res); @@ -166,12 +154,7 @@ public class GetServerListController extends HttpServlet { } } - Collections.sort(serverList, new Comparator() { - @Override - public int compare(DBObject dbObject1, DBObject dbObject2) { - return Integer.compare((int) dbObject1.get("sort"), (int) dbObject2.get("sort")); - } - }); + DBObject resp = new BasicDBObject(); resp.put("serverList", serverList); resp.put("myServerList", myServerList);