merge commit

.gitignore

 /qa_shell_script/TEMP/*
+.idea/

db-utils/db_replace_ip.sh

@@ -16,50 +16,57 @@ ip_last=$5
 echo $server_host
 cd $db_sub_backup_folder
 
-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\:\/\/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
-	sed -i "s/https\:\/\/r.xyqb.com/http\:\/\/${server_host}:7004/g" $entry
-	sed -i "s/http\:\/\/rapi.xyqb.com/http\:\/\/${server_host}:7005/g" $entry
-	sed -i "s/https\:\/\/rapi.xyqb.com/http\:\/\/${server_host}:7005/g" $entry
-	sed -i "s/http\:\/\/payapi.xyqb.com/http\:\/\/${server_host}:7006/g" $entry
-	sed -i "s/https\:\/\/payapi.xyqb.com/http\:\/\/${server_host}:7006/g" $entry
-	sed -i "s/http\:\/\/pay.xyqb.com/http\:\/\/${server_host}:7007/g" $entry
-	sed -i "s/https\:\/\/pay.xyqb.com/http\:\/\/${server_host}:7007/g" $entry
-	sed -i "s/http\:\/\/off.xyqb.com/http\:\/\/${server_host}:7008/g" $entry
-	sed -i "s/https\:\/\/off.xyqb.com/http\:\/\/${server_host}:7008/g" $entry
-	sed -i "s/http\:\/\/offapi.xyqb.com/http\:\/\/${server_host}:7010/g" $entry
-	sed -i "s/https\:\/\/offapi.xyqb.com/http\:\/\/${server_host}:7010/g" $entry
-	sed -i "s/http\:\/\/financial.xyqb.com/http\:\/\/${server_host}:7011/g" $entry
-	sed -i "s/https\:\/\/financial.xyqb.com/http\:\/\/${server_host}:7011/g" $entry
-	sed -i "s/http\:\/\/fsapi.xyqb.com/http\:\/\/${server_host}:7012/g" $entry
-	sed -i "s/https\:\/\/fsapi.xyqb.com/http\:\/\/${server_host}:7012/g" $entry
-	sed -i "s/http\:\/\/auth.xyqb.com/http\:\/\/${server_host}:7013/g" $entry
-	sed -i "s/https\:\/\/auth.xyqb.com/http\:\/\/${server_host}:7013/g" $entry
-	sed -i "s/http\:\/\/qapi.xyqb.com/http\:\/\/${server_host}:7014/g" $entry
-	sed -i "s/https\:\/\/qapi.xyqb.com/http\:\/\/${server_host}:7014/g" $entry
-	sed -i "s/http\:\/\/mallapi.xyqb.com/http\:\/\/${server_host}:7019/g" $entry
-	sed -i "s/https\:\/\/mallapi.xyqb.com/http\:\/\/${server_host}:7019/g" $entry
-	sed -i "s/http\:\/\/scapi.xyqb.com/http\:\/\/${server_host}:7021/g" $entry
-	sed -i "s/https\:\/\/scapi.xyqb.com/http\:\/\/${server_host}:7021/g" $entry
-	sed -i "s/http\:\/\/gyxdapi.xyqb.com/http\:\/\/${server_host}:7029/g" $entry
-	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
-
-if [ "$re_replace_ip" = true ]; then
+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 public ip for $entry"
-		sed -i "s/${server_host}/${public_ip}/g" $entry
-		sed -i "s/\:70/:${ip_last}/g" $entry
+		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}: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
+		sed -i "s/https\:\/\/r.xyqb.com/http\:\/\/${server_host}:7004/g" $entry
+		sed -i "s/http\:\/\/rapi.xyqb.com/http\:\/\/${server_host}:7005/g" $entry
+		sed -i "s/https\:\/\/rapi.xyqb.com/http\:\/\/${server_host}:7005/g" $entry
+		sed -i "s/http\:\/\/payapi.xyqb.com/http\:\/\/${server_host}:7006/g" $entry
+		sed -i "s/https\:\/\/payapi.xyqb.com/http\:\/\/${server_host}:7006/g" $entry
+		sed -i "s/http\:\/\/pay.xyqb.com/http\:\/\/${server_host}:7007/g" $entry
+		sed -i "s/https\:\/\/pay.xyqb.com/http\:\/\/${server_host}:7007/g" $entry
+		sed -i "s/http\:\/\/off.xyqb.com/http\:\/\/${server_host}:7008/g" $entry
+		sed -i "s/https\:\/\/off.xyqb.com/http\:\/\/${server_host}:7008/g" $entry
+		sed -i "s/http\:\/\/offapi.xyqb.com/http\:\/\/${server_host}:7010/g" $entry
+		sed -i "s/https\:\/\/offapi.xyqb.com/http\:\/\/${server_host}:7010/g" $entry
+		sed -i "s/http\:\/\/financial.xyqb.com/http\:\/\/${server_host}:7011/g" $entry
+		sed -i "s/https\:\/\/financial.xyqb.com/http\:\/\/${server_host}:7011/g" $entry
+		sed -i "s/http\:\/\/fsapi.xyqb.com/http\:\/\/${server_host}:7012/g" $entry
+		sed -i "s/https\:\/\/fsapi.xyqb.com/http\:\/\/${server_host}:7012/g" $entry
+		sed -i "s/http\:\/\/auth.xyqb.com/http\:\/\/${server_host}:7013/g" $entry
+		sed -i "s/https\:\/\/auth.xyqb.com/http\:\/\/${server_host}:7013/g" $entry
+		sed -i "s/http\:\/\/qapi.xyqb.com/http\:\/\/${server_host}:7014/g" $entry
+		sed -i "s/https\:\/\/qapi.xyqb.com/http\:\/\/${server_host}:7014/g" $entry
+		sed -i "s/http\:\/\/mallapi.xyqb.com/http\:\/\/${server_host}:7019/g" $entry
+		sed -i "s/https\:\/\/mallapi.xyqb.com/http\:\/\/${server_host}:7019/g" $entry
+		sed -i "s/http\:\/\/scapi.xyqb.com/http\:\/\/${server_host}:7021/g" $entry
+		sed -i "s/https\:\/\/scapi.xyqb.com/http\:\/\/${server_host}:7021/g" $entry
+		sed -i "s/http\:\/\/gyxdapi.xyqb.com/http\:\/\/${server_host}:7029/g" $entry
+		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
+
+	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 "---------------"

qa_shell_script/mock_funding_corp.sh

 function mock()
 {
-	mkdir -p /home/quant_group/di-ting/config
+        mkdir -p /home/quant_group/di-ting/config
         if [[ -a /home/quant_group/di-ting/config/application.properties ]]; then
                 sed -i "/hubei.api.url/d" /home/quant_group/di-ting/config/application.properties
         fi
-	echo "hubei.api.url=http://192.168.4.251:8585/Gateway/servlet/OutsiteReqServlet" >> /home/quant_group/di-ting/config/application.properties
-	/home/qa-deploy-utils/qa_shell_script/5_restart_by_name.sh di-ting
+        echo "hubei.api.url=http://192.168.4.251:8585/Gateway/servlet/OutsiteReqServlet" >> /home/quant_group/di-ting/config/application.properties
+        /home/qa-deploy-utils/qa_shell_script/5_restart_by_name.sh di-ting
 }
 
 function unmock()