test adam登陆接口

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetWechatLoginController.java

 package com.liquidnet.service.sweet.controller;
 
-import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
+import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.sweet.dto.vo.WechatTokenInfoVo;
 import com.liquidnet.service.sweet.dto.vo.WechatUserInfoVo;
 import com.liquidnet.service.sweet.service.impl.SweetWechatLoginServiceImpl;
-import com.liquidnet.service.sweet.vo.SweetAppletUsersVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -50,14 +49,14 @@ public class SweetWechatLoginController {
         return sweetLoginService.wxaCode2Session(jsCode, type);
     }
 
-    @ApiOperation(value = "小程序获取openId、unionId", notes = "这里仅用于获取openId、unionId使用")
-    @GetMapping(value = {"maJscodeResult"})
+    @ApiOperation(value = "小程序静默登陆")
+    @GetMapping(value = {"userInfoMa"})
     @ApiImplicitParams({
             @ApiImplicitParam(type = "query", dataType = "String", name = "jsCode", value = "微信jsCode", required = true),
             @ApiImplicitParam(type = "query", dataType = "Integer", name = "type", value = "1草莓 2五百里 3mdsk 4正在", required = true)
     })
-    public ResponseDto<WxMaJscode2SessionResult> maJscodeResult(@RequestParam String jsCode, @RequestParam Integer type) {
-        return sweetLoginService.wxaCode2SessionAll(jsCode, type);
+    public ResponseDto<AdamUserInfoVo> userInfoMa(@RequestParam String jsCode, @RequestParam Integer type) {
+        return sweetLoginService.userInfoMa(jsCode, type);
     }
 
     @ApiOperation(value = "服务号获取openid", notes = "这里仅用于获取OPENID使用")
@@ -90,14 +89,4 @@ public class SweetWechatLoginController {
         return sweetLoginService.mpUserInfo(code, type);
     }
 
-    @PostMapping("applyUser")
-    @ApiOperation("用unionId或者手机号等相关信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(type = "form", dataType = "String", name = "unionId", value = "微信unionId", required = true)
-    })
-    public ResponseDto<SweetAppletUsersVo> getApplyUser(@RequestParam() String unionId) {
-        SweetAppletUsersVo sweetAppletUsers = sweetLoginService.getApplyUser(unionId);
-        return ResponseDto.success(sweetAppletUsers);
-    }
-
 }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetWechatLoginServiceImpl.java

@@ -3,6 +3,7 @@ package com.liquidnet.service.sweet.service.impl;
 import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
 import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
 import com.liquidnet.commons.lang.util.CollectionUtil;
+import com.liquidnet.commons.lang.util.DESUtils;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
 import com.liquidnet.service.base.ResponseDto;
@@ -23,6 +24,8 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.Objects;
@@ -130,16 +133,6 @@ public class SweetWechatLoginServiceImpl {
         }
     }
 
-    public ResponseDto<WxMaJscode2SessionResult> wxaCode2SessionAll(String jsCode, Integer type) {
-        try {
-            WxMaJscode2SessionResult wxMaJscode2SessionResult = sweetWechatService.sessionInfo(jsCode, type);
-            return ResponseDto.success(wxMaJscode2SessionResult);
-        } catch (Exception e) {
-            log.error("wxaCode2SessionAllError Exception:{}", e);
-            return ResponseDto.failure();
-        }
-    }
-
     public ResponseDto<String> wxOauth2AccessToken(String code, Integer type) {
         try {
             WxOAuth2AccessToken wxOAuth2AccessToken = sweetWechatService.wxOauth2AccessToken(code, type);
@@ -172,7 +165,18 @@ public class SweetWechatLoginServiceImpl {
         }
     }
 
-    public SweetAppletUsersVo getApplyUser(String unionId) {
-        return redisUtils.getSweetAppletUsersOfUnionId(unionId);
+    public ResponseDto<AdamUserInfoVo> userInfoMa(String jsCode, Integer type) {
+        try {
+//            WxMaJscode2SessionResult sessionResult = sweetWechatService.sessionInfo(jsCode, type);
+//            SweetAppletUsersVo sweetAppletUsersVo = redisUtils.getSweetAppletUsersOfUnionId(sessionResult.getUnionid());
+//            String purePhone = sweetAppletUsersVo.getPurePhoneNumber();
+            String purePhone = "15811009011";
+            String otp = DESUtils.DES().encrypt(purePhone + LocalDateTime.now().toEpochSecond(ZoneOffset.UTC));
+            ResponseDto<AdamUserInfoVo> adamUserInfoVoResponseDto = feignAdamBaseClient.loginBySilentMobile(purePhone, otp);
+            return adamUserInfoVoResponseDto;
+        } catch (Exception e) {
+            log.error("userInfoMaError Exception:{}", e);
+        }
+        return null;
     }
 }