cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix 登录bug

Browse Source
This commit is contained in:
gzlv
2021-07-19 20:44:25 +08:00
parent daf51b1ce6
commit 653bb41da4
2 changed files with 25 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
yshop-app/src/main/java/co/yixiang/modules/auth/rest/AuthController.java
View File

@ -41,11 +41,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
@ -101,6 +97,16 @@ public class AuthController {
}
/**
* 根据手机号查询用户状态
*/
@GetMapping("/wxapp/authPhone/{phone}")
@ApiOperation(value = "根据手机号查询用户状态", notes = "根据手机号查询用户状态")
public ApiResult<YxUser> authPhone(@PathVariable String phone) {
return ApiResult.ok(authService.authPhone(phone)).setMsg("获取成功");
}
@AuthCheck
@PostMapping("/wxapp/loginAuth")
@ApiOperation(value = "小程序获取用户信息", notes = "小程序获取用户信息")
public ApiResult<YxUser> loginAuth(@Validated @RequestBody LoginParam loginParam,
@ -126,8 +132,6 @@ public class AuthController {
String token = JwtToken.makeToken(yxUser.getUid(),yxUser.getUsername());
String expiresTimeStr = JwtToken.getExpireTime(token);
// 返回 token
Map<String, Object> map = new HashMap<String, Object>(2) {{
put("token", token);

35
yshop-app/src/main/java/co/yixiang/modules/services/AuthService.java
View File

@ -17,6 +17,7 @@ import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.SecureUtil;
import co.yixiang.api.YshopException;
import co.yixiang.common.bean.LocalUser;
import co.yixiang.common.util.IpUtil;
import co.yixiang.constant.ShopConstants;
import co.yixiang.enums.AppFromEnum;
@ -93,16 +94,10 @@ public class AuthService {
WxMaService wxMaService = WxMaConfiguration.getWxMaService();
WxMaJscode2SessionResult session = wxMaService.getUserService().getSessionInfo(code);
WxMaUserInfo wxMpUser = wxMaService.getUserService()
.getUserInfo(session.getSessionKey(), encryptedData, iv);
String openid = session.getOpenid();
//如果开启了UnionId
if (StrUtil.isNotBlank(session.getUnionid())) {
openid = session.getUnionid();
}
WxMaUserInfo wxMpUser = wxMaService.getUserService().getUserInfo(session.getSessionKey(), encryptedData, iv);
YxUser yxUser = this.userService.getOne(Wrappers.<YxUser>lambdaQuery()
.eq(YxUser::getUid, SecurityUtils.getUserId()), false);
.eq(YxUser::getUid, LocalUser.getUser().getUid()), false);
if (ObjectUtil.isNotEmpty(yxUser)) {
@ -110,7 +105,7 @@ public class AuthService {
//过滤掉表情
String ip = IpUtil.getRequestIp();
yxUser = YxUser.builder()
.username(openid)
.username(wxMpUser.getNickName())
.nickname(wxMpUser.getNickName())
.avatar(wxMpUser.getAvatarUrl())
.addIp(ip)
@ -133,7 +128,7 @@ public class AuthService {
yxUser.setWxProfile(wechatUserDTO);
this.userService.update(yxUser,Wrappers.<YxUser>lambdaQuery()
.eq(YxUser::getUid, SecurityUtils.getUserId()));
.eq(YxUser::getUid, LocalUser.getUser().getUid()));
}
return yxUser;
@ -170,12 +165,6 @@ public class AuthService {
WxMaPhoneNumberInfo phoneNoInfo = wxMaService.getUserService()
.getPhoneNoInfo(session.getSessionKey(), encryptedData, iv);
String openid = session.getOpenid();
//如果开启了UnionId
if (StrUtil.isNotBlank(session.getUnionid())) {
openid = session.getUnionid();
}
YxUser yxUser = this.userService.getOne(Wrappers.<YxUser>lambdaQuery()
.eq(YxUser::getPhone, phoneNoInfo.getPhoneNumber()), false);
@ -204,13 +193,9 @@ public class AuthService {
} else {
WechatUserDto wechatUser = yxUser.getWxProfile();
if ((StrUtil.isBlank(wechatUser.getRoutineOpenid()) && StrUtil.isNotBlank(session.getOpenid()))
|| (StrUtil.isBlank(wechatUser.getUnionId()) && StrUtil.isNotBlank(session.getUnionid()))) {
if (null != wechatUser &&(StrUtil.isBlank(wechatUser.getRoutineOpenid()) && StrUtil.isNotBlank(session.getOpenid()))) {
wechatUser.setRoutineOpenid(session.getOpenid());
wechatUser.setUnionId(session.getUnionid());
yxUser.setWxProfile(wechatUser);
}
yxUser.setUserType(AppFromEnum.ROUNTINE.getValue());
this.userService.updateById(yxUser);
@ -436,4 +421,12 @@ public class AuthService {
return onlineUsers;
}
/**
* 根据手机号查询用户注册状态
* @param phone 手机号
* @return /
*/
public YxUser authPhone(String phone) {
return userService.getOne(Wrappers.<YxUser>lambdaQuery().eq(YxUser::getPhone, phone));
}
}