Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
apollo
Project
Overview
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
openSource
apollo
Commits
81dc3b9c
Commit
81dc3b9c
authored
Jul 08, 2016
by
lepdou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
8314ed1a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
RoleInitializationService.java
...work/apollo/portal/service/RoleInitializationService.java
+2
-2
PropertyResolver.java
...k/apollo/portal/service/txtresolver/PropertyResolver.java
+2
-2
No files found.
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/RoleInitializationService.java
View file @
81dc3b9c
...
@@ -37,7 +37,7 @@ public class RoleInitializationService {
...
@@ -37,7 +37,7 @@ public class RoleInitializationService {
return
;
return
;
}
}
String
operaterUserId
=
userInfoHolder
.
getUser
().
getUserId
();
String
operaterUserId
=
userInfoHolder
.
getUser
().
getUserId
();
//create
Item
app permissions
//create app permissions
createAppMasterRole
(
appId
);
createAppMasterRole
(
appId
);
//assign master role to user
//assign master role to user
...
@@ -75,7 +75,7 @@ public class RoleInitializationService {
...
@@ -75,7 +75,7 @@ public class RoleInitializationService {
appPermissionIds
=
appPermissionIds
=
FluentIterable
.
from
(
createdAppPermissions
).
transform
(
permission
->
permission
.
getId
()).
toSet
();
FluentIterable
.
from
(
createdAppPermissions
).
transform
(
permission
->
permission
.
getId
()).
toSet
();
//create
Item
app master role
//create app master role
Role
appMasterRole
=
createRole
(
RoleUtils
.
buildAppMasterRoleName
(
appId
));
Role
appMasterRole
=
createRole
(
RoleUtils
.
buildAppMasterRoleName
(
appId
));
rolePermissionService
.
createRoleWithPermissions
(
appMasterRole
,
appPermissionIds
);
rolePermissionService
.
createRoleWithPermissions
(
appMasterRole
,
appPermissionIds
);
...
...
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/txtresolver/PropertyResolver.java
View file @
81dc3b9c
...
@@ -15,7 +15,7 @@ import java.util.Set;
...
@@ -15,7 +15,7 @@ import java.util.Set;
/**
/**
* normal property file resolver.
* normal property file resolver.
* update comment and blank item implement by create
Item
new item and delete old item.
* update comment and blank item implement by create new item and delete old item.
* update normal key/value item implement by update.
* update normal key/value item implement by update.
*/
*/
@Component
(
"propertyResolver"
)
@Component
(
"propertyResolver"
)
...
@@ -105,7 +105,7 @@ public class PropertyResolver implements ConfigTextResolver {
...
@@ -105,7 +105,7 @@ public class PropertyResolver implements ConfigTextResolver {
private
void
handleCommentLine
(
Long
namespaceId
,
ItemDTO
oldItemByLine
,
String
newItem
,
int
lineCounter
,
ItemChangeSets
changeSets
)
{
private
void
handleCommentLine
(
Long
namespaceId
,
ItemDTO
oldItemByLine
,
String
newItem
,
int
lineCounter
,
ItemChangeSets
changeSets
)
{
String
oldComment
=
oldItemByLine
==
null
?
""
:
oldItemByLine
.
getComment
();
String
oldComment
=
oldItemByLine
==
null
?
""
:
oldItemByLine
.
getComment
();
//create
Item comment. implement update comment by delete old comment and createItem
new comment
//create
comment. implement update comment by delete old comment and create
new comment
if
(!(
isCommentItem
(
oldItemByLine
)
&&
newItem
.
equals
(
oldComment
)))
{
if
(!(
isCommentItem
(
oldItemByLine
)
&&
newItem
.
equals
(
oldComment
)))
{
changeSets
.
addCreateItem
(
buildCommentItem
(
0
l
,
namespaceId
,
newItem
,
lineCounter
));
changeSets
.
addCreateItem
(
buildCommentItem
(
0
l
,
namespaceId
,
newItem
,
lineCounter
));
}
}
...
...
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