Merge pull request #272 from lepdou/0613_17

bugfix public appnamespace unique & repeat create namespace permission

apollo-common/src/main/java/com/ctrip/framework/apollo/common/controller/GlobalDefaultExceptionHandler.java

@@ -44,12 +44,17 @@ public class GlobalDefaultExceptionHandler {
     return handleError(request, INTERNAL_SERVER_ERROR, ex);
   }
 
-  @ExceptionHandler({HttpRequestMethodNotSupportedException.class, HttpMediaTypeException.class, BadRequestException.class})
+  @ExceptionHandler({HttpRequestMethodNotSupportedException.class, HttpMediaTypeException.class})
   public ResponseEntity<Map<String, Object>> badRequest(HttpServletRequest request,
       ServletException ex) {
     return handleError(request, BAD_REQUEST, ex);
   }
 
+  @ExceptionHandler({BadRequestException.class})
+  public ResponseEntity<Map<String, Object>> badRequest(HttpServletRequest request, BadRequestException ex) {
+    return handleError(request, BAD_REQUEST, ex);
+  }
+
   @ExceptionHandler(NotFoundException.class)
   public ResponseEntity<Map<String, Object>> notFound(HttpServletRequest request,
       NotFoundException ex) {

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

@@ -5,13 +5,18 @@ import com.ctrip.framework.apollo.core.dto.NamespaceDTO;
 import com.ctrip.framework.apollo.core.enums.Env;
 import com.ctrip.framework.apollo.core.utils.StringUtils;
 import com.ctrip.framework.apollo.portal.auth.UserInfoHolder;
+import com.ctrip.framework.apollo.portal.entity.form.NamespaceCreationModel;
 import com.ctrip.framework.apollo.portal.entity.vo.NamespaceVO;
 import com.ctrip.framework.apollo.portal.listener.AppNamespaceCreationEvent;
 import com.ctrip.framework.apollo.portal.service.NamespaceService;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -21,10 +26,13 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.List;
 
 import static com.ctrip.framework.apollo.portal.util.RequestPrecondition.checkArgument;
+import static com.ctrip.framework.apollo.portal.util.RequestPrecondition.checkModel;
 
 @RestController
 public class NamespaceController {
 
+  Logger logger = LoggerFactory.getLogger(NamespaceController.class);
+
   @Autowired
   private ApplicationEventPublisher publisher;
   @Autowired
@@ -37,13 +45,25 @@ public class NamespaceController {
     return namespaceService.findPublicAppNamespaces();
   }
 
-  @PreAuthorize(value = "@permissionValidator.hasCreateNamespacePermission(#namespace.appId)")
-  @RequestMapping(value = "/apps/{appId}/envs/{env}/clusters/{clusterName}/namespaces", method = RequestMethod.POST)
-  public NamespaceDTO createNamespace(@PathVariable String env, @RequestBody NamespaceDTO namespace) {
+  @PreAuthorize(value = "@permissionValidator.hasCreateNamespacePermission(#appId)")
+  @RequestMapping(value = "/apps/{appId}/namespaces", method = RequestMethod.POST)
+  public ResponseEntity<Void> createNamespace(@PathVariable String appId, @RequestBody List<NamespaceCreationModel> models) {
+
+    checkModel(!CollectionUtils.isEmpty(models));
 
-    checkArgument(namespace.getAppId(), namespace.getClusterName(), namespace.getNamespaceName());
+    for (NamespaceCreationModel model : models) {
+      NamespaceDTO namespace = model.getNamespace();
 
-    return namespaceService.createNamespace(Env.valueOf(env), namespace);
+      checkArgument(model.getEnv(), namespace.getAppId(), namespace.getClusterName(), namespace.getNamespaceName());
+
+      try {
+        // TODO: 16/6/17 某些环境创建失败,统一处理这种场景
+        namespaceService.createNamespace(Env.valueOf(model.getEnv()), namespace);
+      } catch (Exception e) {
+        logger.error("create namespace error.", e);
+      }
+    }
+    return ResponseEntity.ok().build();
   }
 
   @RequestMapping(value = "/apps/{appId}/appnamespaces", method = RequestMethod.POST)

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/cumsomize/BizLoggingCustomizer.java → apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/customize/BizLoggingCustomizer.java

-package com.ctrip.framework.apollo.portal.cumsomize;
+package com.ctrip.framework.apollo.portal.customize;
 
 import com.ctrip.framework.apollo.common.customize.LoggingCustomizer;
 import com.ctrip.framework.apollo.portal.repository.ServerConfigRepository;

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/cumsomize/package-info.java → apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/customize/package-info.java

 /**
  * 携程内部的日志系统,第三方公司可删除
  */
-package com.ctrip.framework.apollo.portal.cumsomize;
+package com.ctrip.framework.apollo.portal.customize;

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/entity/form/NamespaceCreationModel.java

+package com.ctrip.framework.apollo.portal.entity.form;
+
+import com.ctrip.framework.apollo.core.dto.NamespaceDTO;
+
+
+public class NamespaceCreationModel {
+
+  private String env;
+
+  private NamespaceDTO namespace;
+
+  public String getEnv() {
+    return env;
+  }
+
+  public void setEnv(String env) {
+    this.env = env;
+  }
+
+  public NamespaceDTO getNamespace() {
+    return namespace;
+  }
+
+  public void setNamespace(NamespaceDTO namespace) {
+    this.namespace = namespace;
+  }
+}

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

@@ -11,6 +11,7 @@ import com.ctrip.framework.apollo.core.dto.ItemDTO;
 import com.ctrip.framework.apollo.core.dto.NamespaceDTO;
 import com.ctrip.framework.apollo.core.dto.ReleaseDTO;
 import com.ctrip.framework.apollo.core.enums.Env;
+import com.ctrip.framework.apollo.core.exception.BadRequestException;
 import com.ctrip.framework.apollo.core.exception.ServiceException;
 import com.ctrip.framework.apollo.core.utils.StringUtils;
 import com.ctrip.framework.apollo.portal.PortalSettings;
@@ -97,6 +98,10 @@ public class NamespaceService {
 
   @Transactional
   public AppNamespace createAppNamespaceInLocal(AppNamespace appNamespace) {
+    //not unique
+    if (appNamespaceRepository.findByName(appNamespace.getName()) != null){
+      throw new BadRequestException(appNamespace.getName() + "已存在");
+    }
     AppNamespace managedAppNamespace = appNamespaceRepository.findByAppIdAndName(appNamespace.getAppId(), appNamespace.getName());
     //update
     if (managedAppNamespace != null){

apollo-portal/src/main/resources/static/scripts/controller/NamespaceController.js

@@ -15,7 +15,7 @@ namespace_module.controller("LinkNamespaceController",
                                            namespace.id = item.name;
                                            namespace.text = item.name;
                                            publicNamespaces.push(namespace);
-                                       }); 
+                                       });
                                        $('#namespaces').select2({
                                                                     width: '250px',
                                                                     data: publicNamespaces
@@ -47,22 +47,23 @@ namespace_module.controller("LinkNamespaceController",
                                            }
 
                                            var hasCreatedClusterCnt = 0;
+                                           var namespaceCreationModels = [];
                                            selectedClusters.forEach(function (cluster) {
-                                               NamespaceService.createNamespace($scope.appId, cluster.env, cluster.clusterName,
-                                                                                $scope.namespaceName).then(function (result) {
-                                                   toastr.success(
-                                                       cluster.env + "_" + result.clusterName + "_" + result.namespaceName
-                                                       + "创建成功");
-                                                   hasCreatedClusterCnt ++;
-                                                   if (hasCreatedClusterCnt == selectedClustersSize){
-                                                       $scope.step = 2;
-                                                   }
+                                               namespaceCreationModels.push({
+                                                                                env: cluster.env,
+                                                                                namespace: {
+                                                                                    appId: $scope.appId,
+                                                                                    clusterName: cluster.clusterName,
+                                                                                    namespaceName: $scope.namespaceName
+                                                                                }
+                                                                            });
+                                           });
+                                           NamespaceService.createNamespace($scope.appId, namespaceCreationModels)
+                                               .then(function (result) {
+                                                   toastr.success("创建成功");
                                                }, function (result) {
-                                                   toastr.error(AppUtil.errorMsg(result),
-                                                                cluster.env + "_" + cluster.clusterName + "_"
-                                                                + $scope.namespaceName + "创建失败");
+                                                   toastr.error(AppUtil.errorMsg(result));
                                                });
-                                           });
                                        }else {
                                            NamespaceService.createAppNamespace($scope.appId, $scope.appNamespace).then(function (result) {
                                                $scope.step = 2;
@@ -79,7 +80,7 @@ namespace_module.controller("LinkNamespaceController",
                                    };
 
                                    $scope.back = function () {
-                                       $window.location.href = '/config.html?#appid=' + $scope.appId;    
+                                       $window.location.href = '/config.html?#appid=' + $scope.appId;
                                    };
                                }]);
 

apollo-portal/src/main/resources/static/scripts/services/NamespaceService.js

@@ -7,7 +7,7 @@ appService.service("NamespaceService", ['$resource', '$q', function ($resource,
         },
         createNamespace: {
             method: 'POST',
-            url: '/apps/:appId/envs/:env/clusters/:clusterName/namespaces',
+            url: '/apps/:appId/namespaces',
             isArray: false
         },
         createAppNamespace: {
@@ -27,17 +27,11 @@ appService.service("NamespaceService", ['$resource', '$q', function ($resource,
             });
             return d.promise;
         },
-        createNamespace: function (appId, env, clusterName, namespaceName) {
+        createNamespace: function (appId, namespaceCreationModel) {
             var d = $q.defer();
             namespace_source.createNamespace({
-                                      appId: appId,
-                                      env: env,
-                                      clusterName: clusterName
-                                  }, {
-                                      appId: appId,
-                                      clusterName: clusterName,
-                                      namespaceName: namespaceName
-                                  }, function (result) {
+                                                 appId: appId
+                                             }, namespaceCreationModel, function (result) {
                 d.resolve(result);
             }, function (result) {
                 d.reject(result);