|
@@ -33,6 +33,11 @@ public class AuthServiceImpl implements AuthService {
|
|
|
*/
|
|
*/
|
|
|
private static final java.util.Map<String, String> CODE_CACHE = new java.util.concurrent.ConcurrentHashMap<>();
|
|
private static final java.util.Map<String, String> CODE_CACHE = new java.util.concurrent.ConcurrentHashMap<>();
|
|
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
|
+ * 默认头像URL
|
|
|
|
|
+ */
|
|
|
|
|
+ private static final String DEFAULT_AVATAR = "/static/images/head.png";
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 微信登录
|
|
* 微信登录
|
|
|
* @param code 微信登录code
|
|
* @param code 微信登录code
|
|
@@ -55,15 +60,19 @@ public class AuthServiceImpl implements AuthService {
|
|
|
|
|
|
|
|
// 如果用户不存在,创建新用户
|
|
// 如果用户不存在,创建新用户
|
|
|
if (user == null) {
|
|
if (user == null) {
|
|
|
|
|
+ // 生成随机6位数字作为用户标识
|
|
|
|
|
+ String randomCode = String.format("%06d", new Random().nextInt(1000000));
|
|
|
|
|
+
|
|
|
user = new User();
|
|
user = new User();
|
|
|
user.setOpenid(openid);
|
|
user.setOpenid(openid);
|
|
|
user.setUnionid(unionid);
|
|
user.setUnionid(unionid);
|
|
|
- user.setNickname("微信用户" + openid.substring(openid.length() - 6));
|
|
|
|
|
|
|
+ user.setNickname("微信用户" + randomCode);
|
|
|
|
|
+ user.setAvatar(DEFAULT_AVATAR);
|
|
|
user.setStatus(0);
|
|
user.setStatus(0);
|
|
|
user.setCreateTime(LocalDateTime.now());
|
|
user.setCreateTime(LocalDateTime.now());
|
|
|
user.setUpdateTime(LocalDateTime.now());
|
|
user.setUpdateTime(LocalDateTime.now());
|
|
|
userMapper.insert(user);
|
|
userMapper.insert(user);
|
|
|
- log.info("创建新用户,userId: {}, openid: {}", user.getId(), openid);
|
|
|
|
|
|
|
+ log.info("创建新用户,userId: {}, openid: {}, nickname: {}", user.getId(), openid, user.getNickname());
|
|
|
} else {
|
|
} else {
|
|
|
// 更新unionid(如果有)
|
|
// 更新unionid(如果有)
|
|
|
if (unionid != null && !unionid.equals(user.getUnionid())) {
|
|
if (unionid != null && !unionid.equals(user.getUnionid())) {
|
|
@@ -113,11 +122,13 @@ public class AuthServiceImpl implements AuthService {
|
|
|
if (user == null) {
|
|
if (user == null) {
|
|
|
user = new User();
|
|
user = new User();
|
|
|
user.setPhone(phone);
|
|
user.setPhone(phone);
|
|
|
- user.setNickname("用户" + phone.substring(7));
|
|
|
|
|
|
|
+ user.setNickname(phone); // 使用手机号作为昵称
|
|
|
|
|
+ user.setAvatar(DEFAULT_AVATAR); // 使用默认头像
|
|
|
user.setStatus(0);
|
|
user.setStatus(0);
|
|
|
user.setCreateTime(LocalDateTime.now());
|
|
user.setCreateTime(LocalDateTime.now());
|
|
|
user.setUpdateTime(LocalDateTime.now());
|
|
user.setUpdateTime(LocalDateTime.now());
|
|
|
userMapper.insert(user);
|
|
userMapper.insert(user);
|
|
|
|
|
+ log.info("创建新用户,userId: {}, phone: {}, nickname: {}", user.getId(), phone, user.getNickname());
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// 生成token
|
|
// 生成token
|