admin/lx-admin-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 去除登录警告

Browse Source
This commit is contained in:
疯狂的狮子li 2021-10-11 16:49:21 +08:00
parent 2006e5e51e
commit aaf9f57459
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-framework/src/main/java/com/ruoyi/framework/mybatisplus/CreateAndUpdateMetaObjectHandler.java
View File

@ -27,7 +27,9 @@ public class CreateAndUpdateMetaObjectHandler implements MetaObjectHandler {
this.setFieldValByName("createTime", new Date(), metaObject); this.setFieldValByName("createTime", new Date(), metaObject);
} }
if (metaObject.hasGetter("createBy")) { if (metaObject.hasGetter("createBy")) {
this.setFieldValByName("createBy", getLoginUsername(), metaObject); if (metaObject.getValue("createBy") == null) {
this.setFieldValByName("createBy", getLoginUsername(), metaObject);
}
} }
} catch (Exception e) { } catch (Exception e) {
throw new ServiceException("自动注入异常 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED); throw new ServiceException("自动注入异常 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED);
@ -39,7 +41,9 @@ public class CreateAndUpdateMetaObjectHandler implements MetaObjectHandler {
public void updateFill(MetaObject metaObject) { public void updateFill(MetaObject metaObject) {
try { try {
if (metaObject.hasGetter("updateBy")) { if (metaObject.hasGetter("updateBy")) {
this.setFieldValByName("updateBy", getLoginUsername(), metaObject); if (metaObject.getValue("updateBy") == null) {
this.setFieldValByName("updateBy", getLoginUsername(), metaObject);
}
} }
if (metaObject.hasGetter("updateTime")) { if (metaObject.hasGetter("updateTime")) {
this.setFieldValByName("updateTime", new Date(), metaObject); this.setFieldValByName("updateTime", new Date(), metaObject);

5
ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
View File

@ -78,7 +78,7 @@ public class SysLoginService {
} }
asyncService.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"), request); asyncService.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"), request);
LoginUser loginUser = (LoginUser) authentication.getPrincipal(); LoginUser loginUser = (LoginUser) authentication.getPrincipal();
recordLoginInfo(loginUser.getUserId()); recordLoginInfo(loginUser.getUserId(), username);
// 生成token // 生成token
return tokenService.createToken(loginUser); return tokenService.createToken(loginUser);
} }
@ -110,11 +110,12 @@ public class SysLoginService {
* *
* @param userId 用户ID * @param userId 用户ID
*/ */
public void recordLoginInfo(Long userId) { public void recordLoginInfo(Long userId, String username) {
SysUser sysUser = new SysUser(); SysUser sysUser = new SysUser();
sysUser.setUserId(userId); sysUser.setUserId(userId);
sysUser.setLoginIp(ServletUtils.getClientIP()); sysUser.setLoginIp(ServletUtils.getClientIP());
sysUser.setLoginDate(DateUtils.getNowDate()); sysUser.setLoginDate(DateUtils.getNowDate());
sysUser.setUpdateBy(username);
userService.updateUserProfile(sysUser); userService.updateUserProfile(sysUser);
} }
} }