Commit 81dc3b9c by lepdou

update

parent 8314ed1a
...@@ -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();
//createItem 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();
//createItem 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);
......
...@@ -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 createItem 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();
//createItem 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(0l, namespaceId, newItem, lineCounter)); changeSets.addCreateItem(buildCommentItem(0l, namespaceId, newItem, lineCounter));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment