|
|
@@ -123,13 +123,19 @@ public class GetServerListController extends HttpServlet {
|
|
|
if (isnew == 1) {
|
|
|
newServerList.add(server_id);
|
|
|
}
|
|
|
-
|
|
|
+ int banreg = 0;
|
|
|
+ if (serverInfo.containsField("is_banreg"))
|
|
|
+ banreg = Integer.parseInt(serverInfo.get("is_banreg").toString());
|
|
|
+// if (banreg == 1) {
|
|
|
+// newServerList.add(server_id);
|
|
|
+// }
|
|
|
DBObject res = new BasicDBObject();
|
|
|
res.put("name", serverInfo.get("name"));
|
|
|
res.put("server_id", server_id);
|
|
|
res.put("state", state);
|
|
|
res.put("open_time", serverInfo.get("open_time"));
|
|
|
res.put("isnew", isnew);
|
|
|
+ res.put("isbanreg", banreg);
|
|
|
Object ip = serverInfo.get("ip");
|
|
|
Object port = serverInfo.get("port");
|
|
|
if (state == 1) { // 服务器状态为维护的话不传给前端ip端口
|
|
|
@@ -157,14 +163,14 @@ public class GetServerListController extends HttpServlet {
|
|
|
//获取我的服务器列表
|
|
|
Map<String, UserRecentLoginInfo> userServerInfoMap = BaseGlobal.getInstance().redisApp.hgetAll(RedisKey.USER_SERVER_INFO, openId, UserRecentLoginInfo.class, -1, false);
|
|
|
DBObject myLastServer = null;
|
|
|
- List<String> myServerList = new ArrayList<>();
|
|
|
+ List<DBObject> myServerList = new ArrayList<>();
|
|
|
long time = 0;
|
|
|
for (Map.Entry<String, UserRecentLoginInfo> entry : userServerInfoMap.entrySet()) {
|
|
|
if (!serverInfosCache.keySet().contains(entry.getKey())) {
|
|
|
//服务器已清除
|
|
|
continue;
|
|
|
}
|
|
|
- myServerList.add(entry.getKey());
|
|
|
+ myServerList.add(getDBObject(entry.getKey(), entry.getValue()));
|
|
|
if (entry.getValue().getLoginTime() > time) {
|
|
|
time = entry.getValue().getLoginTime();
|
|
|
myLastServer = getDBObject(entry.getKey(), entry.getValue());
|
|
|
@@ -200,6 +206,7 @@ public class GetServerListController extends HttpServlet {
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
+
|
|
|
public void doPost(HttpServletRequest request, HttpServletResponse response)
|
|
|
throws ServletException, IOException {
|
|
|
this.doGet(request, response);
|
ming