Browse Source

Merge remote-tracking branch 'origin/develop' into develop

develop
wangsixiang 4 weeks ago
parent
commit
05dce24c60
  1. 5
      ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
  2. 1
      ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java

5
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java

@ -4,11 +4,12 @@ import java.io.Serializable;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
/** /**
* Entity基类 * Entity基类
* *
*/ */
public class BaseEntity implements Serializable public class BaseEntity implements Serializable
@ -37,6 +38,8 @@ public class BaseEntity implements Serializable
private String remark; private String remark;
/** 请求参数 */ /** 请求参数 */
/** 请求参数 */
@TableField(exist = false)
private Map<String, Object> params; private Map<String, Object> params;
public String getSearchValue() public String getSearchValue()

1
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java

@ -108,6 +108,7 @@ public class SysLoginService
} }
AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"))); AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
LoginUser loginUser = (LoginUser) authentication.getPrincipal(); LoginUser loginUser = (LoginUser) authentication.getPrincipal();
recordLoginInfo(loginUser.getUserId());
// 生成token // 生成token
return tokenService.createToken(loginUser); return tokenService.createToken(loginUser);
} }

Loading…
Cancel
Save