+API:第三方账号登录v1;

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamLoginController.java

@@ -299,6 +299,44 @@ public class AdamLoginController {
     }
 
     @ApiOperationSupport(order = 6)
+    @ApiOperation(value = "第三方账号登录v1")
+    @PostMapping(value = {"login/tpa_v1"})
+    public ResponseDto<AdamLoginInfoVo> loginByTpaV1(@Valid @RequestBody AdamThirdPartParam parameter) {
+        log.debug("login by tpa:{}", JsonUtils.toJson(parameter));
+        boolean toRegister = false;
+        AdamLoginInfoVo loginInfoVo = AdamLoginInfoVo.getNew();
+        if (StringUtils.isEmpty(parameter.getMobile())) {
+            String uid = adamRdmService.getUidByPlatformOpenId(parameter.getPlatform(), parameter.getOpenId());
+            if (StringUtils.isEmpty(uid)) return ResponseDto.failure(ErrorMapping.get("10006"));
+
+            loginInfoVo.setUserInfo(adamRdmService.getUserInfoVoByUid(uid));
+//            loginInfoVo.setRealNameInfo(adamRdmService.getRealInfoVoByUid(uid));
+//            loginInfoVo.setThirdPartInfo(adamRdmService.getThirdPartVoListByUid(uid));
+            loginInfoVo.setUserMemberVo(adamRdmService.getUserMemberVoByUid(uid));
+//            loginInfoVo.setMemberVo(adamRdmService.getMemberSimpleVo());
+        } else {// 新账号注册
+            ResponseDto<AdamLoginInfoVo> checkSmsCodeDto = this.checkSmsCode(parameter.getMobile(), parameter.getCode());
+            if (!checkSmsCodeDto.isSuccess()) {
+                return checkSmsCodeDto;
+            }
+            ResponseDto<AdamUserInfoVo> registerRespDto = adamUserService.register(parameter);
+            if (!registerRespDto.isSuccess()) {
+                return ResponseDto.failure(registerRespDto.getCode(), registerRespDto.getMessage());
+            } else {
+                AdamUserInfoVo registerUserInfo = registerRespDto.getData();
+                loginInfoVo.setUserInfo(registerUserInfo);
+                loginInfoVo.setThirdPartInfo(adamRdmService.getThirdPartVoListByUid(registerUserInfo.getUid()));
+//                loginInfoVo.setMemberVo(adamRdmService.getMemberSimpleVo());
+            }
+            toRegister = true;
+        }
+        loginInfoVo.setToken(this.ssoProcess(loginInfoVo.getUserInfo()));
+        loginInfoVo.getUserInfo().setMobile(SensitizeUtil.custom(loginInfoVo.getUserInfo().getMobile(), 3, 4));
+        log.info(UserPathDto.setData(toRegister ? "注册" : "登录", ServletUtils.getRequest().getParameterMap(), loginInfoVo));
+        return ResponseDto.success(loginInfoVo);
+    }
+
+    @ApiOperationSupport(order = 7)
     @ApiOperation(value = "登出")
     @PostMapping(value = {"out"})
     public void logout() {
@@ -307,7 +345,7 @@ public class AdamLoginController {
         redisUtil.del(jwtValidator.getSsoRedisKey().concat(CurrentUtil.getCurrentUid()));
     }
 
-    @ApiOperationSupport(order = 7)
+    @ApiOperationSupport(order = 8)
     @ApiOperation(value = "注销")
     @PostMapping(value = {"close"})
     public ResponseDto<Object> close() {
@@ -320,14 +358,14 @@ public class AdamLoginController {
         return ResponseDto.success();
     }
 
-    @ApiOperationSupport(order = 8)
+    @ApiOperationSupport(order = 9)
     @ApiOperation(value = "时间戳")
     @GetMapping(value = {"ts"})
     public ResponseDto<Long> timestamp() {
         return ResponseDto.success(LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli());
     }
 
-    @ApiOperationSupport(order = 9)
+    @ApiOperationSupport(order = 10)
     @ApiOperation(value = "微信小程序登录凭证校验", notes = "这里仅用于获取OPENID使用。登录凭证校验。通过 wx.login 接口获得临时登录凭证 code 后传到开发者服务器调用此接口完成登录流程。更多使用方法详见 https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/login/auth.code2Session.html")
     @GetMapping(value = {"wxa/code2session"})
     public ResponseDto<String> wxaCode2Session(@RequestParam String jsCode) {
@@ -350,7 +388,7 @@ public class AdamLoginController {
         return ResponseDto.success(openId);
     }
 
-    @ApiOperationSupport(order = 10)
+    @ApiOperationSupport(order = 11)
     @ApiOperation(value = "微信网站应用登录", notes = "这里仅用于获取OPENID使用。方法详见 https://developers.weixin.qq.com/doc/oplatform/Website_App/WeChat_Login/Wechat_Login.html")
     @GetMapping(value = {"wx/oauth2/access_token"})
     public ResponseDto<String> wxOauth2AccessToken(@RequestParam String code) {