From 206f601b1f2a2e3cb0bf4f5dead01bec9077d8e9 Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Thu, 04 Sep 2025 15:28:52 +0800
Subject: [PATCH] Merge branch 'xin' into pxb
---
oying-system/src/main/java/com/oying/modules/security/rest/AuthController.java | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/security/rest/AuthController.java b/oying-system/src/main/java/com/oying/modules/security/rest/AuthController.java
index 67ef05d..0eb367d 100644
--- a/oying-system/src/main/java/com/oying/modules/security/rest/AuthController.java
+++ b/oying-system/src/main/java/com/oying/modules/security/rest/AuthController.java
@@ -2,6 +2,8 @@
import cn.hutool.core.util.IdUtil;
import com.alibaba.fastjson2.JSONObject;
+import com.oying.modules.rider.domain.RiderInfo;
+import com.oying.modules.rider.service.RiderInfoService;
import com.oying.modules.security.config.CaptchaConfig;
import com.oying.modules.security.config.LoginProperties;
import com.oying.modules.security.config.SecurityProperties;
@@ -67,6 +69,7 @@
private final WeiXinService weiXinService;
private final UserService userService;
private final DictDetailService dictDetailService;
+ private final RiderInfoService riderInfoService;
@Log("账号密码登录")
@ApiOperation("账号密码登录")
@@ -227,7 +230,7 @@
@Log("骑手小程序：微信授权登录")
@ApiOperation("骑手小程序：微信授权登录")
@AnonymousPostMapping(value = "/rider/login/weixin")
- public ResponseEntity<Object> riderLoginWeixin(@Validated @RequestBody AuthUserWeixinDto authUser, HttpServletRequest request) throws Exception {
+ public ResponseEntity<Object> riderLoginWeixin(@Validated @RequestBody AuthUserWeixinDto authUser, HttpServletRequest request) {
JSONObject jsonObject;
switch (authUser.getType()) {
case OLD:
@@ -240,7 +243,7 @@
authUser.setUsername(userDto.getUsername());
break;
case NEW:
- jsonObject = weiXinService.getPhoneNumber(authUser.getCode());
+ jsonObject = weiXinService.getRiderPhoneNumber(authUser.getCode());
String phone = jsonObject.getJSONObject("phone_info").getString("purePhoneNumber");
User user1 = userService.findByName(phone);
if (user1 == null) {
@@ -248,22 +251,23 @@
User user = new User();
user.setUsername(phone);
user.setNickName("OYING-" + phone);
- user.setUserType(ConstantsKey.RIDER);
+ user.setUserType(ConstantsKey.BUYER);
user.setPhone(phone);
user.setGender("男");
user.setEnabled(true);
getRole(user);
user.setPassword(passwordEncoder.encode(phone.substring(phone.length() - 6)));
- user.setOpenid(authUser.getUsername());
+ user.setRiderOpenId(authUser.getUsername());
userService.create(user);
} else {
- if (user1.getUserType().equals(ConstantsKey.RIDER)) {
+ if (user1.getUserType().equals(ConstantsKey.BUYER)) {
if (user1.getRoles() == null) {
getRole(user1);
}
}
- user1.setOpenid(authUser.getUsername());
- userService.update(user1);
+ user1.setRiderOpenId(authUser.getUsername());
+ // userService.update(user1);
+ userService.updateRiderOpenId(user1);
}
authUser.setUsername(phone);
break;
@@ -273,6 +277,8 @@
}
// 获取用户信息
JwtUserDto jwtUser = userDetailsService.loadUserByUsername(authUser.getUsername());
+ // 查询骑手信息
+ RiderInfo riderInfo = riderInfoService.getRiderSourceInfo(jwtUser.getUser().getId());
Authentication authentication = new UsernamePasswordAuthenticationToken(jwtUser, null, jwtUser.getAuthorities());
SecurityContextHolder.getContext().setAuthentication(authentication);
// 生成令牌
@@ -281,6 +287,7 @@
Map<String, Object> authInfo = new HashMap<String, Object>(2) {{
put("token", properties.getTokenStartWith() + token);
put("user", jwtUser);
+ put("rider", riderInfo);
}};
if (loginProperties.isSingleLogin()) {
// 踢掉之前已经登录的token
--
Gitblit v1.9.3