bihuisong 5 mesiacov pred
rodič
commit
cd2562d62d

+ 0 - 2
qmjszx-business/src/main/java/beilv/applogin/domain/vo/AppAuthWeixinMiniAppLoginReqVO.java

@@ -20,6 +20,4 @@ public class AppAuthWeixinMiniAppLoginReqVO {
 
     private String iv;
 
-    private String telephoneCode;
-
 }

+ 7 - 8
qmjszx-business/src/main/java/beilv/applogin/service/impl/AppAuthServiceImpl.java

@@ -49,16 +49,18 @@ public class AppAuthServiceImpl implements IAppAuthService {
 
     @Override
     public AppAuthLoginRespVO weixinMiniAppLogin(AppAuthWeixinMiniAppLoginReqVO reqVO) throws Exception {
+        SysMember memberUserDO;
         JSONObject responseMap = getSessionKeyOropenid(reqVO.getLoginCode());
         String openId = (String) responseMap.get("openid");
         String sessionKey = (String) responseMap.get("session_key");
         //获取用户信息
-        SysMember sysMember = getUserInfo(sessionKey, reqVO.getEncryptedData(), reqVO.getIv(), reqVO.getTelephoneCode());
+        SysMember sysMember = getUserInfo(sessionKey, reqVO.getEncryptedData(), reqVO.getIv());
         // 用户已经存在
-        SysMember memberUserDO = sysMemberMapper.selectByMobile(sysMember.getMobile());
+        memberUserDO = sysMemberMapper.selectByMobile(sysMember.getOpenId());
         if (memberUserDO == null) {
             // 获得获得注册用户
-            SysMember userIfAbsent = sysMemberMapper.createUserIfAbsent(sysMember);
+            sysMemberMapper.createUserIfAbsent(sysMember);
+            memberUserDO = sysMemberMapper.selectSysMemberById(sysMember.getId());
         }
         //加密
         String accessToken = RsaUtil.encrypt(memberUserDO.getId().toString(), publicKey);
@@ -75,10 +77,9 @@ public class AppAuthServiceImpl implements IAppAuthService {
      * @param sessionKey    sessionKey
      * @param encryptedData encryptedData
      * @param iv            iv
-     * @param telephoneCode telephoneCode
      * @return 手机号
      */
-    public SysMember getUserInfo(String sessionKey, String encryptedData, String iv, String telephoneCode) {
+    public SysMember getUserInfo(String sessionKey, String encryptedData, String iv) {
         SysMember sysMember = new SysMember();
         Date date = new Date();
         try {
@@ -86,10 +87,8 @@ public class AppAuthServiceImpl implements IAppAuthService {
             byte[] result = decrypt(encryptedData, sessionKey, iv);
             JSONObject json = JSONObject.parseObject(new String(result));
             // 2. 处理解密后的手机号信息
-            String userPhone = getUserPhone(telephoneCode);
-            sysMember.setMobile(userPhone);
             sysMember.setOpenId(json.get("openId").toString());
-            sysMember.setUsername(json.get("nickName").toString() + "_" + userPhone);
+            sysMember.setUsername(json.get("nickName").toString() + "_" + json.get("openId").toString());
             sysMember.setIntegral(BigDecimal.ZERO);
             sysMember.setCreateTime(date);
             return sysMember;

+ 2 - 2
qmjszx-system/src/main/java/beilv/system/mapper/SysMemberMapper.java

@@ -61,7 +61,7 @@ public interface SysMemberMapper {
      */
     public int deleteSysMemberByIds(String[] ids);
 
-    SysMember selectByMobile(String phoneNumber);
+    SysMember selectByMobile(String openId);
 
-    public SysMember createUserIfAbsent(SysMember memberUserDO);
+    public int createUserIfAbsent(SysMember memberUserDO);
 }

+ 1 - 1
qmjszx-system/src/main/resources/mapper/system/SysMemberMapper.xml

@@ -88,7 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
     <select id="selectByMobile" parameterType="SysMember" resultMap="SysMemberResult">
         <include refid="selectSysMemberVo"/>
-        where mobile = #{mobile} and del_flag = 0
+        where open_id = #{openId} and del_flag = 0
     </select>
 
     <insert id="createUserIfAbsent" parameterType="SysMember" useGeneratedKeys="true" keyProperty="id">