diff --git a/src/main/java/com/ljsd/controller/GetServerListController.java b/src/main/java/com/ljsd/controller/GetServerListController.java index 5a3e3a8..23d1377 100644 --- a/src/main/java/com/ljsd/controller/GetServerListController.java +++ b/src/main/java/com/ljsd/controller/GetServerListController.java @@ -164,7 +164,7 @@ public class GetServerListController extends HttpServlet { List myServerList = new ArrayList<>(); long time = 0; for (Map.Entry entry : userServerInfoMap.entrySet()) { - if(!serverInfosCache.keySet().contains(entry.getKey())){ + if(!serverInfosCache.containsKey(entry.getKey())){ //服务器已清除 continue; } @@ -175,12 +175,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")); - } - }); + serverList.sort(Comparator.comparingInt(dbObject -> (int) dbObject.get("sort"))); DBObject resp = new BasicDBObject(); resp.put("serverList", serverList); resp.put("myServerList", myServerList); diff --git a/src/main/java/com/ljsd/service/FengTiVerifyService.java b/src/main/java/com/ljsd/service/FengTiVerifyService.java new file mode 100644 index 0000000..a37b8bd --- /dev/null +++ b/src/main/java/com/ljsd/service/FengTiVerifyService.java @@ -0,0 +1,114 @@ +package com.ljsd.service; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.ljsd.pojo.VerifyParams; +import com.ljsd.util.AppConstans; +import com.ljsd.util.HttpUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + +public class FengTiVerifyService extends AbstractVerifyService { + private static final Logger LOGGER = LoggerFactory.getLogger(FengTiVerifyService.class); + public static int isTestLan=0; + + public FengTiVerifyService(String sign) { + super(sign); + } + + @Override + public boolean verify(HttpServletResponse response, HttpServletRequest request, String admin, String platform, String pid, String openId, String token){ + try { + //如果是自己人不需要验证了 + if(AppConstans.appsecret.equals(admin)) { + return true; + } + if (isTestLan == 1) { //test + boolean result = loginVerfifyByTestLan(openId, token); + if (!result) { + response.sendError(400, "verify fail"); + LOGGER.error("test verify fail"); + return false; + } + return true; + } + + if (!"1".equals(platform) ) {//正式 切不是pc + String sub_channel = request.getParameter("sub_channel"); + boolean result = false; + if (sub_channel != null && !sub_channel.equals("")) { + if (sub_channel.equals("1000")) { + //测试服构建参数 + VerifyParams params = new VerifyParams(); + VerifyParams testParam = getTestParam(params,request, openId, token); + result = verifyTest(testParam); + }else { + //正式服appId + VerifyParams params = new VerifyParams(); + VerifyParams formatParam = getFormatParam(params,request, openId, token); + result = verifyFormat(formatParam); + } + } + if (!result) { + response.sendError(400, "verify fail"); + LOGGER.error("verify fail"); + return false; + } + } + + }catch (Exception e){ + e.printStackTrace(); + } + return true; + } + + @Override + public boolean verifyTest(VerifyParams params) { + return doVerify(params); + } + + @Override + public boolean verifyFormat(VerifyParams params) { + return doVerify(params); + } + + @Override + boolean doVerify(VerifyParams params) { + String url = "http://47.95.231.223/webapi/checkUserInfo"; + LOGGER.info("疯体登录验证-->{}",params.getOpenId()); + Map parms = new HashMap<>(); + parms.put("token",params.getToken()); + parms.put("uid",params.getOpenId()); + boolean result = false; + try { + String r = HttpUtils.doPost(url, parms); + LOGGER.info("疯体登录结果:{}",r); + JSONObject jsonObject = JSON.parseObject(r); + result = jsonObject.getBoolean("status"); + }catch (IOException e){ + LOGGER.info("疯体登录验证失败,{}",e.getMessage()); + return false; + } + return result; + } + + @Override + protected VerifyParams getTestParam(VerifyParams params, HttpServletRequest request, String openId, String token) { + params.setToken(token); + params.setOpenId(openId); + return params; + } + + @Override + protected VerifyParams getFormatParam(VerifyParams params, HttpServletRequest request, String openId, String token) { + params.setToken(token); + params.setOpenId(openId); + return params; + } +}