diff --git a/ruoyi-admin/src/main/resources/templates/system/user/resetUeky.html b/ruoyi-admin/src/main/resources/templates/system/user/resetUeky.html index 45630301..7f17e3e6 100644 --- a/ruoyi-admin/src/main/resources/templates/system/user/resetUeky.html +++ b/ruoyi-admin/src/main/resources/templates/system/user/resetUeky.html @@ -89,7 +89,7 @@ function submitHandler() { if ($.validate.form()) { - $.operate.save(ctx + "system/user/resetUekySave", $('#form-user-ukey').serialize()); + $.operate.saveTab(ctx + "system/user/resetUekySave", $('#form-user-ukey').serialize()); } } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java index e68797dd..65498ea9 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java @@ -109,13 +109,9 @@ public class SysUser extends BaseEntity /** UKey唯一标识 */ private String ukeyId; - public String getUkeyId() { - return ukeyId; - } - public void setUkeyId(String ukeyId) { - this.ukeyId = ukeyId; - } + /** 登录方式(0:普通登录 1:ueky登录)*/ + private Integer isWay; /** 民族 */ @Excel(name = "民族",readConverterExp = "4=汉族,5=苗族,6=维吾尔族") diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysLoginService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysLoginService.java index fbfcefa4..fcfab2c8 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysLoginService.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysLoginService.java @@ -129,7 +129,7 @@ public class SysLoginService { } AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"))); setRolePermission(user); - recordLoginInfo(user.getUserId()); + recordLoginInfo(user.getUserId(),rememberMe); return user; } @@ -174,11 +174,16 @@ public class SysLoginService { * * @param userId 用户ID */ - public void recordLoginInfo(Long userId) { - SysUser user = new SysUser(); - user.setUserId(userId); - user.setLoginIp(ShiroUtils.getIp()); - user.setLoginDate(DateUtils.getNowDate()); - userService.updateUserInfo(user); + public void recordLoginInfo(Long userId,boolean rememberMe) { + int isWay = 0; + if(rememberMe){ + isWay = 1; + } + userService.lambdaUpdate() + .eq(SysUser::getUserId, userId) + .set(SysUser::getLoginIp, ShiroUtils.getIp()) + .set(SysUser::getLoginDate, DateUtils.getNowDate()) + .set(SysUser::getIsWay, isWay) + .update(); } } diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index 88b28a57..eab3e4be 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -45,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" +