Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Wecube Platform2
Commits
989d39e9
Commit
989d39e9
authored
4 years ago
by
gavin2lee
Browse files
Options
Download
Email Patches
Plain Diff
#1858 fix bugs while save
parent
e6629e4b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
platform-core/src/main/java/com/webank/wecube/platform/core/service/plugin/PluginConfigService.java
+11
-6
...ube/platform/core/service/plugin/PluginConfigService.java
with
11 additions
and
6 deletions
+11
-6
platform-core/src/main/java/com/webank/wecube/platform/core/service/plugin/PluginConfigService.java
+
11
-
6
View file @
989d39e9
...
...
@@ -119,14 +119,13 @@ public class PluginConfigService {
private
Map
<
String
,
List
<
String
>>
processUpdatePluginConfigRoleBindings
(
String
pluginConfigId
,
Map
<
String
,
List
<
String
>>
permissionToRole
)
{
Map
<
String
,
List
<
String
>>
boundPermissionToRole
=
new
HashMap
<
String
,
List
<
String
>>();
if
(
permissionToRole
==
null
||
permissionToRole
.
isEmpty
())
{
return
boundP
ermissionToRole
;
return
p
ermissionToRole
;
}
for
(
String
permission
:
boundP
ermissionToRole
.
keySet
())
{
for
(
String
permission
:
p
ermissionToRole
.
keySet
())
{
List
<
String
>
existRoleIds
=
getExistRoleIdsOfPluginConfigAndPermission
(
pluginConfigId
,
permission
);
List
<
String
>
inputRoleIds
=
boundP
ermissionToRole
.
get
(
permission
);
List
<
String
>
inputRoleIds
=
p
ermissionToRole
.
get
(
permission
);
List
<
String
>
roleIdsToAdd
=
CollectionUtils
.
listMinus
(
inputRoleIds
,
existRoleIds
);
List
<
String
>
roleIdsToRemove
=
CollectionUtils
.
listMinus
(
inputRoleIds
,
existRoleIds
);
...
...
@@ -198,13 +197,18 @@ public class PluginConfigService {
private
Map
<
String
,
List
<
String
>>
processCreatePluginConfigRoleBindings
(
String
pluginConfigId
,
Map
<
String
,
List
<
String
>>
permissionToRole
)
{
if
(
log
.
isInfoEnabled
()){
log
.
info
(
"start to create plugin config role bindings:{}, {}"
,
pluginConfigId
,
permissionToRole
);
}
Map
<
String
,
List
<
String
>>
boundPermissionToRole
=
new
HashMap
<
String
,
List
<
String
>>();
if
(
permissionToRole
==
null
||
permissionToRole
.
isEmpty
())
{
log
.
warn
(
"Inputted permission roles is empty for {}"
,
pluginConfigId
);
return
boundPermissionToRole
;
}
for
(
String
permission
:
boundP
ermissionToRole
.
keySet
())
{
List
<
String
>
roleIds
=
boundP
ermissionToRole
.
get
(
permission
);
for
(
String
permission
:
p
ermissionToRole
.
keySet
())
{
List
<
String
>
roleIds
=
p
ermissionToRole
.
get
(
permission
);
if
(
roleIds
!=
null
)
{
List
<
String
>
addedRoleIds
=
new
ArrayList
<
String
>();
for
(
String
roleId
:
roleIds
)
{
...
...
@@ -222,6 +226,7 @@ public class PluginConfigService {
addedRoleIds
.
add
(
roleId
);
}
log
.
info
(
"plugin config roles bound:{}, {}, {}"
,
pluginConfigId
,
permission
,
addedRoleIds
.
size
());
boundPermissionToRole
.
put
(
permission
,
addedRoleIds
);
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
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