generated from root/miduo_server
Merge branch 'master' of 60.1.1.230:backend/jieling_loginserver
commit
6a1b0282e3
|
|
@ -0,0 +1,26 @@
|
|||
#!/bin/bash
|
||||
|
||||
#########################################################################
|
||||
# File Name: build.sh
|
||||
# Created on: 2019-08-15 11:56:54
|
||||
# Author: Wu Kang
|
||||
# Last Modified: 2019-08-15 12:02:59
|
||||
# Description:
|
||||
#########################################################################
|
||||
ip=$1
|
||||
usage(){
|
||||
echo -e "\033[32mUsage: $0 {ip} \033[0m"
|
||||
exit 7;
|
||||
}
|
||||
|
||||
if [ ! $ip ];then
|
||||
usage
|
||||
fi
|
||||
|
||||
./gradlew clean
|
||||
./gradlew build
|
||||
./gradlew jar
|
||||
|
||||
if [ ! -z ${ip} ];then
|
||||
scp build/libs/loginserver-1.0-SNAPSHOT.war ${ip}:/usr/local/apache-tomcat-7.0.79/webapps/jl_loginserver.war
|
||||
fi
|
||||
|
|
@ -11,7 +11,6 @@ import javax.servlet.ServletException;
|
|||
import javax.servlet.http.HttpServlet;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.io.BufferedReader;
|
||||
import java.io.IOException;
|
||||
import java.io.PrintWriter;
|
||||
import java.util.ArrayList;
|
||||
|
|
@ -20,7 +19,7 @@ import java.util.Map;
|
|||
|
||||
public class GetServerListController extends HttpServlet {
|
||||
private final static String _COLLECTION_NAME = "server_info";
|
||||
|
||||
private final static String _WHITE_LIST = "white_list";
|
||||
public GetServerListController() {
|
||||
super();
|
||||
}
|
||||
|
|
@ -29,7 +28,7 @@ public class GetServerListController extends HttpServlet {
|
|||
super.destroy();
|
||||
}
|
||||
|
||||
|
||||
// 服务器状态 0:不可见 1:维护 2:流畅 3:爆满
|
||||
public void doGet(HttpServletRequest request, HttpServletResponse response)
|
||||
throws ServletException, IOException {
|
||||
response.setCharacterEncoding("UTF-8");
|
||||
|
|
@ -41,6 +40,7 @@ public class GetServerListController extends HttpServlet {
|
|||
String sub_channel = request.getParameter("sub_channel");
|
||||
String plat = request.getParameter("plat");
|
||||
DBObject req = new BasicDBObject();
|
||||
DBObject whiteList = BaseGlobal.getInstance().mongoDBPool.findOne(_WHITE_LIST,openId);
|
||||
req.put("channel", channel);
|
||||
req.put("sub_channel", sub_channel);
|
||||
req.put("plat", plat);
|
||||
|
|
@ -51,13 +51,26 @@ public class GetServerListController extends HttpServlet {
|
|||
if (System.currentTimeMillis() < time) {
|
||||
continue;
|
||||
}
|
||||
int state = (int) serverInfo.get("state");
|
||||
if (state == 0 ){
|
||||
continue;
|
||||
}
|
||||
if (whiteList != null && state ==1){
|
||||
state = 2;
|
||||
}
|
||||
DBObject res = new BasicDBObject();
|
||||
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("state", serverInfo.get("state"));
|
||||
res.put("state", state);
|
||||
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);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -65,7 +65,8 @@ public class GetUserController extends HttpServlet {
|
|||
return;
|
||||
}
|
||||
}
|
||||
|
||||
response.setCharacterEncoding("UTF-8");
|
||||
response.setContentType("application/json; charset=utf-8");
|
||||
DBObject dbObject = new BasicDBObject();
|
||||
dbObject.put("openId", openId);
|
||||
dbObject.put("serverId", serverId);
|
||||
|
|
|
|||
Loading…
Reference in New Issue