钟来 / Luhui · 提交

转到一个项目

作者 钟来
提交 85dbbc6f91e1871496a6e3d2daad74366ad9ceee 1 个父辈 49f4796f

初始提交

内嵌 并排对比
正在显示 67 个修改的文件 包含 830 行增加 和 314 行删除
@@ -4,13 +4,13 @@ import com.ruoyi.common.annotation.Log; @@ -4,13 +4,13 @@ import com.ruoyi.common.annotation.Log;
4 import com.ruoyi.common.constant.Constants; 4 import com.ruoyi.common.constant.Constants;
5 import com.ruoyi.common.core.controller.BaseController; 5 import com.ruoyi.common.core.controller.BaseController;
6 import com.ruoyi.common.core.domain.AjaxResult; 6 import com.ruoyi.common.core.domain.AjaxResult;
7 -import com.ruoyi.common.core.domain.model.LoginUser; 7 +import com.zhonglai.luhui.admin.model.LoginUser;
8 import com.ruoyi.common.core.page.TableDataInfo; 8 import com.ruoyi.common.core.page.TableDataInfo;
9 import com.ruoyi.common.core.redis.RedisCache; 9 import com.ruoyi.common.core.redis.RedisCache;
10 import com.ruoyi.common.enums.BusinessType; 10 import com.ruoyi.common.enums.BusinessType;
11 import com.ruoyi.common.utils.StringUtils; 11 import com.ruoyi.common.utils.StringUtils;
12 import com.ruoyi.system.domain.SysUserOnline; 12 import com.ruoyi.system.domain.SysUserOnline;
13 -import com.ruoyi.system.service.ISysUserOnlineService; 13 +import com.ruoyi.framework.web.service.ISysUserOnlineService;
14 import io.swagger.annotations.Api; 14 import io.swagger.annotations.Api;
15 import io.swagger.annotations.ApiImplicitParam; 15 import io.swagger.annotations.ApiImplicitParam;
16 import io.swagger.annotations.ApiImplicitParams; 16 import io.swagger.annotations.ApiImplicitParams;
1 package com.zhonglai.luhui.admin.controller.system; 1 package com.zhonglai.luhui.admin.controller.system;
2 2
3 import com.ruoyi.common.annotation.Log; 3 import com.ruoyi.common.annotation.Log;
4 -import com.ruoyi.common.constant.UserConstants; 4 +import com.ruoyi.system.domain.entity.UserConstants;
5 import com.ruoyi.common.core.controller.BaseController; 5 import com.ruoyi.common.core.controller.BaseController;
6 import com.ruoyi.common.core.domain.AjaxResult; 6 import com.ruoyi.common.core.domain.AjaxResult;
7 import com.ruoyi.common.core.page.TableDataInfo; 7 import com.ruoyi.common.core.page.TableDataInfo;
1 package com.zhonglai.luhui.admin.controller.system; 1 package com.zhonglai.luhui.admin.controller.system;
2 2
3 import com.ruoyi.common.annotation.Log; 3 import com.ruoyi.common.annotation.Log;
4 -import com.ruoyi.common.constant.UserConstants; 4 +import com.ruoyi.system.domain.entity.UserConstants;
5 import com.ruoyi.common.core.controller.BaseController; 5 import com.ruoyi.common.core.controller.BaseController;
6 import com.ruoyi.common.core.domain.AjaxResult; 6 import com.ruoyi.common.core.domain.AjaxResult;
7 -import com.ruoyi.common.core.domain.entity.SysDept; 7 +import com.ruoyi.system.domain.entity.SysDept;
8 import com.ruoyi.common.enums.BusinessType; 8 import com.ruoyi.common.enums.BusinessType;
9 import com.ruoyi.common.utils.StringUtils; 9 import com.ruoyi.common.utils.StringUtils;
10 import com.ruoyi.system.service.ISysDeptService; 10 import com.ruoyi.system.service.ISysDeptService;
@@ -3,7 +3,7 @@ package com.zhonglai.luhui.admin.controller.system; @@ -3,7 +3,7 @@ package com.zhonglai.luhui.admin.controller.system;
3 import com.ruoyi.common.annotation.Log; 3 import com.ruoyi.common.annotation.Log;
4 import com.ruoyi.common.core.controller.BaseController; 4 import com.ruoyi.common.core.controller.BaseController;
5 import com.ruoyi.common.core.domain.AjaxResult; 5 import com.ruoyi.common.core.domain.AjaxResult;
6 -import com.ruoyi.common.core.domain.entity.SysDictData; 6 +import com.ruoyi.system.domain.entity.SysDictData;
7 import com.ruoyi.common.core.page.TableDataInfo; 7 import com.ruoyi.common.core.page.TableDataInfo;
8 import com.ruoyi.common.enums.BusinessType; 8 import com.ruoyi.common.enums.BusinessType;
9 import com.ruoyi.common.utils.StringUtils; 9 import com.ruoyi.common.utils.StringUtils;
1 package com.zhonglai.luhui.admin.controller.system; 1 package com.zhonglai.luhui.admin.controller.system;
2 2
3 import com.ruoyi.common.annotation.Log; 3 import com.ruoyi.common.annotation.Log;
4 -import com.ruoyi.common.constant.UserConstants; 4 +import com.ruoyi.system.domain.entity.UserConstants;
5 import com.ruoyi.common.core.controller.BaseController; 5 import com.ruoyi.common.core.controller.BaseController;
6 import com.ruoyi.common.core.domain.AjaxResult; 6 import com.ruoyi.common.core.domain.AjaxResult;
7 -import com.ruoyi.common.core.domain.entity.SysDictType; 7 +import com.ruoyi.system.domain.entity.SysDictType;
8 import com.ruoyi.common.core.page.TableDataInfo; 8 import com.ruoyi.common.core.page.TableDataInfo;
9 import com.ruoyi.common.enums.BusinessType; 9 import com.ruoyi.common.enums.BusinessType;
10 import com.ruoyi.common.utils.poi.ExcelUtil; 10 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -3,12 +3,12 @@ package com.zhonglai.luhui.admin.controller.system; @@ -3,12 +3,12 @@ package com.zhonglai.luhui.admin.controller.system;
3 import com.ruoyi.common.constant.Constants; 3 import com.ruoyi.common.constant.Constants;
4 import com.ruoyi.common.core.controller.BaseController; 4 import com.ruoyi.common.core.controller.BaseController;
5 import com.ruoyi.common.core.domain.AjaxResult; 5 import com.ruoyi.common.core.domain.AjaxResult;
6 -import com.ruoyi.common.core.domain.entity.SysMenu;  
7 -import com.ruoyi.common.core.domain.entity.SysUser;  
8 -import com.ruoyi.common.core.domain.model.LoginBody; 6 +import com.ruoyi.system.domain.entity.SysMenu;
  7 +import com.ruoyi.system.domain.entity.SysUser;
  8 +import com.zhonglai.luhui.admin.model.LoginBody;
9 import com.ruoyi.common.utils.SecurityUtils; 9 import com.ruoyi.common.utils.SecurityUtils;
10 -import com.ruoyi.framework.web.service.SysLoginService;  
11 -import com.ruoyi.framework.web.service.SysPermissionService; 10 +import com.zhonglai.luhui.admin.service.SysLoginService;
  11 +import com.zhonglai.luhui.admin.service.SysPermissionService;
12 import com.ruoyi.system.service.ISysMenuService; 12 import com.ruoyi.system.service.ISysMenuService;
13 import io.swagger.annotations.Api; 13 import io.swagger.annotations.Api;
14 import io.swagger.annotations.ApiOperation; 14 import io.swagger.annotations.ApiOperation;
1 package com.zhonglai.luhui.admin.controller.system; 1 package com.zhonglai.luhui.admin.controller.system;
2 2
3 import com.ruoyi.common.annotation.Log; 3 import com.ruoyi.common.annotation.Log;
4 -import com.ruoyi.common.constant.UserConstants; 4 +import com.ruoyi.system.domain.entity.UserConstants;
5 import com.ruoyi.common.core.controller.BaseController; 5 import com.ruoyi.common.core.controller.BaseController;
6 import com.ruoyi.common.core.domain.AjaxResult; 6 import com.ruoyi.common.core.domain.AjaxResult;
7 -import com.ruoyi.common.core.domain.entity.SysMenu; 7 +import com.ruoyi.system.domain.entity.SysMenu;
8 import com.ruoyi.common.enums.BusinessType; 8 import com.ruoyi.common.enums.BusinessType;
9 import com.ruoyi.common.utils.StringUtils; 9 import com.ruoyi.common.utils.StringUtils;
10 import com.ruoyi.system.service.ISysMenuService; 10 import com.ruoyi.system.service.ISysMenuService;
1 package com.zhonglai.luhui.admin.controller.system; 1 package com.zhonglai.luhui.admin.controller.system;
2 2
3 import com.ruoyi.common.annotation.Log; 3 import com.ruoyi.common.annotation.Log;
4 -import com.ruoyi.common.constant.UserConstants; 4 +import com.ruoyi.system.domain.entity.UserConstants;
5 import com.ruoyi.common.core.controller.BaseController; 5 import com.ruoyi.common.core.controller.BaseController;
6 import com.ruoyi.common.core.domain.AjaxResult; 6 import com.ruoyi.common.core.domain.AjaxResult;
7 import com.ruoyi.common.core.page.TableDataInfo; 7 import com.ruoyi.common.core.page.TableDataInfo;
@@ -2,11 +2,11 @@ package com.zhonglai.luhui.admin.controller.system; @@ -2,11 +2,11 @@ package com.zhonglai.luhui.admin.controller.system;
2 2
3 import com.ruoyi.common.annotation.Log; 3 import com.ruoyi.common.annotation.Log;
4 import com.ruoyi.common.config.RuoYiConfig; 4 import com.ruoyi.common.config.RuoYiConfig;
5 -import com.ruoyi.common.constant.UserConstants; 5 +import com.ruoyi.system.domain.entity.UserConstants;
6 import com.ruoyi.common.core.controller.BaseController; 6 import com.ruoyi.common.core.controller.BaseController;
7 import com.ruoyi.common.core.domain.AjaxResult; 7 import com.ruoyi.common.core.domain.AjaxResult;
8 -import com.ruoyi.common.core.domain.entity.SysUser;  
9 -import com.ruoyi.common.core.domain.model.LoginUser; 8 +import com.ruoyi.system.domain.entity.SysUser;
  9 +import com.zhonglai.luhui.admin.model.LoginUser;
10 import com.ruoyi.common.enums.BusinessType; 10 import com.ruoyi.common.enums.BusinessType;
11 import com.ruoyi.common.utils.SecurityUtils; 11 import com.ruoyi.common.utils.SecurityUtils;
12 import com.ruoyi.common.utils.StringUtils; 12 import com.ruoyi.common.utils.StringUtils;
@@ -2,10 +2,10 @@ package com.zhonglai.luhui.admin.controller.system; @@ -2,10 +2,10 @@ package com.zhonglai.luhui.admin.controller.system;
2 2
3 import com.ruoyi.common.core.controller.BaseController; 3 import com.ruoyi.common.core.controller.BaseController;
4 import com.ruoyi.common.core.domain.AjaxResult; 4 import com.ruoyi.common.core.domain.AjaxResult;
5 -import com.ruoyi.common.core.domain.model.RegisterBody; 5 +import com.zhonglai.luhui.admin.model.RegisterBody;
6 import com.ruoyi.common.utils.StringUtils; 6 import com.ruoyi.common.utils.StringUtils;
7 -import com.ruoyi.framework.web.service.SysLoginService;  
8 -import com.ruoyi.framework.web.service.SysRegisterService; 7 +import com.zhonglai.luhui.admin.service.SysLoginService;
  8 +import com.zhonglai.luhui.admin.service.SysRegisterService;
