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

db-utils/daily_db_backup.sh

@@ -16,7 +16,7 @@ target_db_pwd=$6
 sync_db_name=$7
 
 function db_schema_sync()
-{	
+{
 	database=$1
 	uuid=$(uuidgen)
 	config_file_name="$sync_config_folder/${database}_${uuid}_db_schema_sync_config.json"

db-utils/db_gen_config.sh

@@ -148,17 +148,17 @@ elif [[ $database_name = 'traffic_distribution' ]]; then
 	source_db_host='192.168.3.36'
 	port='3313'
 elif [[ $database_name = 'notify' ]]; then
- 	sys_table_list='merchant merchant_config'
+	sys_table_list='merchant merchant_config'
 	source_db_host='192.168.4.6'
- 	port='7306'
+	port='7306'
 elif [[ $database_name = 'mall_settlement' ]]; then
- 	sys_table_list='role role_user user'
+	sys_table_list='role role_user user'
 	source_db_host='192.168.4.253'
- 	port='3315'
+	port='3315'
 elif [[ $database_name = 'score' ]]; then
- 	sys_table_list=''
+	sys_table_list=''
 	source_db_host='192.168.4.249'
- 	port='3322'
+	port='3322'
 # elif [[ $database_name = 'silk_road' ]]; then
 #  	sys_table_list='task'
 # 	source_db_host='192.168.4.249'

db-utils/db_schema_sync.sh

@@ -57,7 +57,7 @@ done
 target_db_host=`sh $pwd_path/get-ip.sh $ip_value`
 
 function db_schema_sync()
-{	
+{
 	database=$1
 	uuid=$(uuidgen)
 	config_file_name="$sync_config_folder/${database}_${uuid}_db_schema_sync_config.json"
@@ -98,15 +98,14 @@ function db_schema_sync()
 
 function run_sql_file()
 {
-        sync_db_name=$1
-        echo "run sql files on ${target_db_host}'s $sync_db_name"
-        sh $work_dir/db_execute_sql.sh $target_db_host $sync_db_name
+	sync_db_name=$1
+	echo "run sql files on ${target_db_host}'s $sync_db_name"
+	sh $work_dir/db_execute_sql.sh $target_db_host $sync_db_name
 }
 
 database_list=`grep database_list $work_dir/config/db_config | cut -d "=" -f 2`
 
-if [[ "$sync_db_name" = "all" ]]
-then
+if [[ "$sync_db_name" = "all" ]];then
 	echo "sync all database schema"
 elif [[ "$sync_db_name" = "all(no_mall)" ]];then
 	database_list=`echo $database_list | sed 's#mall ##g'`