lywsvip/likeadmin_java
1
0
Fork 0
mirror of https://gitee.com/likeadmin/likeadmin_java.git synced 2026-05-22 22:49:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

修改登录

Browse Source 
用户列表
全局配置
用户修改
同步用户表结构
This commit is contained in:
pan.wl.2
2024-10-11 22:57:07 +08:00
parent bc59451e21
commit a2bcee032c
26 changed files with 132 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/like-front/src/main/java/com/mdd/front/LikeFrontInterceptor.java
View File

@@ -178,7 +178,7 @@ public class LikeFrontInterceptor implements HandlerInterceptor {
// 写入线程
LikeFrontThreadLocal.put("userId", user.getId());
LikeFrontThreadLocal.put("userSn", user.getSn());
LikeFrontThreadLocal.put("username", user.getUsername());
LikeFrontThreadLocal.put("username", user.getAccount());
LikeFrontThreadLocal.put("nickname", user.getNickname());
LikeFrontThreadLocal.put("mobile", user.getMobile());
}

29
server/like-front/src/main/java/com/mdd/front/service/impl/LoginServiceImpl.java
View File

@@ -65,18 +65,17 @@ public class LoginServiceImpl implements ILoginService {
Assert.isNull(model, "账号已存在,换一个吧!");
Integer sn = this.__generateSn();
String salt = ToolUtils.randomString(5);
String pwd = ToolUtils.makeMd5(password+salt);
// String salt = ToolUtils.randomString(5);
String pwd = ToolUtils.makePassword(password);
User user = new User();
user.setSn(sn);
user.setNickname("用户"+sn);
user.setUsername(username);
user.setAccount(username);
user.setPassword(pwd);
user.setSalt(salt);
user.setAvatar("/api/static/default_avatar.png");
user.setChannel(terminal);
user.setIsNew(1);
user.setIsNewUser(1);
user.setCreateTime(System.currentTimeMillis() / 1000);
user.setUpdateTime(System.currentTimeMillis() / 1000);
userMapper.insert(user);
@@ -99,11 +98,11 @@ public class LoginServiceImpl implements ILoginService {
.last("limit 1"));
Assert.notNull(user, "账号不存在!");
String pwd = ToolUtils.makeMd5(password+user.getSalt());
String pwd = ToolUtils.makePassword(password);
Assert.isFalse(!pwd.equals(user.getPassword()), "账号或密码错误!");
Assert.isFalse(!user.getIsDisable().equals(0), "账号已被禁用!");
return this.__loginToken(user.getId(), user.getMobile(), user.getIsNew(), terminal);
return this.__loginToken(user.getId(), user.getMobile(), user.getIsNewUser(), terminal);
}
/**
@@ -132,7 +131,7 @@ public class LoginServiceImpl implements ILoginService {
Assert.notNull(user, "账号不存在!");
Assert.isFalse(user.getIsDisable() != 0, "账号已禁用!");
return this.__loginToken(user.getId(), user.getMobile(), user.getIsNew(), terminal);
return this.__loginToken(user.getId(), user.getMobile(), user.getIsNewUser(), terminal);
}
/**
@@ -355,14 +354,14 @@ public class LoginServiceImpl implements ILoginService {
model.setSn(sn);
model.setAvatar(defaultAvatar);
model.setNickname(defaultNickname);
model.setUsername("u" + sn);
model.setAccount("u" + sn);
model.setChannel(terminal);
model.setSex(0);
model.setLastLoginIp(IpUtils.getHostIp());
model.setLastLoginTime(System.currentTimeMillis() / 1000);
model.setLoginIp(IpUtils.getHostIp());
model.setLoginTime(System.currentTimeMillis() / 1000);
model.setUpdateTime(System.currentTimeMillis() / 1000);
model.setCreateTime(System.currentTimeMillis() / 1000);
model.setIsNew(1);
model.setIsNewUser(1);
userMapper.insert(model);
user = model;
}
@@ -390,7 +389,7 @@ public class LoginServiceImpl implements ILoginService {
userAuthMapper.updateById(auth);
}
return this.__loginToken(user.getId(), user.getMobile(), user.getIsNew(), terminal);
return this.__loginToken(user.getId(), user.getMobile(), user.getIsNewUser(), terminal);
}
/**
@@ -408,8 +407,8 @@ public class LoginServiceImpl implements ILoginService {
// 更新登录信息
User user = new User();
user.setLastLoginIp(IpUtils.getHostIp());
user.setLastLoginTime(System.currentTimeMillis() / 1000);
user.setLoginIp(IpUtils.getHostIp());
user.setLoginTime(System.currentTimeMillis() / 1000);
userMapper.update(user, new QueryWrapper<User>().eq("id", userId));
// 返回登录信息

2
server/like-front/src/main/java/com/mdd/front/service/impl/PayServiceImpl.java
View File

@@ -235,7 +235,7 @@ public class PayServiceImpl implements IPayService {
rechargeOrderMapper.updateById(rechargeOrder);
User user = userMapper.selectById(rechargeOrder.getUserId());
user.setMoney(user.getMoney().add(rechargeOrder.getOrderAmount()));
user.setUserMoney(user.getUserMoney().add(rechargeOrder.getOrderAmount()));
user.setUpdateTime(System.currentTimeMillis() / 1000);
userMapper.updateById(user);

2
server/like-front/src/main/java/com/mdd/front/service/impl/RechargeServiceImpl.java
View File

@@ -53,7 +53,7 @@ public class RechargeServiceImpl implements IRechargeService {
RechargeConfigVo vo = new RechargeConfigVo();
vo.setOpenRecharge(Integer.parseInt(config.getOrDefault("openRecharge", "0")));
vo.setMinRechargeMoney(new BigDecimal(config.getOrDefault("minRechargeMoney", "0")));
vo.setUserMoney(user.getMoney());
vo.setUserMoney(user.getUserMoney());
return vo;
}

21
server/like-front/src/main/java/com/mdd/front/service/impl/UserServiceImpl.java
View File

@@ -54,7 +54,7 @@ public class UserServiceImpl implements IUserService {
@Override
public UserCenterVo center(Integer userId, Integer terminal) {
User user = userMapper.selectOne(new QueryWrapper<User>()
.select("id,sn,avatar,real_name,nickname,username,mobile,money,is_new,password")
.select("id,sn,avatar,real_name,nickname,account,mobile,user_money,is_new_user,password")
.eq("id", userId)
.last("limit 1"));
@@ -93,7 +93,7 @@ public class UserServiceImpl implements IUserService {
@Override
public UserInfoVo info(Integer userId) {
User user = userMapper.selectOne(new QueryWrapper<User>()
.select("id,sn,avatar,real_name,nickname,username,mobile,password,sex,create_time")
.select("id,sn,avatar,real_name,nickname,account,mobile,password,sex,create_time")
.eq("id", userId)
.last("limit 1"));
@@ -151,13 +151,13 @@ public class UserServiceImpl implements IUserService {
throw new OperateException("账号已被使用!");
}
if (StringUtils.isNotNull(usernameUser) && usernameUser.getUsername().equals(value)) {
if (StringUtils.isNotNull(usernameUser) && usernameUser.getAccount().equals(value)) {
throw new OperateException("新账号与旧账号一致,修改失败!");
}
User u = new User();
u.setId(userId);
u.setUsername(value);
u.setAccount(value);
u.setUpdateTime(System.currentTimeMillis() / 1000);
userMapper.updateById(u);
break;
@@ -199,19 +199,17 @@ public class UserServiceImpl implements IUserService {
if (!user.getPassword().equals("")) {
Assert.notNull(oldPassword, "oldPassword参数缺失");
String oldPwd = ToolUtils.makeMd5(oldPassword.trim() + user.getSalt());
String oldPwd = ToolUtils.makePassword(oldPassword.trim());
if (!oldPwd.equals(user.getPassword())) {
throw new OperateException("原密码不正确!");
}
}
String salt = ToolUtils.randomString(5);
String pwd = ToolUtils.makeMd5(password.trim()+salt);
String pwd = ToolUtils.makePassword(password.trim());
User u = new User();
u.setId(userId);
u.setPassword(pwd);
u.setSalt(salt);
u.setUpdateTime(System.currentTimeMillis() / 1000);
userMapper.updateById(u);
}
@@ -242,12 +240,11 @@ public class UserServiceImpl implements IUserService {
// 验证账号
com.baomidou.mybatisplus.core.toolkit.Assert.notNull(user, "账号不存在!");
String salt = ToolUtils.randomString(5);
String pwd = ToolUtils.makeMd5(password.trim()+salt);
// String salt = ToolUtils.randomString(5);
String pwd = ToolUtils.makePassword(password.trim());
// 更新密码
user.setPassword(pwd);
user.setSalt(salt);
user.setUpdateTime(System.currentTimeMillis() / 1000);
userMapper.updateById(user);
}
@@ -330,7 +327,7 @@ public class UserServiceImpl implements IUserService {
user.setId(userId);
user.setNickname(newUserUpdateValidate.getNickname());
user.setAvatar(UrlUtils.toRelativeUrl(newUserUpdateValidate.getAvatar()));
user.setIsNew(0);
user.setIsNewUser(0);
user.setUpdateTime(System.currentTimeMillis() / 1000);
userMapper.updateById(user);
}