Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Q
qk_backend
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
quanku
qk_backend
Commits
64319b12
Commit
64319b12
authored
Nov 01, 2023
by
shiyu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
后台新增用户
parent
b4418eed
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
3 deletions
+20
-3
ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/AdminAuthServiceImpl.java
...ain/java/com/wwdz/ch/admin/impl/AdminAuthServiceImpl.java
+2
-1
ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/AdminDataAuthServiceImpl.java
...java/com/wwdz/ch/admin/impl/AdminDataAuthServiceImpl.java
+2
-1
ch-admin-api/src/main/java/com/wwdz/ch/admin/shiro/AdminAuthorizingRealm.java
...n/java/com/wwdz/ch/admin/shiro/AdminAuthorizingRealm.java
+2
-1
ch-core/src/main/java/com/wwdz/ch/core/util/StringUtil.java
ch-core/src/main/java/com/wwdz/ch/core/util/StringUtil.java
+14
-0
No files found.
ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/AdminAuthServiceImpl.java
View file @
64319b12
...
@@ -7,6 +7,7 @@ import com.wwdz.ch.admin.util.*;
...
@@ -7,6 +7,7 @@ import com.wwdz.ch.admin.util.*;
import
com.wwdz.ch.core.captcha.CaptchaCodeManager
;
import
com.wwdz.ch.core.captcha.CaptchaCodeManager
;
import
com.wwdz.ch.core.util.Base64
;
import
com.wwdz.ch.core.util.Base64
;
import
com.wwdz.ch.core.util.ResponseUtil
;
import
com.wwdz.ch.core.util.ResponseUtil
;
import
com.wwdz.ch.core.util.StringUtil
;
import
com.wwdz.ch.core.util.UUID
;
import
com.wwdz.ch.core.util.UUID
;
import
com.wwdz.ch.db.dao.dts.DtsPermissionDao
;
import
com.wwdz.ch.db.dao.dts.DtsPermissionDao
;
import
com.wwdz.ch.db.dao.dts.DtsRoleDao
;
import
com.wwdz.ch.db.dao.dts.DtsRoleDao
;
...
@@ -53,7 +54,7 @@ public class AdminAuthServiceImpl implements AdminAuthService {
...
@@ -53,7 +54,7 @@ public class AdminAuthServiceImpl implements AdminAuthService {
data
.
put
(
"name"
,
admin
.
getUsername
());
data
.
put
(
"name"
,
admin
.
getUsername
());
data
.
put
(
"avatar"
,
admin
.
getAvatar
());
data
.
put
(
"avatar"
,
admin
.
getAvatar
());
Integer
[]
roleIds
=
admin
.
getRoleIds
(
);
Integer
[]
roleIds
=
StringUtil
.
StringArrayToNumberArray
(
admin
.
getRoleIds
().
split
(
","
)
);
Set
<
String
>
roles
=
dtsRoleDao
.
queryByIds
(
roleIds
);
Set
<
String
>
roles
=
dtsRoleDao
.
queryByIds
(
roleIds
);
Set
<
String
>
permissions
=
dtsPermissionDao
.
queryByRoleIds
(
roleIds
);
Set
<
String
>
permissions
=
dtsPermissionDao
.
queryByRoleIds
(
roleIds
);
data
.
put
(
"roles"
,
roles
);
data
.
put
(
"roles"
,
roles
);
...
...
ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/AdminDataAuthServiceImpl.java
View file @
64319b12
...
@@ -3,6 +3,7 @@ package com.wwdz.ch.admin.impl;
...
@@ -3,6 +3,7 @@ package com.wwdz.ch.admin.impl;
import
java.util.Set
;
import
java.util.Set
;
import
com.wwdz.ch.admin.service.AdminDataAuthService
;
import
com.wwdz.ch.admin.service.AdminDataAuthService
;
import
com.wwdz.ch.core.util.StringUtil
;
import
com.wwdz.ch.db.dao.dts.DtsRoleDao
;
import
com.wwdz.ch.db.dao.dts.DtsRoleDao
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
...
@@ -25,7 +26,7 @@ public class AdminDataAuthServiceImpl implements AdminDataAuthService {
...
@@ -25,7 +26,7 @@ public class AdminDataAuthServiceImpl implements AdminDataAuthService {
Integer
[]
roleIds
=
null
;
Integer
[]
roleIds
=
null
;
Admin
currentUser
=
AuthSupport
.
currentUser
();
Admin
currentUser
=
AuthSupport
.
currentUser
();
if
(
currentUser
!=
null
)
{
if
(
currentUser
!=
null
)
{
roleIds
=
currentUser
.
getRoleIds
(
);
roleIds
=
StringUtil
.
StringArrayToNumberArray
(
currentUser
.
getRoleIds
().
split
(
","
)
);
Set
<
String
>
roles
=
dtsRoleDao
.
queryByIds
(
roleIds
);
Set
<
String
>
roles
=
dtsRoleDao
.
queryByIds
(
roleIds
);
//仅仅只是品牌管理员且不属于超级管理员
//仅仅只是品牌管理员且不属于超级管理员
if
(
roles
.
contains
(
AuthSupport
.
BRAND_ROLE_NAME
)
&&
!
roles
.
contains
(
AuthSupport
.
SUPER_ROLE_NAME
))
{
if
(
roles
.
contains
(
AuthSupport
.
BRAND_ROLE_NAME
)
&&
!
roles
.
contains
(
AuthSupport
.
SUPER_ROLE_NAME
))
{
...
...
ch-admin-api/src/main/java/com/wwdz/ch/admin/shiro/AdminAuthorizingRealm.java
View file @
64319b12
...
@@ -3,6 +3,7 @@ package com.wwdz.ch.admin.shiro;
...
@@ -3,6 +3,7 @@ package com.wwdz.ch.admin.shiro;
import
java.util.List
;
import
java.util.List
;
import
java.util.Set
;
import
java.util.Set
;
import
com.wwdz.ch.core.util.StringUtil
;
import
com.wwdz.ch.db.dao.dts.DtsAdminDao
;
import
com.wwdz.ch.db.dao.dts.DtsAdminDao
;
import
com.wwdz.ch.db.dao.dts.DtsPermissionDao
;
import
com.wwdz.ch.db.dao.dts.DtsPermissionDao
;
import
com.wwdz.ch.db.dao.dts.DtsRoleDao
;
import
com.wwdz.ch.db.dao.dts.DtsRoleDao
;
...
@@ -53,7 +54,7 @@ public class AdminAuthorizingRealm extends AuthorizingRealm {
...
@@ -53,7 +54,7 @@ public class AdminAuthorizingRealm extends AuthorizingRealm {
}
}
Admin
admin
=
(
Admin
)
getAvailablePrincipal
(
principals
);
Admin
admin
=
(
Admin
)
getAvailablePrincipal
(
principals
);
Integer
[]
roleIds
=
admin
.
getRoleIds
(
);
Integer
[]
roleIds
=
StringUtil
.
StringArrayToNumberArray
(
admin
.
getRoleIds
().
split
(
","
)
);
Set
<
String
>
roles
=
dtsRoleDao
.
queryByIds
(
roleIds
);
Set
<
String
>
roles
=
dtsRoleDao
.
queryByIds
(
roleIds
);
Set
<
String
>
permissions
=
dtsPermissionDao
.
queryByRoleIds
(
roleIds
);
Set
<
String
>
permissions
=
dtsPermissionDao
.
queryByRoleIds
(
roleIds
);
SimpleAuthorizationInfo
info
=
new
SimpleAuthorizationInfo
();
SimpleAuthorizationInfo
info
=
new
SimpleAuthorizationInfo
();
...
...
ch-core/src/main/java/com/wwdz/ch/core/util/StringUtil.java
View file @
64319b12
...
@@ -30,4 +30,18 @@ public class StringUtil {
...
@@ -30,4 +30,18 @@ public class StringUtil {
return
topImage
+
REGEXSPLIT
+
images
;
return
topImage
+
REGEXSPLIT
+
images
;
}
}
public
static
Integer
[]
StringArrayToNumberArray
(
String
[]
numbers
)
{
Integer
[]
numberArray
=
new
Integer
[
numbers
.
length
];
for
(
int
i
=
0
;
i
<
numbers
.
length
;
i
++)
{
try
{
numberArray
[
i
]
=
Integer
.
parseInt
(
numbers
[
i
]);
}
catch
(
NumberFormatException
e
)
{
e
.
printStackTrace
();
}
}
return
numberArray
;
}
}
}
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