From a5b32658c8f69686e31311b9ba3813b81357775f Mon Sep 17 00:00:00 2001
From: lepdou <ledou.zhang@dianping.com>
Date: Tue, 26 Apr 2016 11:13:58 +0800
Subject: [PATCH] change default namespace name to application

---
 .../java/com/ctrip/apollo/biz/service/AppNamespaceService.java | 3 ++-
 .../java/com/ctrip/apollo/biz/service/NamespaceService.java    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/apollo-biz/src/main/java/com/ctrip/apollo/biz/service/AppNamespaceService.java b/apollo-biz/src/main/java/com/ctrip/apollo/biz/service/AppNamespaceService.java
index 86681f6e5..be62ab843 100644
--- a/apollo-biz/src/main/java/com/ctrip/apollo/biz/service/AppNamespaceService.java
+++ b/apollo-biz/src/main/java/com/ctrip/apollo/biz/service/AppNamespaceService.java
@@ -9,6 +9,7 @@ import org.springframework.transaction.annotation.Transactional;
 import com.ctrip.apollo.biz.entity.AppNamespace;
 import com.ctrip.apollo.biz.entity.Audit;
 import com.ctrip.apollo.biz.repository.AppNamespaceRepository;
+import com.ctrip.apollo.core.ConfigConsts;
 import com.ctrip.apollo.core.exception.ServiceException;
 
 @Service
@@ -33,7 +34,7 @@ public class AppNamespaceService {
     }
     AppNamespace appNs = new AppNamespace();
     appNs.setAppId(appId);
-    appNs.setName(appId);
+    appNs.setName(ConfigConsts.NAMESPACE_DEFAULT);
     appNs.setComment("default app namespace");
     appNs.setDataChangeCreatedBy(createBy);
     appNs.setDataChangeLastModifiedBy(createBy);
diff --git a/apollo-biz/src/main/java/com/ctrip/apollo/biz/service/NamespaceService.java b/apollo-biz/src/main/java/com/ctrip/apollo/biz/service/NamespaceService.java
index 93433c5b5..46086d183 100644
--- a/apollo-biz/src/main/java/com/ctrip/apollo/biz/service/NamespaceService.java
+++ b/apollo-biz/src/main/java/com/ctrip/apollo/biz/service/NamespaceService.java
@@ -91,7 +91,7 @@ public class NamespaceService {
     Namespace ns = new Namespace();
     ns.setAppId(appId);
     ns.setClusterName(ConfigConsts.CLUSTER_NAME_DEFAULT);
-    ns.setNamespaceName(appId);
+    ns.setNamespaceName(ConfigConsts.NAMESPACE_DEFAULT);
     ns.setDataChangeCreatedBy(createBy);
     ns.setDataChangeLastModifiedBy(createBy);
     namespaceRepository.save(ns);
-- 
GitLab