login-v1

src/main/java/com/zhentao/common/user/service/impl/GooseUserServiceImpl.java

@@ -57,7 +57,6 @@ public class GooseUserServiceImpl extends ServiceImpl<GooseUserMapper, GooseUser
             if(user==null){
                 GooseUser gooseUser1=new GooseUser();
                 gooseUser1.setPhone(loginDto.getPhone());
-
                 if(StringUtils.checkValNotNull(loginDto.getPassword())){
                     gooseUser1.setId(SnowflakeIdGenerator.getSnowId());
                     gooseUser1.setNickname("普通用户"+ UUID.randomUUID().toString().replace("-","").substring(0,8));
@@ -83,8 +82,24 @@ public class GooseUserServiceImpl extends ServiceImpl<GooseUserMapper, GooseUser
                 }
                 return ResultVo.ERROR();
             }
-            String token= TokenUtils.createJwtToken(user.getId().toString());
-            return ResultVo.OK(token);
+            if(StringUtils.checkValNotNull(loginDto.getPassword())){
+                String password = user.getPassword();
+                String salt= user.getSalt();
+                String pwd=DigestUtils.md5DigestAsHex((loginDto.getPassword()+salt).getBytes(StandardCharsets.UTF_8));
+                if(pwd.equals(password)){
+                    String token=TokenUtils.createJwtToken(user.getId().toString());
+                    return ResultVo.OK();
+                }
+                return ResultVo.ERROR();
+            }
+            if(StringUtils.checkValNotNull(loginDto.getCode())){
+                Jedis jedis=new Jedis("localhost");
+                String code = jedis.get("code");
+                if(loginDto.getCode().equals(code)){
+                    String token= TokenUtils.createJwtToken(user.getId().toString());
+                    return ResultVo.OK(token);
+                }
+            }
         }
         return ResultVo.ERROR();
     }
@@ -115,7 +130,6 @@ public class GooseUserServiceImpl extends ServiceImpl<GooseUserMapper, GooseUser
 
             // 手动解析 JSON
             Map<String, Object> result = objectMapper.readValue(responseBody, Map.class);
-            System.out.println(result);
             if (result.containsKey("errcode")) { // 微信错误响应
                 return new ResultVo(400,"微信接口返回错误: " + result.get("errmsg"),null);
             }