From 7d15eee93fc5d29e0f165763c0244078b4c15a46 Mon Sep 17 00:00:00 2001 From: duhui Date: Wed, 28 Dec 2022 14:25:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=82=A0=E8=B0=B7=E6=B8=A0=E9=81=93=E5=B0=8F?= =?UTF-8?q?=E4=B8=83=E4=B8=93=E6=9C=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/controller/GetUserController.java | 1 + .../ljsd/service/AbstractVerifyService.java | 3 +-- .../com/ljsd/service/YouGuVerifyService.java | 24 +++++++++++-------- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/ljsd/controller/GetUserController.java b/src/main/java/com/ljsd/controller/GetUserController.java index 32d94d7..ee0212b 100644 --- a/src/main/java/com/ljsd/controller/GetUserController.java +++ b/src/main/java/com/ljsd/controller/GetUserController.java @@ -39,6 +39,7 @@ public class GetUserController extends HttpServlet { serviceMap.put("QUICK2", new QuickVerifyService2("QUICK2")); serviceMap.put("QUICK3", new QuickVerifyService3("QUICK3")); serviceMap.put("YOUGU", new YouGuVerifyService("YG")); + serviceMap.put("YGXQ", new YouGuVerifyService("YGXQ")); serviceMap.put("DUOYOU", new DuoYouVerifyService("DUOYOU")); serviceMap.put("AIWAN", new AiWanVerifyService("AIWAN")); serviceMap.put("HF", new HFVerifyService("HF")); diff --git a/src/main/java/com/ljsd/service/AbstractVerifyService.java b/src/main/java/com/ljsd/service/AbstractVerifyService.java index 334b5bb..82af7a4 100644 --- a/src/main/java/com/ljsd/service/AbstractVerifyService.java +++ b/src/main/java/com/ljsd/service/AbstractVerifyService.java @@ -28,8 +28,7 @@ public abstract class AbstractVerifyService implements VerifyService { public static String caohua_app_id; public static String caohua_secret_key; - - private String sign; + public String sign; public AbstractVerifyService(String sign) { this.sign = sign; diff --git a/src/main/java/com/ljsd/service/YouGuVerifyService.java b/src/main/java/com/ljsd/service/YouGuVerifyService.java index c77f806..fcd5554 100644 --- a/src/main/java/com/ljsd/service/YouGuVerifyService.java +++ b/src/main/java/com/ljsd/service/YouGuVerifyService.java @@ -36,7 +36,10 @@ public class YouGuVerifyService extends AbstractVerifyService { LOGGER.error("test verify fail"); return false; } - } else if (!"3".equals(platform) ) {//正式 切不是pc + return true; + } + + if (!"3".equals(platform) ) {//正式 切不是pc String sub_channel = request.getParameter("sub_channel"); boolean result = false; if (sub_channel != null && !sub_channel.equals("")) { @@ -45,10 +48,7 @@ public class YouGuVerifyService extends AbstractVerifyService { VerifyParams params = new VerifyParams(); VerifyParams testParam = getTestParam(params,request, openId, token); result = verifyTest(testParam); - } else if(sub_channel.equals("20201222")){ - //商务服 - //result = loginVerfifyShangwu("MHT", openId, token, MHTSDKConstans.rhappIdshangwu); - } else { + }else { //正式服appId VerifyParams params = new VerifyParams(); VerifyParams formatParam = getFormatParam(params,request, openId, token); @@ -80,8 +80,14 @@ public class YouGuVerifyService extends AbstractVerifyService { @Override boolean doVerify(VerifyParams params) { - LOGGER.info("YouGuVerifyService登录验证-->{}",params.getOpenId()); String url = "http://smi.648sy.com/tcx/auth"; + String log = "youguVerifyService"; + + if (sign.equals("YGXQ")){ + url = "http://smi.648sy.com/tcxxqzf/auth"; + log = "youguXQVerifyService"; + } + LOGGER.info("{}登录验证-->{}",log,params.getOpenId()); Map parms = new HashMap<>(); parms.put("token",params.getToken()); parms.put("uid",params.getOpenId()); @@ -90,12 +96,12 @@ public class YouGuVerifyService extends AbstractVerifyService { String r = HttpUtils.doPost(url, parms); JSONObject jsonObject = JSON.parseObject(r); int errno = jsonObject.getIntValue("errno"); - LOGGER.info("YouGuVerifyService请求结果:{}",r); + LOGGER.info("{}请求结果:{}",log,r); if(errno == 0){ result = true; } }catch (IOException e){ - LOGGER.info("YouGuVerifyService验证失败,IOException"); + LOGGER.info("{}验证失败,{}",log,e.getMessage()); return false; } return result; @@ -103,7 +109,6 @@ public class YouGuVerifyService extends AbstractVerifyService { @Override protected VerifyParams getTestParam(VerifyParams params, HttpServletRequest request, String openId, String token) { - params.setChannel("YouGu"); params.setToken(token); params.setOpenId(openId); return params; @@ -111,7 +116,6 @@ public class YouGuVerifyService extends AbstractVerifyService { @Override protected VerifyParams getFormatParam(VerifyParams params, HttpServletRequest request, String openId, String token) { - params.setChannel("YouGu"); params.setToken(token); params.setOpenId(openId); return params;