update

db-utils/db_import.sh

@@ -23,8 +23,6 @@ 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 -uqa -pqatest
 
-echo `pwd`
-
 for entry in ./*.sql
 do
 	echo "mysql -h $mysql_host -uqa -pqatest $database_name < $entry"

db-utils/db_replace_ip.sh

@@ -18,6 +18,7 @@ project_path=`cat $config_server/project_path.sh`
 config_path=`cat $config_server/config_path.sh`
 
 echo $server_host
+echo cd $db_sub_backup_folder
 cd $db_sub_backup_folder
 
 hosts=`node $config_server/get_project_config.js -type multi -attr port/url -attr2 true`
@@ -73,19 +74,19 @@ if [ $database_name = 'mall' ];then
 	done
 else
 	sed -i "s/https\:/http\:/g" $db_sub_backup_folder/*
-	if [ "$re_replace_ip" = true ]; then
-		echo "replace public ip for $db_sub_backup_folder/*"
+	if [ "$re_replace_ip" = false ];then
+		echo "replace ip for $db_sub_backup_folder/*"
 		for host in $hosts
 		do
 			arr=${host//|/ }
-			transByPort $arr "$db_sub_backup_folder/*"
+			transByUrl $arr "$db_sub_backup_folder/*"
 		done
-	elif [ "$re_replace_ip" = false ];then
-		echo "replace ip for $db_sub_backup_folder/*"
+	elif [ "$re_replace_ip" = true ]; then
+		echo "replace public ip for $db_sub_backup_folder/*"
 		for host in $hosts
 		do
 			arr=${host//|/ }
-			transByUrl $arr "$db_sub_backup_folder/*"
+			transByPort $arr "$db_sub_backup_folder/*"
 		done
 	else
 		echo "replace $re_replace_ip ip for $db_sub_backup_folder/*"