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

db-utils/db_execute_sql.sh

@@ -7,7 +7,7 @@
 # -------------------------------------------------------------------------------
 
 mysql_host=$1
-$sql_file_folder=/home/qa-deploy-utils/db-utils/sql_to_run
+sql_file_folder=/home/qa-deploy-utils/db-utils/sql_to_run
 
 echo "cd $sql_file_folder"
 cd $sql_file_folder

db-utils/db_gen_config.sh

@@ -26,8 +26,6 @@ port=""
 sync_config_folder=~/db_sync_configs
 base_config_file=$sync_config_folder/base_config.json
 
-mkdir $db_backup_sub_folders
-
 if [ $# -ne 9 ]; then
 	echo "db_gen_config.sh"
 	echo "Total Number of Parameters : $#"

db-utils/db_replace_ip.sh

@@ -66,7 +66,4 @@ if [ "$file_count" -gt 0 ]; then
 			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

@@ -44,6 +44,9 @@ function db_schema_sync()
 	config_file_name="$sync_config_folder/${database}_${uuid}_db_schema_sync_config.json"
 	db_backup_sub_folders=$db_backup_folder/${uuid}
 	
+	echo "mkdir $db_backup_sub_folders"
+	mkdir $db_backup_sub_folders
+	
 	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"
@@ -62,6 +65,8 @@ function db_schema_sync()
 	sync_cmd="mss -conf ${config_file_name} -sync"
 	echo "${sync_cmd}"
 	$sync_cmd
+	
+	rm -rf $db_sub_backup_folder
 }
 
 function run_sql_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
+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` = 'xyqb_mall';
\ No newline at end of file