update

qa_shell_script/2_get_code_by_name.sh

@@ -6,8 +6,6 @@ config_server="$pwd_path/config_server"
 project_path=`cat $config_server/project_path.sh`
 config_path=`cat $config_server/config_path.sh`
 
-#echo -e "\033[40;32m 执行2_get_code_by_name \033[0m"
-
 cd $project_path
 project_folder=`find ./ -maxdepth 1 -name "$project_name"`
 if [ -n "$project_folder" ];then

qa_shell_script/2_get_code_by_type.sh

@@ -50,9 +50,9 @@ elif [ "$project_type" = "python" ]
 then
 	getCode python
 else
-	getCode java
 	getCode ui
 	getCode node
 	getCode python
+	getCode java
 fi
 	
\ No newline at end of file

qa_shell_script/3_link_config_file_by_name.sh

@@ -24,10 +24,10 @@ else
 		if $is_public_ip && [ -n "$is_public_ip" ]
 		then
 			echo "-------link-$project--$config_path/public/$project_type/$project.*----/home/quant_group/$project/$file "
-			cp $config_path/public/$project_type/${project}.* /home/quant_group/${project}/$file
+			cp -r $config_path/public/$project_type/${project}.* /home/quant_group/${project}/$file
 		else
 			echo "-------link-$project--$config_path/$project_type/$project.*----/home/quant_group/$project/$file "
-			cp $config_path/$project_type/${project}.* /home/quant_group/${project}/$file
+			cp -r $config_path/$project_type/${project}.* /home/quant_group/${project}/$file
 		fi
 	else
 		if $is_public_ip && [ -n "$is_public_ip" ]

qa_shell_script/4_build_by_name.sh

@@ -40,7 +40,6 @@ function buildJavaProject()
 		sed -i  "${num}s/1.0.[0-9].[0-9]/1.0.0.${suffix}-SNAPSHOT/"  $project_path/$project/pom.xml
 	fi
 
-	# cd ./target
 	echo "mvn clean package -P${profile} -Dmaven.test.skip=true"
 	mvn clean package -P${profile} -Dmaven.test.skip=true
 	mv $project_path/$project/target/*.jar $project_path/$project/$project.jar
@@ -62,9 +61,9 @@ function buildUiProject()
 	
 	if $is_public_ip && [ -n "$is_public_ip" ]
 	then
-		cp $config_path/public/ui/$project.* $project_path/$project/$config_file
+		cp -r $config_path/public/ui/$project.* $project_path/$project/$config_file
 	else
-		cp $config_path/ui/$project.* $project_path/$project/$config_file
+		cp -r $config_path/ui/$project.* $project_path/$project/$config_file
 	fi
 	
 	imagemin_dist=`grep -n -A3 "imagemin"  *.js|awk '{print $1}'`
@@ -126,7 +125,7 @@ function buildPythonProject()
 	python ${setup_path_temp} install
 	#第四步  关联配置文件
 	rm -rf $config_file
-	ln -s $config_path/python/$project.*	$config_file
+	ln -s $config_path/python/$project.*  $config_file
 }
 
 if [ "$project_type" = "java" ]; then

qa_shell_script/5_restart_by_name.sh

@@ -37,9 +37,11 @@ function restartJavaProject()
 		echo "no have"
 		if $is_public_ip && [ -n "$is_public_ip" ]
 		then
+			rm -rf /home/quant_group/${project}/application.properties
 			echo "ln -s $config_path/public/java/${project}.* /home/quant_group/${project}/application.properties"
 			ln -s $config_path/public/java/${project}.* /home/quant_group/${project}/application.properties
 		else
+			rm -rf /home/quant_group/${project}/application.properties
 			echo "ln -s $config_path/java/${project}.* /home/quant_group/${project}/application.properties"
 			ln -s $config_path/java/${project}.* /home/quant_group/${project}/application.properties
 		fi