12

demo_india_plat.sh

@@ -248,10 +248,11 @@ clone_branch() {
 fetch_git_svr() {
 
 	REPO_URL="git@git.wkwork.xyz:LaunchDemo/india_plat_svr.git"
-	BASE_DIR="./svr"
+	BASE_DIR="./india_plat_svr"
 	MAX_RETRY=3 # 最大重试次数
 
 	BRANCHES=(
+		"master"
 		"0000_Demo_India_Plat"
 	)
 	# 主循环
@@ -269,7 +270,7 @@ fetch_git_svr() {
 fetch_git_web() {
 
 	REPO_URL="git@git.wkwork.xyz:LaunchDemo/india_plat_web.git"
-	BASE_DIR="./web"
+	BASE_DIR="./india_plat_web"
 	MAX_RETRY=3 # 最大重试次数
 
 	BRANCHES=(
@@ -392,23 +393,21 @@ EOF
 }
 run_docker() {
 
-	cd ./svr/0000_Demo_India_Plat/docker-base || exit
+	cd ./india_plat_svr/0000_Demo_India_Plat/docker-base || exit
 	make addnet
 
 	make up
-	chmod 777 ../../tmp/base/etcd/data
-	chmod 777 ../../tmp/base/zookeeper/data
+	chmod 777 ../tmp/base/etcd/data
+	chmod 777 ../tmp/base/zookeeper/data
 	make up
 	cd ../../..
-	3
-	cd ./svr/0000_Demo_India_Plat/docker-nginx || exit
+	cd ./india_plat_svr/0000_Demo_India_Plat/docker-nginx || exit
 	make up
 	cd ../../..
-
 }
 
 run_service() {
-	cd ./svr/0000_Demo_India_Plat/indiaplat || exit
+	cd ./india_plat_svr/0000_Demo_India_Plat/indiaplat || exit
 	make export_env
 	make start
 	cd ../../..