Merge pull request #129 from lepdou/lepdou_master

首页获取的app列表从配置的环境中拿到 & 创建默认的namespace名字用appid

apollo-biz/src/main/java/com/ctrip/apollo/biz/service/AdminService.java

@@ -54,7 +54,7 @@ public class AdminService {
   private void createDefaultAppNamespace(String appId, String createBy) {
     AppNamespace appNs = new AppNamespace();
     appNs.setAppId(appId);
-    appNs.setName(ConfigConsts.NAMESPACE_APPLICATION);
+    appNs.setName(appId);
     appNs.setComment("default app namespace");
     appNs.setDataChangeCreatedBy(createBy);
     appNs.setDataChangeLastModifiedBy(createBy);
@@ -79,7 +79,7 @@ public class AdminService {
     Namespace ns = new Namespace();
     ns.setAppId(appId);
     ns.setClusterName(ConfigConsts.CLUSTER_NAME_DEFAULT);
-    ns.setNamespaceName(ConfigConsts.NAMESPACE_APPLICATION);
+    ns.setNamespaceName(appId);
     ns.setDataChangeCreatedBy(createBy);
     ns.setDataChangeLastModifiedBy(createBy);
     namespaceRepository.save(ns);

apollo-biz/src/test/java/com/ctrip/apollo/biz/service/AdminServiceTest.java

@@ -17,6 +17,7 @@ import com.ctrip.apollo.biz.entity.App;
 import com.ctrip.apollo.biz.entity.Audit;
 import com.ctrip.apollo.biz.entity.Cluster;
 import com.ctrip.apollo.biz.entity.Namespace;
+import com.ctrip.apollo.core.ConfigConsts;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringApplicationConfiguration(classes = BizTestConfiguration.class)
@@ -51,11 +52,11 @@ public class AdminServiceTest {
 
     List<Cluster> clusters = viewService.findClusters(app.getAppId());
     Assert.assertEquals(1, clusters.size());
-    Assert.assertEquals("default", clusters.get(0).getName());
+    Assert.assertEquals(ConfigConsts.CLUSTER_NAME_DEFAULT, clusters.get(0).getName());
 
     List<Namespace> namespaces = viewService.findNamespaces(appId, clusters.get(0).getName());
     Assert.assertEquals(1, namespaces.size());
-    Assert.assertEquals("application", namespaces.get(0).getNamespaceName());
+    Assert.assertEquals(appId, namespaces.get(0).getNamespaceName());
 
     List<Audit> audits = auditService.findByOwner(owner);
     Assert.assertEquals(4, audits.size());

apollo-portal/src/main/java/com/ctrip/apollo/portal/controller/AppController.java

@@ -25,9 +25,9 @@ public class AppController {
   private AppService appService;
 
 
-  @RequestMapping("/env/{env}")
-  public List<AppDTO> findAllApp(@PathVariable String env){
-    return appService.findAll(Env.valueOf(env));
+  @RequestMapping("")
+  public List<AppDTO> findAllApp(){
+    return appService.findAll();
   }
 
   @RequestMapping("/{appId}/navtree")

apollo-portal/src/main/java/com/ctrip/apollo/portal/service/AppService.java

@@ -29,7 +29,9 @@ public class AppService {
   @Autowired
   private AdminServiceAPI.AppAPI appAPI;
 
-  public List<AppDTO> findAll(Env env) {
+  public List<AppDTO> findAll() {
+    // TODO: 16/4/21 先从 portalSettings第一个环境去apps,后续可以优化
+    Env env = portalSettings.getEnvs().get(0);
     return appAPI.getApps(env);
   }
 

apollo-portal/src/main/java/com/ctrip/apollo/portal/service/ConfigService.java

@@ -9,6 +9,7 @@ import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.HttpClientErrorException;
 
+import com.ctrip.apollo.common.utils.ExceptionUtils;
 import com.ctrip.apollo.core.enums.Env;
 import com.ctrip.apollo.core.dto.ItemChangeSets;
 import com.ctrip.apollo.core.dto.ItemDTO;
@@ -73,7 +74,7 @@ public class ConfigService {
       } catch (Exception e) {
         logger.error("parse namespace error. app id:{}, env:{}, clusterName:{}, namespace:{}",
             appId, env, clusterName, namespace.getNamespaceName(), e);
-        return namespaceVOs;
+        throw e;
       }
     }
 
@@ -98,7 +99,7 @@ public class ConfigService {
       releaseItems = gson.fromJson(release.getConfigurations(), Map.class);
     }catch (HttpClientErrorException e){
       if (e.getStatusCode() == HttpStatus.NOT_FOUND){
-        //ignore maybe new app has no release.
+        logger.warn(ExceptionUtils.toString(e));
       }else {
         throw e;
       }

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

 index_module.controller('IndexController', ['$scope', '$window', 'toastr', 'AppService',
         function ($scope, $window, toastr, AppService) {
 
-                $scope.env = 'LOCAL';
-
                 var apps = [];
-                AppService.find_all_app($scope.env).then(function (result) {
+                AppService.find_all_app().then(function (result) {
                         apps = result;
                         $scope.apps = apps;
                         $scope.appsCount = apps.length;

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

@@ -3,7 +3,7 @@ appService.service('AppService', ['$resource', '$q', function ($resource, $q) {
         find_all_app:{
             method: 'GET',
             isArray: true,
-            url:'/apps/env/:env'
+            url:'/apps'
         },
         load_navtree:{
             methode: 'GET',
@@ -20,11 +20,11 @@ appService.service('AppService', ['$resource', '$q', function ($resource, $q) {
         }
     });
     return {
-        find_all_app: function (env) {
+        find_all_app: function () {
             var d = $q.defer();
             app_resource.find_all_app({
-                                          env: env
-                                      }, function (result) {
+                                      },
+            function (result) {
                 d.resolve(result);
             }, function (result) {
                 d.reject(result);

apollo-portal/src/main/resources/static/views/common/nav.html

@@ -2,7 +2,7 @@
     <div class="container-fluid">
         <!-- Brand and toggle get grouped for better mobile display -->
         <div class="navbar-header">
-            <a class="navbar-brand" href="#">Apollo</a>
+            <a class="navbar-brand" href="/">Apollo</a>
         </div>
 
         <!-- Collect the nav links, forms, and other content for toggling -->