From 69f0629745fc62171a82eba573a3a78b29dde2e3 Mon Sep 17 00:00:00 2001
From: zhangli <123879394@qq.com>
Date: Sun, 27 Jul 2025 14:33:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=B3=A8=E5=86=8C?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user/dto/WxMiniProgramRegRequest.java     | 10 ++++-----
 .../user/service/impl/UserServiceImpl.java    | 22 +++++++++----------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/sczx/user/dto/WxMiniProgramRegRequest.java b/src/main/java/com/sczx/user/dto/WxMiniProgramRegRequest.java
index c922e41..d9f2622 100644
--- a/src/main/java/com/sczx/user/dto/WxMiniProgramRegRequest.java
+++ b/src/main/java/com/sczx/user/dto/WxMiniProgramRegRequest.java
@@ -16,9 +16,9 @@ public class WxMiniProgramRegRequest {
     @ApiModelProperty(value = "微信手机号加密数据iv")
     String phoneIv;
 
-    @ApiModelProperty(value = "微信用户加密数据")
-    String userEncryptedData;
-
-    @ApiModelProperty(value = "微信用户加密数据iv")
-    String userIv;
+//    @ApiModelProperty(value = "微信用户加密数据")
+//    String userEncryptedData;
+//
+//    @ApiModelProperty(value = "微信用户加密数据iv")
+//    String userIv;
 }
diff --git a/src/main/java/com/sczx/user/service/impl/UserServiceImpl.java b/src/main/java/com/sczx/user/service/impl/UserServiceImpl.java
index 950f3f8..80d47a6 100644
--- a/src/main/java/com/sczx/user/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/sczx/user/service/impl/UserServiceImpl.java
@@ -12,7 +12,6 @@ import com.sczx.user.po.BaseUserPO;
 import com.sczx.user.repository.BaseUserRepo;
 import com.sczx.user.service.IUserService;
 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.integ.WeichatInteg;
 import com.sczx.user.util.JwtUtil;
@@ -25,7 +24,6 @@ import org.springframework.stereotype.Service;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Optional;
 
 /**
  * @Author: 张黎
@@ -89,12 +87,12 @@ public class UserServiceImpl implements IUserService {
                 phoneInfo = weichatInteg.decryptPhoneNumber(sessionKey, wxMiniProgramRegRequest.getPhoneEncryptedData(), wxMiniProgramRegRequest.getPhoneIv());
             }
 
-            // 3. 解密用户基本信息（昵称、头像等）
-            WechatDecryptedUserInfo userInfo = null;
-            if (StringUtils.isNotBlank(wxMiniProgramRegRequest.getUserEncryptedData()) && StringUtils.isNotBlank(wxMiniProgramRegRequest.getUserIv())
-                    && StringUtils.isNotBlank(sessionKey)) {
-                userInfo = weichatInteg.decryptUserInfo(sessionKey, wxMiniProgramRegRequest.getUserEncryptedData(), wxMiniProgramRegRequest.getUserIv());
-            }
+//            // 3. 解密用户基本信息（昵称、头像等）
+//            WechatDecryptedUserInfo userInfo = null;
+//            if (StringUtils.isNotBlank(wxMiniProgramRegRequest.getUserEncryptedData()) && StringUtils.isNotBlank(wxMiniProgramRegRequest.getUserIv())
+//                    && StringUtils.isNotBlank(sessionKey)) {
+//                userInfo = weichatInteg.decryptUserInfo(sessionKey, wxMiniProgramRegRequest.getUserEncryptedData(), wxMiniProgramRegRequest.getUserIv());
+//            }
 
 
             LambdaQueryWrapper<BaseUserPO> queryWrapper = new LambdaQueryWrapper<>();
@@ -106,14 +104,14 @@ public class UserServiceImpl implements IUserService {
                 newUserPO.setUserName(phoneInfo.getPurePhoneNumber());
                 newUserPO.setPhoneNumber(phoneInfo.getPurePhoneNumber());
                 newUserPO.setPassword(MD5Utils.md5Hex("88888888", "UTF-8"));
-                newUserPO.setNickName(Optional.ofNullable(userInfo).map(WechatDecryptedUserInfo::getNickName).orElse(null));
-                newUserPO.setAvatarUrl(Optional.ofNullable(userInfo).map(WechatDecryptedUserInfo::getAvatarUrl).orElse(null));
+                newUserPO.setNickName(phoneInfo.getPurePhoneNumber());
+//                newUserPO.setAvatarUrl(Optional.ofNullable(userInfo).map(WechatDecryptedUserInfo::getAvatarUrl).orElse(null));
                 newUserPO.setRoleId(1);
             }else {
                 newUserPO.setId(baseUserPO.getId());
                 newUserPO.setWechatOpenid(openid);
-                newUserPO.setNickName(Optional.ofNullable(userInfo).map(WechatDecryptedUserInfo::getNickName).orElse(null));
-                newUserPO.setAvatarUrl(Optional.ofNullable(userInfo).map(WechatDecryptedUserInfo::getAvatarUrl).orElse(null));
+                newUserPO.setNickName(phoneInfo.getPurePhoneNumber());
+//                newUserPO.setAvatarUrl(Optional.ofNullable(userInfo).map(WechatDecryptedUserInfo::getAvatarUrl).orElse(null));
             }
             baseUserRepo.saveOrUpdate(newUserPO);