update to 1.0.0

chentuan · Aug 11, 2018 · e7599ca · e7599ca
1 parent 845df67
commit e7599ca
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 2 deletions.
diff --git a/apollo-all-in-one.jar b/apollo-all-in-one.jar
diff --git a/client/apollo-demo.jar b/client/apollo-demo.jar
diff --git a/demo.sh b/demo.sh
@@ -29,7 +29,7 @@ eureka_service_url=$config_server_url/eureka/
 portal_url=http://localhost:8070
 
 # JAVA OPTS
-BASE_JAVA_OPTS="-Denv=dev -Ddev_meta=$config_server_url"
+BASE_JAVA_OPTS="-Denv=dev -Dapollo.meta=$config_server_url"
 SERVER_JAVA_OPTS="$BASE_JAVA_OPTS -Dspring.profiles.active=github -Deureka.service.url=$eureka_service_url"
 PORTAL_JAVA_OPTS="$BASE_JAVA_OPTS -Dspring.profiles.active=github,auth"
 

diff --git a/sql/apolloportaldb.sql b/sql/apolloportaldb.sql
@@ -311,7 +311,8 @@ VALUES
     ('organizations', '[{\"orgId\":\"TEST1\",\"orgName\":\"样例部门1\"},{\"orgId\":\"TEST2\",\"orgName\":\"样例部门2\"}]', '部门列表'),
     ('superAdmin', 'apollo', 'Portal超级管理员'),
     ('api.readTimeout', '10000', 'http接口read timeout'),
-    ('consumer.token.salt', 'someSalt', 'consumer token salt');
+    ('consumer.token.salt', 'someSalt', 'consumer token salt'),
+    ('admin.createPrivateNamespace.switch', 'true', '是否允许项目管理员创建私有namespace');
 
 INSERT INTO `Users` (`Username`, `Password`, `Email`, `Enabled`)
 VALUES