diff --git a/src/main/java/com/ljsd/controller/GetServerListController.java b/src/main/java/com/ljsd/controller/GetServerListController.java index d39d79b..3bf7d16 100644 --- a/src/main/java/com/ljsd/controller/GetServerListController.java +++ b/src/main/java/com/ljsd/controller/GetServerListController.java @@ -56,6 +56,9 @@ public class GetServerListController extends HttpServlet { response.sendError(400, "parm is wrong"); return; } + if("F5_GW".equals(channel)){ + channel = "F5"; + } DBObject req = new BasicDBObject(); req.put("channel", channel); diff --git a/src/main/java/com/ljsd/controller/GetUserController.java b/src/main/java/com/ljsd/controller/GetUserController.java index 71568ce..196eef5 100644 --- a/src/main/java/com/ljsd/controller/GetUserController.java +++ b/src/main/java/com/ljsd/controller/GetUserController.java @@ -76,17 +76,19 @@ public class GetUserController extends HttpServlet { } DBObject serverObject = new BasicDBObject(); - serverObject.put("server_id", serverId+""); + serverObject.put("server_id", serverId); DBObject serverInfo = BaseGlobal.getInstance().mongoDBPool.findOne("server_info", serverObject); // LOGGER.info("serverInfo is {}", JSON.toJSONString(serverInfo)); String realServerId = serverId; if(serverInfo != null){ - realServerId = serverInfo.get("real_server_id").toString(); + if(serverInfo.containsField("real_server_id")) { + realServerId = serverInfo.get("real_server_id").toString(); + } } String token = request.getParameter("token"); - if (token == null || serverId.isEmpty()) { + if (token == null) { response.sendError(400, "token is empety"); return; } @@ -105,7 +107,10 @@ public class GetUserController extends HttpServlet { response.sendError(400, "platform is empety"); return; }*/ - LOGGER.info("the opendId = {},token={},platform={}",openId,token,platform); + LOGGER.info("the opendId = {},token={},platform={},pid={}",openId,token,platform,pid); + if(pid!= null && pid.equals("F5_GW")){ + pid = "F5"; + } try { boolean vertify = vertify(response, request, admin, platform, pid, openId, token); if(!vertify){ @@ -128,7 +133,7 @@ public class GetUserController extends HttpServlet { int uid = 0; List userInfos = BaseGlobal.getInstance().mongoDBPool.find(_COLLECTION_NAME, dbObject); DBObject res = new BasicDBObject(); - if (userInfos.size() == 0) { + if (userInfos.isEmpty()) { uid = BaseGlobal.getInstance().mongoDBPool.inc("uid") + 10000000; dbObject.put("uid", uid); dbObject.put("_id", uid); @@ -199,9 +204,9 @@ public class GetUserController extends HttpServlet { public boolean vertify(HttpServletResponse response,HttpServletRequest request,String admin,String platform,String pid,String openId,String token){ - try { - if(!KTSDKConstans.appsecret.equals(admin)) { - if (isTestLan == 1) { //test + try { + if(!KTSDKConstans.appsecret.equals(admin)) { + if (isTestLan == 1) { //test boolean result = loginVerfifyByTestLan(openId, token); if (!result) { //response.sendError(400, "verify fail"); @@ -217,7 +222,7 @@ public class GetUserController extends HttpServlet { } else if (!"3".equals(platform)) {//正式 切不是pc String sub_channel = request.getParameter("sub_channel"); boolean result = false; - if (sub_channel != null && !sub_channel.equals("")) { + if (sub_channel != null && !sub_channel.isEmpty()) { if (sub_channel.equals("1000")) { result = loginVerfify(pid, openId, token, MHTSDKConstans.rhappid); } else { @@ -230,7 +235,8 @@ public class GetUserController extends HttpServlet { return false; } } - }else { + } + else { boolean result = loginVerfifyByTestLan(openId, token); if (!result) { //response.sendError(400, "verify fail");