+log;

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/AdamThirdPartParam.java

@@ -3,10 +3,8 @@ package com.liquidnet.service.adam.dto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.springframework.validation.annotation.Validated;
 
-import javax.validation.Valid;
-import javax.validation.constraints.Pattern;
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 
@@ -15,6 +13,7 @@ import java.io.Serializable;
 public class AdamThirdPartParam implements Serializable {
     private static final long serialVersionUID = 675588088506034208L;
     @ApiModelProperty(position = 11, required = true, value = "第三方OPENID[64]")
+    @NotBlank
     private String openId;
     @ApiModelProperty(position = 12, required = true, value = "昵称[64]", example = "Swagger")
 //    @Size(min = 2, max = 64)

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

@@ -17,6 +17,7 @@ import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
 import com.liquidnet.service.adam.service.*;
 import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.base.UserPathDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -170,6 +171,7 @@ public class AdamLoginController {
         loginInfoVo.setUserInfo(userInfoVo);
         loginInfoVo.setToken(this.ssoProcess(userInfoVo));
         loginInfoVo.getUserInfo().setMobile(SensitizeUtil.custom(userInfoVo.getMobile(), 3, 4));
+        log.info(UserPathDto.setData(toRegister ? "注册":"登录", ServletUtils.getRequest().getParameterMap(), loginInfoVo));
         return ResponseDto.success(loginInfoVo);
     }
 
@@ -207,19 +209,16 @@ public class AdamLoginController {
         loginInfoVo.setUserInfo(userInfoVo);
         loginInfoVo.setToken(this.ssoProcess(userInfoVo));
         loginInfoVo.getUserInfo().setMobile(SensitizeUtil.custom(userInfoVo.getMobile(), 3, 4));
+        log.info(UserPathDto.setData(toRegister ? "注册":"登录", ServletUtils.getRequest().getParameterMap(), loginInfoVo));
         return ResponseDto.success(loginInfoVo);
     }
 
     @ApiOperationSupport(order = 5)
     @ApiOperation(value = "第三方账号登录")
     @PostMapping(value = {"login/tpa"})
-    public ResponseDto<AdamLoginInfoVo> loginByTpa(@RequestBody @Valid AdamThirdPartParam parameter) {
+    public ResponseDto<AdamLoginInfoVo> loginByTpa(@Valid @RequestBody AdamThirdPartParam parameter) {
         log.debug("login by tpa:{}", JsonUtils.toJson(parameter));
-
-        if (StringUtils.isBlank(parameter.getOpenId())) {
-            return ResponseDto.failure(ErrorMapping.get("10009"));
-        }
-
+        boolean toRegister = false;
         AdamLoginInfoVo loginInfoVo = AdamLoginInfoVo.getNew();
         if (StringUtils.isEmpty(parameter.getMobile())) {
             String uid = adamRdmService.getUidByPlatformOpenId(parameter.getPlatform(), parameter.getOpenId());
@@ -238,12 +237,14 @@ public class AdamLoginController {
             if (null == registerUserInfo) {
                 return ResponseDto.failure(ErrorMapping.get("10000"));
             }
+            toRegister = true;
             loginInfoVo.setUserInfo(registerUserInfo);
             loginInfoVo.setThirdPartInfo(adamRdmService.getThirdPartVoListByUid(registerUserInfo.getUid()));
 //            loginInfoVo.setMemberVo(adamRdmService.getMemberSimpleVo());
         }
         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);
     }
 

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/resources/errors.properties

@@ -12,7 +12,7 @@
 10006=第三方账号未注册
 10007=该第三方账号已经被其他用户绑定
 10008=已经绑定过该类型的第三方账号
-10009=OPENID不能为空
+10009=
 10010=
 10011=性别标签无效
 10012=音乐风格标签无效