update

db-utils/db_gen_config.sh

@@ -113,7 +113,7 @@ elif [[  $database_name = 'spider_center'  ]]; then
 	port='3312'
 elif [[  $database_name = 'silk_road'  ]]; then
 	# 
-	sys_table_list='task'
+	sys_table_list=''
 	source_db_host='192.168.4.80'
 	port='9999'
 elif [[  $database_name = 'xyqb_user'  ]]; then
@@ -121,7 +121,7 @@ elif [[  $database_name = 'xyqb_user'  ]]; then
 	sys_table_list='merchant_config merchant'
 	port='3313'
 elif [[ $database_name = 'merchant' ]]; then
-	# 用户中心
+	# 商户
 	sys_table_list='authority product_nature role role_authority role_supplier user'
 	port='3314'
 elif [[ $database_name = 'xyqb_btzt' ]]; then
@@ -130,7 +130,7 @@ elif [[ $database_name = 'xyqb_btzt' ]]; then
 	source_db_host='192.168.4.116'
 	port='7001'
  elif [[ $database_name = 'notify' ]]; then
- 	# 白条直投
+	# 通知
  	sys_table_list='merchant merchant_config'
 	source_db_host='192.168.4.6'
  	port='7306'

db-utils/db_import.sh

@@ -30,7 +30,7 @@ do
 	echo "mysql -h $mysql_host -uqa -pqatest $database_name < $entry"
 	mysql -h $mysql_host -uqa -pqatest $database_name < $entry
 	if [ $? != 0 ];then
-		echo "mysql -h $mysql_host -uqa -pqatest $database_name < $entry import error"
+		echo "--- mysql -h $mysql_host -uqa -pqatest $database_name < $entry import error ---"
 		exit -1
 	fi
 done

db-utils/db_schema_sync.sh

@@ -82,10 +82,10 @@ function db_schema_sync()
 
 	echo "--- Step 3: import basic data from backup file: $database $mysql_host $db_backup_sub_folders ---"
 	sh $work_dir/db_import.sh $database $target_db_host $db_backup_sub_folders $delete_business_data
-	if [ $? != 0 ];then
-		echo "db_import.sh error"
-		exit -1
-	fi
+	#if [ $? != 0 ];then
+	#	echo "db_import.sh error"
+	#	exit -1
+	#fi
 	
 	echo "--- Step 4: sync schema: $database $target_db_host ---"
 	sync_cmd="mss -conf ${config_file_name} -sync"