Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
R
restful
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
李永强
restful
Commits
4d8149f0
Commit
4d8149f0
authored
Oct 24, 2019
by
张明杰
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
8f8a5050
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
14 deletions
+19
-14
LoginIntercept.java
...ain/java/com/restful/common/intercept/LoginIntercept.java
+10
-7
User.java
src/main/java/com/restful/domain/User.java
+7
-5
user.xml
src/main/resources/mapper/user.xml
+2
-2
No files found.
src/main/java/com/restful/common/intercept/LoginIntercept.java
View file @
4d8149f0
...
@@ -25,6 +25,7 @@ import javax.servlet.http.HttpServletRequest;
...
@@ -25,6 +25,7 @@ import javax.servlet.http.HttpServletRequest;
import
javax.servlet.http.HttpServletResponse
;
import
javax.servlet.http.HttpServletResponse
;
import
java.io.IOException
;
import
java.io.IOException
;
import
java.io.PrintWriter
;
import
java.io.PrintWriter
;
import
java.util.List
;
@Component
@Component
public
class
LoginIntercept
implements
HandlerInterceptor
{
public
class
LoginIntercept
implements
HandlerInterceptor
{
...
@@ -102,9 +103,10 @@ public class LoginIntercept implements HandlerInterceptor {
...
@@ -102,9 +103,10 @@ public class LoginIntercept implements HandlerInterceptor {
private
boolean
getJurisdictionByRoles
(
User
user
,
String
requestUrl
)
{
private
boolean
getJurisdictionByRoles
(
User
user
,
String
requestUrl
)
{
if
(
user
==
null
)
if
(
user
==
null
)
return
false
;
return
false
;
Role
role
=
user
.
getRole
();
List
<
Role
>
roleList
=
user
.
getRoleList
();
if
(
role
==
null
)
if
(
role
List
==
null
)
return
false
;
return
false
;
for
(
Role
role
:
roleList
)
{
if
(
RoleTable
.
admin
.
getId
().
equals
(
role
.
getId
()))
if
(
RoleTable
.
admin
.
getId
().
equals
(
role
.
getId
()))
return
true
;
return
true
;
Role
complexRole
=
jurisdictionService
.
findMenusByRoleId
(
role
.
getId
());
Role
complexRole
=
jurisdictionService
.
findMenusByRoleId
(
role
.
getId
());
...
@@ -112,6 +114,7 @@ public class LoginIntercept implements HandlerInterceptor {
...
@@ -112,6 +114,7 @@ public class LoginIntercept implements HandlerInterceptor {
if
(
requestUrl
.
indexOf
(
menu
.
getUrl
())
>
0
)
if
(
requestUrl
.
indexOf
(
menu
.
getUrl
())
>
0
)
return
true
;
return
true
;
}
}
}
return
false
;
return
false
;
}
}
...
...
src/main/java/com/restful/domain/User.java
View file @
4d8149f0
...
@@ -3,6 +3,8 @@ package com.restful.domain;
...
@@ -3,6 +3,8 @@ package com.restful.domain;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
import
java.util.List
;
public
class
User
extends
BaseInfo
{
public
class
User
extends
BaseInfo
{
private
String
userName
;
private
String
userName
;
...
@@ -12,7 +14,7 @@ public class User extends BaseInfo {
...
@@ -12,7 +14,7 @@ public class User extends BaseInfo {
@ApiModelProperty
(
hidden
=
true
)
@ApiModelProperty
(
hidden
=
true
)
private
Boolean
resetPassword
;
private
Boolean
resetPassword
;
private
String
phone
;
private
String
phone
;
private
Role
role
;
private
List
<
Role
>
roleList
;
public
Boolean
getResetPassword
()
{
public
Boolean
getResetPassword
()
{
return
resetPassword
;
return
resetPassword
;
...
@@ -46,12 +48,12 @@ public class User extends BaseInfo {
...
@@ -46,12 +48,12 @@ public class User extends BaseInfo {
this
.
name
=
name
;
this
.
name
=
name
;
}
}
public
Role
getRole
()
{
public
List
<
Role
>
getRoleList
()
{
return
role
;
return
role
List
;
}
}
public
void
setRole
(
Role
role
)
{
public
void
setRole
List
(
List
<
Role
>
roleList
)
{
this
.
role
=
role
;
this
.
role
List
=
roleList
;
}
}
public
void
setPhone
(
String
phone
)
{
public
void
setPhone
(
String
phone
)
{
...
...
src/main/resources/mapper/user.xml
View file @
4d8149f0
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
</resultMap>
</resultMap>
<resultMap
id=
"userMap_ex"
type=
"com.restful.domain.User"
extends=
"userMap"
>
<resultMap
id=
"userMap_ex"
type=
"com.restful.domain.User"
extends=
"userMap"
>
<association
property=
"role"
resultMap=
"com.restful.dao.JurisdictionDao.simpleRoleMap"
/>
<association
property=
"role
List
"
resultMap=
"com.restful.dao.JurisdictionDao.simpleRoleMap"
/>
</resultMap>
</resultMap>
<insert
id=
"addUser"
useGeneratedKeys=
"true"
keyProperty=
"id"
>
<insert
id=
"addUser"
useGeneratedKeys=
"true"
keyProperty=
"id"
>
...
@@ -45,7 +45,7 @@
...
@@ -45,7 +45,7 @@
from users
from users
left join user_role on ur_user_id = user_id
left join user_role on ur_user_id = user_id
left join role on role_id = ur_role_id
left join role on role_id = ur_role_id
where
role_id = '${@com.jianju.detecting.field.RoleTable@detection_admin.id}'
where
1=1
<if
test=
"name!=null"
>
<if
test=
"name!=null"
>
and user_name like '%'||#{name}||'%'
and user_name like '%'||#{name}||'%'
</if>
</if>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment