作者 钟来

初始提交

正在显示 67 个修改的文件 包含 829 行增加313 行删除
... ... @@ -4,13 +4,13 @@ import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.zhonglai.luhui.admin.model.LoginUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.domain.SysUserOnline;
import com.ruoyi.system.service.ISysUserOnlineService;
import com.ruoyi.framework.web.service.ISysUserOnlineService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
... ...
package com.zhonglai.luhui.admin.controller.system;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.system.domain.entity.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
... ...
package com.zhonglai.luhui.admin.controller.system;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.system.domain.entity.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.system.domain.entity.SysDept;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.service.ISysDeptService;
... ...
... ... @@ -3,7 +3,7 @@ package com.zhonglai.luhui.admin.controller.system;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.system.domain.entity.SysDictData;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils;
... ...
package com.zhonglai.luhui.admin.controller.system;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.system.domain.entity.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysDictType;
import com.ruoyi.system.domain.entity.SysDictType;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
... ...
... ... @@ -3,12 +3,12 @@ package com.zhonglai.luhui.admin.controller.system;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginBody;
import com.ruoyi.system.domain.entity.SysMenu;
import com.ruoyi.system.domain.entity.SysUser;
import com.zhonglai.luhui.admin.model.LoginBody;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.web.service.SysLoginService;
import com.ruoyi.framework.web.service.SysPermissionService;
import com.zhonglai.luhui.admin.service.SysLoginService;
import com.zhonglai.luhui.admin.service.SysPermissionService;
import com.ruoyi.system.service.ISysMenuService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
... ...
package com.zhonglai.luhui.admin.controller.system;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.system.domain.entity.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.system.domain.entity.SysMenu;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.service.ISysMenuService;
... ...
package com.zhonglai.luhui.admin.controller.system;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.system.domain.entity.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
... ...
... ... @@ -2,11 +2,11 @@ package com.zhonglai.luhui.admin.controller.system;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.system.domain.entity.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.system.domain.entity.SysUser;
import com.zhonglai.luhui.admin.model.LoginUser;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
... ...
... ... @@ -2,10 +2,10 @@ package com.zhonglai.luhui.admin.controller.system;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.model.RegisterBody;
import com.zhonglai.luhui.admin.model.RegisterBody;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.web.service.SysLoginService;
import com.ruoyi.framework.web.service.SysRegisterService;
import com.zhonglai.luhui.admin.service.SysLoginService;
import com.zhonglai.luhui.admin.service.SysRegisterService;
import com.ruoyi.system.service.ISysConfigService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
... ...
package com.zhonglai.luhui.admin.controller.system;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.system.domain.entity.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.system.domain.entity.SysRole;
import com.ruoyi.system.domain.entity.SysUser;
import com.zhonglai.luhui.admin.model.LoginUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.service.SysPermissionService;
import com.zhonglai.luhui.admin.service.SysPermissionService;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.domain.SysUserRole;
import com.ruoyi.system.service.ISysRoleService;
... ...
package com.zhonglai.luhui.admin.controller.system;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.system.domain.entity.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.system.domain.entity.SysRole;
import com.ruoyi.system.domain.entity.SysUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils;
... ...
package com.ruoyi.common.core.domain.model;
package com.zhonglai.luhui.admin.model;
/**
* 用户登录对象
... ...
package com.ruoyi.common.core.domain.model;
package com.zhonglai.luhui.admin.model;
import com.alibaba.fastjson.annotation.JSONField;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.BaseLoginUser;
import com.ruoyi.system.domain.entity.SysUser;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.userdetails.UserDetails;
import java.util.Collection;
import java.util.Set;
... ... @@ -13,56 +13,16 @@ import java.util.Set;
*
* @author ruoyi
*/
public class LoginUser implements UserDetails
public class LoginUser extends BaseLoginUser
{
private static final long serialVersionUID = 1L;
/**
* 用户ID
*/
private Long userId;
/**
* 部门ID
*/
private Long deptId;
/**
* 用户唯一标识
*/
private String token;
/**
* 登录时间
*/
private Long loginTime;
/**
* 过期时间
*/
private Long expireTime;
/**
* 登录IP地址
*/
private String ipaddr;
/**
* 登录地点
*/
private String loginLocation;
/**
* 浏览器类型
*/
private String browser;
/**
* 操作系统
*/
private String os;
/**
* 权限列表
*/
private Set<String> permissions;
... ... @@ -72,15 +32,6 @@ public class LoginUser implements UserDetails
*/
private SysUser user;
public Long getUserId()
{
return userId;
}
public void setUserId(Long userId)
{
this.userId = userId;
}
public Long getDeptId()
{
... ... @@ -92,15 +43,6 @@ public class LoginUser implements UserDetails
this.deptId = deptId;
}
public String getToken()
{
return token;
}
public void setToken(String token)
{
this.token = token;
}
public LoginUser()
{
... ... @@ -114,14 +56,13 @@ public class LoginUser implements UserDetails
public LoginUser(Long userId, Long deptId, SysUser user, Set<String> permissions)
{
this.userId = userId;
setUserId(userId);
this.deptId = deptId;
this.user = user;
this.permissions = permissions;
}
@JSONField(serialize = false)
public String getPassword()
{
return user.getPassword();
... ... @@ -137,7 +78,6 @@ public class LoginUser implements UserDetails
* 账户是否未过期,过期无法验证
*/
@JSONField(serialize = false)
public boolean isAccountNonExpired()
{
return true;
... ... @@ -149,7 +89,6 @@ public class LoginUser implements UserDetails
* @return
*/
@JSONField(serialize = false)
public boolean isAccountNonLocked()
{
return true;
... ... @@ -161,7 +100,6 @@ public class LoginUser implements UserDetails
* @return
*/
@JSONField(serialize = false)
public boolean isCredentialsNonExpired()
{
return true;
... ... @@ -173,72 +111,11 @@ public class LoginUser implements UserDetails
* @return
*/
@JSONField(serialize = false)
public boolean isEnabled()
{
return true;
}
public Long getLoginTime()
{
return loginTime;
}
public void setLoginTime(Long loginTime)
{
this.loginTime = loginTime;
}
public String getIpaddr()
{
return ipaddr;
}
public void setIpaddr(String ipaddr)
{
this.ipaddr = ipaddr;
}
public String getLoginLocation()
{
return loginLocation;
}
public void setLoginLocation(String loginLocation)
{
this.loginLocation = loginLocation;
}
public String getBrowser()
{
return browser;
}
public void setBrowser(String browser)
{
this.browser = browser;
}
public String getOs()
{
return os;
}
public void setOs(String os)
{
this.os = os;
}
public Long getExpireTime()
{
return expireTime;
}
public void setExpireTime(Long expireTime)
{
this.expireTime = expireTime;
}
public Set<String> getPermissions()
{
return permissions;
... ...
package com.ruoyi.framework.aspectj;
package com.zhonglai.luhui.admin.service;
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.core.domain.BaseLoginUser;
import com.ruoyi.system.domain.tool.BaseEntity;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.system.domain.entity.SysRole;
import com.ruoyi.system.domain.entity.SysUser;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import org.aspectj.lang.JoinPoint;
... ... @@ -61,10 +61,10 @@ public class DataScopeAspect
protected void handleDataScope(final JoinPoint joinPoint, DataScope controllerDataScope)
{
// 获取当前的用户
LoginUser loginUser = SecurityUtils.getLoginUser();
BaseLoginUser loginUser = SecurityUtils.getLoginUser();
if (StringUtils.isNotNull(loginUser))
{
SysUser currentUser = loginUser.getUser();
SysUser currentUser = (SysUser) loginUser.getUser();
// 如果是超级管理员,则不过滤数据
if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin())
{
... ...
package com.ruoyi.framework.web.service;
package com.zhonglai.luhui.admin.service;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.domain.BaseLoginUser;
import com.ruoyi.system.domain.entity.SysRole;
import com.zhonglai.luhui.admin.model.LoginUser;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import org.springframework.stereotype.Service;
... ... @@ -39,7 +40,7 @@ public class PermissionService
{
return false;
}
LoginUser loginUser = SecurityUtils.getLoginUser();
LoginUser loginUser = (LoginUser) SecurityUtils.getLoginUser();
if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getPermissions()))
{
return false;
... ... @@ -70,7 +71,7 @@ public class PermissionService
{
return false;
}
LoginUser loginUser = SecurityUtils.getLoginUser();
LoginUser loginUser = (LoginUser) SecurityUtils.getLoginUser();
if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getPermissions()))
{
return false;
... ... @@ -98,7 +99,7 @@ public class PermissionService
{
return false;
}
LoginUser loginUser = SecurityUtils.getLoginUser();
LoginUser loginUser = (LoginUser) SecurityUtils.getLoginUser();
if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getUser().getRoles()))
{
return false;
... ... @@ -137,7 +138,7 @@ public class PermissionService
{
return false;
}
LoginUser loginUser = SecurityUtils.getLoginUser();
LoginUser loginUser = (LoginUser) SecurityUtils.getLoginUser();
if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getUser().getRoles()))
{
return false;
... ...
package com.ruoyi.framework.web.service;
package com.zhonglai.luhui.admin.service;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.system.domain.entity.SysUser;
import com.zhonglai.luhui.admin.model.LoginUser;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.exception.user.CaptchaException;
... ... @@ -15,6 +15,7 @@ import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.ip.IpUtils;
import com.ruoyi.framework.manager.AsyncManager;
import com.ruoyi.framework.manager.factory.AsyncFactory;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysUserService;
import org.springframework.beans.factory.annotation.Autowired;
... ...
package com.ruoyi.framework.web.service;
package com.zhonglai.luhui.admin.service;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.system.domain.entity.SysUser;
import com.ruoyi.system.service.ISysMenuService;
import com.ruoyi.system.service.ISysRoleService;
import org.springframework.beans.factory.annotation.Autowired;
... ...
package com.ruoyi.framework.web.service;
package com.zhonglai.luhui.admin.service;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.RegisterBody;
import com.ruoyi.system.domain.entity.UserConstants;
import com.ruoyi.system.domain.entity.SysUser;
import com.zhonglai.luhui.admin.model.RegisterBody;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.exception.user.CaptchaException;
import com.ruoyi.common.exception.user.CaptchaExpireException;
... ...
package com.ruoyi.system.service.impl;
package com.zhonglai.luhui.admin.service;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.domain.BaseLoginUser;
import com.ruoyi.framework.web.service.ISysUserOnlineService;
import com.zhonglai.luhui.admin.model.LoginUser;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.domain.SysUserOnline;
import com.ruoyi.system.service.ISysUserOnlineService;
import org.springframework.stereotype.Service;
/**
... ... @@ -14,16 +15,9 @@ import org.springframework.stereotype.Service;
@Service
public class SysUserOnlineServiceImpl implements ISysUserOnlineService
{
/**
* 通过登录地址查询信息
*
* @param ipaddr 登录地址
* @param user 用户信息
* @return 在线用户信息
*/
@Override
public SysUserOnline selectOnlineByIpaddr(String ipaddr, LoginUser user)
{
public SysUserOnline selectOnlineByIpaddr(String ipaddr, BaseLoginUser user) {
if (StringUtils.equals(ipaddr, user.getIpaddr()))
{
return loginUserToUserOnline(user);
... ... @@ -39,7 +33,7 @@ public class SysUserOnlineServiceImpl implements ISysUserOnlineService
* @return 在线用户信息
*/
@Override
public SysUserOnline selectOnlineByUserName(String userName, LoginUser user)
public SysUserOnline selectOnlineByUserName(String userName, BaseLoginUser user)
{
if (StringUtils.equals(userName, user.getUsername()))
{
... ... @@ -57,7 +51,7 @@ public class SysUserOnlineServiceImpl implements ISysUserOnlineService
* @return 在线用户信息
*/
@Override
public SysUserOnline selectOnlineByInfo(String ipaddr, String userName, LoginUser user)
public SysUserOnline selectOnlineByInfo(String ipaddr, String userName, BaseLoginUser user)
{
if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsername()))
{
... ... @@ -69,16 +63,17 @@ public class SysUserOnlineServiceImpl implements ISysUserOnlineService
/**
* 设置在线用户信息
*
* @param user 用户信息
* @param baseLoginUser 用户信息
* @return 在线用户
*/
@Override
public SysUserOnline loginUserToUserOnline(LoginUser user)
public SysUserOnline loginUserToUserOnline(BaseLoginUser baseLoginUser)
{
if (StringUtils.isNull(user) || StringUtils.isNull(user.getUser()))
if (StringUtils.isNull(baseLoginUser) || StringUtils.isNull(baseLoginUser.getUser()))
{
return null;
}
LoginUser user = (LoginUser) baseLoginUser;
SysUserOnline sysUserOnline = new SysUserOnline();
sysUserOnline.setTokenId(user.getToken());
sysUserOnline.setUserName(user.getUsername());
... ...
package com.ruoyi.framework.web.service;
package com.zhonglai.luhui.admin.service;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.system.domain.entity.SysUser;
import com.zhonglai.luhui.admin.model.LoginUser;
import com.ruoyi.common.enums.UserStatus;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.StringUtils;
... ...
... ... @@ -18,27 +18,30 @@
<artifactId>spring-boot-devtools</artifactId>
<optional>true</optional> <!-- 表示依赖不会传递 -->
</dependency>
<!-- Mysql驱动包 -->
<!-- SpringBoot Web容器 -->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<!-- 核心模块-->
<!-- Spring框架基本的核心工具 -->
<dependency>
<groupId>com.zhonglai.luhui</groupId>
<artifactId>ruoyi-framework</artifactId>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
</dependency>
<!-- 代码生成模块-->
<!-- SpringWeb模块 -->
<dependency>
<groupId>com.zhonglai.luhui</groupId>
<artifactId>ruoyi-generator</artifactId>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</dependency>
<!-- 代码生成模块-->
<dependency>
<groupId>com.zhonglai.luhui</groupId>
<artifactId>lh-mqtt-service</artifactId>
<artifactId>ruoyi-framework</artifactId>
</dependency>
<!-- Mysql驱动包 -->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>
<!-- 文档 -->
<dependency >
... ...
package com.zhonglai.luhui.api.config;
import com.zhonglai.luhui.api.dto.ApiLoginUser;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.stereotype.Service;
@Service
public class ApiUserDetailsServiceImpl implements UserDetailsService {
@Override
public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
return new ApiLoginUser(user.getUserId(), user.getDeptId(), user, permissionService.getMenuPermission(user));
}
}
... ...
package com.zhonglai.luhui.api.dto;
import com.alibaba.fastjson.annotation.JSONField;
import com.ruoyi.common.core.domain.BaseLoginUser;
import org.springframework.security.core.GrantedAuthority;
import java.util.Collection;
public class ApiLoginUser extends BaseLoginUser {
private UserInfo userInfo;
private UserLogin userLogin;
@Override
public UserInfo getUser() {
return userInfo;
}
@Override
public Collection<? extends GrantedAuthority> getAuthorities() {
return null;
}
@Override
public String getPassword() {
return userLogin.getLoginPass();
}
@Override
public String getUsername() {
return userInfo.getLoginName();
}
/**
* 账户是否未过期,过期无法验证
*/
@JSONField(serialize = false)
@Override
public boolean isAccountNonExpired() {
return false;
}
/**
* 指定用户是否解锁,锁定的用户无法进行身份验证
*
* @return
*/
@JSONField(serialize = false)
@Override
public boolean isAccountNonLocked() {
return false;
}
/**
* 指示是否已过期的用户的凭据(密码),过期的凭据防止认证
*
* @return
*/
@JSONField(serialize = false)
@Override
public boolean isCredentialsNonExpired() {
return false;
}
/**
* 是否可用 ,禁用的用户不能身份验证
*
* @return
*/
@JSONField(serialize = false)
@Override
public boolean isEnabled() {
return false;
}
public void setUserInfo(UserInfo userInfo) {
this.userInfo = userInfo;
}
public UserLogin getUserLogin() {
return userLogin;
}
public void setUserLogin(UserLogin userLogin) {
this.userLogin = userLogin;
}
}
... ...
package com.zhonglai.luhui.api.dto;
import java.io.Serializable;
/**
* 用户信息
*/
public class UserInfo implements Serializable {
private static final long serialVersionUID = 2442852637823064570L;
private Integer id; // int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
private String loginName; // varchar(50) NOT NULL COMMENT '登录名',
private String name; // varchar(50) DEFAULT NULL COMMENT '真实姓名',
private Integer gender; // int(11) DEFAULT '0' COMMENT '性别(0男,1女)',
private String email; // varchar(100) DEFAULT NULL COMMENT '电子邮箱',
private String phone; // varchar(50) DEFAULT NULL COMMENT '手机号',
private String imgUrl; // text COMMENT '头像地址',
private Integer onlineState; // int(2) DEFAULT '0' COMMENT '在线状态(0离线,1在线)',
private Integer lastLoginTime; // int(11) DEFAULT NULL COMMENT '最后登陆时间',
private String lastLoginIp; // varchar(50) DEFAULT NULL COMMENT '最后登陆ip',
private Integer createTime; // int(11) DEFAULT NULL COMMENT '创建时间',
private Integer nameAuthentication; // int(11) DEFAULT '0' COMMENT '是否实名认证(0否,1是)',
private Integer integral; // int(11) DEFAULT '0' COMMENT '积分',
private String qq; // varchar(50) DEFAULT NULL COMMENT 'qq账号',
private String weixin; // varchar(50) DEFAULT NULL COMMENT '微信账号',
private String lastAddress; // varchar(50) DEFAULT NULL COMMENT '最后登陆地点',
private String nickname; // varchar(50) DEFAULT NULL COMMENT '昵称',
private Integer userType; // int(11) DEFAULT '0' COMMENT '用户类型(0普通用户,1管理员,2客服)',
private String lastLoginLongitude; // varchar(20) DEFAULT NULL COMMENT '最后登陆经度',
private String lastLoginLatitude; // varchar(20) DEFAULT NULL COMMENT '最后登陆纬度',
private String search; // varchar(200) DEFAULT NULL COMMENT '常用搜索内容,中间用逗号隔开(如:鲤鱼,黑鱼)',
private String provinceId; // varchar(50) DEFAULT NULL COMMENT '省id',
private String cityId; // varchar(50) DEFAULT NULL COMMENT '市id',
private String countyId; // varchar(50) DEFAULT NULL COMMENT '县id',
private String provinceName; // varchar(50) DEFAULT NULL COMMENT '省名称',
private String cityName; // varchar(50) DEFAULT NULL COMMENT '市名称',
private String countyName; // varchar(50) DEFAULT NULL COMMENT '县名称',
private String address; // varchar(50) DEFAULT NULL COMMENT '地址',
private Integer isInvalid; // int(11) DEFAULT '0' COMMENT '是否失效(0否,1是)',
private Integer alarmAgreement; // int(11) DEFAULT '0' COMMENT '告警协议',
private Integer annualServiceCharge; // int(11) DEFAULT '0' COMMENT '年度服务费',
private String messagePassWord; // varchar(50) DEFAULT NULL COMMENT '极光消息密码',
private String ysChildrenId; // varchar(50) DEFAULT NULL COMMENT '萤石子账号id',
private String ysChildrenPass; // varchar(50) DEFAULT NULL COMMENT '萤石子账号密码',
private Integer isParticipateIn; // int(11) DEFAULT '0' COMMENT '是否参与活动',
private Integer level; //级别
private Integer currency; //货币(换算人民币为分)
private Integer experience; //经验
private Integer openId; //开放id
private Integer dianmiaoEndTime; //点苗器到期时间 -1表示终身有效
private Integer balance; //余额(单位分)
private Integer companyId; //公司id
private String alarmNoticePhone; //告警通知电话
public String getAlarmNoticePhone() {
return alarmNoticePhone;
}
public void setAlarmNoticePhone(String alarmNoticePhone) {
this.alarmNoticePhone = alarmNoticePhone;
}
public Integer getCompanyId() {
return companyId;
}
public void setCompanyId(Integer companyId) {
this.companyId = companyId;
}
public Integer getBalance() {
return balance;
}
public void setBalance(Integer balance) {
this.balance = balance;
}
public Integer getDianmiaoEndTime() {
return dianmiaoEndTime;
}
public void setDianmiaoEndTime(Integer dianmiaoEndTime) {
this.dianmiaoEndTime = dianmiaoEndTime;
}
public Integer getOpenId() {
return openId;
}
public void setOpenId(Integer openId) {
this.openId = openId;
}
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public String getLoginName() {
return loginName;
}
public void setLoginName(String loginName) {
this.loginName = loginName;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public Integer getGender() {
return gender;
}
public void setGender(Integer gender) {
this.gender = gender;
}
public String getEmail() {
return email;
}
public void setEmail(String email) {
this.email = email;
}
public String getPhone() {
return phone;
}
public void setPhone(String phone) {
this.phone = phone;
}
public String getImgUrl() {
return imgUrl;
}
public void setImgUrl(String imgUrl) {
this.imgUrl = imgUrl;
}
public Integer getOnlineState() {
return onlineState;
}
public void setOnlineState(Integer onlineState) {
this.onlineState = onlineState;
}
public Integer getLastLoginTime() {
return lastLoginTime;
}
public void setLastLoginTime(Integer lastLoginTime) {
this.lastLoginTime = lastLoginTime;
}
public String getLastLoginIp() {
return lastLoginIp;
}
public void setLastLoginIp(String lastLoginIp) {
this.lastLoginIp = lastLoginIp;
}
public Integer getCreateTime() {
return createTime;
}
public void setCreateTime(Integer createTime) {
this.createTime = createTime;
}
public Integer getNameAuthentication() {
return nameAuthentication;
}
public void setNameAuthentication(Integer nameAuthentication) {
this.nameAuthentication = nameAuthentication;
}
public Integer getIntegral() {
return integral;
}
public void setIntegral(Integer integral) {
this.integral = integral;
}
public String getQq() {
return qq;
}
public void setQq(String qq) {
this.qq = qq;
}
public String getWeixin() {
return weixin;
}
public void setWeixin(String weixin) {
this.weixin = weixin;
}
public String getLastAddress() {
return lastAddress;
}
public void setLastAddress(String lastAddress) {
this.lastAddress = lastAddress;
}
public String getNickname() {
return nickname;
}
public void setNickname(String nickname) {
this.nickname = nickname;
}
public Integer getUserType() {
return userType;
}
public void setUserType(Integer userType) {
this.userType = userType;
}
public String getLastLoginLongitude() {
return lastLoginLongitude;
}
public void setLastLoginLongitude(String lastLoginLongitude) {
this.lastLoginLongitude = lastLoginLongitude;
}
public String getLastLoginLatitude() {
return lastLoginLatitude;
}
public void setLastLoginLatitude(String lastLoginLatitude) {
this.lastLoginLatitude = lastLoginLatitude;
}
public String getSearch() {
return search;
}
public void setSearch(String search) {
this.search = search;
}
public String getProvinceId() {
return provinceId;
}
public void setProvinceId(String provinceId) {
this.provinceId = provinceId;
}
public String getCityId() {
return cityId;
}
public void setCityId(String cityId) {
this.cityId = cityId;
}
public String getCountyId() {
return countyId;
}
public void setCountyId(String countyId) {
this.countyId = countyId;
}
public String getProvinceName() {
return provinceName;
}
public void setProvinceName(String provinceName) {
this.provinceName = provinceName;
}
public String getCityName() {
return cityName;
}
public void setCityName(String cityName) {
this.cityName = cityName;
}
public String getCountyName() {
return countyName;
}
public void setCountyName(String countyName) {
this.countyName = countyName;
}
public String getAddress() {
return address;
}
public void setAddress(String address) {
this.address = address;
}
public Integer getIsInvalid() {
return isInvalid;
}
public void setIsInvalid(Integer isInvalid) {
this.isInvalid = isInvalid;
}
public Integer getAlarmAgreement() {
return alarmAgreement;
}
public void setAlarmAgreement(Integer alarmAgreement) {
this.alarmAgreement = alarmAgreement;
}
public Integer getAnnualServiceCharge() {
return annualServiceCharge;
}
public void setAnnualServiceCharge(Integer annualServiceCharge) {
this.annualServiceCharge = annualServiceCharge;
}
public String getMessagePassWord() {
return messagePassWord;
}
public void setMessagePassWord(String messagePassWord) {
this.messagePassWord = messagePassWord;
}
public String getYsChildrenId() {
return ysChildrenId;
}
public void setYsChildrenId(String ysChildrenId) {
this.ysChildrenId = ysChildrenId;
}
public String getYsChildrenPass() {
return ysChildrenPass;
}
public void setYsChildrenPass(String ysChildrenPass) {
this.ysChildrenPass = ysChildrenPass;
}
public Integer getIsParticipateIn() {
return isParticipateIn;
}
public void setIsParticipateIn(Integer isParticipateIn) {
this.isParticipateIn = isParticipateIn;
}
public Integer getLevel() {
return level;
}
public void setLevel(Integer level) {
this.level = level;
}
public Integer getCurrency() {
return currency;
}
public void setCurrency(Integer currency) {
this.currency = currency;
}
public Integer getExperience() {
return experience;
}
public void setExperience(Integer experience) {
this.experience = experience;
}
}
... ...
package com.zhonglai.luhui.api.dto;
/**
* 用户登录
*/
public class UserLogin {
private Integer id; // int(11) NOT NULL AUTO_INCREMENT COMMENT '用户登录主键主键',
private Integer userId; // int(11) NOT NULL COMMENT '用户主键id',
private String loginName; // varchar(50) NOT NULL COMMENT '用户登录名',
private String loginPass; // text NOT NULL COMMENT '用户密码',
private String userLoginPassKey; // varchar(20) NOT NULL COMMENT '用户登录密码key',
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public Integer getUserId() {
return userId;
}
public void setUserId(Integer userId) {
this.userId = userId;
}
public String getLoginName() {
return loginName;
}
public void setLoginName(String loginName) {
this.loginName = loginName;
}
public String getLoginPass() {
return loginPass;
}
public void setLoginPass(String loginPass) {
this.loginPass = loginPass;
}
public String getUserLoginPassKey() {
return userLoginPassKey;
}
public void setUserLoginPassKey(String userLoginPassKey) {
this.userLoginPassKey = userLoginPassKey;
}
}
... ...
package com.ruoyi.common.core.domain.entity;
package com.ruoyi.system.domain.entity;
import com.ruoyi.system.domain.tool.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
... ...
package com.ruoyi.common.core.domain.entity;
package com.ruoyi.system.domain.entity;
import com.ruoyi.system.domain.tool.Excel;
import com.ruoyi.system.domain.tool.Excel.ColumnType;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.system.domain.tool.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
... ...
package com.ruoyi.system.domain.entity; import javax.validation.constraints.NotBlank;import javax.validation.constraints.Size;import org.apache.commons.lang3.builder.ToStringBuilder;import org.apache.commons.lang3.builder.ToStringStyle;import com.ruoyi.system.domain.tool.Excel;import com.ruoyi.system.domain.tool.Excel.ColumnType;import com.ruoyi.system.domain.tool.BaseEntity; /** * 字典类型表 sys_dict_type * * @author ruoyi */public class SysDictType extends BaseEntity{ private static final long serialVersionUID = 1L; /** 字典主键 */ @Excel(name = "字典主键", cellType = ColumnType.NUMERIC) private Long dictId; /** 字典名称 */ @Excel(name = "字典名称") private String dictName; /** 字典类型 */ @Excel(name = "字典类型") private String dictType; /** 状态(0正常 1停用) */ @Excel(name = "状态", readConverterExp = "0=正常,1=停用") private String status; public Long getDictId() { return dictId; } public void setDictId(Long dictId) { this.dictId = dictId; } @NotBlank(message = "字典名称不能为空") @Size(min = 0, max = 100, message = "字典类型名称长度不能超过100个字符") public String getDictName() { return dictName; } public void setDictName(String dictName) { this.dictName = dictName; } @NotBlank(message = "字典类型不能为空") @Size(min = 0, max = 100, message = "字典类型类型长度不能超过100个字符") public String getDictType() { return dictType; } public void setDictType(String dictType) { this.dictType = dictType; } public String getStatus() { return status; } public void setStatus(String status) { this.status = status; } @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) .append("dictId", getDictId()) .append("dictName", getDictName()) .append("dictType", getDictType()) .append("status", getStatus()) .append("createBy", getCreateBy()) .append("createTime", getCreateTime()) .append("updateBy", getUpdateBy()) .append("updateTime", getUpdateTime()) .append("remark", getRemark()) .toString(); }}
\ No newline at end of file
... ...
package com.ruoyi.common.core.domain.entity;
package com.ruoyi.system.domain.entity;
import com.ruoyi.system.domain.tool.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
... ...
package com.ruoyi.common.core.domain.entity;
package com.ruoyi.system.domain.entity;
import com.ruoyi.system.domain.tool.Excel;
import com.ruoyi.system.domain.tool.Excel.ColumnType;
... ...
package com.ruoyi.common.core.domain.entity;
package com.ruoyi.system.domain.entity;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.ruoyi.system.domain.tool.Excel;
import com.ruoyi.system.domain.tool.Excel.ColumnType;
import com.ruoyi.system.domain.tool.Excel.Type;
import com.ruoyi.common.annotation.Excels;
import com.ruoyi.system.domain.tool.BaseEntity;
import com.ruoyi.system.domain.tool.Excels;
import com.ruoyi.system.domain.tool.Xss;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
... ...
package com.ruoyi.common.annotation;
package com.ruoyi.system.domain.tool;
import com.ruoyi.system.domain.tool.Excel;
... ...
... ... @@ -4,7 +4,7 @@ import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.domain.BaseLoginUser;
import com.ruoyi.common.core.page.PageDomain;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.page.TableSupport;
... ... @@ -156,7 +156,7 @@ public class BaseController
/**
* 获取用户缓存信息
*/
public LoginUser getLoginUser()
public BaseLoginUser getLoginUser()
{
return SecurityUtils.getLoginUser();
}
... ... @@ -169,13 +169,6 @@ public class BaseController
return getLoginUser().getUserId();
}
/**
* 获取登录部门id
*/
public Long getDeptId()
{
return getLoginUser().getDeptId();
}
/**
* 获取登录用户名
... ...
package com.ruoyi.common.core.domain;
import org.springframework.security.core.userdetails.UserDetails;
public abstract class BaseLoginUser implements UserDetails {
/**
* 用户ID
*/
private Long userId;
/**
* 用户唯一标识
*/
private String token;
/**
* 登录时间
*/
private Long loginTime;
/**
* 过期时间
*/
private Long expireTime;
/**
* 登录IP地址
*/
private String ipaddr;
/**
* 登录地点
*/
private String loginLocation;
/**
* 浏览器类型
*/
private String browser;
/**
* 操作系统
*/
private String os;
public Long getUserId() {
return userId;
}
public void setUserId(Long userId) {
this.userId = userId;
}
public String getToken() {
return token;
}
public void setToken(String token) {
this.token = token;
}
public Long getLoginTime() {
return loginTime;
}
public void setLoginTime(Long loginTime) {
this.loginTime = loginTime;
}
public Long getExpireTime() {
return expireTime;
}
public void setExpireTime(Long expireTime) {
this.expireTime = expireTime;
}
public String getIpaddr() {
return ipaddr;
}
public void setIpaddr(String ipaddr) {
this.ipaddr = ipaddr;
}
public String getLoginLocation() {
return loginLocation;
}
public void setLoginLocation(String loginLocation) {
this.loginLocation = loginLocation;
}
public String getBrowser() {
return browser;
}
public void setBrowser(String browser) {
this.browser = browser;
}
public String getOs() {
return os;
}
public void setOs(String os) {
this.os = os;
}
public abstract Object getUser();
}
... ...
package com.ruoyi.common.core.domain;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.system.domain.entity.SysDept;
import com.ruoyi.system.domain.entity.SysMenu;
import java.io.Serializable;
import java.util.List;
... ...
package com.ruoyi.common.core.domain.entity; import javax.validation.constraints.NotBlank;import javax.validation.constraints.Size;import org.apache.commons.lang3.builder.ToStringBuilder;import org.apache.commons.lang3.builder.ToStringStyle;import com.ruoyi.system.domain.tool.Excel;import com.ruoyi.system.domain.tool.Excel.ColumnType;import com.ruoyi.system.domain.tool.BaseEntity; /** * 字典类型表 sys_dict_type * * @author ruoyi */public class SysDictType extends BaseEntity{ private static final long serialVersionUID = 1L; /** 字典主键 */ @Excel(name = "字典主键", cellType = ColumnType.NUMERIC) private Long dictId; /** 字典名称 */ @Excel(name = "字典名称") private String dictName; /** 字典类型 */ @Excel(name = "字典类型") private String dictType; /** 状态(0正常 1停用) */ @Excel(name = "状态", readConverterExp = "0=正常,1=停用") private String status; public Long getDictId() { return dictId; } public void setDictId(Long dictId) { this.dictId = dictId; } @NotBlank(message = "字典名称不能为空") @Size(min = 0, max = 100, message = "字典类型名称长度不能超过100个字符") public String getDictName() { return dictName; } public void setDictName(String dictName) { this.dictName = dictName; } @NotBlank(message = "字典类型不能为空") @Size(min = 0, max = 100, message = "字典类型类型长度不能超过100个字符") public String getDictType() { return dictType; } public void setDictType(String dictType) { this.dictType = dictType; } public String getStatus() { return status; } public void setStatus(String status) { this.status = status; } @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) .append("dictId", getDictId()) .append("dictName", getDictName()) .append("dictType", getDictType()) .append("status", getStatus()) .append("createBy", getCreateBy()) .append("createTime", getCreateTime()) .append("updateBy", getUpdateBy()) .append("updateTime", getUpdateTime()) .append("remark", getRemark()) .toString(); }}
\ No newline at end of file
package com.ruoyi.common.utils;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.system.domain.entity.SysDictData;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.spring.SpringUtils;
... ...
package com.ruoyi.common.utils;
import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.domain.BaseLoginUser;
import com.ruoyi.common.exception.ServiceException;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
... ... @@ -30,21 +30,6 @@ public class SecurityUtils
}
/**
* 获取部门ID
**/
public static Long getDeptId()
{
try
{
return getLoginUser().getDeptId();
}
catch (Exception e)
{
throw new ServiceException("获取部门ID异常", HttpStatus.UNAUTHORIZED);
}
}
/**
* 获取用户账户
**/
public static String getUsername()
... ... @@ -62,11 +47,11 @@ public class SecurityUtils
/**
* 获取用户
**/
public static LoginUser getLoginUser()
public static BaseLoginUser getLoginUser()
{
try
{
return (LoginUser) getAuthentication().getPrincipal();
return (BaseLoginUser) getAuthentication().getPrincipal();
}
catch (Exception e)
{
... ...
package com.ruoyi.common.utils.poi;
import com.ruoyi.common.annotation.Excels;
import com.ruoyi.system.domain.tool.Excels;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.text.Convert;
... ...
... ... @@ -2,7 +2,7 @@ package com.ruoyi.framework.aspectj;
import com.alibaba.fastjson.JSON;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.domain.BaseLoginUser;
import com.ruoyi.common.enums.BusinessStatus;
import com.ruoyi.common.enums.HttpMethod;
import com.ruoyi.common.utils.SecurityUtils;
... ... @@ -67,7 +67,7 @@ public class LogAspect
try
{
// 获取当前的用户
LoginUser loginUser = SecurityUtils.getLoginUser();
BaseLoginUser loginUser = SecurityUtils.getLoginUser();
// *========数据库日志=========*//
SysOperLog operLog = new SysOperLog();
... ...
package com.ruoyi.framework.security.filter;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.domain.BaseLoginUser;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.web.service.TokenService;
... ... @@ -32,7 +32,7 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter
protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain)
throws ServletException, IOException
{
LoginUser loginUser = tokenService.getLoginUser(request);
BaseLoginUser loginUser = tokenService.getLoginUser(request);
if (StringUtils.isNotNull(loginUser) && StringUtils.isNull(SecurityUtils.getAuthentication()))
{
tokenService.verifyToken(loginUser);
... ...
... ... @@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSON;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.domain.BaseLoginUser;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.manager.AsyncManager;
... ... @@ -15,10 +15,8 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.security.core.Authentication;
import org.springframework.security.web.authentication.logout.LogoutSuccessHandler;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
/**
* 自定义退出处理类 返回成功
... ... @@ -38,9 +36,8 @@ public class LogoutSuccessHandlerImpl implements LogoutSuccessHandler
*/
@Override
public void onLogoutSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication)
throws IOException, ServletException
{
LoginUser loginUser = tokenService.getLoginUser(request);
BaseLoginUser loginUser = tokenService.getLoginUser(request);
if (StringUtils.isNotNull(loginUser))
{
String userName = loginUser.getUsername();
... ...
package com.ruoyi.system.service;
package com.ruoyi.framework.web.service;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.domain.BaseLoginUser;
import com.ruoyi.system.domain.SysUserOnline;
/**
... ... @@ -17,7 +17,7 @@ public interface ISysUserOnlineService
* @param user 用户信息
* @return 在线用户信息
*/
public SysUserOnline selectOnlineByIpaddr(String ipaddr, LoginUser user);
public SysUserOnline selectOnlineByIpaddr(String ipaddr, BaseLoginUser user);
/**
* 通过用户名称查询信息
... ... @@ -26,7 +26,7 @@ public interface ISysUserOnlineService
* @param user 用户信息
* @return 在线用户信息
*/
public SysUserOnline selectOnlineByUserName(String userName, LoginUser user);
public SysUserOnline selectOnlineByUserName(String userName, BaseLoginUser user);
/**
* 通过登录地址/用户名称查询信息
... ... @@ -36,7 +36,7 @@ public interface ISysUserOnlineService
* @param user 用户信息
* @return 在线用户信息
*/
public SysUserOnline selectOnlineByInfo(String ipaddr, String userName, LoginUser user);
public SysUserOnline selectOnlineByInfo(String ipaddr, String userName, BaseLoginUser user);
/**
* 设置在线用户信息
... ... @@ -44,5 +44,5 @@ public interface ISysUserOnlineService
* @param user 用户信息
* @return 在线用户
*/
public SysUserOnline loginUserToUserOnline(LoginUser user);
public SysUserOnline loginUserToUserOnline(BaseLoginUser user);
}
... ...
package com.ruoyi.framework.web.service;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.domain.BaseLoginUser;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.StringUtils;
... ... @@ -42,7 +42,7 @@ public class TokenService
private int expireTime;
@Value("${token.rediskey}")
private int rediskey;
private String rediskey;
protected static final long MILLIS_SECOND = 1000;
... ... @@ -58,7 +58,7 @@ public class TokenService
*
* @return 用户信息
*/
public LoginUser getLoginUser(HttpServletRequest request)
public BaseLoginUser getLoginUser(HttpServletRequest request)
{
// 获取请求携带的令牌
String token = getToken(request);
... ... @@ -70,7 +70,7 @@ public class TokenService
// 解析对应的权限以及用户信息
String uuid = (String) claims.get(Constants.LOGIN_USER_KEY);
String userKey = getTokenKey(uuid);
LoginUser user = redisCache.getCacheObject(userKey);
BaseLoginUser user = redisCache.getCacheObject(userKey);
return user;
}
catch (Exception e)
... ... @@ -83,7 +83,7 @@ public class TokenService
/**
* 设置用户身份信息
*/
public void setLoginUser(LoginUser loginUser)
public void setLoginUser(BaseLoginUser loginUser)
{
if (StringUtils.isNotNull(loginUser) && StringUtils.isNotEmpty(loginUser.getToken()))
{
... ... @@ -109,7 +109,7 @@ public class TokenService
* @param loginUser 用户信息
* @return 令牌
*/
public String createToken(LoginUser loginUser)
public String createToken(BaseLoginUser loginUser)
{
String token = IdUtils.fastUUID();
loginUser.setToken(token);
... ... @@ -127,7 +127,7 @@ public class TokenService
* @param loginUser
* @return 令牌
*/
public void verifyToken(LoginUser loginUser)
public void verifyToken(BaseLoginUser loginUser)
{
long expireTime = loginUser.getExpireTime();
long currentTime = System.currentTimeMillis();
... ... @@ -142,7 +142,7 @@ public class TokenService
*
* @param loginUser 登录信息
*/
public void refreshToken(LoginUser loginUser)
public void refreshToken(BaseLoginUser loginUser)
{
loginUser.setLoginTime(System.currentTimeMillis());
loginUser.setExpireTime(loginUser.getLoginTime() + expireTime * MILLIS_MINUTE);
... ... @@ -156,7 +156,7 @@ public class TokenService
*
* @param loginUser 登录信息
*/
public void setUserAgent(LoginUser loginUser)
public void setUserAgent(BaseLoginUser loginUser)
{
UserAgent userAgent = UserAgent.parseUserAgentString(ServletUtils.getRequest().getHeader("User-Agent"));
String ip = IpUtils.getIpAddr(ServletUtils.getRequest());
... ...
package com.ruoyi.system.mapper;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.system.domain.entity.SysDept;
import org.apache.ibatis.annotations.Param;
import java.util.List;
... ...
package com.ruoyi.system.mapper;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.system.domain.entity.SysDictData;
import org.apache.ibatis.annotations.Param;
import java.util.List;
... ...
package com.ruoyi.system.mapper;
import com.ruoyi.common.core.domain.entity.SysDictType;
import com.ruoyi.system.domain.entity.SysDictType;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
... ...
package com.ruoyi.system.mapper;
import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.system.domain.entity.SysMenu;
import org.apache.ibatis.annotations.Param;
import java.util.List;
... ...
package com.ruoyi.system.mapper;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.system.domain.entity.SysRole;
import java.util.List;
... ...
package com.ruoyi.system.mapper;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.system.domain.entity.SysUser;
import org.apache.ibatis.annotations.Param;
import java.util.List;
... ...
package com.ruoyi.system.service;
import com.ruoyi.common.core.domain.TreeSelect;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.system.domain.entity.SysDept;
import java.util.List;
... ...
package com.ruoyi.system.service;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.system.domain.entity.SysDictData;
import java.util.List;
... ...
package com.ruoyi.system.service;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.domain.entity.SysDictType;
import com.ruoyi.system.domain.entity.SysDictData;
import com.ruoyi.system.domain.entity.SysDictType;
import java.util.List;
... ...
package com.ruoyi.system.service;
import com.ruoyi.common.core.domain.TreeSelect;
import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.system.domain.entity.SysMenu;
import com.ruoyi.system.domain.vo.RouterVo;
import java.util.List;
... ...
package com.ruoyi.system.service;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.system.domain.entity.SysRole;
import com.ruoyi.system.domain.SysUserRole;
import java.util.List;
... ...
package com.ruoyi.system.service;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.system.domain.entity.SysUser;
import java.util.List;
... ...
... ... @@ -2,7 +2,7 @@ package com.ruoyi.system.service.impl;
import com.ruoyi.common.annotation.DataSource;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.system.domain.entity.UserConstants;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.enums.DataSourceType;
... ...
package com.ruoyi.system.service.impl;
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.system.domain.entity.UserConstants;
import com.ruoyi.common.core.domain.TreeSelect;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.system.domain.entity.SysDept;
import com.ruoyi.system.domain.entity.SysRole;
import com.ruoyi.system.domain.entity.SysUser;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils;
... ...
package com.ruoyi.system.service.impl;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.system.domain.entity.SysDictData;
import com.ruoyi.common.utils.DictUtils;
import com.ruoyi.system.mapper.SysDictDataMapper;
import com.ruoyi.system.service.ISysDictDataService;
... ...
package com.ruoyi.system.service.impl;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.domain.entity.SysDictType;
import com.ruoyi.system.domain.entity.UserConstants;
import com.ruoyi.system.domain.entity.SysDictData;
import com.ruoyi.system.domain.entity.SysDictType;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DictUtils;
import com.ruoyi.common.utils.StringUtils;
... ...
package com.ruoyi.system.service.impl;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.system.domain.entity.UserConstants;
import com.ruoyi.common.core.domain.TreeSelect;
import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.system.domain.entity.SysMenu;
import com.ruoyi.system.domain.entity.SysRole;
import com.ruoyi.system.domain.entity.SysUser;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.domain.vo.MetaVo;
... ...
package com.ruoyi.system.service.impl;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.system.domain.entity.UserConstants;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.domain.SysPost;
... ...
package com.ruoyi.system.service.impl;
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.system.domain.entity.UserConstants;
import com.ruoyi.system.domain.entity.SysRole;
import com.ruoyi.system.domain.entity.SysUser;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
... ...
package com.ruoyi.system.service.impl;
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.system.domain.entity.UserConstants;
import com.ruoyi.system.domain.entity.SysRole;
import com.ruoyi.system.domain.entity.SysUser;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
... ...