|
|
@@ -28,8 +28,8 @@ import java.util.Map;
|
|
|
@ConditionalOnProperty(prefix = "redis", name = "enabled", havingValue = "true", matchIfMissing = true)
|
|
|
public class AuthCodeController {
|
|
|
|
|
|
- @Autowired
|
|
|
- private SmsService smsService;
|
|
|
+// @Autowired
|
|
|
+// private SmsService smsService;
|
|
|
|
|
|
@Autowired
|
|
|
private JwtUtil jwtUtil;
|
|
|
@@ -45,86 +45,86 @@ public class AuthCodeController {
|
|
|
|
|
|
private final BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
|
|
|
|
|
|
- /**
|
|
|
- * 发送登录验证码（不依赖数据库）
|
|
|
- */
|
|
|
- @PostMapping("/send-code")
|
|
|
- public Result<Void> sendCode(@RequestBody SmsSendRequest req) {
|
|
|
- if (req == null || req.getPhone() == null || req.getPhone().trim().isEmpty()) {
|
|
|
- return Result.error(400, "手机号不能为空");
|
|
|
- }
|
|
|
- boolean ok = smsService.sendLoginCode(req.getPhone().trim());
|
|
|
- if (!ok) {
|
|
|
- return Result.error(500, "验证码发送失败");
|
|
|
- }
|
|
|
- return Result.success();
|
|
|
- }
|
|
|
-
|
|
|
- /**
|
|
|
- * 验证码登录：校验通过后查询或创建用户，签发JWT
|
|
|
- */
|
|
|
- @PostMapping("/sms-login")
|
|
|
- public Result<LoginResponse> smsLogin(@RequestBody SmsLoginRequest req) {
|
|
|
- System.out.println("=== 验证码登录请求 ===");
|
|
|
- if (req == null || req.getPhone() == null || req.getCode() == null) {
|
|
|
- return Result.error(400, "手机号或验证码不能为空");
|
|
|
- }
|
|
|
-
|
|
|
- System.out.println("手机号: " + req.getPhone());
|
|
|
- boolean passed = smsService.verifyLoginCode(req.getPhone().trim(), req.getCode().trim());
|
|
|
- if (!passed) {
|
|
|
- System.out.println("❌ 验证码验证失败");
|
|
|
- return Result.error(401, "验证码错误或已过期");
|
|
|
- }
|
|
|
-
|
|
|
- System.out.println("✅ 验证码验证成功");
|
|
|
-
|
|
|
- // 查询数据库中的用户
|
|
|
- Users user = usersService.getOne(new LambdaQueryWrapper<Users>()
|
|
|
- .eq(Users::getPhone, req.getPhone().trim())
|
|
|
- .eq(Users::getStatus, 1), false);
|
|
|
-
|
|
|
- // 如果用户不存在，创建新用户
|
|
|
- if (user == null) {
|
|
|
- System.out.println("⚠️ 用户不存在，创建新用户");
|
|
|
- user = new Users();
|
|
|
- user.setPhone(req.getPhone().trim());
|
|
|
- user.setNickname("用户" + req.getPhone().substring(Math.max(0, req.getPhone().length() - 4)));
|
|
|
- user.setStatus(1);
|
|
|
- user.setPassword(null);
|
|
|
- user.setCreatedAt(new Date());
|
|
|
- user.setUpdatedAt(new Date());
|
|
|
- user.setSourceChannel("sms");
|
|
|
-
|
|
|
- // 保存到数据库，自动生成userId
|
|
|
- usersService.save(user);
|
|
|
- System.out.println("✅ 创建新用户成功，ID: " + user.getUserId());
|
|
|
- } else {
|
|
|
- System.out.println("✅ 找到现有用户，ID: " + user.getUserId());
|
|
|
- // 更新最后登录时间
|
|
|
- user.setLastLoginAt(new Date());
|
|
|
- usersService.updateById(user);
|
|
|
- }
|
|
|
-
|
|
|
- // 生成JWT令牌
|
|
|
- Map<String, Object> claims = new HashMap<>();
|
|
|
- claims.put("userId", user.getUserId());
|
|
|
- claims.put("nickname", user.getNickname());
|
|
|
- claims.put("phone", user.getPhone());
|
|
|
- String token = jwtUtil.generateToken(claims);
|
|
|
-
|
|
|
- System.out.println("✅ JWT token生成成功");
|
|
|
-
|
|
|
- // 构造响应，避免泄露密码
|
|
|
- user.setPassword(null);
|
|
|
- LoginResponse resp = new LoginResponse();
|
|
|
- resp.setToken(token);
|
|
|
- resp.setUser(user);
|
|
|
-
|
|
|
- System.out.println("✅ 验证码登录成功，返回用户信息");
|
|
|
- System.out.println("返回的用户ID: " + user.getUserId() + " (类型: " + user.getUserId().getClass().getSimpleName() + ")");
|
|
|
- return Result.success(resp);
|
|
|
- }
|
|
|
+// /**
|
|
|
+// * 发送登录验证码（不依赖数据库）
|
|
|
+// */
|
|
|
+// @PostMapping("/send-code")
|
|
|
+// public Result<Void> sendCode(@RequestBody SmsSendRequest req) {
|
|
|
+// if (req == null || req.getPhone() == null || req.getPhone().trim().isEmpty()) {
|
|
|
+// return Result.error(400, "手机号不能为空");
|
|
|
+// }
|
|
|
+// boolean ok = smsService.sendLoginCode(req.getPhone().trim());
|
|
|
+// if (!ok) {
|
|
|
+// return Result.error(500, "验证码发送失败");
|
|
|
+// }
|
|
|
+// return Result.success();
|
|
|
+// }
|
|
|
+//
|
|
|
+// /**
|
|
|
+// * 验证码登录：校验通过后查询或创建用户，签发JWT
|
|
|
+// */
|
|
|
+// @PostMapping("/sms-login")
|
|
|
+// public Result<LoginResponse> smsLogin(@RequestBody SmsLoginRequest req) {
|
|
|
+// System.out.println("=== 验证码登录请求 ===");
|
|
|
+// if (req == null || req.getPhone() == null || req.getCode() == null) {
|
|
|
+// return Result.error(400, "手机号或验证码不能为空");
|
|
|
+// }
|
|
|
+//
|
|
|
+// System.out.println("手机号: " + req.getPhone());
|
|
|
+// boolean passed = smsService.verifyLoginCode(req.getPhone().trim(), req.getCode().trim());
|
|
|
+// if (!passed) {
|
|
|
+// System.out.println("❌ 验证码验证失败");
|
|
|
+// return Result.error(401, "验证码错误或已过期");
|
|
|
+// }
|
|
|
+//
|
|
|
+// System.out.println("✅ 验证码验证成功");
|
|
|
+//
|
|
|
+// // 查询数据库中的用户
|
|
|
+// Users user = usersService.getOne(new LambdaQueryWrapper<Users>()
|
|
|
+// .eq(Users::getPhone, req.getPhone().trim())
|
|
|
+// .eq(Users::getStatus, 1), false);
|
|
|
+//
|
|
|
+// // 如果用户不存在，创建新用户
|
|
|
+// if (user == null) {
|
|
|
+// System.out.println("⚠️ 用户不存在，创建新用户");
|
|
|
+// user = new Users();
|
|
|
+// user.setPhone(req.getPhone().trim());
|
|
|
+// user.setNickname("用户" + req.getPhone().substring(Math.max(0, req.getPhone().length() - 4)));
|
|
|
+// user.setStatus(1);
|
|
|
+// user.setPassword(null);
|
|
|
+// user.setCreatedAt(new Date());
|
|
|
+// user.setUpdatedAt(new Date());
|
|
|
+// user.setSourceChannel("sms");
|
|
|
+//
|
|
|
+// // 保存到数据库，自动生成userId
|
|
|
+// usersService.save(user);
|
|
|
+// System.out.println("✅ 创建新用户成功，ID: " + user.getUserId());
|
|
|
+// } else {
|
|
|
+// System.out.println("✅ 找到现有用户，ID: " + user.getUserId());
|
|
|
+// // 更新最后登录时间
|
|
|
+// user.setLastLoginAt(new Date());
|
|
|
+// usersService.updateById(user);
|
|
|
+// }
|
|
|
+//
|
|
|
+// // 生成JWT令牌
|
|
|
+// Map<String, Object> claims = new HashMap<>();
|
|
|
+// claims.put("userId", user.getUserId());
|
|
|
+// claims.put("nickname", user.getNickname());
|
|
|
+// claims.put("phone", user.getPhone());
|
|
|
+// String token = jwtUtil.generateToken(claims);
|
|
|
+//
|
|
|
+// System.out.println("✅ JWT token生成成功");
|
|
|
+//
|
|
|
+// // 构造响应，避免泄露密码
|
|
|
+// user.setPassword(null);
|
|
|
+// LoginResponse resp = new LoginResponse();
|
|
|
+// resp.setToken(token);
|
|
|
+// resp.setUser(user);
|
|
|
+//
|
|
|
+// System.out.println("✅ 验证码登录成功，返回用户信息");
|
|
|
+// System.out.println("返回的用户ID: " + user.getUserId() + " (类型: " + user.getUserId().getClass().getSimpleName() + ")");
|
|
|
+// return Result.success(resp);
|
|
|
+// }
|
|
|
|
|
|
/**
|
|
|
* 微信授权登录：传入 wx.login 的临时 code，后端调用 jscode2session，查询或创建用户并返回 JWT
|
|
|
@@ -135,7 +135,7 @@ public class AuthCodeController {
|
|
|
if (req == null || req.getCode() == null || req.getCode().trim().isEmpty()) {
|
|
|
return Result.error(400, "code 不能为空");
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
Map<String, Object> wx = weChatService.code2Session(req.getCode().trim());
|
|
|
if (wx == null || (wx.containsKey("errcode") && ((Number) wx.get("errcode")).intValue() != 0)) {
|
|
|
String msg = wx != null && wx.get("errmsg") != null ? String.valueOf(wx.get("errmsg")) : "微信接口错误";
|
|
|
@@ -157,10 +157,21 @@ public class AuthCodeController {
|
|
|
System.out.println("⚠️ 微信用户不存在，创建新用户");
|
|
|
user = new Users();
|
|
|
|
|
|
- // ✅ 使用前端传来的昵称
|
|
|
- user.setNickname(req.getNickname() != null && !req.getNickname().trim().isEmpty()
|
|
|
- ? req.getNickname().trim()
|
|
|
- : "微信用户");
|
|
|
+ // ✅ 生成默认昵称
|
|
|
+ String defaultNickname = "微信用户";
|
|
|
+ if (req.getNickname() != null && !req.getNickname().trim().isEmpty()) {
|
|
|
+ user.setNickname(req.getNickname().trim());
|
|
|
+ } else if (user.getPhone() != null && !user.getPhone().trim().isEmpty()) {
|
|
|
+ // 如果有手机号，使用"用户+手机号后四位"
|
|
|
+ String phone = user.getPhone().trim();
|
|
|
+ defaultNickname = "用户" + phone.substring(Math.max(0, phone.length() - 4));
|
|
|
+ user.setNickname(defaultNickname);
|
|
|
+ } else {
|
|
|
+ // 随机生成4位数字作为后缀
|
|
|
+ int randomNum = (int) (Math.random() * 9000) + 1000;
|
|
|
+ defaultNickname = "微信用户" + randomNum;
|
|
|
+ user.setNickname(defaultNickname);
|
|
|
+ }
|
|
|
|
|
|
System.out.println("设置用户昵称: " + user.getNickname());
|
|
|
|
|
|
@@ -174,15 +185,18 @@ public class AuthCodeController {
|
|
|
System.out.println("✅ 头像上传成功: " + avatarUrl);
|
|
|
} else {
|
|
|
System.out.println("⚠️ 头像上传失败，使用默认头像");
|
|
|
- user.setAvatarUrl(null);
|
|
|
+ // 这里可以设置一个默认头像URL
|
|
|
+ user.setAvatarUrl("https://via.placeholder.com/150");
|
|
|
}
|
|
|
} catch (Exception e) {
|
|
|
System.err.println("⚠️ 头像上传异常: " + e.getMessage());
|
|
|
- user.setAvatarUrl(null);
|
|
|
+ // 这里可以设置一个默认头像URL
|
|
|
+ user.setAvatarUrl("https://via.placeholder.com/150");
|
|
|
}
|
|
|
} else {
|
|
|
- System.out.println("⚠️ 未提供头像");
|
|
|
- user.setAvatarUrl(null);
|
|
|
+ System.out.println("⚠️ 未提供头像，使用默认头像");
|
|
|
+ // 这里可以设置一个默认头像URL
|
|
|
+ user.setAvatarUrl("https://via.placeholder.com/150");
|
|
|
}
|
|
|
|
|
|
user.setStatus(1);
|
|
|
@@ -197,7 +211,7 @@ public class AuthCodeController {
|
|
|
user.setCreatedAt(new Date());
|
|
|
user.setUpdatedAt(new Date());
|
|
|
|
|
|
- // ✅ 如果提供了手机号code，尝试获取手机号
|
|
|
+ // ✅ 如果提供了手机号code，尝试获取手机号（先获取手机号，以便生成昵称）
|
|
|
if (req.getPhoneCode() != null && !req.getPhoneCode().trim().isEmpty()) {
|
|
|
try {
|
|
|
System.out.println("尝试获取手机号，code: " + req.getPhoneCode());
|
|
|
@@ -215,6 +229,18 @@ public class AuthCodeController {
|
|
|
System.out.println("⚠️ 未提供手机号code");
|
|
|
}
|
|
|
|
|
|
+ // ✅ 重新生成昵称（确保使用最新的手机号信息）
|
|
|
+ if (req.getNickname() == null || req.getNickname().trim().isEmpty()) {
|
|
|
+// String defaultNickname = "微信用户";
|
|
|
+ if (user.getPhone() != null && !user.getPhone().trim().isEmpty()) {
|
|
|
+ // 如果有手机号，使用"用户+手机号后四位"
|
|
|
+ String phone = user.getPhone().trim();
|
|
|
+ defaultNickname = "用户" + phone.substring(Math.max(0, phone.length() - 4));
|
|
|
+ user.setNickname(defaultNickname);
|
|
|
+ System.out.println("更新昵称使用手机号后四位: " + defaultNickname);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
// 保存到数据库，自动生成userId
|
|
|
usersService.save(user);
|
|
|
System.out.println("✅ 创建微信新用户成功，ID: " + user.getUserId() + ", 昵称: " + user.getNickname());
|
