sczx_group/sczx_user
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

小程序注册接口修改

Browse Source
This commit is contained in:
zhangli
2025-07-27 14:33:41 +08:00
parent 912da1f9c9
commit 69f0629745
2 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/sczx/user/dto/WxMiniProgramRegRequest.java
View File

@ -16,9 +16,9 @@ public class WxMiniProgramRegRequest {
@ApiModelProperty(value = "微信手机号加密数据iv") @ApiModelProperty(value = "微信手机号加密数据iv")
String phoneIv; String phoneIv;
@ApiModelProperty(value = "微信用户加密数据") // @ApiModelProperty(value = "微信用户加密数据")
String userEncryptedData; // String userEncryptedData;
//
@ApiModelProperty(value = "微信用户加密数据iv") // @ApiModelProperty(value = "微信用户加密数据iv")
String userIv; // String userIv;
} }

22
src/main/java/com/sczx/user/service/impl/UserServiceImpl.java
View File

@ -12,7 +12,6 @@ import com.sczx.user.po.BaseUserPO;
import com.sczx.user.repository.BaseUserRepo; import com.sczx.user.repository.BaseUserRepo;
import com.sczx.user.service.IUserService; import com.sczx.user.service.IUserService;
import com.sczx.user.thirdpart.dto.WechatDecryptedPhoneInfo; import com.sczx.user.thirdpart.dto.WechatDecryptedPhoneInfo;
import com.sczx.user.thirdpart.dto.WechatDecryptedUserInfo;
import com.sczx.user.thirdpart.dto.WechatMiniProgramResponse; import com.sczx.user.thirdpart.dto.WechatMiniProgramResponse;
import com.sczx.user.thirdpart.integ.WeichatInteg; import com.sczx.user.thirdpart.integ.WeichatInteg;
import com.sczx.user.util.JwtUtil; import com.sczx.user.util.JwtUtil;
@ -25,7 +24,6 @@ import org.springframework.stereotype.Service;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.Optional;
/** /**
* @Author: 张黎 * @Author: 张黎
@ -89,12 +87,12 @@ public class UserServiceImpl implements IUserService {
phoneInfo = weichatInteg.decryptPhoneNumber(sessionKey, wxMiniProgramRegRequest.getPhoneEncryptedData(), wxMiniProgramRegRequest.getPhoneIv()); phoneInfo = weichatInteg.decryptPhoneNumber(sessionKey, wxMiniProgramRegRequest.getPhoneEncryptedData(), wxMiniProgramRegRequest.getPhoneIv());
} }
// 3. 解密用户基本信息（昵称、头像等） // // 3. 解密用户基本信息（昵称、头像等）
WechatDecryptedUserInfo userInfo = null; // WechatDecryptedUserInfo userInfo = null;
if (StringUtils.isNotBlank(wxMiniProgramRegRequest.getUserEncryptedData()) && StringUtils.isNotBlank(wxMiniProgramRegRequest.getUserIv()) // if (StringUtils.isNotBlank(wxMiniProgramRegRequest.getUserEncryptedData()) && StringUtils.isNotBlank(wxMiniProgramRegRequest.getUserIv())
&& StringUtils.isNotBlank(sessionKey)) { // && StringUtils.isNotBlank(sessionKey)) {
userInfo = weichatInteg.decryptUserInfo(sessionKey, wxMiniProgramRegRequest.getUserEncryptedData(), wxMiniProgramRegRequest.getUserIv()); // userInfo = weichatInteg.decryptUserInfo(sessionKey, wxMiniProgramRegRequest.getUserEncryptedData(), wxMiniProgramRegRequest.getUserIv());
} // }
LambdaQueryWrapper<BaseUserPO> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<BaseUserPO> queryWrapper = new LambdaQueryWrapper<>();
@ -106,14 +104,14 @@ public class UserServiceImpl implements IUserService {
newUserPO.setUserName(phoneInfo.getPurePhoneNumber()); newUserPO.setUserName(phoneInfo.getPurePhoneNumber());
newUserPO.setPhoneNumber(phoneInfo.getPurePhoneNumber()); newUserPO.setPhoneNumber(phoneInfo.getPurePhoneNumber());
newUserPO.setPassword(MD5Utils.md5Hex("88888888", "UTF-8")); newUserPO.setPassword(MD5Utils.md5Hex("88888888", "UTF-8"));
newUserPO.setNickName(Optional.ofNullable(userInfo).map(WechatDecryptedUserInfo::getNickName).orElse(null)); newUserPO.setNickName(phoneInfo.getPurePhoneNumber());
newUserPO.setAvatarUrl(Optional.ofNullable(userInfo).map(WechatDecryptedUserInfo::getAvatarUrl).orElse(null)); // newUserPO.setAvatarUrl(Optional.ofNullable(userInfo).map(WechatDecryptedUserInfo::getAvatarUrl).orElse(null));
newUserPO.setRoleId(1); newUserPO.setRoleId(1);
}else { }else {
newUserPO.setId(baseUserPO.getId()); newUserPO.setId(baseUserPO.getId());
newUserPO.setWechatOpenid(openid); newUserPO.setWechatOpenid(openid);
newUserPO.setNickName(Optional.ofNullable(userInfo).map(WechatDecryptedUserInfo::getNickName).orElse(null)); newUserPO.setNickName(phoneInfo.getPurePhoneNumber());
newUserPO.setAvatarUrl(Optional.ofNullable(userInfo).map(WechatDecryptedUserInfo::getAvatarUrl).orElse(null)); // newUserPO.setAvatarUrl(Optional.ofNullable(userInfo).map(WechatDecryptedUserInfo::getAvatarUrl).orElse(null));
} }
baseUserRepo.saveOrUpdate(newUserPO); baseUserRepo.saveOrUpdate(newUserPO);