add user role related entity, repository and service and rename usern…

…ame to userId

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/auth/CtripUserInfoHolder.java

@@ -36,7 +36,7 @@ public UserInfo getUser() {
       String name = (String) getName.invoke(principal);
 
       UserInfo userInfo = new UserInfo();
-      userInfo.setUsername(name);
+      userInfo.setUserId(name);
 
       return userInfo;
     } catch (Exception e) {

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/auth/DefaultUserInfoHolder.java

@@ -15,7 +15,7 @@ public DefaultUserInfoHolder(){
   @Override
   public UserInfo getUser() {
     UserInfo userInfo = new UserInfo();
-    userInfo.setUsername("apollo");
+    userInfo.setUserId("apollo");
     return userInfo;
   }
 }

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/PortalServerConfigController.java

@@ -32,7 +32,7 @@ public ServerConfig createOrUpdate(@RequestBody ServerConfig serverConfig) {
       throw new BadRequestException("request payload contains empty");
     }
 
-    String modifiedBy = userInfoHolder.getUser().getUsername();
+    String modifiedBy = userInfoHolder.getUser().getUserId();
 
     ServerConfig storedConfig = serverConfigRepository.findByKey(serverConfig.getKey());
 

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/entity/po/Permission.java

@@ -0,0 +1,41 @@
+package com.ctrip.framework.apollo.portal.entity.po;
+
+import com.ctrip.framework.apollo.common.entity.BaseEntity;
+
+import org.hibernate.annotations.SQLDelete;
+import org.hibernate.annotations.Where;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @author Jason Song(song_s@ctrip.com)
+ */
+@Entity
+@Table(name = "Permission")
+@SQLDelete(sql = "Update Permission set isDeleted = 1 where id = ?")
+@Where(clause = "isDeleted = 0")
+public class Permission extends BaseEntity {
+  @Column(name = "PermissionType", nullable = false)
+  private String permissionType;
+
+  @Column(name = "TargetId", nullable = false)
+  private String targetId;
+
+  public String getPermissionType() {
+    return permissionType;
+  }
+
+  public void setPermissionType(String permissionType) {
+    this.permissionType = permissionType;
+  }
+
+  public String getTargetId() {
+    return targetId;
+  }
+
+  public void setTargetId(String targetId) {
+    this.targetId = targetId;
+  }
+}

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/entity/po/Role.java

@@ -0,0 +1,30 @@
+package com.ctrip.framework.apollo.portal.entity.po;
+
+import com.ctrip.framework.apollo.common.entity.BaseEntity;
+
+import org.hibernate.annotations.SQLDelete;
+import org.hibernate.annotations.Where;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @author Jason Song(song_s@ctrip.com)
+ */
+@Entity
+@Table(name = "Role")
+@SQLDelete(sql = "Update Role set isDeleted = 1 where id = ?")
+@Where(clause = "isDeleted = 0")
+public class Role extends BaseEntity {
+  @Column(name = "RoleName", nullable = false)
+  private String roleName;
+
+  public String getRoleName() {
+    return roleName;
+  }
+
+  public void setRoleName(String roleName) {
+    this.roleName = roleName;
+  }
+}

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/entity/po/RolePermission.java

@@ -0,0 +1,41 @@
+package com.ctrip.framework.apollo.portal.entity.po;
+
+import com.ctrip.framework.apollo.common.entity.BaseEntity;
+
+import org.hibernate.annotations.SQLDelete;
+import org.hibernate.annotations.Where;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @author Jason Song(song_s@ctrip.com)
+ */
+@Entity
+@Table(name = "RolePermission")
+@SQLDelete(sql = "Update RolePermission set isDeleted = 1 where id = ?")
+@Where(clause = "isDeleted = 0")
+public class RolePermission extends BaseEntity {
+  @Column(name = "RoleId", nullable = false)
+  private long roleId;
+
+  @Column(name = "PermissionId", nullable = false)
+  private long permissionId;
+
+  public long getRoleId() {
+    return roleId;
+  }
+
+  public void setRoleId(long roleId) {
+    this.roleId = roleId;
+  }
+
+  public long getPermissionId() {
+    return permissionId;
+  }
+
+  public void setPermissionId(long permissionId) {
+    this.permissionId = permissionId;
+  }
+}

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/entity/po/UserInfo.java

@@ -1,13 +1,13 @@
 package com.ctrip.framework.apollo.portal.entity.po;
 
 public class UserInfo {
-  private String username;
+  private String userId;
 
-  public String getUsername() {
-    return username;
+  public String getUserId() {
+    return userId;
   }
 
-  public void setUsername(String username) {
-    this.username = username;
+  public void setUserId(String userId) {
+    this.userId = userId;
   }
 }

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/entity/po/UserRole.java

@@ -0,0 +1,41 @@
+package com.ctrip.framework.apollo.portal.entity.po;
+
+import com.ctrip.framework.apollo.common.entity.BaseEntity;
+
+import org.hibernate.annotations.SQLDelete;
+import org.hibernate.annotations.Where;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @author Jason Song(song_s@ctrip.com)
+ */
+@Entity
+@Table(name = "UserRole")
+@SQLDelete(sql = "Update UserRole set isDeleted = 1 where id = ?")
+@Where(clause = "isDeleted = 0")
+public class UserRole extends BaseEntity {
+  @Column(name = "UserId", nullable = false)
+  private String userId;
+
+  @Column(name = "RoleId", nullable = false)
+  private long roleId;
+
+  public String getUserId() {
+    return userId;
+  }
+
+  public void setUserId(String userId) {
+    this.userId = userId;
+  }
+
+  public long getRoleId() {
+    return roleId;
+  }
+
+  public void setRoleId(long roleId) {
+    this.roleId = roleId;
+  }
+}

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/repository/PermissionRepository.java

@@ -0,0 +1,27 @@
+package com.ctrip.framework.apollo.portal.repository;
+
+import com.ctrip.framework.apollo.portal.entity.po.Permission;
+
+import org.springframework.data.repository.PagingAndSortingRepository;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * @author Jason Song(song_s@ctrip.com)
+ */
+public interface PermissionRepository extends PagingAndSortingRepository<Permission, Long> {
+  /**
+   * find permission by permission type and targetId
+   */
+  Permission findTopByPermissionTypeAndTargetId(String permissionType, String targetId);
+
+  /**
+   * find permissions by permission types and targetId
+   * @param permissionTypes
+   * @param targetId
+   * @return
+   */
+  List<Permission> findByPermissionTypeInAndTargetId(Collection<String> permissionTypes,
+                                                           String targetId);
+}

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/repository/RolePermissionRepository.java

@@ -0,0 +1,19 @@
+package com.ctrip.framework.apollo.portal.repository;
+
+import com.ctrip.framework.apollo.portal.entity.po.RolePermission;
+
+import org.springframework.data.repository.PagingAndSortingRepository;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * @author Jason Song(song_s@ctrip.com)
+ */
+public interface RolePermissionRepository extends PagingAndSortingRepository<RolePermission, Long> {
+
+  /**
+   * find role permissions by role ids
+   */
+  List<RolePermission> findByRoleIdIn(Collection<Long> roleId);
+}

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/repository/RoleRepository.java

@@ -0,0 +1,17 @@
+package com.ctrip.framework.apollo.portal.repository;
+
+import com.ctrip.framework.apollo.portal.entity.po.Role;
+
+import org.springframework.data.repository.PagingAndSortingRepository;
+
+/**
+ * @author Jason Song(song_s@ctrip.com)
+ */
+public interface RoleRepository extends PagingAndSortingRepository<Role, Long> {
+  /**
+   * find role by role name
+   * @param roleName
+   * @return
+   */
+  Role findTopByRoleName(String roleName);
+}

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/repository/UserRoleRepository.java

@@ -0,0 +1,36 @@
+package com.ctrip.framework.apollo.portal.repository;
+
+import com.ctrip.framework.apollo.portal.entity.po.UserRole;
+
+import org.springframework.data.repository.PagingAndSortingRepository;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * @author Jason Song(song_s@ctrip.com)
+ */
+public interface UserRoleRepository extends PagingAndSortingRepository<UserRole, Long> {
+  /**
+   * find user roles by userId
+   * @param userId
+   * @return
+   */
+  List<UserRole> findByUserId(String userId);
+
+  /**
+   * find user roles by roleId
+   * @param roleId
+   * @return
+   */
+  List<UserRole> findByRoleId(long roleId);
+
+  /**
+   * find user roles by userIds and roleId
+   * @param userId
+   * @param roleId
+   * @return
+   */
+  List<UserRole> findByUserIdInAndRoleId(Collection<String> userId, long roleId);
+}

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/PortalAppService.java

@@ -98,7 +98,7 @@ public void createApp(Env env, AppDTO app) {
   }
 
   private void enrichUserInfo(AppDTO app){
-    String username = userInfoHolder.getUser().getUsername();
+    String username = userInfoHolder.getUser().getUserId();
     app.setDataChangeCreatedBy(username);
     app.setDataChangeLastModifiedBy(username);
   }

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/PortalConfigService.java

@@ -67,7 +67,7 @@ public void updateConfigItemByText(NamespaceTextModel model) {
     }
 
     try {
-      changeSets.setDataChangeLastModifiedBy(userInfoHolder.getUser().getUsername());
+      changeSets.setDataChangeLastModifiedBy(userInfoHolder.getUser().getUserId());
       itemAPI.updateItems(appId, env, clusterName, namespaceName, changeSets);
     } catch (Exception e) {
       logger.error("itemAPI.updateItems error. appId{},env:{},clusterName:{},namespaceName:{}", appId, env, clusterName,
@@ -83,7 +83,7 @@ public ItemDTO createOrUpdateItem(String appId, Env env, String clusterName, Str
       throw new BadRequestException(
           "namespace:" + namespaceName + " not exist in env:" + env + ", cluster:" + clusterName);
     }
-    String username = userInfoHolder.getUser().getUsername();
+    String username = userInfoHolder.getUser().getUserId();
     if (StringUtils.isEmpty(item.getDataChangeCreatedBy())) {
       item.setDataChangeCreatedBy(username);
     }
@@ -93,7 +93,7 @@ public ItemDTO createOrUpdateItem(String appId, Env env, String clusterName, Str
   }
 
   public void deleteItem(Env env, long itemId) {
-    itemAPI.deleteItem(env, itemId, userInfoHolder.getUser().getUsername());
+    itemAPI.deleteItem(env, itemId, userInfoHolder.getUser().getUserId());
   }
 
   /**
@@ -102,7 +102,7 @@ public void deleteItem(Env env, long itemId) {
   public ReleaseDTO createRelease(NamespaceReleaseModel model) {
     return releaseAPI.release(model.getAppId(), model.getEnv(), model.getClusterName(),
                               model.getNamespaceName(), model.getReleaseBy(), model.getReleaseComment()
-        , userInfoHolder.getUser().getUsername());
+        , userInfoHolder.getUser().getUserId());
   }
 
   public List<ItemDTO> findItems(String appId, Env env, String clusterName, String namespaceName) {
@@ -114,7 +114,7 @@ public void syncItems(List<NamespaceIdentifer> comparedNamespaces, List<ItemDTO>
     for (ItemDiffs itemDiff : itemDiffs) {
       NamespaceIdentifer namespaceIdentifer = itemDiff.getNamespace();
       ItemChangeSets changeSets = itemDiff.getDiffs();
-      changeSets.setDataChangeLastModifiedBy(userInfoHolder.getUser().getUsername());
+      changeSets.setDataChangeLastModifiedBy(userInfoHolder.getUser().getUserId());
       try {
         itemAPI
             .updateItems(namespaceIdentifer.getAppId(), namespaceIdentifer.getEnv(),

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/PortalNamespaceService.java

@@ -54,14 +54,14 @@ public List<AppNamespaceDTO> findPublicAppNamespaces() {
 
   public NamespaceDTO createNamespace(Env env, NamespaceDTO namespace) {
     if (StringUtils.isEmpty(namespace.getDataChangeCreatedBy())){
-      namespace.setDataChangeCreatedBy(userInfoHolder.getUser().getUsername());
+      namespace.setDataChangeCreatedBy(userInfoHolder.getUser().getUserId());
     }
-    namespace.setDataChangeLastModifiedBy(userInfoHolder.getUser().getUsername());
+    namespace.setDataChangeLastModifiedBy(userInfoHolder.getUser().getUserId());
     return namespaceAPI.createNamespace(env, namespace);
   }
 
   public void createAppNamespace(AppNamespaceDTO appNamespace) {
-    String operator = userInfoHolder.getUser().getUsername();
+    String operator = userInfoHolder.getUser().getUserId();
     if (StringUtils.isEmpty(appNamespace.getDataChangeCreatedBy())){
       appNamespace.setDataChangeCreatedBy(operator);
     }