From fc1a066edd335345167df7573f9119ef8dd1689a Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Thu, 10 Jul 2025 17:36:47 +0800
Subject: [PATCH] 小程序：微信授权登录角色处理
---
oying-system/src/main/java/com/oying/modules/security/rest/AuthController.java | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 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 43c4154..4141c9b 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
@@ -147,22 +147,18 @@
public static final String OLD = "OLD";
public static final String NEW = "NEW";
- @Log("微信授权登录")
- @ApiOperation("微信授权登录")
+ @Log("小程序：微信授权登录")
+ @ApiOperation("小程序：微信授权登录")
@AnonymousPostMapping(value = "/login/weixin")
public ResponseEntity<Object> loginWeixin(@Validated @RequestBody AuthUserWeixinDto authUser, HttpServletRequest request) throws Exception {
JSONObject jsonObject;
- switch (authUser.getCode()) {
+ switch (authUser.getType()) {
case OLD:
jsonObject = weiXinService.code2Session(authUser.getCode());
String openid = jsonObject.getString("openid");
User userDto = userService.findByOpenid(openid);
if (userDto == null) {
- Map<String, Object> authInfo = new HashMap<String, Object>(2) {{
- put("token", openid);
- put("member", null);
- }};
- return ResponseEntity.ok(authInfo);
+ return ResponseEntity.ok(R.success(openid));
}
authUser.setUsername(userDto.getUsername());
break;
@@ -174,8 +170,10 @@
//创建用户
User user = new User();
user.setUsername(phone);
- user.setNickName("LYHD-" + phone);
+ user.setNickName("OYING-" + phone);
user.setUserType(ConstantsKey.BUYER);
+ user.setPhone(phone);
+ user.setGender("男");
user.setEnabled(true);
getRole(user);
user.setPassword(passwordEncoder.encode(phone.substring(phone.length() - 6)));
@@ -221,7 +219,7 @@
Set<Role> roles = new HashSet<>();
Role role = new Role();
DictDetail detail = dictDetailService.getDictByName(ConstantsKey.USER_TYPE_BUYER).get(0);
- role.setId(Long.valueOf(detail.getLabel()));
+ role.setId(Long.valueOf(detail.getValue()));
roles.add(role);
user1.setRoles(roles);
}
--
Gitblit v1.9.3