Merge branch 'master' of http://gitabc.xyqb.com/QA/qa-deploy-utils

.gitignore

+/qa_shell_script/TEMP/*

qa_shell_script/5_restart_by_name.sh

@@ -71,21 +71,25 @@ function restartNodeProject()
 {
 	project=$1
 	desc=`node $config_server/get_project_config.js  -name $project -attr desc`
+	stop_command=`node $config_server/get_project_config.js  -name $project -attr command2`
 	sh $config_server/show_info.sh $project 重新启动 $desc
 	cd $project_path/$project
-	
-	forever stop $project
-	forever stop $project-www
-	setup_path_temp=`find ./ -maxdepth 2 -path "./node_modules" -prune -o -type f -name "app.js" -print`
-	echo "------setup_path_temp:$setup_path_temp"
-
-	echo `forever start -a -s --uid $project  ${setup_path_temp}`
-	
-	setup_path_temp_for_appbackent=`find ./ -maxdepth 2 -path "./node_modules" -prune -o -type f -name "www" -print`
-	if [ -n "$setup_path_temp_for_appbackent" ];then
-		echo "-----project:$project while be run command:  python $python_project_path --mode=beta --port=$port > /dev/null 2>&1 &"
-		echo `forever start -a -s --uid $project-www ${setup_path_temp_for_appbackent}`
-	fi
+	$stop_command
+	# forever stop $project
+	# forever stop $project-www
+	# pm2 stop $project
+	start_command=`node $config_server/get_project_config.js  -name $project -attr command`
+	$start_command
+	# setup_path_temp=`find ./ -maxdepth 2 -path "./node_modules" -prune -o -type f -name "app.js" -print`
+# 	echo "------setup_path_temp:$setup_path_temp"
+#
+# 	echo `forever start -a -s --uid $project  ${setup_path_temp}`
+#
+# 	setup_path_temp_for_appbackent=`find ./ -maxdepth 2 -path "./node_modules" -prune -o -type f -name "www" -print`
+# 	if [ -n "$setup_path_temp_for_appbackent" ];then
+# 		echo "-----project:$project while be run command:  python $python_project_path --mode=beta --port=$port > /dev/null 2>&1 &"
+# 		echo `forever start -a -s --uid $project-www ${setup_path_temp_for_appbackent}`
+# 	fi
 }
 
 function restartPythonProject()

qa_shell_script/5_restart_by_type.sh

@@ -67,21 +67,26 @@ function restartNodeProject()
 	for project in ${projects[@]}
 	do
 		desc=`node $config_server/get_project_config.js  -name $project -attr desc`
+		stop_command=`node $config_server/get_project_config.js  -name $project -attr command2`
 		sh $config_server/show_info.sh $project 重新启动 $desc
 		cd $project_path/$project
 		
-		forever stop $project
-		forever stop $project-www
-		setup_path_temp=`find ./ -maxdepth 2 -path "./node_modules"  -prune -o -type f -name "app.js" -print`
-		echo "------setup_path_temp:$setup_path_temp"
-
-		echo `forever start -a -s --uid $project  ${setup_path_temp}`
-		
-		setup_path_temp_for_appbackent=`find ./ -maxdepth 2 -path "./node_modules" -prune -o -type f -name "www" -print`
-		if [ -n "$setup_path_temp_for_appbackent" ];then
-			echo "-----project:$project while be run command:  python $python_project_path --mode=beta --port=$port > /dev/null 2>&1 &"
-			echo `forever start -a -s --uid $project-www ${setup_path_temp_for_appbackent}`
-		fi
+		$stop_command
+		# forever stop $project
+		# forever stop $project-www
+		# pm2 stop $project
+		start_command=`node $config_server/get_project_config.js  -name $project -attr command`
+		$start_command
+		# setup_path_temp=`find ./ -maxdepth 2 -path "./node_modules"  -prune -o -type f -name "app.js" -print`
+		# echo "------setup_path_temp:$setup_path_temp"
+		#
+		# echo `forever start -a -s --uid $project  ${setup_path_temp}`
+		#
+		# setup_path_temp_for_appbackent=`find ./ -maxdepth 2 -path "./node_modules" -prune -o -type f -name "www" -print`
+		# if [ -n "$setup_path_temp_for_appbackent" ];then
+		# 	echo "-----project:$project while be run command:  python $python_project_path --mode=beta --port=$port > /dev/null 2>&1 &"
+		# 	echo `forever start -a -s --uid $project-www ${setup_path_temp_for_appbackent}`
+		# fi
 	done
 }
 

qa_shell_script/6_start_by_name.sh

@@ -46,21 +46,25 @@ function restartNodeProject()
 {
 	project=$1
 	desc=`node $config_server/get_project_config.js  -name $project -attr desc`
+	stop_command=`node $config_server/get_project_config.js  -name $project -attr command2`
 	sh $config_server/show_info.sh $project 重新启动 $desc
 	cd $project_path/$project
-	
-	forever stop $project
-	forever stop $project-www
-	setup_path_temp=`find ./ -maxdepth 2 -path "./node_modules" -prune -o -type f -name "app.js" -print`
-	echo "------setup_path_temp:$setup_path_temp"
-
-	echo `forever start -a -s --uid $project  ${setup_path_temp}`
-	
-	setup_path_temp_for_appbackent=`find ./ -maxdepth 2 -path "./node_modules" -prune -o -type f -name "www" -print`
-	if [ -n "$setup_path_temp_for_appbackent" ];then
-		echo "-----project:$project while be run command:  python $python_project_path --mode=beta --port=$port > /dev/null 2>&1 &"
-		echo `forever start -a -s --uid $project-www ${setup_path_temp_for_appbackent}`
-	fi
+	$stop_command
+	# forever stop $project
+	# forever stop $project-www
+	# pm2 stop $project
+	start_command=`node $config_server/get_project_config.js  -name $project -attr command`
+	$start_command
+	# setup_path_temp=`find ./ -maxdepth 2 -path "./node_modules" -prune -o -type f -name "app.js" -print`
+	# echo "------setup_path_temp:$setup_path_temp"
+	#
+	# echo `forever start -a -s --uid $project  ${setup_path_temp}`
+	#
+	# setup_path_temp_for_appbackent=`find ./ -maxdepth 2 -path "./node_modules" -prune -o -type f -name "www" -print`
+	# if [ -n "$setup_path_temp_for_appbackent" ];then
+	# 	echo "-----project:$project while be run command:  python $python_project_path --mode=beta --port=$port > /dev/null 2>&1 &"
+	# 	echo `forever start -a -s --uid $project-www ${setup_path_temp_for_appbackent}`
+	# fi
 }
 
 function restartPythonProject()

qa_shell_script/exception_sub_shell.sh

@@ -37,15 +37,30 @@ function tranceConfig()
 }
 
 
-tranceConfig java "pay.debug=0" "pay.debug=1" "192.168.4.13" "xyqb-mall.properties"
-tranceConfig java "sms.is.debug=1" "sms.is.debug=0" "192.168.4.13" "*.properties"
+#tranceConfig java "pay.debug=0" "pay.debug=1" "192.168.4.13" "xyqb-mall.properties"
 tranceConfig java "pay.debug=0" "pay.debug=1" "192.168.4.151" "xyqb-mall.properties"
 #tranceConfig java "pay.debug=0" "pay.debug=1" "192.168.4.152" "xyqb-mall.properties"
 #tranceConfig java "192.168.4.3" "192.168.4.17" "192.168.4.17" "*"
 #tranceConfig java "sms.is.debug=1" "sms.is.debug=0" "192.168.4.24" "xyqb.properties"
 #tranceConfig java "sms.is.debug=1" "sms.is.debug=0" "192.168.4.24" "di-ting.properties"
 #tranceConfig java "xyqb.is.debug=1" "xyqb.is.debug=0" "192.168.4.24" "xyqb.properties"
-tranceConfig node "192.168.4.3" "192.168.4.107"  "192.168.4.12" "AppBackend.js"
-tranceConfig java "sms.is.debug=1" "sms.is.debug=0" "192.168.4.151" "*.properties"
+#tranceConfig node "192.168.4.3" "192.168.4.107"  "192.168.4.12" "AppBackend.js"
 tranceConfig java "xyqb.is.debug=1" "xyqb.is.debug=0" "192.168.4.151" "xyqb.properties"
-tranceConfig java "sms.is.debug=1" "sms.is.debug=0" "192.168.4.12" "*.properties"
+#tranceConfig ui "7047" "12047"  "192.168.4.12" "merchant-op-ui.js"
+tranceConfig node "d45o0qd" "5exp2xo" "192.168.4.152" "op-api.js"
+tranceConfig java "7007" "1507" "192.168.4.15" "gu-bei.properties"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

qa_shell_script/rabbitmq/initial_mq.sh

@@ -83,4 +83,5 @@ add_queues mall refund
 add_queues mall refundFeed
 add_queues financial_system refundInfo
 add_queues bt_loan bt_loan_queue
+add_queues financial_system save_redpacket