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

db-utils/db_execute_sql.sh

+# -------------------------------------------------------------------------------
+# Filename:    db_execute_sql.sh
+# Revision:    1.0
+# Date:        2017/03
+# Author:      dekun.dai
+# Description: 执行目录下所有数据库脚本
+# -------------------------------------------------------------------------------
+
+mysql_host=$1
+$sql_file_folder=/home/qa-deploy-utils/db-utils/sql_to_run
+
+echo "cd $sql_file_folder"
+cd $sql_file_folder
+
+for entry in ./*
+do
+	echo "run sql file: $entry"
+	mysql -h $mysql_host -uqa -pqatest < $entry
+done
\ No newline at end of file

db-utils/db_replace_ip.sh

@@ -18,7 +18,7 @@ cd $db_sub_backup_folder
 
 file_count=`ls -l |grep "^-"|wc -l`
 echo "./* file count is $file_count"
-if [ "$file_count" gt 0 ]; then
+if [ "$file_count" -gt 0 ]; then
 	for entry in ./*
 	do
 		echo "is replace ip for db_back_file $entry"

db-utils/db_schema_sync.sh

@@ -64,6 +64,12 @@ function db_schema_sync()
 	$sync_cmd
 }
 
+function run_sql_file()
+{
+	echo "run sql files on ${target_db_host}"
+	sh $work_dir/db_execute_sql.sh $target_db_host
+}
+
 database_list='xyqb xyqb_app payment_center risk_control dujiangyan mall qinqiong quartz contract financial_system gyxd offline sms-center spider_center xyqb_user merchant'
 if [[ "$sync_db_name" = "all" ]]
 then
@@ -71,8 +77,10 @@ then
 	for db_name in $database_list
 	do
 	    db_schema_sync $db_name
-        echo $db_name
+      echo $db_name
 	done
+	run_sql_file
 else
 	db_schema_sync $sync_db_name
+	run_sql_file
 fi
\ No newline at end of file

db-utils/sql_to_run/qinqiong.sql

+ UPDATE `qinqiong`.`secure_key` SET qinqiong.`secure_key`.`public_key` = '-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvKEKOt+IJH6v2vA2y3lj\n4BA+Exi9dK6Chol4sS85Na6br0I03KG4Qg7W5KA9CsWtPM07AxBizr5QsCt7CvT/\nHJUNs8hxSBfseW/eoL6PDwvgjfaAlGQ/hradqnzmU3c9za13E6Qmj64s+ZuNog0l\nsavlbKXlMp5riv4Rd6qZ5BXBRqB8zEhqgdLmW5QV9PYp8XNbmcRv/XRtFVQgSnig\npslVKJRCi0RuGuYr0JMk3Eg+7ZPYhYA6Y35xY6F3Ln6lGkjq1hOhaKzTHFkxTB0H\nu1jz6e+xfVrKWt7q+B8581367pTKxbec3lsylmI+gUOeHDtDn6Gtvcm8M/rpV/Y0\n6wIDAQAB\n-----END PUBLIC KEY-----' WHERE qinqiong.`secure_key`.`merchant_id` <> '';
\ No newline at end of file