merge commit

.gitignore

 /qa_shell_script/TEMP/*
+.idea/

db-utils/db_replace_ip.sh

@@ -16,13 +16,16 @@ ip_last=$5
 echo $server_host
 cd $db_sub_backup_folder
 
-for entry in ./*
-do
+file_count=`ls -l |grep "^-"|wc -l`
+echo "./* file count is $file_count"
+if [ "$file_count" gt 0 ]; then
+	for entry in ./*
+	do
 		echo "is replace ip for db_back_file $entry"
 		sed -i "s/http\:\/\/m.xyqb.com/http\:\/\/${server_host}:7001/g" $entry
 		sed -i "s/https\:\/\/m.xyqb.com/http\:\/\/${server_host}:7001/g" $entry
-	sed -i  "s/http\:\/\/bt.xyqb.com/http\:\/\/${server_host}:7002/g" $entry
-	sed -i  "s/https\:\/\/bt.xyqb.com/http\:\/\/${server_host}:7002/g" $entry
+		sed -i  "s/http\:\/\/bt.xyqb.com/http\:\/\/${server_host}:7050/g" $entry
+		sed -i  "s/https\:\/\/bt.xyqb.com/http\:\/\/${server_host}:7050/g" $entry
 		sed -i "s/http\:\/\/api.xyqb.com/http\:\/\/${server_host}:7003/g" $entry
 		sed -i "s/https\:\/\/api.xyqb.com/http\:\/\/${server_host}:7003/g" $entry
 		sed -i "s/http\:\/\/r.xyqb.com/http\:\/\/${server_host}:7004/g" $entry
@@ -53,13 +56,17 @@ do
 		sed -i "s/https\:\/\/gyxdapi.xyqb.com/http\:\/\/${server_host}:7029/g" $entry
 		sed -i "s/http\:\/\/btapi.xyqb.com/http\:\/\/${server_host}:7025/g" $entry
 		sed -i "s/https\:\/\/btapi.xyqb.com/http\:\/\/${server_host}:7025/g" $entry
-done
+	done
 
-if [ "$re_replace_ip" = true ]; then
+	if [ "$re_replace_ip" = true ]; then
 		for entry in ./*
 		do
 			echo "is replace public ip for $entry"
 			sed -i "s/${server_host}/${public_ip}/g" $entry
 			sed -i "s/\:70/:${ip_last}/g" $entry
 		done
+	fi
+
+	cd ..
+	rm -rf $db_sub_backup_folder
 fi
\ No newline at end of file

db-utils/db_schema_sync.sh

@@ -8,6 +8,7 @@
 # -------------------------------------------------------------------------------
 
 source ~/.bash_profile
+source ~/.profile
 
 if [ $# -ne 8 ]; then
 	echo "---------------"
@@ -32,7 +33,7 @@ target_db_pwd=$6
 sync_db_name=$7
 re_replace_ip=$8
 
-work_dir=/home/quant_group/qa-deploy-utils/db-utils
+work_dir=/home/qa-deploy-utils/db-utils
 sync_config_folder=~/db_sync_configs
 db_backup_folder=~/db_backups
 
@@ -58,7 +59,7 @@ function db_schema_sync()
 	sh $work_dir/db_import.sh $database $target_db_host $db_backup_sub_folders
 	
 	echo "Step 4: sync schema: $database $target_db_host"
-	sync_cmd="mysql-schema-sync -conf ${config_file_name} -sync"
+	sync_cmd="mss -conf ${config_file_name} -sync"
 	echo "${sync_cmd}"
 	$sync_cmd
 }

db-utils/publish_db_schema_to_all_env.sh

@@ -8,7 +8,9 @@
 # -------------------------------------------------------------------------------
 
 source ~/.bash_profile
-work_dir=/home/quant_group/test-utils/db-utils
+source ~/.profile
+
+work_dir=/home/test-utils/db-utils
 
 if [ $# -gt 0 ]; then
 	echo "---------------"