|
@@ -9,10 +9,7 @@ import com.zhentao.common.user.domain.GooseUser;
|
|
import com.zhentao.common.user.dto.LoginDto;
|
|
import com.zhentao.common.user.dto.LoginDto;
|
|
import com.zhentao.common.user.mapper.GooseUserMapper;
|
|
import com.zhentao.common.user.mapper.GooseUserMapper;
|
|
import com.zhentao.common.user.service.GooseUserService;
|
|
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.*;
|
|
import lombok.SneakyThrows;
|
|
import lombok.SneakyThrows;
|
|
import org.apache.http.HttpResponse;
|
|
import org.apache.http.HttpResponse;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -88,7 +85,7 @@ public class GooseUserServiceImpl extends ServiceImpl<GooseUserMapper, GooseUser
|
|
String pwd=DigestUtils.md5DigestAsHex((loginDto.getPassword()+salt).getBytes(StandardCharsets.UTF_8));
|
|
String pwd=DigestUtils.md5DigestAsHex((loginDto.getPassword()+salt).getBytes(StandardCharsets.UTF_8));
|
|
if(pwd.equals(password)){
|
|
if(pwd.equals(password)){
|
|
String token=AppJwtUtil.getToken(user.getId());
|
|
String token=AppJwtUtil.getToken(user.getId());
|
|
- return ResultVo.OK();
|
|
|
|
|
|
+ return ResultVo.OK(token);
|
|
}
|
|
}
|
|
return ResultVo.ERROR();
|
|
return ResultVo.ERROR();
|
|
}
|
|
}
|
|
@@ -108,6 +105,8 @@ public class GooseUserServiceImpl extends ServiceImpl<GooseUserMapper, GooseUser
|
|
@Override
|
|
@Override
|
|
public ResultVo Wxlogin(Map<String, String> requestData) {
|
|
public ResultVo Wxlogin(Map<String, String> requestData) {
|
|
String code = requestData.get("code");
|
|
String code = requestData.get("code");
|
|
|
|
+ String encryptedData = requestData.get("encryptedData");
|
|
|
|
+ String iv = requestData.get("iv");
|
|
System.out.println(code);
|
|
System.out.println(code);
|
|
if (code == null) {
|
|
if (code == null) {
|
|
return new ResultVo(400,"Missing code",null);
|
|
return new ResultVo(400,"Missing code",null);
|
|
@@ -146,8 +145,12 @@ public class GooseUserServiceImpl extends ServiceImpl<GooseUserMapper, GooseUser
|
|
user.setNickname("微信用户"+ UUID.randomUUID().toString().replace("-","").substring(0,8));
|
|
user.setNickname("微信用户"+ UUID.randomUUID().toString().replace("-","").substring(0,8));
|
|
userMapper.insert(user);
|
|
userMapper.insert(user);
|
|
String token=AppJwtUtil.getToken(user.getId());
|
|
String token=AppJwtUtil.getToken(user.getId());
|
|
|
|
+ String userInfo = WXBizDataCryptUtil.decryptData(APPID, session_key, encryptedData, iv);
|
|
|
|
+ System.out.println(userInfo);
|
|
return new ResultVo(200,"登录成功",token);
|
|
return new ResultVo(200,"登录成功",token);
|
|
}
|
|
}
|
|
|
|
+ String userInfo = WXBizDataCryptUtil.decryptData(APPID, session_key, encryptedData, iv);
|
|
|
|
+ System.out.println(userInfo);
|
|
String token=AppJwtUtil.getToken(gooseUser.getId());
|
|
String token=AppJwtUtil.getToken(gooseUser.getId());
|
|
return new ResultVo(200,"登录成功",token);
|
|
return new ResultVo(200,"登录成功",token);
|
|
} catch (HttpClientErrorException e) { // 处理 HTTP 错误(如 400、500)
|
|
} catch (HttpClientErrorException e) { // 处理 HTTP 错误(如 400、500)
|