更新按类型脚本

qa_shell_script/2_get_code_by_type.sh

@@ -50,9 +50,9 @@ elif [ "$project_type" = "python" ]
 then
 	getCode python
 else
-	getCode ui
-	getCode node
-	getCode python
 	getCode java
+	getCode python
+	getCode node
+	getCode ui
 fi
 	

qa_shell_script/5_restart_by_type.sh

@@ -55,8 +55,8 @@ function restartJavaProject()
 			echo `java -Xmx512m -XX:PermSize64m -Xloggc:/tmp/${project}.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps  -jar ${project}.jar --worker 1 --currentWorker 1 -t > /dev/null 2>&1 &`
 		fi
 
-		#sleep 30s
-		ack "$ack_phrase" $project_path/logs/$log_name ${max_wait_log_generate_time} ${max_wait_ack_time}
+		sleep 10s
+		#ack "$ack_phrase" $project_path/logs/$log_name ${max_wait_log_generate_time} ${max_wait_ack_time}
 
 	done
 }
@@ -172,8 +172,12 @@ elif [ "$project_type" = "python" ]; then
 elif [ "$project_type" = "ui" ]; then
 	restartUiProject
 else
+	echo "***restart node***"
 	restartNodeProject
+	echo "***restart python***"
 	restartPythonProject
+	echo "***restart ui***"
 	restartUiProject
+	echo "***restart java***"
 	restartJavaProject
 fi

qa_shell_script/config_server/show_info.sh

 #!/bin/bash
 echo "\"--------------------------------------------\""
-echo "\"--------项目 $1 将要  $2\""
-echo "\"--------项目描述： $3\""
-echo "\"--------------------------------------------\""
+echo "\"--------项目 $1 将要 $2\""
+echo "\"--------项目描述：$3\""
+echo "\"--------------------------------------------\""
\ No newline at end of file

qa_shell_script/deploy_project_by_type.sh

 #!/bin/bash
+date
 project_type=$1
 branch_name=$2
 public_ip=$3
 
+pwd_path="/home/qa-deploy-utils/qa_shell_script"
+config_server="$pwd_path/config_server"
+project_path=`cat $config_server/project_path.sh`
+config_path=`cat $config_server/config_path.sh`
+if [ "$project_type" = "all" ]
+then
+	projects=(`node $config_server/get_project_config.js  -type ui -attr name`)
+        echo ${#projects[@]}"个ui项目:"  ${projects[@]}
+	projects=(`node $config_server/get_project_config.js  -type java -attr name`)
+        echo ${#projects[@]}"个java项目:"  ${projects[@]}
+	projects=(`node $config_server/get_project_config.js  -type node -attr name`)
+        echo ${#projects[@]}"个node项目:"  ${projects[@]}
+	projects=(`node $config_server/get_project_config.js  -type python -attr name`)
+        echo ${#projects[@]}"个python项目:"  ${projects[@]}
+else
+	projects=(`node $config_server/get_project_config.js  -type $1 -attr name`)
+	echo ${#projects[@]}"个"$1"项目:"  ${projects[@]}
+fi
 sh 2_get_code_by_type.sh $project_type $branch_name
 sh 3_link_config_file_by_type.sh $project_type $public_ip
 sh 4_build_by_type.sh $project_type $public_ip
-sh 5_restart_by_type.sh $project_type $public_ip
+sh 5_restart_by_type.sh $project_type $public_ip
\ No newline at end of file
+date