diff --git a/apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/controller/AppNamespaceController.java b/apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/controller/AppNamespaceController.java index e96674f832e397b00b19a908b13eebab02b8c6e1..4c4e9b22a81a1a6b06047ffe6701de2c46fb2257 100644 --- a/apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/controller/AppNamespaceController.java +++ b/apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/controller/AppNamespaceController.java @@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import java.util.List; @@ -46,7 +47,16 @@ public class AppNamespaceController { entity = appNamespaceService.createAppNamespace(entity); return BeanUtils.transfrom(AppNamespaceDTO.class, entity); + } + @RequestMapping(value = "/apps/{appId}/appnamespaces/{namespaceName:.+}", method = RequestMethod.DELETE) + public void delete(@PathVariable("appId") String appId, @PathVariable("namespaceName") String namespaceName, + @RequestParam String operator) { + AppNamespace entity = appNamespaceService.findOne(appId, namespaceName); + if (entity == null) { + throw new BadRequestException("app namespace not found for appId: " + appId + " namespace: " + namespaceName); + } + appNamespaceService.deleteAppNamespace(entity, operator); } @RequestMapping(value = "/appnamespaces/{publicNamespaceName}/namespaces", method = RequestMethod.GET) diff --git a/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/repository/AppNamespaceRepository.java b/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/repository/AppNamespaceRepository.java index 4fae7ceb80e6aaa98870dd9905fc38c084061d83..184da83b10ccb717ae4ff99cf1568809565337f4 100644 --- a/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/repository/AppNamespaceRepository.java +++ b/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/repository/AppNamespaceRepository.java @@ -29,4 +29,8 @@ public interface AppNamespaceRepository extends PagingAndSortingRepository findFirst500ByIdGreaterThanOrderByIdAsc(Long id); - @Modifying - @Query("UPDATE GrayReleaseRule SET IsDeleted=1, DataChange_LastModifiedBy = ?4 where appId=?1 and clusterName=?2 and namespaceName = ?3") - int batchDelete(String appId, String clusterName, String namespaceName, String operator); } diff --git a/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/repository/NamespaceRepository.java b/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/repository/NamespaceRepository.java index 469001e966e8d073f6b24ba60173069830890935..175f0e09c28af3ea3ee578d4fe9f1a16d21de7f9 100644 --- a/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/repository/NamespaceRepository.java +++ b/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/repository/NamespaceRepository.java @@ -19,7 +19,7 @@ public interface NamespaceRepository extends PagingAndSortingRepository findByAppIdAndNamespaceName(String appId, String namespaceName); + List findByAppIdAndNamespaceNameOrderByIdAsc(String appId, String namespaceName); List findByNamespaceName(String namespaceName, Pageable page); diff --git a/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/AdminService.java b/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/AdminService.java index 8239565567af9bce90ae7af45b9de307404b2f73..4e742e96e975cb96e27d3c7dc0204558b2df7b01 100644 --- a/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/AdminService.java +++ b/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/AdminService.java @@ -2,7 +2,6 @@ package com.ctrip.framework.apollo.biz.service; import com.ctrip.framework.apollo.biz.entity.Cluster; import com.ctrip.framework.apollo.common.entity.App; -import com.ctrip.framework.apollo.common.exception.NotFoundException; import com.ctrip.framework.apollo.core.ConfigConsts; import org.slf4j.Logger; diff --git a/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/AppNamespaceService.java b/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/AppNamespaceService.java index 83ebe738b682e01d257fe962767114c5794cef3b..b31a94311bfb4e56b5a838969b4694216a8b755f 100644 --- a/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/AppNamespaceService.java +++ b/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/AppNamespaceService.java @@ -14,6 +14,8 @@ import com.ctrip.framework.apollo.core.ConfigConsts; import com.ctrip.framework.apollo.core.enums.ConfigFileFormat; import com.ctrip.framework.apollo.core.utils.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -26,6 +28,8 @@ import java.util.Set; @Service public class AppNamespaceService { + private static final Logger logger = LoggerFactory.getLogger(AppNamespaceService.class); + @Autowired private AppNamespaceRepository appNamespaceRepository; @Autowired @@ -142,4 +146,24 @@ public class AppNamespaceService { public void batchDelete(String appId, String operator) { appNamespaceRepository.batchDeleteByAppId(appId, operator); } + + @Transactional + public void deleteAppNamespace(AppNamespace appNamespace, String operator) { + String appId = appNamespace.getAppId(); + String namespaceName = appNamespace.getName(); + + logger.info("{} is deleting AppNamespace, appId: {}, namespace: {}", operator, appId, namespaceName); + + // 1. delete namespaces + List namespaces = namespaceService.findByAppIdAndNamespaceName(appId, namespaceName); + + if (namespaces != null) { + for (Namespace namespace : namespaces) { + namespaceService.deleteNamespace(namespace, operator); + } + } + + // 2. delete app namespace + appNamespaceRepository.delete(appId, namespaceName, operator); + } } diff --git a/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/ClusterService.java b/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/ClusterService.java index cd404dd504780117d60593224b1b0c5b9d2965bf..50a051748366225fd21b493835bb7181ad53492c 100644 --- a/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/ClusterService.java +++ b/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/ClusterService.java @@ -138,6 +138,15 @@ public class ClusterService { } public List findClusters(String appId) { - return clusterRepository.findByAppId(appId); + List clusters = clusterRepository.findByAppId(appId); + + if (clusters == null) { + return Collections.emptyList(); + } + + // to make sure parent cluster is ahead of branch cluster + Collections.sort(clusters); + + return clusters; } } diff --git a/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/GrayReleaseRuleService.java b/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/GrayReleaseRuleService.java deleted file mode 100644 index 30f9427cb7bb868408ffefa58c7d4d0da838775e..0000000000000000000000000000000000000000 --- a/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/GrayReleaseRuleService.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.ctrip.framework.apollo.biz.service; - -import com.ctrip.framework.apollo.biz.repository.GrayReleaseRuleRepository; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -@Service -public class GrayReleaseRuleService { - - @Autowired - private GrayReleaseRuleRepository grayReleaseRuleRepository; - - @Transactional - public void batchDelete(String appId, String clusterName, String namespaceName, String operator) { - grayReleaseRuleRepository.batchDelete(appId, clusterName, namespaceName, operator); - } -} diff --git a/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/NamespaceService.java b/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/NamespaceService.java index 75e264ccc56e45b131f199b3b0df5beaa26b8466..241eac6bf1c8b2de7c5b66ee54638b063a8e1e98 100644 --- a/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/NamespaceService.java +++ b/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/NamespaceService.java @@ -59,8 +59,6 @@ public class NamespaceService { @Autowired private ReleaseHistoryService releaseHistoryService; @Autowired - private GrayReleaseRuleService grayReleaseRuleService; - @Autowired private NamespaceLockService namespaceLockService; @Autowired private InstanceService instanceService; @@ -177,7 +175,7 @@ public class NamespaceService { } public List findByAppIdAndNamespaceName(String appId, String namespaceName) { - return namespaceRepository.findByAppIdAndNamespaceName(appId, namespaceName); + return namespaceRepository.findByAppIdAndNamespaceNameOrderByIdAsc(appId, namespaceName); } public Namespace findChildNamespace(String appId, String parentClusterName, String namespaceName) { @@ -266,17 +264,14 @@ public class NamespaceService { commitService.batchDelete(appId, clusterName, namespace.getNamespaceName(), operator); releaseService.batchDelete(appId, clusterName, namespace.getNamespaceName(), operator); - grayReleaseRuleService.batchDelete(appId, clusterName, namespace.getNamespaceName(), operator); - - if (!isChildNamespace(namespace)) { - //delete child namespace - Namespace childNamespace = findChildNamespace(namespace); - if (childNamespace != null) { - namespaceBranchService.deleteBranch(appId, clusterName, namespaceName, - childNamespace.getClusterName(), NamespaceBranchStatus.DELETED, operator); - //delete child namespace's releases. Notice: delete child namespace will not delete child namespace's releases - releaseService.batchDelete(appId, childNamespace.getClusterName(), namespaceName, operator); - } + + //delete child namespace + Namespace childNamespace = findChildNamespace(namespace); + if (childNamespace != null) { + namespaceBranchService.deleteBranch(appId, clusterName, namespaceName, + childNamespace.getClusterName(), NamespaceBranchStatus.DELETED, operator); + //delete child namespace's releases. Notice: delete child namespace will not delete child namespace's releases + releaseService.batchDelete(appId, childNamespace.getClusterName(), namespaceName, operator); } releaseHistoryService.batchDelete(appId, clusterName, namespaceName, operator); @@ -397,4 +392,6 @@ public class NamespaceService { return false; } + + } diff --git a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/api/AdminServiceAPI.java b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/api/AdminServiceAPI.java index 1242b899f1e21604ff8413f26f19ebafe37605ff..ada3029f33c132d64714e4564a17787fd8211b59 100644 --- a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/api/AdminServiceAPI.java +++ b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/api/AdminServiceAPI.java @@ -132,6 +132,10 @@ public class AdminServiceAPI { return count == null ? 0 : count; } + public void deleteAppNamespace(Env env, String appId, String namespaceName, String operator) { + restTemplate.delete(env, "/apps/{appId}/appnamespaces/{namespaceName}?operator={operator}", appId, namespaceName, + operator); + } } @Service diff --git a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/NamespaceController.java b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/NamespaceController.java index 40c51261e2d4203c552dcf1b21d7f878d7e5dc24..da9687034be5faf9d7f8ad43e6355098180b0e0f 100644 --- a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/NamespaceController.java +++ b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/NamespaceController.java @@ -1,5 +1,6 @@ package com.ctrip.framework.apollo.portal.controller; +import com.ctrip.framework.apollo.portal.listener.AppNamespaceDeletionEvent; import com.google.common.collect.Sets; import com.ctrip.framework.apollo.common.dto.NamespaceDTO; @@ -132,6 +133,17 @@ public class NamespaceController { return ResponseEntity.ok().build(); } + @PreAuthorize(value = "@permissionValidator.isSuperAdmin()") + @RequestMapping(value = "/apps/{appId}/appnamespaces/{namespaceName:.+}", method = RequestMethod.DELETE) + public ResponseEntity deleteAppNamespace(@PathVariable String appId, @PathVariable String namespaceName) { + + AppNamespace appNamespace = appNamespaceService.deleteAppNamespace(appId, namespaceName); + + publisher.publishEvent(new AppNamespaceDeletionEvent(appNamespace)); + + return ResponseEntity.ok().build(); + } + @PreAuthorize(value = "@permissionValidator.hasCreateAppNamespacePermission(#appId, #appNamespace)") @RequestMapping(value = "/apps/{appId}/appnamespaces", method = RequestMethod.POST) public AppNamespace createAppNamespace(@PathVariable String appId, @RequestBody AppNamespace appNamespace) { diff --git a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/listener/AppInfoChangedListener.java b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/listener/AppInfoChangedListener.java index 8ef56cd19a90a691f4f5073fae95dd3abde2a178..4c8ac2c1b0a36765b16efab8dec0606bae4d0474 100644 --- a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/listener/AppInfoChangedListener.java +++ b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/listener/AppInfoChangedListener.java @@ -40,21 +40,4 @@ public class AppInfoChangedListener { } } } - - @EventListener - public void onAppDelete(AppDeletionEvent event) { - AppDTO appDTO = BeanUtils.transfrom(AppDTO.class, event.getApp()); - String appId = appDTO.getAppId(); - String operator = appDTO.getDataChangeLastModifiedBy(); - - List envs = portalSettings.getActiveEnvs(); - for (Env env : envs) { - try { - appAPI.deleteApp(env, appId, operator); - } catch (Throwable e) { - logger.error("Delete app failed. Env = {}, AppId = {}", env, appId, e); - Tracer.logError(String.format("Delete app failed. Env = %s, AppId = %s", env, appId), e); - } - } - } } diff --git a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/listener/AppNamespaceDeletionEvent.java b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/listener/AppNamespaceDeletionEvent.java new file mode 100644 index 0000000000000000000000000000000000000000..ec28151f9a71803ddfe07b39f106d1681251422b --- /dev/null +++ b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/listener/AppNamespaceDeletionEvent.java @@ -0,0 +1,17 @@ +package com.ctrip.framework.apollo.portal.listener; + +import com.ctrip.framework.apollo.common.entity.AppNamespace; +import com.google.common.base.Preconditions; +import org.springframework.context.ApplicationEvent; + +public class AppNamespaceDeletionEvent extends ApplicationEvent { + + public AppNamespaceDeletionEvent(Object source) { + super(source); + } + + public AppNamespace getAppNamespace() { + Preconditions.checkState(source != null); + return (AppNamespace) this.source; + } +} diff --git a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/listener/DeletionListener.java b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/listener/DeletionListener.java new file mode 100644 index 0000000000000000000000000000000000000000..0d99734010b83675354f45f2719e140f37df97cd --- /dev/null +++ b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/listener/DeletionListener.java @@ -0,0 +1,64 @@ +package com.ctrip.framework.apollo.portal.listener; + +import com.ctrip.framework.apollo.common.dto.AppDTO; +import com.ctrip.framework.apollo.common.dto.AppNamespaceDTO; +import com.ctrip.framework.apollo.common.utils.BeanUtils; +import com.ctrip.framework.apollo.core.enums.Env; +import com.ctrip.framework.apollo.portal.api.AdminServiceAPI; +import com.ctrip.framework.apollo.portal.component.PortalSettings; +import com.ctrip.framework.apollo.tracer.Tracer; +import java.util.List; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.event.EventListener; +import org.springframework.stereotype.Component; + +@Component +public class DeletionListener { + + private static final Logger logger = LoggerFactory.getLogger(DeletionListener.class); + + @Autowired + private PortalSettings portalSettings; + @Autowired + private AdminServiceAPI.AppAPI appAPI; + @Autowired + private AdminServiceAPI.NamespaceAPI namespaceAPI; + + @EventListener + public void onAppDeletionEvent(AppDeletionEvent event) { + AppDTO appDTO = BeanUtils.transfrom(AppDTO.class, event.getApp()); + String appId = appDTO.getAppId(); + String operator = appDTO.getDataChangeLastModifiedBy(); + + List envs = portalSettings.getActiveEnvs(); + for (Env env : envs) { + try { + appAPI.deleteApp(env, appId, operator); + } catch (Throwable e) { + logger.error("Delete app failed. Env = {}, AppId = {}", env, appId, e); + Tracer.logError(String.format("Delete app failed. Env = %s, AppId = %s", env, appId), e); + } + } + } + + @EventListener + public void onAppNamespaceDeletionEvent(AppNamespaceDeletionEvent event) { + AppNamespaceDTO appNamespace = BeanUtils.transfrom(AppNamespaceDTO.class, event.getAppNamespace()); + List envs = portalSettings.getActiveEnvs(); + String appId = appNamespace.getAppId(); + String namespaceName = appNamespace.getName(); + String operator = appNamespace.getDataChangeLastModifiedBy(); + + for (Env env : envs) { + try { + namespaceAPI.deleteAppNamespace(env, appId, namespaceName, operator); + } catch (Throwable e) { + logger.error("Delete appNamespace failed. appId = {}, namespace = {}, env = {}", appId, namespaceName, env, e); + Tracer.logError(String + .format("Delete appNamespace failed. appId = %s, namespace = %s, env = %s", appId, namespaceName, env), e); + } + } + } +} diff --git a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/repository/AppNamespaceRepository.java b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/repository/AppNamespaceRepository.java index 4af7fa41934888857c1afc76ced35e844560b2ca..fa7c58b959c808e4f120a309761991d1b9365577 100644 --- a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/repository/AppNamespaceRepository.java +++ b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/repository/AppNamespaceRepository.java @@ -19,4 +19,8 @@ public interface AppNamespaceRepository extends PagingAndSortingRepository findPermissionIdsByAppId(String appId); + @Query("SELECT p.id from Permission p where p.targetId = CONCAT(?1, '+', ?2)") + List findPermissionIdsByAppIdAndNamespace(String appId, String namespaceName); + @Modifying @Query("UPDATE Permission SET IsDeleted=1, DataChange_LastModifiedBy = ?2 WHERE Id in ?1") Integer batchDelete(List permissionIds, String operator); diff --git a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/repository/RoleRepository.java b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/repository/RoleRepository.java index 06120f0001b0921200917b1b01ef6e7fbed4da0f..01a2dc300b4454f0144d9e2dbeab17ae93da9643 100644 --- a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/repository/RoleRepository.java +++ b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/repository/RoleRepository.java @@ -22,6 +22,10 @@ public interface RoleRepository extends PagingAndSortingRepository { + "OR r.roleName like CONCAT('ReleaseNamespace+', ?1, '+%'))") List findRoleIdsByAppId(String appId); + @Query("SELECT r.id from Role r where (r.roleName = CONCAT('ModifyNamespace+', ?1, '+', ?2) " + + "OR r.roleName = CONCAT('ReleaseNamespace+', ?1, '+', ?2))") + List findRoleIdsByAppIdAndNamespace(String appId, String namespaceName); + @Modifying @Query("UPDATE Role SET IsDeleted=1, DataChange_LastModifiedBy = ?2 WHERE Id in ?1") Integer batchDelete(List roleIds, String operator); diff --git a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/AppNamespaceService.java b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/AppNamespaceService.java index ceab80c8334543117516a3ed9b429281f804c2be..03005e1838dd09d5f7b01aefdd7541b1ebab3d54 100644 --- a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/AppNamespaceService.java +++ b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/AppNamespaceService.java @@ -27,6 +27,8 @@ public class AppNamespaceService { private RoleInitializationService roleInitializationService; @Autowired private AppService appService; + @Autowired + private RolePermissionService rolePermissionService; /** * 公共的app ns,能被其它项目关联到的app ns @@ -118,6 +120,28 @@ public class AppNamespaceService { return createdAppNamespace; } + @Transactional + public AppNamespace deleteAppNamespace(String appId, String namespaceName) { + AppNamespace appNamespace = appNamespaceRepository.findByAppIdAndName(appId, namespaceName); + if (appNamespace == null) { + throw new BadRequestException( + String.format("AppNamespace not exists. AppId = %s, NamespaceName = %s", appId, namespaceName)); + } + + String operator = userInfoHolder.getUser().getUserId(); + + // this operator is passed to com.ctrip.framework.apollo.portal.listener.DeletionListener.onAppNamespaceDeletionEvent + appNamespace.setDataChangeLastModifiedBy(operator); + + // delete app namespace in portal db + appNamespaceRepository.delete(appId, namespaceName, operator); + + // delete Permission and Role related data + rolePermissionService.deleteRolePermissionsByAppIdAndNamespace(appId, namespaceName, operator); + + return appNamespace; + } + public void batchDeleteByAppId(String appId, String operator) { appNamespaceRepository.batchDeleteByAppId(appId, operator); } diff --git a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/AppService.java b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/AppService.java index 21d58ad6d4cb773c0efae0b60b22e7a35a9ff306..0eb853b092223810f1424c99713fdc03910c4f4a 100644 --- a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/AppService.java +++ b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/AppService.java @@ -151,7 +151,7 @@ public class AppService { } String operator = userInfoHolder.getUser().getUserId(); - //this operator is passed to com.ctrip.framework.apollo.portal.listener.AppInfoChangedListener.onAppDelete + //this operator is passed to com.ctrip.framework.apollo.portal.listener.DeletionListener.onAppDeletionEvent managedApp.setDataChangeLastModifiedBy(operator); //删除portal数据库中的app diff --git a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/NamespaceService.java b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/NamespaceService.java index 5bd918c70e4f294d3eb035da38c41be70b162679..185bc178dd4f898d1fa6a5ebbe36470a301eef86 100644 --- a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/NamespaceService.java +++ b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/NamespaceService.java @@ -238,8 +238,9 @@ public class NamespaceService { String format; boolean isPublic; if (appNamespace == null) { + //dirty data format = ConfigFileFormat.Properties.getValue(); - isPublic = false; + isPublic = true; // set to true, because public namespace allowed to delete by user } else { format = appNamespace.getFormat(); isPublic = appNamespace.isPublic(); diff --git a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/RolePermissionService.java b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/RolePermissionService.java index 1fc872737cd4192eecf8afa18a8d69c9fa981ef1..14609c3bea610fe98703f3660c3a59092701344d 100644 --- a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/RolePermissionService.java +++ b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/RolePermissionService.java @@ -60,4 +60,9 @@ public interface RolePermissionService { * delete permissions when delete app. */ public void deleteRolePermissionsByAppId(String appId, String operator); + + /** + * delete permissions when delete app namespace. + */ + public void deleteRolePermissionsByAppIdAndNamespace(String appId, String namespaceName, String operator); } diff --git a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/defaultimpl/DefaultRolePermissionService.java b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/defaultimpl/DefaultRolePermissionService.java index 9af31fd8dc1117f71e0688424b36eba7955cd812..6be24ccbf85249898796efac2acb3ae54c0545ae 100644 --- a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/defaultimpl/DefaultRolePermissionService.java +++ b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/defaultimpl/DefaultRolePermissionService.java @@ -1,6 +1,5 @@ package com.ctrip.framework.apollo.portal.spi.defaultimpl; -import com.ctrip.framework.apollo.common.entity.BaseEntity; import com.ctrip.framework.apollo.openapi.repository.ConsumerRoleRepository; import com.ctrip.framework.apollo.portal.component.config.PortalConfig; import com.ctrip.framework.apollo.portal.entity.bo.UserInfo; @@ -18,8 +17,6 @@ import com.google.common.collect.FluentIterable; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import com.google.common.collect.Sets; -import java.util.function.Function; -import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; @@ -251,4 +248,31 @@ public class DefaultRolePermissionService implements RolePermissionService { consumerRoleRepository.batchDeleteByRoleIds(roleIds, operator); } } + + @Transactional + @Override + public void deleteRolePermissionsByAppIdAndNamespace(String appId, String namespaceName, String operator) { + List permissionIds = permissionRepository.findPermissionIdsByAppIdAndNamespace(appId, namespaceName); + + if (!permissionIds.isEmpty()) { + // 1. delete Permission + permissionRepository.batchDelete(permissionIds, operator); + + // 2. delete Role Permission + rolePermissionRepository.batchDeleteByPermissionIds(permissionIds, operator); + } + + List roleIds = roleRepository.findRoleIdsByAppIdAndNamespace(appId, namespaceName); + + if (!roleIds.isEmpty()) { + // 3. delete Role + roleRepository.batchDelete(roleIds, operator); + + // 4. delete User Role + userRoleRepository.batchDeleteByRoleIds(roleIds, operator); + + // 5. delete Consumer Role + consumerRoleRepository.batchDeleteByRoleIds(roleIds, operator); + } + } }