9 import com.ruoyi.system.service.ISysConfigService; 9 import com.ruoyi.system.service.ISysConfigService;
10 import io.swagger.annotations.Api; 10 import io.swagger.annotations.Api;
11 import io.swagger.annotations.ApiOperation; 11 import io.swagger.annotations.ApiOperation;
1 package com.zhonglai.luhui.admin.controller.system; 1 package com.zhonglai.luhui.admin.controller.system;
2 2
3 import com.ruoyi.common.annotation.Log; 3 import com.ruoyi.common.annotation.Log;
4 -import com.ruoyi.common.constant.UserConstants; 4 +import com.ruoyi.system.domain.entity.UserConstants;
5 import com.ruoyi.common.core.controller.BaseController; 5 import com.ruoyi.common.core.controller.BaseController;
6 import com.ruoyi.common.core.domain.AjaxResult; 6 import com.ruoyi.common.core.domain.AjaxResult;
7 -import com.ruoyi.common.core.domain.entity.SysRole;  
8 -import com.ruoyi.common.core.domain.entity.SysUser;  
9 -import com.ruoyi.common.core.domain.model.LoginUser; 7 +import com.ruoyi.system.domain.entity.SysRole;
  8 +import com.ruoyi.system.domain.entity.SysUser;
  9 +import com.zhonglai.luhui.admin.model.LoginUser;
10 import com.ruoyi.common.core.page.TableDataInfo; 10 import com.ruoyi.common.core.page.TableDataInfo;
11 import com.ruoyi.common.enums.BusinessType; 11 import com.ruoyi.common.enums.BusinessType;
12 import com.ruoyi.common.utils.StringUtils; 12 import com.ruoyi.common.utils.StringUtils;
13 import com.ruoyi.common.utils.poi.ExcelUtil; 13 import com.ruoyi.common.utils.poi.ExcelUtil;
14 -import com.ruoyi.framework.web.service.SysPermissionService; 14 +import com.zhonglai.luhui.admin.service.SysPermissionService;
15 import com.ruoyi.framework.web.service.TokenService; 15 import com.ruoyi.framework.web.service.TokenService;
16 import com.ruoyi.system.domain.SysUserRole; 16 import com.ruoyi.system.domain.SysUserRole;
17 import com.ruoyi.system.service.ISysRoleService; 17 import com.ruoyi.system.service.ISysRoleService;
1 package com.zhonglai.luhui.admin.controller.system; 1 package com.zhonglai.luhui.admin.controller.system;
2 2
3 import com.ruoyi.common.annotation.Log; 3 import com.ruoyi.common.annotation.Log;
4 -import com.ruoyi.common.constant.UserConstants; 4 +import com.ruoyi.system.domain.entity.UserConstants;
5 import com.ruoyi.common.core.controller.BaseController; 5 import com.ruoyi.common.core.controller.BaseController;
6 import com.ruoyi.common.core.domain.AjaxResult; 6 import com.ruoyi.common.core.domain.AjaxResult;
7 -import com.ruoyi.common.core.domain.entity.SysRole;  
8 -import com.ruoyi.common.core.domain.entity.SysUser; 7 +import com.ruoyi.system.domain.entity.SysRole;
  8 +import com.ruoyi.system.domain.entity.SysUser;
