add 权限增加是否外网展示

This commit is contained in:
lijiarao
2023-08-23 18:17:12 +08:00
parent 7290aea066
commit b49bc36c1a
8 changed files with 48 additions and 15 deletions
@@ -82,7 +82,7 @@ public class LoginController {
@ApiOperation("登录接口")
@RequestMapping(value = "/login", method = RequestMethod.POST)
public Result<JSONObject> login(@RequestBody SysLoginModel sysLoginModel) {
public Result<JSONObject> login(@RequestBody SysLoginModel sysLoginModel,HttpServletRequest request) {
Result<JSONObject> result = new Result<>();
String username = sysLoginModel.getUsername();
String password = sysLoginModel.getPassword();
@@ -159,6 +159,7 @@ public class LoginController {
return result;
}
//用户登录信息
sysUser.setLoginType(request.getHeader("Externalterminalshow"));
sysUserService.userInfo(sysUser, result);
//update-begin--Author:wangshuai Date:20200714 for:登录日志没有记录人员
LoginUser loginUser = new LoginUser();
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableLogic;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.jero.common.aspect.annotation.Dict;
import com.jero.common.constant.enums.LoginType;
import com.jero.common.util.PasswordUtil;
import com.jero.common.util.superSearch.ConstantUtils;
import com.jero.modules.system.volid.group.CreateGroup;
@@ -233,6 +234,9 @@ public class SysUser implements Serializable {
@TableField(exist = false)
private String verifyPassword;
@TableField(exist = false)
private String loginType;
public String convertisEmail(){
if (StringUtils.isNotBlank(email)){
return PasswordUtil.decrypt(email);
@@ -727,8 +727,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
public Result<JSONObject> userInfo(SysUser sysUser, Result<JSONObject> result) {
String syspassword = sysUser.getPassword();
String username = sysUser.getUsername();
String loginType = sysUser.getLoginType();
// 生成token
String token = JwtUtil.sign(username, syspassword);
String token = JwtUtil.sign(username, loginType, syspassword);
// 设置token缓存有效时间
redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + username, token);
redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + username, JwtUtil.EXPIRE_TIME * 2 / 1000);