Merge branch 'master' of http://git.quantgroup.cn/QA/qa-deploy-utils

db-utils/db_gen_config.sh

@@ -43,7 +43,7 @@ cache_dir=/home/daily_db_backup
 # 	exit 1
 # fi
 
-echo "prepare to get port"
+echo "prepare to get source_port"
 if [[ $database_name = 'xyqb' ]]; then
 	# 信用钱包database
 	sys_table_list='baitiao_merchant baitiao_secure_key channel funding_contract funding_corp loan_product merchant_channel payeco_return_url_info red_packet t_phonenum zmxy_return_url configuration secure_proxy funding_corp_config funding_info_map baitiao_preferential_rule funding_corp_policy'
@@ -166,7 +166,7 @@ elif [[ $database_name = 'score' ]]; then
 #  	port='3322'
 fi
 
-echo "port is $port"
+echo "source_port is $port"
 echo "copy ${base_config_file} to ${config_file_name}"
 cp -f $base_config_file $config_file_name
 

db-utils/db_import.sh

@@ -18,15 +18,19 @@ cd $db_sub_backup_folder
 echo "delete_business_data:"$delete_business_data
 
 if [ "$delete_business_data" = "true" ];then
-	echo "DROP DATABASE ${database_name};"
-	echo "DROP DATABASE ${database_name};" | mysql -h $mysql_host -P $target_db_port -uqa -pqatest
+	# echo "DROP DATABASE ${database_name};"
+	# echo "DROP DATABASE ${database_name};" | mysql -h $mysql_host -P $target_db_port -uqa -pqatest
+	echo "mysql -h $mysql_host -P $target_db_port -uqa -pqatest -e \"DROP DATABASE ${database_name};\""
+	mysql -h $mysql_host -P $target_db_port -uqa -pqatest -e "DROP DATABASE ${database_name};"
 fi
-echo "CREATE DATABASE IF NOT EXISTS \`${database_name}\` DEFAULT CHARSET utf8 COLLATE utf8_general_ci;"
-echo "CREATE DATABASE IF NOT EXISTS \`${database_name}\` DEFAULT CHARSET utf8 COLLATE utf8_general_ci;" | mysql -h $mysql_host -P $target_db_port -uqa -pqatest
+# echo "CREATE DATABASE IF NOT EXISTS \`${database_name}\` DEFAULT CHARSET utf8 COLLATE utf8_general_ci;"
+# echo "CREATE DATABASE IF NOT EXISTS \`${database_name}\` DEFAULT CHARSET utf8 COLLATE utf8_general_ci;" | mysql -h $mysql_host -P $target_db_port -uqa -pqatest
+echo "mysql -h $mysql_host -P $target_db_port -uqa -pqatest -e \"CREATE DATABASE IF NOT EXISTS \`${database_name}\` DEFAULT CHARSET utf8 COLLATE utf8_general_ci;\""
+mysql -h $mysql_host -P $target_db_port -uqa -pqatest -e "CREATE DATABASE IF NOT EXISTS \`${database_name}\` DEFAULT CHARSET utf8 COLLATE utf8_general_ci;"
 
 for entry in ./*.sql
 do
-	echo "mysql -h $mysql_host -uqa -pqatest $database_name < $entry"
+	echo "mysql -h $mysql_host -P $target_db_port -uqa -pqatest $database_name < $entry"
 	mysql -h $mysql_host -P $target_db_port -uqa -pqatest $database_name < $entry
 	if [ $? != 0 ];then
 		echo "--- mysql -h $mysql_host -P $target_db_port -uqa -pqatest $database_name < $entry import error ---"

db-utils/db_schema_sync.sh

@@ -71,7 +71,7 @@ function db_schema_sync()
 	
 	echo "--- Step 1: generate_config_file: $config_file_name ---"
 	echo "source infos: $source_db_host $source_db_user"
-	echo "target infos: $target_db_host $target_db_user"
+	echo "target infos: $target_db_host $target_db_port $target_db_user "
 	echo "database_name is : $database"
 	echo "delete_business_data : $delete_business_data"
 	echo "use_cache : $use_cache"
@@ -115,7 +115,7 @@ elif [[ "$sync_db_name" = "all(no_mall)" ]];then
 	echo "sync all(no_mall) database schema"
 else
 	database_list=$sync_db_name
-	echo "sync $sync_db_name database schema"
+	echo "sync single database schema:$sync_db_name"
 fi
 
 echo "database_list:${database_list}"

qa_shell_script/base_script/buildJava.sh

@@ -15,25 +15,27 @@ cd $project_path/$project
 rm -rf $target_path
 rm -rf $project.jar
 
-echo "准备修改pom文件中的消息中心SDK测试版本"
-nums=(`awk '/quantgroup-sms-sdk/ {print NR}' $project_path/$project/pom.xml`)
-for num in ${nums[@]}
-do
-	lin=$[ $num+1 ]
-	echo "第$lin行 pom文件修改成<version>3.0</version>"
-	sed -i "${lin}s#[0-9].*</version>#3.0</version>#" $project_path/$project/pom.xml
-done
-echo "修改完毕"
+if [ "$project" != "di-ting" ];then
+	echo "准备修改pom文件中的消息中心SDK测试版本"
+	nums=(`awk '/quantgroup-sms-sdk/ {print NR}' $project_path/$project/pom.xml`)
+	for num in ${nums[@]}
+	do
+		lin=$[ $num+1 ]
+		echo "第$lin行 pom文件修改成<version>3.0</version>"
+		sed -i "${lin}s#[0-9].*</version>#3.0</version>#" $project_path/$project/pom.xml
+	done
+	echo "修改完毕"
 
-echo "准备修改pom文件中的消息中心Notify-SDK测试版本"
-nums=(`awk '/quantgroup-notify-sdk/ {print NR}' $project_path/$project/pom.xml`)
-for num in ${nums[@]}
-do
-        lin=$[ $num+1 ]
-        echo "第$lin行 pom文件修改成<version>3.0</version>"
-        sed -i "${lin}s#[0-9].*</version>#3.0</version>#"  $project_path/$project/pom.xml
-done
-echo "修改完毕"
+	echo "准备修改pom文件中的消息中心Notify-SDK测试版本"
+	nums=(`awk '/quantgroup-notify-sdk/ {print NR}' $project_path/$project/pom.xml`)
+	for num in ${nums[@]}
+	do
+	        lin=$[ $num+1 ]
+	        echo "第$lin行 pom文件修改成<version>3.0</version>"
+	        sed -i "${lin}s#[0-9].*</version>#3.0</version>#"  $project_path/$project/pom.xml
+	done
+	echo "修改完毕"
+fi
 
 echo "$build_command"