9 import com.ruoyi.common.core.page.TableDataInfo; 9 import com.ruoyi.common.core.page.TableDataInfo;
10 import com.ruoyi.common.enums.BusinessType; 10 import com.ruoyi.common.enums.BusinessType;
11 import com.ruoyi.common.utils.SecurityUtils; 11 import com.ruoyi.common.utils.SecurityUtils;
1 -package com.ruoyi.common.core.domain.model; 1 +package com.zhonglai.luhui.admin.model;
2 2
3 /** 3 /**
4 * 用户登录对象 4 * 用户登录对象
1 -package com.ruoyi.common.core.domain.model; 1 +package com.zhonglai.luhui.admin.model;
2 2
3 import com.alibaba.fastjson.annotation.JSONField; 3 import com.alibaba.fastjson.annotation.JSONField;
4 -import com.ruoyi.common.core.domain.entity.SysUser; 4 +import com.ruoyi.common.core.domain.BaseLoginUser;
  5 +import com.ruoyi.system.domain.entity.SysUser;
5 import org.springframework.security.core.GrantedAuthority; 6 import org.springframework.security.core.GrantedAuthority;
6 -import org.springframework.security.core.userdetails.UserDetails;  
7 7
8 import java.util.Collection; 8 import java.util.Collection;
9 import java.util.Set; 9 import java.util.Set;
@@ -13,56 +13,16 @@ import java.util.Set; @@ -13,56 +13,16 @@ import java.util.Set;
13 * 13 *
14 * @author ruoyi 14 * @author ruoyi
15 */ 15 */
16 -public class LoginUser implements UserDetails 16 +public class LoginUser extends BaseLoginUser
17 { 17 {
18 private static final long serialVersionUID = 1L; 18 private static final long serialVersionUID = 1L;
19 19
20 /** 20 /**
21 - * 用户ID  
22 - */  
23 - private Long userId;  
24 -  
25 - /**  
26 * 部门ID 21 * 部门ID
27 */ 22 */
28 private Long deptId; 23 private Long deptId;
29 24
30 /** 25 /**
31 - * 用户唯一标识  
32 - */  
33 - private String token;  
34 -  
35 - /**  
36 - * 登录时间  
37 - */  
38 - private Long loginTime;  
39 -  
40 - /**  
41 - * 过期时间  
42 - */  
43 - private Long expireTime;  
44 -  
45 - /**  
46 - * 登录IP地址  
47 - */  
48 - private String ipaddr;  
49 -  
50 - /**  
51 - * 登录地点  
52 - */  
53 - private String loginLocation;  
54 -  
55 - /**  
56 - * 浏览器类型  
57 - */  
58 - private String browser;  
59 -  
60 - /**  
61 - * 操作系统  
62 - */  
63 - private String os;  
64 -  
65 - /**  
66 * 权限列表 26 * 权限列表
67 */ 27 */
68 private Set<String> permissions; 28 private Set<String> permissions;
@@ -72,15 +32,6 @@ public class LoginUser implements UserDetails @@ -72,15 +32,6 @@ public class LoginUser implements UserDetails
72 */ 32 */
73 private SysUser user; 33 private SysUser user;
74 34
75 - public Long getUserId()  
76 - {  
77 - return userId;  
78 - }  
79 -  
80 - public void setUserId(Long userId)  
81 - {  
82 - this.userId = userId;  
83 - }  
84 35
85 public Long getDeptId() 36 public Long getDeptId()
86 { 37 {
@@ -92,15 +43,6 @@ public class LoginUser implements UserDetails @@ -92,15 +43,6 @@ public class LoginUser implements UserDetails
92 this.deptId = deptId; 43 this.deptId = deptId;
93 } 44 }
94 45
95 - public String getToken()  
96 - {  
97 - return token;  
98 - }  
99 -  
100 - public void setToken(String token)  
101 - {  
102 - this.token = token;  
103 - }  
104 46
105 public LoginUser() 47 public LoginUser()
106 { 48 {
@@ -114,20 +56,19 @@ public class LoginUser implements UserDetails @@ -114,20 +56,19 @@ public class LoginUser implements UserDetails
114 56
115 public LoginUser(Long userId, Long deptId, SysUser user, Set<String> permissions) 57 public LoginUser(Long userId, Long deptId, SysUser user, Set<String> permissions)
116 { 58 {
117 - this.userId = userId; 59 + setUserId(userId);
118 this.deptId = deptId; 60 this.deptId = deptId;
119 this.user = user; 61 this.user = user;
120 this.permissions = permissions; 62 this.permissions = permissions;
121 } 63 }
122 64
123 @JSONField(serialize = false) 65 @JSONField(serialize = false)
124 -  
125 public String getPassword() 66 public String getPassword()
126 { 67 {
127 return user.getPassword(); 68 return user.getPassword();
128 } 69 }
129 70
130 - 71 +
131 public String getUsername() 72 public String getUsername()
132 { 73 {
133 return user.getUserName(); 74 return user.getUserName();
@@ -137,7 +78,6 @@ public class LoginUser implements UserDetails @@ -137,7 +78,6 @@ public class LoginUser implements UserDetails
137 * 账户是否未过期,过期无法验证 78 * 账户是否未过期,过期无法验证
138 */ 79 */
139 @JSONField(serialize = false) 80 @JSONField(serialize = false)
140 -  
141 public boolean isAccountNonExpired() 81 public boolean isAccountNonExpired()
142 { 82 {
143 return true; 83 return true;
@@ -149,7 +89,6 @@ public class LoginUser implements UserDetails @@ -149,7 +89,6 @@ public class LoginUser implements UserDetails
149 * @return 89 * @return
150 */ 90 */
151 @JSONField(serialize = false) 91 @JSONField(serialize = false)
152 -  
153 public boolean isAccountNonLocked() 92 public boolean isAccountNonLocked()
154 { 93 {
155 return true; 94 return true;
@@ -161,7 +100,6 @@ public class LoginUser implements UserDetails @@ -161,7 +100,6 @@ public class LoginUser implements UserDetails
161 * @return 100 * @return
162 */ 101 */
163 @JSONField(serialize = false) 102 @JSONField(serialize = false)
164 -  
165 public boolean isCredentialsNonExpired() 103 public boolean isCredentialsNonExpired()
166 { 104 {
167 return true; 105 return true;
@@ -173,72 +111,11 @@ public class LoginUser implements UserDetails @@ -173,72 +111,11 @@ public class LoginUser implements UserDetails
173 * @return 111 * @return
174 */ 112 */
175 @JSONField(serialize = false) 113 @JSONField(serialize = false)
176 -  
177 public boolean isEnabled() 114 public boolean isEnabled()
178 { 115 {
179 return true; 116 return true;
180 } 117 }
181 118
182 - public Long getLoginTime()  
183 - {  
184 - return loginTime;  
185 - }  
186 -  
187 - public void setLoginTime(Long loginTime)  
188 - {  
189 - this.loginTime = loginTime;  
190 - }  
191 -  
192 - public String getIpaddr()  
193 - {  
194 - return ipaddr;  
195 - }  
196 -  
197 - public void setIpaddr(String ipaddr)  
198 - {  
199 - this.ipaddr = ipaddr;  
200 - }  
201 -  
202 - public String getLoginLocation()  
203 - {  
204 - return loginLocation;  
205 - }  
206 -  
207 - public void setLoginLocation(String loginLocation)  
208 - {  
209 - this.loginLocation = loginLocation;  
210 - }  
211 -  
212 - public String getBrowser()  
213 - {  
214 - return browser;  
215 - }  
216 -  
217 - public void setBrowser(String browser)  
218 - {  
219 - this.browser = browser;  
220 - }  
221 -  
222 - public String getOs()  
223 - {  
224 - return os;  
225 - }  
226 -  
227 - public void setOs(String os)  
228 - {  
229 - this.os = os;  
230 - }  
231 -  
232 - public Long getExpireTime()  
233 - {  
234 - return expireTime;  
235 - }  
236 -  
237 - public void setExpireTime(Long expireTime)  
238 - {  
239 - this.expireTime = expireTime;  
240 - }  
241 -  
242 public Set<String> getPermissions() 119 public Set<String> getPermissions()
243 { 120 {
244 return permissions; 121 return permissions;
1 -package com.ruoyi.common.core.domain.model; 1 +package com.zhonglai.luhui.admin.model;
2 2
3 /** 3 /**
4 * 用户注册对象 4 * 用户注册对象
1 -package com.ruoyi.framework.aspectj; 1 +package com.zhonglai.luhui.admin.service;
2 2
3 import com.ruoyi.common.annotation.DataScope; 3 import com.ruoyi.common.annotation.DataScope;
  4 +import com.ruoyi.common.core.domain.BaseLoginUser;
4 import com.ruoyi.system.domain.tool.BaseEntity; 5 import com.ruoyi.system.domain.tool.BaseEntity;
5 -import com.ruoyi.common.core.domain.entity.SysRole;  
6 -import com.ruoyi.common.core.domain.entity.SysUser;  
7 -import com.ruoyi.common.core.domain.model.LoginUser; 6 +import com.ruoyi.system.domain.entity.SysRole;
  7 +import com.ruoyi.system.domain.entity.SysUser;
8 import com.ruoyi.common.utils.SecurityUtils; 8 import com.ruoyi.common.utils.SecurityUtils;
9 import com.ruoyi.common.utils.StringUtils; 9 import com.ruoyi.common.utils.StringUtils;
10 import org.aspectj.lang.JoinPoint; 10 import org.aspectj.lang.JoinPoint;
@@ -61,10 +61,10 @@ public class DataScopeAspect @@ -61,10 +61,10 @@ public class DataScopeAspect
61 protected void handleDataScope(final JoinPoint joinPoint, DataScope controllerDataScope) 61 protected void handleDataScope(final JoinPoint joinPoint, DataScope controllerDataScope)
62 { 62 {
63 // 获取当前的用户 63 // 获取当前的用户
64 - LoginUser loginUser = SecurityUtils.getLoginUser(); 64 + BaseLoginUser loginUser = SecurityUtils.getLoginUser();
65 if (StringUtils.isNotNull(loginUser)) 65 if (StringUtils.isNotNull(loginUser))
66 { 66 {
67 - SysUser currentUser = loginUser.getUser(); 67 + SysUser currentUser = (SysUser) loginUser.getUser();
68 // 如果是超级管理员，则不过滤数据 68 // 如果是超级管理员，则不过滤数据
69 if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin()) 69 if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin())
70 { 70 {
1 -package com.ruoyi.framework.web.service; 1 +package com.zhonglai.luhui.admin.service;
2 2
3 -import com.ruoyi.common.core.domain.entity.SysRole;  
4 -import com.ruoyi.common.core.domain.model.LoginUser; 3 +import com.ruoyi.common.core.domain.BaseLoginUser;
  4 +import com.ruoyi.system.domain.entity.SysRole;
  5 +import com.zhonglai.luhui.admin.model.LoginUser;
5 import com.ruoyi.common.utils.SecurityUtils; 6 import com.ruoyi.common.utils.SecurityUtils;
6 import com.ruoyi.common.utils.StringUtils; 7 import com.ruoyi.common.utils.StringUtils;
7 import org.springframework.stereotype.Service; 8 import org.springframework.stereotype.Service;
@@ -39,7 +40,7 @@ public class PermissionService @@ -39,7 +40,7 @@ public class PermissionService
39 { 40 {
40 return false; 41 return false;
41 } 42 }
42 - LoginUser loginUser = SecurityUtils.getLoginUser(); 43 + LoginUser loginUser = (LoginUser) SecurityUtils.getLoginUser();
43 if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getPermissions())) 44 if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getPermissions()))
44 { 45 {
45 return false; 46 return false;
@@ -70,7 +71,7 @@ public class PermissionService @@ -70,7 +71,7 @@ public class PermissionService
70 { 71 {
71 return false; 72 return false;
72 } 73 }
73 - LoginUser loginUser = SecurityUtils.getLoginUser(); 74 + LoginUser loginUser = (LoginUser) SecurityUtils.getLoginUser();
74 if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getPermissions())) 75 if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getPermissions()))
75 { 76 {
76 return false; 77 return false;
@@ -98,7 +99,7 @@ public class PermissionService @@ -98,7 +99,7 @@ public class PermissionService
98 { 99 {
99 return false; 100 return false;
100 } 101 }
101 - LoginUser loginUser = SecurityUtils.getLoginUser(); 102 + LoginUser loginUser = (LoginUser) SecurityUtils.getLoginUser();
102 if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getUser().getRoles())) 103 if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getUser().getRoles()))
103 { 104 {
104 return false; 105 return false;
@@ -137,7 +138,7 @@ public class PermissionService @@ -137,7 +138,7 @@ public class PermissionService
137 { 138 {
138 return false; 139 return false;
139 } 140 }
140 - LoginUser loginUser = SecurityUtils.getLoginUser(); 141 + LoginUser loginUser = (LoginUser) SecurityUtils.getLoginUser();
141 if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getUser().getRoles())) 142 if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getUser().getRoles()))
142 { 143 {
143 return false; 144 return false;
1 -package com.ruoyi.framework.web.service; 1 +package com.zhonglai.luhui.admin.service;
2 2
3 import com.ruoyi.common.constant.Constants; 3 import com.ruoyi.common.constant.Constants;
4 -import com.ruoyi.common.core.domain.entity.SysUser;  
5 -import com.ruoyi.common.core.domain.model.LoginUser; 4 +import com.ruoyi.system.domain.entity.SysUser;
  5 +import com.zhonglai.luhui.admin.model.LoginUser;
6 import com.ruoyi.common.core.redis.RedisCache; 6 import com.ruoyi.common.core.redis.RedisCache;
7 import com.ruoyi.common.exception.ServiceException; 7 import com.ruoyi.common.exception.ServiceException;
8 import com.ruoyi.common.exception.user.CaptchaException; 8 import com.ruoyi.common.exception.user.CaptchaException;
@@ -15,6 +15,7 @@ import com.ruoyi.common.utils.StringUtils; @@ -15,6 +15,7 @@ import com.ruoyi.common.utils.StringUtils;
15 import com.ruoyi.common.utils.ip.IpUtils; 15 import com.ruoyi.common.utils.ip.IpUtils;
16 import com.ruoyi.framework.manager.AsyncManager; 16 import com.ruoyi.framework.manager.AsyncManager;
17 import com.ruoyi.framework.manager.factory.AsyncFactory; 17 import com.ruoyi.framework.manager.factory.AsyncFactory;
  18 +import com.ruoyi.framework.web.service.TokenService;
18 import com.ruoyi.system.service.ISysConfigService; 19 import com.ruoyi.system.service.ISysConfigService;
19 import com.ruoyi.system.service.ISysUserService; 20 import com.ruoyi.system.service.ISysUserService;
20 import org.springframework.beans.factory.annotation.Autowired; 21 import org.springframework.beans.factory.annotation.Autowired;
1 -package com.ruoyi.framework.web.service; 1 +package com.zhonglai.luhui.admin.service;
2 2
3 -import com.ruoyi.common.core.domain.entity.SysUser; 3 +import com.ruoyi.system.domain.entity.SysUser;
4 import com.ruoyi.system.service.ISysMenuService; 4 import com.ruoyi.system.service.ISysMenuService;
5 import com.ruoyi.system.service.ISysRoleService; 5 import com.ruoyi.system.service.ISysRoleService;
6 import org.springframework.beans.factory.annotation.Autowired; 6 import org.springframework.beans.factory.annotation.Autowired;
1 -package com.ruoyi.framework.web.service; 1 +package com.zhonglai.luhui.admin.service;
2 2
3 import com.ruoyi.common.constant.Constants; 3 import com.ruoyi.common.constant.Constants;
4 -import com.ruoyi.common.constant.UserConstants;  
5 -import com.ruoyi.common.core.domain.entity.SysUser;  
6 -import com.ruoyi.common.core.domain.model.RegisterBody; 4 +import com.ruoyi.system.domain.entity.UserConstants;
  5 +import com.ruoyi.system.domain.entity.SysUser;
  6 +import com.zhonglai.luhui.admin.model.RegisterBody;
7 import com.ruoyi.common.core.redis.RedisCache; 7 import com.ruoyi.common.core.redis.RedisCache;
8 import com.ruoyi.common.exception.user.CaptchaException; 8 import com.ruoyi.common.exception.user.CaptchaException;
9 import com.ruoyi.common.exception.user.CaptchaExpireException; 9 import com.ruoyi.common.exception.user.CaptchaExpireException;
1 -package com.ruoyi.system.service.impl; 1 +package com.zhonglai.luhui.admin.service;
2 2
3 -import com.ruoyi.common.core.domain.model.LoginUser; 3 +import com.ruoyi.common.core.domain.BaseLoginUser;
  4 +import com.ruoyi.framework.web.service.ISysUserOnlineService;
  5 +import com.zhonglai.luhui.admin.model.LoginUser;
4 import com.ruoyi.common.utils.StringUtils; 6 import com.ruoyi.common.utils.StringUtils;
5 import com.ruoyi.system.domain.SysUserOnline; 7 import com.ruoyi.system.domain.SysUserOnline;
6 -import com.ruoyi.system.service.ISysUserOnlineService;  
7 import org.springframework.stereotype.Service; 8 import org.springframework.stereotype.Service;
8 9
9 /** 10 /**
@@ -14,16 +15,9 @@ import org.springframework.stereotype.Service; @@ -14,16 +15,9 @@ import org.springframework.stereotype.Service;
14 @Service 15 @Service
15 public class SysUserOnlineServiceImpl implements ISysUserOnlineService 16 public class SysUserOnlineServiceImpl implements ISysUserOnlineService
16 { 17 {
17 - /**  
18 - * 通过登录地址查询信息  
19 - *  
20 - * @param ipaddr 登录地址  
21 - * @param user 用户信息  
22 - * @return 在线用户信息  
23 - */ 18 +
24 @Override 19 @Override
25 - public SysUserOnline selectOnlineByIpaddr(String ipaddr, LoginUser user)  
26 - { 20 + public SysUserOnline selectOnlineByIpaddr(String ipaddr, BaseLoginUser user) {
27 if (StringUtils.equals(ipaddr, user.getIpaddr())) 21 if (StringUtils.equals(ipaddr, user.getIpaddr()))
28 { 22 {
29 return loginUserToUserOnline(user); 23 return loginUserToUserOnline(user);
@@ -39,7 +33,7 @@ public class SysUserOnlineServiceImpl implements ISysUserOnlineService @@ -39,7 +33,7 @@ public class SysUserOnlineServiceImpl implements ISysUserOnlineService
39 * @return 在线用户信息 33 * @return 在线用户信息
40 */ 34 */
41 @Override 35 @Override
42 - public SysUserOnline selectOnlineByUserName(String userName, LoginUser user) 36 + public SysUserOnline selectOnlineByUserName(String userName, BaseLoginUser user)
43 { 37 {
44 if (StringUtils.equals(userName, user.getUsername())) 38 if (StringUtils.equals(userName, user.getUsername()))
45 { 39 {
@@ -57,7 +51,7 @@ public class SysUserOnlineServiceImpl implements ISysUserOnlineService @@ -57,7 +51,7 @@ public class SysUserOnlineServiceImpl implements ISysUserOnlineService
57 * @return 在线用户信息 51 * @return 在线用户信息
58 */ 52 */
59 @Override 53 @Override
60 - public SysUserOnline selectOnlineByInfo(String ipaddr, String userName, LoginUser user) 54 + public SysUserOnline selectOnlineByInfo(String ipaddr, String userName, BaseLoginUser user)
61 { 55 {
62 if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsername())) 56 if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsername()))
63 { 57 {
@@ -69,16 +63,17 @@ public class SysUserOnlineServiceImpl implements ISysUserOnlineService @@ -69,16 +63,17 @@ public class SysUserOnlineServiceImpl implements ISysUserOnlineService
69 /** 63 /**
70 * 设置在线用户信息 64 * 设置在线用户信息
71 * 65 *
72 - * @param user 用户信息 66 + * @param baseLoginUser 用户信息
73 * @return 在线用户 67 * @return 在线用户
74 */ 68 */
75 @Override 69 @Override
76 - public SysUserOnline loginUserToUserOnline(LoginUser user) 70 + public SysUserOnline loginUserToUserOnline(BaseLoginUser baseLoginUser)
77 { 71 {
78 - if (StringUtils.isNull(user) || StringUtils.isNull(user.getUser())) 72 + if (StringUtils.isNull(baseLoginUser) || StringUtils.isNull(baseLoginUser.getUser()))
79 { 73 {
80 return null; 74 return null;
81 } 75 }
  76 + LoginUser user = (LoginUser) baseLoginUser;
82 SysUserOnline sysUserOnline = new SysUserOnline(); 77 SysUserOnline sysUserOnline = new SysUserOnline();
83 sysUserOnline.setTokenId(user.getToken()); 78 sysUserOnline.setTokenId(user.getToken());
84 sysUserOnline.setUserName(user.getUsername()); 79 sysUserOnline.setUserName(user.getUsername());
1 -package com.ruoyi.framework.web.service; 1 +package com.zhonglai.luhui.admin.service;
2 2
3 -import com.ruoyi.common.core.domain.entity.SysUser;  
4 -import com.ruoyi.common.core.domain.model.LoginUser; 3 +import com.ruoyi.system.domain.entity.SysUser;
  4 +import com.zhonglai.luhui.admin.model.LoginUser;
5 import com.ruoyi.common.enums.UserStatus; 5 import com.ruoyi.common.enums.UserStatus;
6 import com.ruoyi.common.exception.ServiceException; 6 import com.ruoyi.common.exception.ServiceException;
7 import com.ruoyi.common.utils.StringUtils; 7 import com.ruoyi.common.utils.StringUtils;
@@ -18,27 +18,30 @@ @@ -18,27 +18,30 @@
18 <artifactId>spring-boot-devtools</artifactId> 18 <artifactId>spring-boot-devtools</artifactId>
19 <optional>true</optional> <!-- 表示依赖不会传递 --> 19 <optional>true</optional> <!-- 表示依赖不会传递 -->
20 </dependency> 20 </dependency>
21 -  
22 - <!-- Mysql驱动包 --> 21 + <!-- SpringBoot Web容器 -->
23 <dependency> 22 <dependency>
24 - <groupId>mysql</groupId>  
25 - <artifactId>mysql-connector-java</artifactId> 23 + <groupId>org.springframework.boot</groupId>
  24 + <artifactId>spring-boot-starter-web</artifactId>
26 </dependency> 25 </dependency>
27 -  
28 - <!-- 核心模块--> 26 + <!-- Spring框架基本的核心工具 -->
29 <dependency> 27 <dependency>
30 - <groupId>com.zhonglai.luhui</groupId>  
31 - <artifactId>ruoyi-framework</artifactId> 28 + <groupId>org.springframework</groupId>
  29 + <artifactId>spring-context-support</artifactId>
32 </dependency> 30 </dependency>
33 - <!-- 代码生成模块--> 31 + <!-- SpringWeb模块 -->
34 <dependency> 32 <dependency>
35 - <groupId>com.zhonglai.luhui</groupId>  
36 - <artifactId>ruoyi-generator</artifactId> 33 + <groupId>org.springframework</groupId>
  34 + <artifactId>spring-web</artifactId>
37 </dependency> 35 </dependency>
38 - <!-- 代码生成模块-->  
39 <dependency> 36 <dependency>
40 <groupId>com.zhonglai.luhui</groupId> 37 <groupId>com.zhonglai.luhui</groupId>
41 - <artifactId>lh-mqtt-service</artifactId> 38 + <artifactId>ruoyi-framework</artifactId>
  39 + </dependency>
  40 +
  41 + <!-- Mysql驱动包 -->
  42 + <dependency>
  43 + <groupId>mysql</groupId>
  44 + <artifactId>mysql-connector-java</artifactId>
42 </dependency> 45 </dependency>
43 <!-- 文档 --> 46 <!-- 文档 -->
44 <dependency > 47 <dependency >
  1 +package com.zhonglai.luhui.api.config;
  2 +
  3 +import com.zhonglai.luhui.api.dto.ApiLoginUser;
  4 +import org.springframework.security.core.userdetails.UserDetails;
  5 +import org.springframework.security.core.userdetails.UserDetailsService;
  6 +import org.springframework.security.core.userdetails.UsernameNotFoundException;
  7 +import org.springframework.stereotype.Service;
  8 +
  9 +@Service
  10 +public class ApiUserDetailsServiceImpl implements UserDetailsService {
  11 + @Override
  12 + public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
  13 +
  14 + return new ApiLoginUser(user.getUserId(), user.getDeptId(), user, permissionService.getMenuPermission(user));
  15 + }
  16 +}
  1 +package com.zhonglai.luhui.api.dto;
  2 +
  3 +import com.alibaba.fastjson.annotation.JSONField;
  4 +import com.ruoyi.common.core.domain.BaseLoginUser;
  5 +import org.springframework.security.core.GrantedAuthority;
  6 +
  7 +import java.util.Collection;
  8 +
  9 +public class ApiLoginUser extends BaseLoginUser {
  10 + private UserInfo userInfo;
  11 +
  12 + private UserLogin userLogin;
  13 +
  14 + @Override
  15 + public UserInfo getUser() {
  16 + return userInfo;
  17 + }
  18 +
  19 + @Override
  20 + public Collection<? extends GrantedAuthority> getAuthorities() {
  21 + return null;
  22 + }
  23 +
  24 + @Override
  25 + public String getPassword() {
  26 + return userLogin.getLoginPass();
  27 + }
  28 +
  29 + @Override
  30 + public String getUsername() {
  31 + return userInfo.getLoginName();
  32 + }
  33 +
  34 + /**
  35 + * 账户是否未过期,过期无法验证
  36 + */
  37 + @JSONField(serialize = false)
  38 + @Override
  39 + public boolean isAccountNonExpired() {
  40 + return false;
  41 + }
  42 +
  43 + /**
  44 + * 指定用户是否解锁,锁定的用户无法进行身份验证
  45 + *
  46 + * @return
  47 + */
  48 + @JSONField(serialize = false)
  49 + @Override
  50 + public boolean isAccountNonLocked() {
  51 + return false;
  52 + }
  53 +
  54 + /**
  55 + * 指示是否已过期的用户的凭据(密码),过期的凭据防止认证
  56 + *
  57 + * @return
  58 + */
  59 + @JSONField(serialize = false)
  60 + @Override
  61 + public boolean isCredentialsNonExpired() {
  62 + return false;
  63 + }
  64 +
  65 + /**
  66 + * 是否可用 ,禁用的用户不能身份验证
  67 + *
  68 + * @return
  69 + */
  70 + @JSONField(serialize = false)
  71 + @Override
  72 + public boolean isEnabled() {
  73 + return false;
  74 + }
  75 +
  76 + public void setUserInfo(UserInfo userInfo) {
  77 + this.userInfo = userInfo;
  78 + }
  79 +
  80 + public UserLogin getUserLogin() {
  81 + return userLogin;
  82 + }
  83 +
  84 + public void setUserLogin(UserLogin userLogin) {
  85 + this.userLogin = userLogin;
  86 + }
  87 +}
  1 +package com.zhonglai.luhui.api.dto;
  2 +
  3 +
  4 +import java.io.Serializable;
  5 +
  6 +/**
  7 + * 用户信息
  8 + */
  9 +public class UserInfo implements Serializable {
  10 + private static final long serialVersionUID = 2442852637823064570L;
  11 +
  12 + private Integer id; // int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
  13 + private String loginName; // varchar(50) NOT NULL COMMENT '登录名',
  14 + private String name; // varchar(50) DEFAULT NULL COMMENT '真实姓名',
  15 + private Integer gender; // int(11) DEFAULT '0' COMMENT '性别(0男,1女)',
  16 + private String email; // varchar(100) DEFAULT NULL COMMENT '电子邮箱',
  17 + private String phone; // varchar(50) DEFAULT NULL COMMENT '手机号',
  18 + private String imgUrl; // text COMMENT '头像地址',
  19 + private Integer onlineState; // int(2) DEFAULT '0' COMMENT '在线状态(0离线,1在线)',
  20 + private Integer lastLoginTime; // int(11) DEFAULT NULL COMMENT '最后登陆时间',
  21 + private String lastLoginIp; // varchar(50) DEFAULT NULL COMMENT '最后登陆ip',
  22 + private Integer createTime; // int(11) DEFAULT NULL COMMENT '创建时间',
  23 + private Integer nameAuthentication; // int(11) DEFAULT '0' COMMENT '是否实名认证(0否,1是)',
  24 + private Integer integral; // int(11) DEFAULT '0' COMMENT '积分',
  25 + private String qq; // varchar(50) DEFAULT NULL COMMENT 'qq账号',
  26 + private String weixin; // varchar(50) DEFAULT NULL COMMENT '微信账号',
  27 + private String lastAddress; // varchar(50) DEFAULT NULL COMMENT '最后登陆地点',
  28 + private String nickname; // varchar(50) DEFAULT NULL COMMENT '昵称',
  29 + private Integer userType; // int(11) DEFAULT '0' COMMENT '用户类型（0普通用户,1管理员,2客服）',
  30 + private String lastLoginLongitude; // varchar(20) DEFAULT NULL COMMENT '最后登陆经度',
  31 + private String lastLoginLatitude; // varchar(20) DEFAULT NULL COMMENT '最后登陆纬度',
  32 + private String search; // varchar(200) DEFAULT NULL COMMENT '常用搜索内容,中间用逗号隔开(如:鲤鱼,黑鱼)',
  33 + private String provinceId; // varchar(50) DEFAULT NULL COMMENT '省id',
  34 + private String cityId; // varchar(50) DEFAULT NULL COMMENT '市id',
  35 + private String countyId; // varchar(50) DEFAULT NULL COMMENT '县id',
  36 + private String provinceName; // varchar(50) DEFAULT NULL COMMENT '省名称',
  37 + private String cityName; // varchar(50) DEFAULT NULL COMMENT '市名称',
  38 + private String countyName; // varchar(50) DEFAULT NULL COMMENT '县名称',
  39 + private String address; // varchar(50) DEFAULT NULL COMMENT '地址',
  40 + private Integer isInvalid; // int(11) DEFAULT '0' COMMENT '是否失效（0否，1是）',
  41 + private Integer alarmAgreement; // int(11) DEFAULT '0' COMMENT '告警协议',
  42 + private Integer annualServiceCharge; // int(11) DEFAULT '0' COMMENT '年度服务费',
  43 + private String messagePassWord; // varchar(50) DEFAULT NULL COMMENT '极光消息密码',
  44 + private String ysChildrenId; // varchar(50) DEFAULT NULL COMMENT '萤石子账号id',
  45 + private String ysChildrenPass; // varchar(50) DEFAULT NULL COMMENT '萤石子账号密码',
  46 + private Integer isParticipateIn; // int(11) DEFAULT '0' COMMENT '是否参与活动',
  47 + private Integer level; //级别
  48 + private Integer currency; //货币(换算人民币为分)
  49 + private Integer experience; //经验
  50 + private Integer openId; //开放id
  51 + private Integer dianmiaoEndTime; //点苗器到期时间 -1表示终身有效
  52 + private Integer balance; //余额(单位分)
  53 + private Integer companyId; //公司id
  54 + private String alarmNoticePhone; //告警通知电话
  55 +
  56 + public String getAlarmNoticePhone() {
  57 + return alarmNoticePhone;
  58 + }
  59 +
  60 + public void setAlarmNoticePhone(String alarmNoticePhone) {
  61 + this.alarmNoticePhone = alarmNoticePhone;
  62 + }
  63 +
  64 + public Integer getCompanyId() {
  65 + return companyId;
  66 + }
  67 +
  68 + public void setCompanyId(Integer companyId) {
  69 + this.companyId = companyId;
  70 + }
  71 +
  72 + public Integer getBalance() {
  73 + return balance;
  74 + }
  75 +
  76 + public void setBalance(Integer balance) {
  77 + this.balance = balance;
  78 + }
  79 +
  80 + public Integer getDianmiaoEndTime() {
  81 + return dianmiaoEndTime;
  82 + }
  83 +
  84 + public void setDianmiaoEndTime(Integer dianmiaoEndTime) {
  85 + this.dianmiaoEndTime = dianmiaoEndTime;
  86 + }
  87 +
  88 + public Integer getOpenId() {
  89 + return openId;
  90 + }
  91 +
  92 + public void setOpenId(Integer openId) {
  93 + this.openId = openId;
  94 + }
  95 +
  96 + public Integer getId() {
  97 + return id;
  98 + }
  99 +
  100 + public void setId(Integer id) {
  101 + this.id = id;
  102 + }
  103 +
  104 + public String getLoginName() {
  105 + return loginName;
  106 + }
  107 +
  108 + public void setLoginName(String loginName) {
  109 + this.loginName = loginName;
  110 + }
  111 +
  112 + public String getName() {
  113 + return name;
  114 + }
  115 +
  116 + public void setName(String name) {
  117 + this.name = name;
  118 + }
  119 +
  120 + public Integer getGender() {
  121 + return gender;
  122 + }
  123 +
  124 + public void setGender(Integer gender) {
  125 + this.gender = gender;
  126 + }
  127 +
  128 + public String getEmail() {
  129 + return email;
  130 + }
  131 +
  132 + public void setEmail(String email) {
  133 + this.email = email;
  134 + }
  135 +
  136 + public String getPhone() {
  137 + return phone;
  138 + }
  139 +
  140 + public void setPhone(String phone) {
  141 + this.phone = phone;
  142 + }
  143 +
  144 + public String getImgUrl() {
  145 + return imgUrl;
  146 + }
  147 +
  148 + public void setImgUrl(String imgUrl) {
  149 + this.imgUrl = imgUrl;
  150 + }
  151 +
  152 + public Integer getOnlineState() {
  153 + return onlineState;
  154 + }
  155 +
  156 + public void setOnlineState(Integer onlineState) {
  157 + this.onlineState = onlineState;
  158 + }
  159 +
  160 + public Integer getLastLoginTime() {
  161 + return lastLoginTime;
  162 + }
  163 +
  164 + public void setLastLoginTime(Integer lastLoginTime) {
  165 + this.lastLoginTime = lastLoginTime;
  166 + }
  167 +
  168 + public String getLastLoginIp() {
  169 + return lastLoginIp;
  170 + }
  171 +
  172 + public void setLastLoginIp(String lastLoginIp) {
  173 + this.lastLoginIp = lastLoginIp;
  174 + }
  175 +
  176 + public Integer getCreateTime() {
  177 + return createTime;
  178 + }
  179 +
  180 + public void setCreateTime(Integer createTime) {
  181 + this.createTime = createTime;
  182 + }
  183 +
  184 + public Integer getNameAuthentication() {
  185 + return nameAuthentication;
  186 + }
  187 +
  188 + public void setNameAuthentication(Integer nameAuthentication) {
  189 + this.nameAuthentication = nameAuthentication;
  190 + }
  191 +
  192 + public Integer getIntegral() {
  193 + return integral;
  194 + }
  195 +
  196 + public void setIntegral(Integer integral) {
  197 + this.integral = integral;
  198 + }
  199 +
  200 + public String getQq() {
  201 + return qq;
  202 + }
  203 +
  204 + public void setQq(String qq) {
  205 + this.qq = qq;
  206 + }
  207 +
  208 + public String getWeixin() {
  209 + return weixin;
  210 + }
  211 +
  212 + public void setWeixin(String weixin) {
  213 + this.weixin = weixin;
  214 + }
  215 +
  216 + public String getLastAddress() {
  217 + return lastAddress;
  218 + }
  219 +
  220 + public void setLastAddress(String lastAddress) {
  221 + this.lastAddress = lastAddress;
  222 + }
  223 +
  224 + public String getNickname() {
  225 + return nickname;
  226 + }
  227 +
  228 + public void setNickname(String nickname) {
  229 + this.nickname = nickname;
  230 + }
  231 +
  232 + public Integer getUserType() {
  233 + return userType;
  234 + }
  235 +
  236 + public void setUserType(Integer userType) {
  237 + this.userType = userType;
  238 + }
  239 +
  240 + public String getLastLoginLongitude() {
  241 + return lastLoginLongitude;
  242 + }
  243 +
  244 + public void setLastLoginLongitude(String lastLoginLongitude) {
  245 + this.lastLoginLongitude = lastLoginLongitude;
  246 + }
  247 +
  248 + public String getLastLoginLatitude() {
  249 + return lastLoginLatitude;
  250 + }
  251 +
  252 + public void setLastLoginLatitude(String lastLoginLatitude) {
  253 + this.lastLoginLatitude = lastLoginLatitude;
  254 + }
  255 +
  256 + public String getSearch() {
  257 + return search;
  258 + }
  259 +
  260 + public void setSearch(String search) {
  261 + this.search = search;
  262 + }
  263 +
  264 + public String getProvinceId() {
  265 + return provinceId;
  266 + }
  267 +
  268 + public void setProvinceId(String provinceId) {
  269 + this.provinceId = provinceId;
  270 + }
  271 +
  272 + public String getCityId() {
  273 + return cityId;
  274 + }
  275 +
  276 + public void setCityId(String cityId) {
  277 + this.cityId = cityId;
  278 + }
  279 +
  280 + public String getCountyId() {
  281 + return countyId;
  282 + }
  283 +
  284 + public void setCountyId(String countyId) {
  285 + this.countyId = countyId;
  286 + }
  287 +
  288 + public String getProvinceName() {
  289 + return provinceName;
  290 + }
  291 +
  292 + public void setProvinceName(String provinceName) {
  293 + this.provinceName = provinceName;
  294 + }
  295 +
  296 + public String getCityName() {
  297 + return cityName;
  298 + }
  299 +
  300 + public void setCityName(String cityName) {
  301 + this.cityName = cityName;
  302 + }
  303 +
  304 + public String getCountyName() {
  305 + return countyName;
  306 + }
  307 +
  308 + public void setCountyName(String countyName) {
  309 + this.countyName = countyName;
  310 + }
  311 +
  312 + public String getAddress() {
  313 + return address;
  314 + }
  315 +
  316 + public void setAddress(String address) {
  317 + this.address = address;
  318 + }
  319 +
  320 + public Integer getIsInvalid() {
  321 + return isInvalid;
  322 + }
  323 +
  324 + public void setIsInvalid(Integer isInvalid) {
  325 + this.isInvalid = isInvalid;
  326 + }
  327 +
  328 + public Integer getAlarmAgreement() {
  329 + return alarmAgreement;
  330 + }
  331 +
  332 + public void setAlarmAgreement(Integer alarmAgreement) {
  333 + this.alarmAgreement = alarmAgreement;
  334 + }
  335 +
  336 + public Integer getAnnualServiceCharge() {
  337 + return annualServiceCharge;
  338 + }
  339 +
  340 + public void setAnnualServiceCharge(Integer annualServiceCharge) {
  341 + this.annualServiceCharge = annualServiceCharge;
  342 + }
  343 +
  344 + public String getMessagePassWord() {
  345 + return messagePassWord;
  346 + }
  347 +
  348 + public void setMessagePassWord(String messagePassWord) {
  349 + this.messagePassWord = messagePassWord;
  350 + }
  351 +
  352 + public String getYsChildrenId() {
  353 + return ysChildrenId;
  354 + }
  355 +
  356 + public void setYsChildrenId(String ysChildrenId) {
  357 + this.ysChildrenId = ysChildrenId;
  358 + }
  359 +
  360 + public String getYsChildrenPass() {
  361 + return ysChildrenPass;
  362 + }
  363 +
  364 + public void setYsChildrenPass(String ysChildrenPass) {
  365 + this.ysChildrenPass = ysChildrenPass;
  366 + }
  367 +
  368 + public Integer getIsParticipateIn() {
  369 + return isParticipateIn;
  370 + }
  371 +
  372 + public void setIsParticipateIn(Integer isParticipateIn) {
  373 + this.isParticipateIn = isParticipateIn;
  374 + }
  375 +
  376 + public Integer getLevel() {
  377 + return level;
  378 + }
  379 +
  380 + public void setLevel(Integer level) {
  381 + this.level = level;
  382 + }
  383 +
  384 + public Integer getCurrency() {
  385 + return currency;
  386 + }
  387 +
  388 + public void setCurrency(Integer currency) {
  389 + this.currency = currency;
  390 + }
  391 +
  392 + public Integer getExperience() {
  393 + return experience;
  394 + }
  395 +
  396 + public void setExperience(Integer experience) {
  397 + this.experience = experience;
  398 + }
  399 +}
  1 +package com.zhonglai.luhui.api.dto;
  2 +
  3 +/**
  4 + * 用户登录
  5 + */
  6 +public class UserLogin {
  7 + private Integer id; // int(11) NOT NULL AUTO_INCREMENT COMMENT '用户登录主键主键',
  8 + private Integer userId; // int(11) NOT NULL COMMENT '用户主键id',
  9 + private String loginName; // varchar(50) NOT NULL COMMENT '用户登录名',
  10 + private String loginPass; // text NOT NULL COMMENT '用户密码',
  11 + private String userLoginPassKey; // varchar(20) NOT NULL COMMENT '用户登录密码key',
  12 +
  13 + public Integer getId() {
  14 + return id;
  15 + }
  16 +
  17 + public void setId(Integer id) {
  18 + this.id = id;
  19 + }
  20 +
  21 + public Integer getUserId() {
  22 + return userId;
  23 + }
  24 +
  25 + public void setUserId(Integer userId) {
  26 + this.userId = userId;
  27 + }
  28 +
  29 + public String getLoginName() {
  30 + return loginName;
  31 + }
  32 +
  33 + public void setLoginName(String loginName) {
  34 + this.loginName = loginName;
  35 + }
  36 +
  37 + public String getLoginPass() {
  38 + return loginPass;
  39 + }
  40 +
  41 + public void setLoginPass(String loginPass) {
  42 + this.loginPass = loginPass;
  43 + }
  44 +
  45 + public String getUserLoginPassKey() {
  46 + return userLoginPassKey;
  47 + }
  48 +
  49 + public void setUserLoginPassKey(String userLoginPassKey) {
  50 + this.userLoginPassKey = userLoginPassKey;
  51 + }
  52 +}
1 -package com.ruoyi.common.core.domain.entity; 1 +package com.ruoyi.system.domain.entity;
2 2
3 import com.ruoyi.system.domain.tool.BaseEntity; 3 import com.ruoyi.system.domain.tool.BaseEntity;
4 import org.apache.commons.lang3.builder.ToStringBuilder; 4 import org.apache.commons.lang3.builder.ToStringBuilder;
1 -package com.ruoyi.common.core.domain.entity; 1 +package com.ruoyi.system.domain.entity;
2 2
3 import com.ruoyi.system.domain.tool.Excel; 3 import com.ruoyi.system.domain.tool.Excel;
4 import com.ruoyi.system.domain.tool.Excel.ColumnType; 4 import com.ruoyi.system.domain.tool.Excel.ColumnType;
5 -import com.ruoyi.common.constant.UserConstants;  
6 import com.ruoyi.system.domain.tool.BaseEntity; 5 import com.ruoyi.system.domain.tool.BaseEntity;
7 import org.apache.commons.lang3.builder.ToStringBuilder; 6 import org.apache.commons.lang3.builder.ToStringBuilder;
8 import org.apache.commons.lang3.builder.ToStringStyle; 7 import org.apache.commons.lang3.builder.ToStringStyle;
  1 +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(); }}
1 -package com.ruoyi.common.core.domain.entity; 1 +package com.ruoyi.system.domain.entity;
2 2
3 import com.ruoyi.system.domain.tool.BaseEntity; 3 import com.ruoyi.system.domain.tool.BaseEntity;
4 import org.apache.commons.lang3.builder.ToStringBuilder; 4 import org.apache.commons.lang3.builder.ToStringBuilder;
1 -package com.ruoyi.common.core.domain.entity; 1 +package com.ruoyi.system.domain.entity;
2 2
3 import com.ruoyi.system.domain.tool.Excel; 3 import com.ruoyi.system.domain.tool.Excel;
4 import com.ruoyi.system.domain.tool.Excel.ColumnType; 4 import com.ruoyi.system.domain.tool.Excel.ColumnType;
1 -package com.ruoyi.common.core.domain.entity; 1 +package com.ruoyi.system.domain.entity;
2 2
3 import com.fasterxml.jackson.annotation.JsonIgnore; 3 import com.fasterxml.jackson.annotation.JsonIgnore;
4 import com.fasterxml.jackson.annotation.JsonProperty; 4 import com.fasterxml.jackson.annotation.JsonProperty;
5 import com.ruoyi.system.domain.tool.Excel; 5 import com.ruoyi.system.domain.tool.Excel;
6 import com.ruoyi.system.domain.tool.Excel.ColumnType; 6 import com.ruoyi.system.domain.tool.Excel.ColumnType;
7 import com.ruoyi.system.domain.tool.Excel.Type; 7 import com.ruoyi.system.domain.tool.Excel.Type;
8 -import com.ruoyi.common.annotation.Excels;  
9 import com.ruoyi.system.domain.tool.BaseEntity; 8 import com.ruoyi.system.domain.tool.BaseEntity;
  9 +import com.ruoyi.system.domain.tool.Excels;
10 import com.ruoyi.system.domain.tool.Xss; 10 import com.ruoyi.system.domain.tool.Xss;
11 import org.apache.commons.lang3.builder.ToStringBuilder; 11 import org.apache.commons.lang3.builder.ToStringBuilder;
12 import org.apache.commons.lang3.builder.ToStringStyle; 12 import org.apache.commons.lang3.builder.ToStringStyle;
1 -package com.ruoyi.common.constant; 1 +package com.ruoyi.system.domain.entity;
2 2
3 /** 3 /**
4 * 用户常量信息 4 * 用户常量信息
1 -package com.ruoyi.common.annotation; 1 +package com.ruoyi.system.domain.tool;
2 2
3 import com.ruoyi.system.domain.tool.Excel; 3 import com.ruoyi.system.domain.tool.Excel;
4 4
@@ -4,7 +4,7 @@ import com.github.pagehelper.PageHelper; @@ -4,7 +4,7 @@ import com.github.pagehelper.PageHelper;
4 import com.github.pagehelper.PageInfo; 4 import com.github.pagehelper.PageInfo;
5 import com.ruoyi.common.constant.HttpStatus; 5 import com.ruoyi.common.constant.HttpStatus;
6 import com.ruoyi.common.core.domain.AjaxResult; 6 import com.ruoyi.common.core.domain.AjaxResult;
7 -import com.ruoyi.common.core.domain.model.LoginUser; 7 +import com.ruoyi.common.core.domain.BaseLoginUser;
8 import com.ruoyi.common.core.page.PageDomain; 8 import com.ruoyi.common.core.page.PageDomain;
9 import com.ruoyi.common.core.page.TableDataInfo; 9 import com.ruoyi.common.core.page.TableDataInfo;
10 import com.ruoyi.common.core.page.TableSupport; 10 import com.ruoyi.common.core.page.TableSupport;
@@ -156,7 +156,7 @@ public class BaseController @@ -156,7 +156,7 @@ public class BaseController
156 /** 156 /**
157 * 获取用户缓存信息 157 * 获取用户缓存信息
158 */ 158 */
159 - public LoginUser getLoginUser() 159 + public BaseLoginUser getLoginUser()
160 { 160 {
161 return SecurityUtils.getLoginUser(); 161 return SecurityUtils.getLoginUser();
162 } 162 }
@@ -169,13 +169,6 @@ public class BaseController @@ -169,13 +169,6 @@ public class BaseController
169 return getLoginUser().getUserId(); 169 return getLoginUser().getUserId();
170 } 170 }
171 171
172 - /**  
173 - * 获取登录部门id  
174 - */  
175 - public Long getDeptId()  
176 - {  
177 - return getLoginUser().getDeptId();  
178 - }  
179 172
180 /** 173 /**
181 * 获取登录用户名 174 * 获取登录用户名
  1 +package com.ruoyi.common.core.domain;
  2 +
  3 +import org.springframework.security.core.userdetails.UserDetails;
  4 +
  5 +
  6 +public abstract class BaseLoginUser implements UserDetails {
  7 + /**
  8 + * 用户ID
  9 + */
  10 + private Long userId;
  11 + /**
  12 + * 用户唯一标识
  13 + */
  14 + private String token;
  15 +
  16 + /**
  17 + * 登录时间
  18 + */
  19 + private Long loginTime;
  20 +
  21 + /**
  22 + * 过期时间
  23 + */
  24 + private Long expireTime;
  25 +
  26 + /**
  27 + * 登录IP地址
  28 + */
  29 + private String ipaddr;
  30 +
  31 + /**
  32 + * 登录地点
  33 + */
  34 + private String loginLocation;
  35 +
  36 + /**
  37 + * 浏览器类型
  38 + */
  39 + private String browser;
  40 +
  41 + /**
  42 + * 操作系统
  43 + */
  44 + private String os;
  45 +
  46 + public Long getUserId() {
  47 + return userId;
  48 + }
  49 +
  50 + public void setUserId(Long userId) {
  51 + this.userId = userId;
  52 + }
  53 +
  54 + public String getToken() {
  55 + return token;
  56 + }
  57 +
  58 + public void setToken(String token) {
  59 + this.token = token;
  60 + }
  61 +
  62 + public Long getLoginTime() {
  63 + return loginTime;
  64 + }
  65 +
  66 + public void setLoginTime(Long loginTime) {
  67 + this.loginTime = loginTime;
  68 + }
  69 +
  70 + public Long getExpireTime() {
  71 + return expireTime;
  72 + }
  73 +
  74 + public void setExpireTime(Long expireTime) {
  75 + this.expireTime = expireTime;
  76 + }
  77 +
  78 + public String getIpaddr() {
  79 + return ipaddr;
  80 + }
  81 +
  82 + public void setIpaddr(String ipaddr) {
  83 + this.ipaddr = ipaddr;
  84 + }
  85 +
  86 + public String getLoginLocation() {
  87 + return loginLocation;
  88 + }
  89 +
  90 + public void setLoginLocation(String loginLocation) {
  91 + this.loginLocation = loginLocation;
  92 + }
  93 +
  94 + public String getBrowser() {
  95 + return browser;
  96 + }
  97 +
  98 + public void setBrowser(String browser) {
  99 + this.browser = browser;
  100 + }
  101 +
  102 + public String getOs() {
  103 + return os;
  104 + }
  105 +
  106 + public void setOs(String os) {
  107 + this.os = os;
  108 + }
  109 +
  110 + public abstract Object getUser();
  111 +}
1 package com.ruoyi.common.core.domain; 1 package com.ruoyi.common.core.domain;
2 2
3 import com.fasterxml.jackson.annotation.JsonInclude; 3 import com.fasterxml.jackson.annotation.JsonInclude;
4 -import com.ruoyi.common.core.domain.entity.SysDept;  
5 -import com.ruoyi.common.core.domain.entity.SysMenu; 4 +import com.ruoyi.system.domain.entity.SysDept;
  5 +import com.ruoyi.system.domain.entity.SysMenu;
6 6
7 import java.io.Serializable; 7 import java.io.Serializable;
8 import java.util.List; 8 import java.util.List;
1 -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(); }}  
1 package com.ruoyi.common.utils; 1 package com.ruoyi.common.utils;
2 2
3 import com.ruoyi.common.constant.Constants; 3 import com.ruoyi.common.constant.Constants;
4 -import com.ruoyi.common.core.domain.entity.SysDictData; 4 +import com.ruoyi.system.domain.entity.SysDictData;
5 import com.ruoyi.common.core.redis.RedisCache; 5 import com.ruoyi.common.core.redis.RedisCache;
6 import com.ruoyi.common.utils.spring.SpringUtils; 6 import com.ruoyi.common.utils.spring.SpringUtils;
7 7
1 package com.ruoyi.common.utils; 1 package com.ruoyi.common.utils;
2 2
3 import com.ruoyi.common.constant.HttpStatus; 3 import com.ruoyi.common.constant.HttpStatus;
4 -import com.ruoyi.common.core.domain.model.LoginUser; 4 +import com.ruoyi.common.core.domain.BaseLoginUser;
5 import com.ruoyi.common.exception.ServiceException; 5 import com.ruoyi.common.exception.ServiceException;
6 import org.springframework.security.core.Authentication; 6 import org.springframework.security.core.Authentication;
7 import org.springframework.security.core.context.SecurityContextHolder; 7 import org.springframework.security.core.context.SecurityContextHolder;
@@ -30,21 +30,6 @@ public class SecurityUtils @@ -30,21 +30,6 @@ public class SecurityUtils
30 } 30 }
31 31
32 /** 32 /**
33 - * 获取部门ID  
34 - **/  
35 - public static Long getDeptId()  
36 - {  
37 - try  
38 - {  
39 - return getLoginUser().getDeptId();  
40 - }  
41 - catch (Exception e)  
42 - {  
43 - throw new ServiceException("获取部门ID异常", HttpStatus.UNAUTHORIZED);  
44 - }  
45 - }  
46 -  
47 - /**  
48 * 获取用户账户 33 * 获取用户账户
49 **/ 34 **/
50 public static String getUsername() 35 public static String getUsername()
@@ -62,11 +47,11 @@ public class SecurityUtils @@ -62,11 +47,11 @@ public class SecurityUtils
62 /** 47 /**
63 * 获取用户 48 * 获取用户
64 **/ 49 **/
65 - public static LoginUser getLoginUser() 50 + public static BaseLoginUser getLoginUser()
66 { 51 {
67 try 52 try
68 { 53 {
69 - return (LoginUser) getAuthentication().getPrincipal(); 54 + return (BaseLoginUser) getAuthentication().getPrincipal();
70 } 55 }
71 catch (Exception e) 56 catch (Exception e)
72 { 57 {
1 package com.ruoyi.common.utils.poi; 1 package com.ruoyi.common.utils.poi;
2 2
3 -import com.ruoyi.common.annotation.Excels; 3 +import com.ruoyi.system.domain.tool.Excels;
4 import com.ruoyi.common.config.RuoYiConfig; 4 import com.ruoyi.common.config.RuoYiConfig;
5 import com.ruoyi.common.core.domain.AjaxResult; 5 import com.ruoyi.common.core.domain.AjaxResult;
6 import com.ruoyi.common.core.text.Convert; 6 import com.ruoyi.common.core.text.Convert;
@@ -2,7 +2,7 @@ package com.ruoyi.framework.aspectj; @@ -2,7 +2,7 @@ package com.ruoyi.framework.aspectj;
2 2
3 import com.alibaba.fastjson.JSON; 3 import com.alibaba.fastjson.JSON;
4 import com.ruoyi.common.annotation.Log; 4 import com.ruoyi.common.annotation.Log;
5 -import com.ruoyi.common.core.domain.model.LoginUser; 5 +import com.ruoyi.common.core.domain.BaseLoginUser;
6 import com.ruoyi.common.enums.BusinessStatus; 6 import com.ruoyi.common.enums.BusinessStatus;
7 import com.ruoyi.common.enums.HttpMethod; 7 import com.ruoyi.common.enums.HttpMethod;
8 import com.ruoyi.common.utils.SecurityUtils; 8 import com.ruoyi.common.utils.SecurityUtils;
@@ -67,7 +67,7 @@ public class LogAspect @@ -67,7 +67,7 @@ public class LogAspect
67 try 67 try
68 { 68 {
69 // 获取当前的用户 69 // 获取当前的用户
70 - LoginUser loginUser = SecurityUtils.getLoginUser(); 70 + BaseLoginUser loginUser = SecurityUtils.getLoginUser();
71 71
72 // *========数据库日志=========*// 72 // *========数据库日志=========*//
73 SysOperLog operLog = new SysOperLog(); 73 SysOperLog operLog = new SysOperLog();
1 package com.ruoyi.framework.security.filter; 1 package com.ruoyi.framework.security.filter;
2 2
3 -import com.ruoyi.common.core.domain.model.LoginUser; 3 +import com.ruoyi.common.core.domain.BaseLoginUser;
4 import com.ruoyi.common.utils.SecurityUtils; 4 import com.ruoyi.common.utils.SecurityUtils;
5 import com.ruoyi.common.utils.StringUtils; 5 import com.ruoyi.common.utils.StringUtils;
6 import com.ruoyi.framework.web.service.TokenService; 6 import com.ruoyi.framework.web.service.TokenService;
@@ -32,7 +32,7 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter @@ -32,7 +32,7 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter
32 protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain) 32 protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain)
33 throws ServletException, IOException 33 throws ServletException, IOException
34 { 34 {
35 - LoginUser loginUser = tokenService.getLoginUser(request); 35 + BaseLoginUser loginUser = tokenService.getLoginUser(request);
36 if (StringUtils.isNotNull(loginUser) && StringUtils.isNull(SecurityUtils.getAuthentication())) 36 if (StringUtils.isNotNull(loginUser) && StringUtils.isNull(SecurityUtils.getAuthentication()))
37 { 37 {
38 tokenService.verifyToken(loginUser); 38 tokenService.verifyToken(loginUser);
@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSON; @@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSON;
4 import com.ruoyi.common.constant.Constants; 4 import com.ruoyi.common.constant.Constants;
5 import com.ruoyi.common.constant.HttpStatus; 5 import com.ruoyi.common.constant.HttpStatus;
6 import com.ruoyi.common.core.domain.AjaxResult; 6 import com.ruoyi.common.core.domain.AjaxResult;
7 -import com.ruoyi.common.core.domain.model.LoginUser; 7 +import com.ruoyi.common.core.domain.BaseLoginUser;
8 import com.ruoyi.common.utils.ServletUtils; 8 import com.ruoyi.common.utils.ServletUtils;
9 import com.ruoyi.common.utils.StringUtils; 9 import com.ruoyi.common.utils.StringUtils;
10 import com.ruoyi.framework.manager.AsyncManager; 10 import com.ruoyi.framework.manager.AsyncManager;
@@ -15,10 +15,8 @@ import org.springframework.context.annotation.Configuration; @@ -15,10 +15,8 @@ import org.springframework.context.annotation.Configuration;
15 import org.springframework.security.core.Authentication; 15 import org.springframework.security.core.Authentication;
16 import org.springframework.security.web.authentication.logout.LogoutSuccessHandler; 16 import org.springframework.security.web.authentication.logout.LogoutSuccessHandler;
17 17
18 -import javax.servlet.ServletException;  
19 import javax.servlet.http.HttpServletRequest; 18 import javax.servlet.http.HttpServletRequest;
20 import javax.servlet.http.HttpServletResponse; 19 import javax.servlet.http.HttpServletResponse;
21 -import java.io.IOException;  
22 20
23 /** 21 /**
24 * 自定义退出处理类 返回成功 22 * 自定义退出处理类 返回成功
@@ -38,9 +36,8 @@ public class LogoutSuccessHandlerImpl implements LogoutSuccessHandler @@ -38,9 +36,8 @@ public class LogoutSuccessHandlerImpl implements LogoutSuccessHandler
38 */ 36 */
39 @Override 37 @Override
40 public void onLogoutSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) 38 public void onLogoutSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication)
41 - throws IOException, ServletException  
42 { 39 {
43 - LoginUser loginUser = tokenService.getLoginUser(request); 40 + BaseLoginUser loginUser = tokenService.getLoginUser(request);
44 if (StringUtils.isNotNull(loginUser)) 41 if (StringUtils.isNotNull(loginUser))
45 { 42 {
46 String userName = loginUser.getUsername(); 43 String userName = loginUser.getUsername();
1 -package com.ruoyi.system.service; 1 +package com.ruoyi.framework.web.service;
2 2
3 -import com.ruoyi.common.core.domain.model.LoginUser; 3 +import com.ruoyi.common.core.domain.BaseLoginUser;
4 import com.ruoyi.system.domain.SysUserOnline; 4 import com.ruoyi.system.domain.SysUserOnline;
5 5
6 /** 6 /**
@@ -17,7 +17,7 @@ public interface ISysUserOnlineService @@ -17,7 +17,7 @@ public interface ISysUserOnlineService
17 * @param user 用户信息 17 * @param user 用户信息
18 * @return 在线用户信息 18 * @return 在线用户信息
19 */ 19 */
20 - public SysUserOnline selectOnlineByIpaddr(String ipaddr, LoginUser user); 20 + public SysUserOnline selectOnlineByIpaddr(String ipaddr, BaseLoginUser user);
21 21
22 /** 22 /**
23 * 通过用户名称查询信息 23 * 通过用户名称查询信息
@@ -26,7 +26,7 @@ public interface ISysUserOnlineService @@ -26,7 +26,7 @@ public interface ISysUserOnlineService
26 * @param user 用户信息 26 * @param user 用户信息
27 * @return 在线用户信息 27 * @return 在线用户信息
28 */ 28 */
29 - public SysUserOnline selectOnlineByUserName(String userName, LoginUser user); 29 + public SysUserOnline selectOnlineByUserName(String userName, BaseLoginUser user);
30 30
31 /** 31 /**
32 * 通过登录地址/用户名称查询信息 32 * 通过登录地址/用户名称查询信息
@@ -36,7 +36,7 @@ public interface ISysUserOnlineService @@ -36,7 +36,7 @@ public interface ISysUserOnlineService
36 * @param user 用户信息 36 * @param user 用户信息
37 * @return 在线用户信息 37 * @return 在线用户信息
38 */ 38 */
39 - public SysUserOnline selectOnlineByInfo(String ipaddr, String userName, LoginUser user); 39 + public SysUserOnline selectOnlineByInfo(String ipaddr, String userName, BaseLoginUser user);
40 40
41 /** 41 /**
42 * 设置在线用户信息 42 * 设置在线用户信息
@@ -44,5 +44,5 @@ public interface ISysUserOnlineService @@ -44,5 +44,5 @@ public interface ISysUserOnlineService
44 * @param user 用户信息 44 * @param user 用户信息
45 * @return 在线用户 45 * @return 在线用户
46 */ 46 */
47 - public SysUserOnline loginUserToUserOnline(LoginUser user); 47 + public SysUserOnline loginUserToUserOnline(BaseLoginUser user);
48 } 48 }
1 package com.ruoyi.framework.web.service; 1 package com.ruoyi.framework.web.service;
2 2
3 import com.ruoyi.common.constant.Constants; 3 import com.ruoyi.common.constant.Constants;
4 -import com.ruoyi.common.core.domain.model.LoginUser; 4 +import com.ruoyi.common.core.domain.BaseLoginUser;
5 import com.ruoyi.common.core.redis.RedisCache; 5 import com.ruoyi.common.core.redis.RedisCache;
6 import com.ruoyi.common.utils.ServletUtils; 6 import com.ruoyi.common.utils.ServletUtils;
7 import com.ruoyi.common.utils.StringUtils; 7 import com.ruoyi.common.utils.StringUtils;
@@ -42,7 +42,7 @@ public class TokenService @@ -42,7 +42,7 @@ public class TokenService
42 private int expireTime; 42 private int expireTime;
43 43
44 @Value("${token.rediskey}") 44 @Value("${token.rediskey}")
45 - private int rediskey; 45 + private String rediskey;
46 46
47 protected static final long MILLIS_SECOND = 1000; 47 protected static final long MILLIS_SECOND = 1000;
48 48
@@ -58,7 +58,7 @@ public class TokenService @@ -58,7 +58,7 @@ public class TokenService
58 * 58 *
59 * @return 用户信息 59 * @return 用户信息
60 */ 60 */
61 - public LoginUser getLoginUser(HttpServletRequest request) 61 + public BaseLoginUser getLoginUser(HttpServletRequest request)
62 { 62 {
63 // 获取请求携带的令牌 63 // 获取请求携带的令牌
64 String token = getToken(request); 64 String token = getToken(request);
@@ -70,7 +70,7 @@ public class TokenService @@ -70,7 +70,7 @@ public class TokenService
70 // 解析对应的权限以及用户信息 70 // 解析对应的权限以及用户信息
71 String uuid = (String) claims.get(Constants.LOGIN_USER_KEY); 71 String uuid = (String) claims.get(Constants.LOGIN_USER_KEY);
72 String userKey = getTokenKey(uuid); 72 String userKey = getTokenKey(uuid);
73 - LoginUser user = redisCache.getCacheObject(userKey); 73 + BaseLoginUser user = redisCache.getCacheObject(userKey);
74 return user; 74 return user;
75 } 75 }
76 catch (Exception e) 76 catch (Exception e)
@@ -83,7 +83,7 @@ public class TokenService @@ -83,7 +83,7 @@ public class TokenService
83 /** 83 /**
84 * 设置用户身份信息 84 * 设置用户身份信息
85 */ 85 */
86 - public void setLoginUser(LoginUser loginUser) 86 + public void setLoginUser(BaseLoginUser loginUser)
87 { 87 {
88 if (StringUtils.isNotNull(loginUser) && StringUtils.isNotEmpty(loginUser.getToken())) 88 if (StringUtils.isNotNull(loginUser) && StringUtils.isNotEmpty(loginUser.getToken()))
89 { 89 {
@@ -109,7 +109,7 @@ public class TokenService @@ -109,7 +109,7 @@ public class TokenService
109 * @param loginUser 用户信息 109 * @param loginUser 用户信息
110 * @return 令牌 110 * @return 令牌
111 */ 111 */
112 - public String createToken(LoginUser loginUser) 112 + public String createToken(BaseLoginUser loginUser)
113 { 113 {
114 String token = IdUtils.fastUUID(); 114 String token = IdUtils.fastUUID();
115 loginUser.setToken(token); 115 loginUser.setToken(token);
@@ -127,7 +127,7 @@ public class TokenService @@ -127,7 +127,7 @@ public class TokenService
127 * @param loginUser 127 * @param loginUser
128 * @return 令牌 128 * @return 令牌
129 */ 129 */
130 - public void verifyToken(LoginUser loginUser) 130 + public void verifyToken(BaseLoginUser loginUser)
131 { 131 {
132 long expireTime = loginUser.getExpireTime(); 132 long expireTime = loginUser.getExpireTime();
133 long currentTime = System.currentTimeMillis(); 133 long currentTime = System.currentTimeMillis();
@@ -142,7 +142,7 @@ public class TokenService @@ -142,7 +142,7 @@ public class TokenService
142 * 142 *
143 * @param loginUser 登录信息 143 * @param loginUser 登录信息
144 */ 144 */
145 - public void refreshToken(LoginUser loginUser) 145 + public void refreshToken(BaseLoginUser loginUser)
146 { 146 {
147 loginUser.setLoginTime(System.currentTimeMillis()); 147 loginUser.setLoginTime(System.currentTimeMillis());
148 loginUser.setExpireTime(loginUser.getLoginTime() + expireTime * MILLIS_MINUTE); 148 loginUser.setExpireTime(loginUser.getLoginTime() + expireTime * MILLIS_MINUTE);
@@ -156,7 +156,7 @@ public class TokenService @@ -156,7 +156,7 @@ public class TokenService
156 * 156 *
157 * @param loginUser 登录信息 157 * @param loginUser 登录信息
158 */ 158 */
159 - public void setUserAgent(LoginUser loginUser) 159 + public void setUserAgent(BaseLoginUser loginUser)
160 { 160 {
161 UserAgent userAgent = UserAgent.parseUserAgentString(ServletUtils.getRequest().getHeader("User-Agent")); 161 UserAgent userAgent = UserAgent.parseUserAgentString(ServletUtils.getRequest().getHeader("User-Agent"));
162 String ip = IpUtils.getIpAddr(ServletUtils.getRequest()); 162 String ip = IpUtils.getIpAddr(ServletUtils.getRequest());
1 package com.ruoyi.system.mapper; 1 package com.ruoyi.system.mapper;
2 2
3 -import com.ruoyi.common.core.domain.entity.SysDept; 3 +import com.ruoyi.system.domain.entity.SysDept;
4 import org.apache.ibatis.annotations.Param; 4 import org.apache.ibatis.annotations.Param;
5 5
6 import java.util.List; 6 import java.util.List;
1 package com.ruoyi.system.mapper; 1 package com.ruoyi.system.mapper;
2 2
3 -import com.ruoyi.common.core.domain.entity.SysDictData; 3 +import com.ruoyi.system.domain.entity.SysDictData;
4 import org.apache.ibatis.annotations.Param; 4 import org.apache.ibatis.annotations.Param;
5 5
6 import java.util.List; 6 import java.util.List;
1 package com.ruoyi.system.mapper; 1 package com.ruoyi.system.mapper;
2 2
3 -import com.ruoyi.common.core.domain.entity.SysDictType; 3 +import com.ruoyi.system.domain.entity.SysDictType;
4 import org.apache.ibatis.annotations.Mapper; 4 import org.apache.ibatis.annotations.Mapper;
5 5
6 import java.util.List; 6 import java.util.List;
1 package com.ruoyi.system.mapper; 1 package com.ruoyi.system.mapper;
2 2
3 -import com.ruoyi.common.core.domain.entity.SysMenu; 3 +import com.ruoyi.system.domain.entity.SysMenu;
4 import org.apache.ibatis.annotations.Param; 4 import org.apache.ibatis.annotations.Param;
5 5
6 import java.util.List; 6 import java.util.List;
1 package com.ruoyi.system.mapper; 1 package com.ruoyi.system.mapper;
2 2
3 -import com.ruoyi.common.core.domain.entity.SysRole; 3 +import com.ruoyi.system.domain.entity.SysRole;
4 4
5 import java.util.List; 5 import java.util.List;
6 6
1 package com.ruoyi.system.mapper; 1 package com.ruoyi.system.mapper;
2 2
3 -import com.ruoyi.common.core.domain.entity.SysUser; 3 +import com.ruoyi.system.domain.entity.SysUser;
4 import org.apache.ibatis.annotations.Param; 4 import org.apache.ibatis.annotations.Param;
5 5
6 import java.util.List; 6 import java.util.List;
1 package com.ruoyi.system.service; 1 package com.ruoyi.system.service;
2 2
3 import com.ruoyi.common.core.domain.TreeSelect; 3 import com.ruoyi.common.core.domain.TreeSelect;
4 -import com.ruoyi.common.core.domain.entity.SysDept; 4 +import com.ruoyi.system.domain.entity.SysDept;
5 5
6 import java.util.List; 6 import java.util.List;
7 7
1 package com.ruoyi.system.service; 1 package com.ruoyi.system.service;
2 2
3 -import com.ruoyi.common.core.domain.entity.SysDictData; 3 +import com.ruoyi.system.domain.entity.SysDictData;
4 4
5 import java.util.List; 5 import java.util.List;
6 6
1 package com.ruoyi.system.service; 1 package com.ruoyi.system.service;
2 2
3 -import com.ruoyi.common.core.domain.entity.SysDictData;  
4 -import com.ruoyi.common.core.domain.entity.SysDictType; 3 +import com.ruoyi.system.domain.entity.SysDictData;
  4 +import com.ruoyi.system.domain.entity.SysDictType;
5 5
6 import java.util.List; 6 import java.util.List;
7 7
1 package com.ruoyi.system.service; 1 package com.ruoyi.system.service;
2 2
3 import com.ruoyi.common.core.domain.TreeSelect; 3 import com.ruoyi.common.core.domain.TreeSelect;
4 -import com.ruoyi.common.core.domain.entity.SysMenu; 4 +import com.ruoyi.system.domain.entity.SysMenu;
5 import com.ruoyi.system.domain.vo.RouterVo; 5 import com.ruoyi.system.domain.vo.RouterVo;
6 6
7 import java.util.List; 7 import java.util.List;
1 package com.ruoyi.system.service; 1 package com.ruoyi.system.service;
2 2
3 -import com.ruoyi.common.core.domain.entity.SysRole; 3 +import com.ruoyi.system.domain.entity.SysRole;
4 import com.ruoyi.system.domain.SysUserRole; 4 import com.ruoyi.system.domain.SysUserRole;
5 5
6 import java.util.List; 6 import java.util.List;
1 package com.ruoyi.system.service; 1 package com.ruoyi.system.service;
2 2
3 -import com.ruoyi.common.core.domain.entity.SysUser; 3 +import com.ruoyi.system.domain.entity.SysUser;
4 4
5 import java.util.List; 5 import java.util.List;
6 6
@@ -2,7 +2,7 @@ package com.ruoyi.system.service.impl; @@ -2,7 +2,7 @@ package com.ruoyi.system.service.impl;
2 2
3 import com.ruoyi.common.annotation.DataSource; 3 import com.ruoyi.common.annotation.DataSource;
4 import com.ruoyi.common.constant.Constants; 4 import com.ruoyi.common.constant.Constants;
5 -import com.ruoyi.common.constant.UserConstants; 5 +import com.ruoyi.system.domain.entity.UserConstants;
6 import com.ruoyi.common.core.redis.RedisCache; 6 import com.ruoyi.common.core.redis.RedisCache;
7 import com.ruoyi.common.core.text.Convert; 7 import com.ruoyi.common.core.text.Convert;
8 import com.ruoyi.common.enums.DataSourceType; 8 import com.ruoyi.common.enums.DataSourceType;
1 package com.ruoyi.system.service.impl; 1 package com.ruoyi.system.service.impl;
2 2
3 import com.ruoyi.common.annotation.DataScope; 3 import com.ruoyi.common.annotation.DataScope;
4 -import com.ruoyi.common.constant.UserConstants; 4 +import com.ruoyi.system.domain.entity.UserConstants;
5 import com.ruoyi.common.core.domain.TreeSelect; 5 import com.ruoyi.common.core.domain.TreeSelect;
6 -import com.ruoyi.common.core.domain.entity.SysDept;  
7 -import com.ruoyi.common.core.domain.entity.SysRole;  
8 -import com.ruoyi.common.core.domain.entity.SysUser; 6 +import com.ruoyi.system.domain.entity.SysDept;
  7 +import com.ruoyi.system.domain.entity.SysRole;
  8 +import com.ruoyi.system.domain.entity.SysUser;
9 import com.ruoyi.common.core.text.Convert; 9 import com.ruoyi.common.core.text.Convert;
10 import com.ruoyi.common.exception.ServiceException; 10 import com.ruoyi.common.exception.ServiceException;
11 import com.ruoyi.common.utils.SecurityUtils; 11 import com.ruoyi.common.utils.SecurityUtils;
1 package com.ruoyi.system.service.impl; 1 package com.ruoyi.system.service.impl;
2 2
3 -import com.ruoyi.common.core.domain.entity.SysDictData; 3 +import com.ruoyi.system.domain.entity.SysDictData;
4 import com.ruoyi.common.utils.DictUtils; 4 import com.ruoyi.common.utils.DictUtils;
5 import com.ruoyi.system.mapper.SysDictDataMapper; 5 import com.ruoyi.system.mapper.SysDictDataMapper;
6 import com.ruoyi.system.service.ISysDictDataService; 6 import com.ruoyi.system.service.ISysDictDataService;
1 package com.ruoyi.system.service.impl; 1 package com.ruoyi.system.service.impl;
2 2
3 -import com.ruoyi.common.constant.UserConstants;  
4 -import com.ruoyi.common.core.domain.entity.SysDictData;  
5 -import com.ruoyi.common.core.domain.entity.SysDictType; 3 +import com.ruoyi.system.domain.entity.UserConstants;
  4 +import com.ruoyi.system.domain.entity.SysDictData;
  5 +import com.ruoyi.system.domain.entity.SysDictType;
6 import com.ruoyi.common.exception.ServiceException; 6 import com.ruoyi.common.exception.ServiceException;
7 import com.ruoyi.common.utils.DictUtils; 7 import com.ruoyi.common.utils.DictUtils;
8 import com.ruoyi.common.utils.StringUtils; 8 import com.ruoyi.common.utils.StringUtils;
1 package com.ruoyi.system.service.impl; 1 package com.ruoyi.system.service.impl;
2 2
3 import com.ruoyi.common.constant.Constants; 3 import com.ruoyi.common.constant.Constants;
4 -import com.ruoyi.common.constant.UserConstants; 4 +import com.ruoyi.system.domain.entity.UserConstants;
5 import com.ruoyi.common.core.domain.TreeSelect; 5 import com.ruoyi.common.core.domain.TreeSelect;
6 -import com.ruoyi.common.core.domain.entity.SysMenu;  
7 -import com.ruoyi.common.core.domain.entity.SysRole;  
8 -import com.ruoyi.common.core.domain.entity.SysUser; 6 +import com.ruoyi.system.domain.entity.SysMenu;
  7 +import com.ruoyi.system.domain.entity.SysRole;
  8 +import com.ruoyi.system.domain.entity.SysUser;
9 import com.ruoyi.common.utils.SecurityUtils; 9 import com.ruoyi.common.utils.SecurityUtils;
10 import com.ruoyi.common.utils.StringUtils; 10 import com.ruoyi.common.utils.StringUtils;
11 import com.ruoyi.system.domain.vo.MetaVo; 11 import com.ruoyi.system.domain.vo.MetaVo;
1 package com.ruoyi.system.service.impl; 1 package com.ruoyi.system.service.impl;
2 2
3 -import com.ruoyi.common.constant.UserConstants; 3 +import com.ruoyi.system.domain.entity.UserConstants;
4 import com.ruoyi.common.exception.ServiceException; 4 import com.ruoyi.common.exception.ServiceException;
5 import com.ruoyi.common.utils.StringUtils; 5 import com.ruoyi.common.utils.StringUtils;
6 import com.ruoyi.system.domain.SysPost; 6 import com.ruoyi.system.domain.SysPost;
1 package com.ruoyi.system.service.impl; 1 package com.ruoyi.system.service.impl;
2 2
3 import com.ruoyi.common.annotation.DataScope; 3 import com.ruoyi.common.annotation.DataScope;
4 -import com.ruoyi.common.constant.UserConstants;  
5 -import com.ruoyi.common.core.domain.entity.SysRole;  
6 -import com.ruoyi.common.core.domain.entity.SysUser; 4 +import com.ruoyi.system.domain.entity.UserConstants;
  5 +import com.ruoyi.system.domain.entity.SysRole;
  6 +import com.ruoyi.system.domain.entity.SysUser;
7 import com.ruoyi.common.exception.ServiceException; 7 import com.ruoyi.common.exception.ServiceException;
8 import com.ruoyi.common.utils.SecurityUtils; 8 import com.ruoyi.common.utils.SecurityUtils;
9 import com.ruoyi.common.utils.StringUtils; 9 import com.ruoyi.common.utils.StringUtils;
1 package com.ruoyi.system.service.impl; 1 package com.ruoyi.system.service.impl;
2 2
3 import com.ruoyi.common.annotation.DataScope; 3 import com.ruoyi.common.annotation.DataScope;
4 -import com.ruoyi.common.constant.UserConstants;  
5 -import com.ruoyi.common.core.domain.entity.SysRole;  
6 -import com.ruoyi.common.core.domain.entity.SysUser; 4 +import com.ruoyi.system.domain.entity.UserConstants;
  5 +import com.ruoyi.system.domain.entity.SysRole;
  6 +import com.ruoyi.system.domain.entity.SysUser;
7 import com.ruoyi.common.exception.ServiceException; 7 import com.ruoyi.common.exception.ServiceException;
8 import com.ruoyi.common.utils.SecurityUtils; 8 import com.ruoyi.common.utils.SecurityUtils;
9 import com.ruoyi.common.utils.StringUtils; 9 import com.ruoyi.common.utils.StringUtils;