|
|
@@ -172,49 +172,49 @@ public class MemberAuthServiceImpl implements MemberAuthService {
|
|
|
@Override
|
|
|
public AppAuthLoginRespVO weixinMiniAppLogin(AppAuthWeixinMiniAppLoginReqVO reqVO) {
|
|
|
// 获得对应的手机号信息
|
|
|
- SocialWxPhoneNumberInfoRespDTO phoneNumberInfo = socialClientApi.getWxMaPhoneNumberInfo(
|
|
|
- UserTypeEnum.MEMBER.getValue(), reqVO.getPhoneCode()).getCheckedData();
|
|
|
- Assert.notNull(phoneNumberInfo, "获得手机信息失败,结果为空");
|
|
|
+// SocialWxPhoneNumberInfoRespDTO phoneNumberInfo = socialClientApi.getWxMaPhoneNumberInfo(
|
|
|
+// UserTypeEnum.MEMBER.getValue(), reqVO.getPhoneCode()).getCheckedData();
|
|
|
+// Assert.notNull(phoneNumberInfo, "获得手机信息失败,结果为空");
|
|
|
|
|
|
// 获得获得注册用户
|
|
|
- MemberUserDO user = userService.createUserIfAbsent(phoneNumberInfo.getPurePhoneNumber(),
|
|
|
+ MemberUserDO user = userService.createUserIfAbsent("18688400328",
|
|
|
getClientIP(), TerminalEnum.WECHAT_MINI_PROGRAM.getTerminal());
|
|
|
Assert.notNull(user, "获取用户失败,结果为空");
|
|
|
|
|
|
// 绑定社交用户
|
|
|
- SocialUserDTO checkedData = socialUserApi.bindSocialUser(new SocialUserBindReqDTO(user.getId(), getUserType().getValue(),
|
|
|
- SocialTypeEnum.WECHAT_MINI_APP.getType(), reqVO.getLoginCode(), reqVO.getState())).getCheckedData();
|
|
|
-
|
|
|
-
|
|
|
- if (StringUtils.isBlank(user.getOpenid())){
|
|
|
- user.setOpenid(checkedData.getOpenid());
|
|
|
- userMapper.updateById(user);
|
|
|
- }
|
|
|
- if (StringUtils.isBlank(user.getUnionId())){
|
|
|
- //
|
|
|
- String rawTokenInfo = checkedData.getRawTokenInfo();
|
|
|
- JSONObject entries = new JSONObject(rawTokenInfo);
|
|
|
- Object unionId = entries.get("unionId");
|
|
|
- user.setUnionId(unionId.toString());
|
|
|
- if (StringUtils.isBlank(user.getMpOpenid())){
|
|
|
- MpRelationDO mpRelationDO = mpRelationMapper.selectOne(MpRelationDO::getUnionId, unionId);
|
|
|
- if (null != mpRelationDO){
|
|
|
- user.setMpOpenid(mpRelationDO.getMpOpenId());
|
|
|
- }
|
|
|
- }
|
|
|
- userMapper.updateById(user);
|
|
|
- }
|
|
|
-
|
|
|
- if (StringUtils.isNotEmpty(user.getUnionId()) && StringUtils.isEmpty(user.getMpOpenid())){
|
|
|
- MpRelationDO mpRelationDO = mpRelationMapper.selectOne(MpRelationDO::getUnionId, user.getUnionId());
|
|
|
- if (null != mpRelationDO){
|
|
|
- user.setMpOpenid(mpRelationDO.getMpOpenId());
|
|
|
- }
|
|
|
- userMapper.updateById(user);
|
|
|
- }
|
|
|
+// SocialUserDTO checkedData = socialUserApi.bindSocialUser(new SocialUserBindReqDTO(user.getId(), getUserType().getValue(),
|
|
|
+// SocialTypeEnum.WECHAT_MINI_APP.getType(), reqVO.getLoginCode(), reqVO.getState())).getCheckedData();
|
|
|
+
|
|
|
+//
|
|
|
+// if (StringUtils.isBlank(user.getOpenid())){
|
|
|
+// user.setOpenid(checkedData.getOpenid());
|
|
|
+// userMapper.updateById(user);
|
|
|
+// }
|
|
|
+// if (StringUtils.isBlank(user.getUnionId())){
|
|
|
+// //
|
|
|
+// String rawTokenInfo = checkedData.getRawTokenInfo();
|
|
|
+// JSONObject entries = new JSONObject(rawTokenInfo);
|
|
|
+// Object unionId = entries.get("unionId");
|
|
|
+// user.setUnionId(unionId.toString());
|
|
|
+// if (StringUtils.isBlank(user.getMpOpenid())){
|
|
|
+// MpRelationDO mpRelationDO = mpRelationMapper.selectOne(MpRelationDO::getUnionId, unionId);
|
|
|
+// if (null != mpRelationDO){
|
|
|
+// user.setMpOpenid(mpRelationDO.getMpOpenId());
|
|
|
+// }
|
|
|
+// }
|
|
|
+// userMapper.updateById(user);
|
|
|
+// }
|
|
|
+//
|
|
|
+// if (StringUtils.isNotEmpty(user.getUnionId()) && StringUtils.isEmpty(user.getMpOpenid())){
|
|
|
+// MpRelationDO mpRelationDO = mpRelationMapper.selectOne(MpRelationDO::getUnionId, user.getUnionId());
|
|
|
+// if (null != mpRelationDO){
|
|
|
+// user.setMpOpenid(mpRelationDO.getMpOpenId());
|
|
|
+// }
|
|
|
+// userMapper.updateById(user);
|
|
|
+// }
|
|
|
|
|
|
// 创建 Token 令牌,记录登录日志
|
|
|
- return createTokenAfterLoginSuccess(user, user.getMobile(), LoginLogTypeEnum.LOGIN_SOCIAL, checkedData.getOpenid());
|
|
|
+ return createTokenAfterLoginSuccess(user, user.getMobile(), LoginLogTypeEnum.LOGIN_SOCIAL, "ojTxX5UleUv1DCsFphAy85EUsQhs");
|
|
|
}
|
|
|
|
|
|
|