update to 1.2.0

chentuan · Dec 10, 2018 · a5def1e · a5def1e
1 parent 9188ff2
commit a5def1e
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,4 +25,5 @@ target
 apollo-portal.jar
 apollo-service.jar
 *.log
+*.gz
 *.pid
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
@@ -81,7 +81,7 @@ function checkServerAlive {
 
   SERVER_URL="$1"
 
-  until [[ (( counter -ge max_counter )) || "$(curl -X GET --silent --connect-timeout 1 --head $SERVER_URL | grep "Coyote")" != "" ]];
+  until [[ (( counter -ge max_counter )) || "$(curl -X GET --silent --connect-timeout 1 --max-time 2 --head $SERVER_URL | grep "HTTP")" != "" ]];
   do
     printf "."
     counter+=1

diff --git a/sql/apolloportaldb.sql b/sql/apolloportaldb.sql
@@ -297,7 +297,7 @@ DROP TABLE IF EXISTS `Authorities`;
 
 CREATE TABLE `Authorities` (
   `Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
-  `Username` varchar(50) NOT NULL,
+  `Username` varchar(64) NOT NULL,
   `Authority` varchar(50) NOT NULL,
   PRIMARY KEY (`Id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
@@ -312,7 +312,8 @@ VALUES
     ('superAdmin', 'apollo', 'Portal超级管理员'),
     ('api.readTimeout', '10000', 'http接口read timeout'),
     ('consumer.token.salt', 'someSalt', 'consumer token salt'),
-    ('admin.createPrivateNamespace.switch', 'true', '是否允许项目管理员创建私有namespace');
+    ('admin.createPrivateNamespace.switch', 'true', '是否允许项目管理员创建私有namespace'),
+    ('configView.memberOnly.envs', 'dev', '只对项目成员显示配置信息的环境列表，多个env以英文逗号分隔');
 
 INSERT INTO `Users` (`Username`, `Password`, `Email`, `Enabled`)
 VALUES
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,4 +25,5 @@ target @@
     apollo-portal.jar
     apollo-service.jar
     *.log
+    *.gz
     *.pid