|
@@ -9,10 +9,10 @@ import com.zhentao.common.user.domain.GooseUser;
|
|
|
import com.zhentao.common.user.dto.LoginDto;
|
|
|
import com.zhentao.common.user.mapper.GooseUserMapper;
|
|
|
import com.zhentao.common.user.service.GooseUserService;
|
|
|
+import com.zhentao.util.AppJwtUtil;
|
|
|
import com.zhentao.util.HttpUtils;
|
|
|
import com.zhentao.util.ResultVo;
|
|
|
import com.zhentao.util.SnowflakeIdGenerator;
|
|
|
-import com.zhentao.util.TokenUtils;
|
|
|
import lombok.SneakyThrows;
|
|
|
import org.apache.http.HttpResponse;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -66,7 +66,7 @@ public class GooseUserServiceImpl extends ServiceImpl<GooseUserMapper, GooseUser
|
|
|
gooseUser1.setPassword(pwd);
|
|
|
gooseUser1.setSalt(salt);
|
|
|
userMapper.insert(gooseUser1);
|
|
|
- String token= TokenUtils.createJwtToken(gooseUser1.getId().toString());
|
|
|
+ String token= AppJwtUtil.getToken(gooseUser1.getId());
|
|
|
return ResultVo.OK(token);
|
|
|
}
|
|
|
if(StringUtils.checkValNotNull(loginDto.getCode())){
|
|
@@ -76,7 +76,7 @@ public class GooseUserServiceImpl extends ServiceImpl<GooseUserMapper, GooseUser
|
|
|
String code = jedis.get("code");
|
|
|
if(loginDto.getCode().equals(code)){
|
|
|
userMapper.insert(gooseUser1);
|
|
|
- String token= TokenUtils.createJwtToken(gooseUser1.getId().toString());
|
|
|
+ String token= AppJwtUtil.getToken(gooseUser1.getId());
|
|
|
return ResultVo.OK(token);
|
|
|
}
|
|
|
}
|
|
@@ -87,7 +87,7 @@ public class GooseUserServiceImpl extends ServiceImpl<GooseUserMapper, GooseUser
|
|
|
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());
|
|
|
+ String token=AppJwtUtil.getToken(user.getId());
|
|
|
return ResultVo.OK();
|
|
|
}
|
|
|
return ResultVo.ERROR();
|
|
@@ -96,7 +96,7 @@ public class GooseUserServiceImpl extends ServiceImpl<GooseUserMapper, GooseUser
|
|
|
Jedis jedis=new Jedis("localhost");
|
|
|
String code = jedis.get("code");
|
|
|
if(loginDto.getCode().equals(code)){
|
|
|
- String token= TokenUtils.createJwtToken(user.getId().toString());
|
|
|
+ String token=AppJwtUtil.getToken(user.getId());
|
|
|
return ResultVo.OK(token);
|
|
|
}
|
|
|
}
|
|
@@ -145,10 +145,10 @@ public class GooseUserServiceImpl extends ServiceImpl<GooseUserMapper, GooseUser
|
|
|
user.setOpenId(openId);
|
|
|
user.setNickname("微信用户"+ UUID.randomUUID().toString().replace("-","").substring(0,8));
|
|
|
userMapper.insert(user);
|
|
|
- String token=TokenUtils.createJwtToken(user.getId().toString());
|
|
|
+ String token=AppJwtUtil.getToken(user.getId());
|
|
|
return new ResultVo(200,"登录成功",token);
|
|
|
}
|
|
|
- String token=TokenUtils.createJwtToken(gooseUser.getId().toString());
|
|
|
+ String token=AppJwtUtil.getToken(gooseUser.getId());
|
|
|
return new ResultVo(200,"登录成功",token);
|
|
|
} catch (HttpClientErrorException e) { // 处理 HTTP 错误(如 400、500)
|
|
|
return new ResultVo(400,"请求微信接口失败: " + e.getResponseBodyAsString(),null);
|