B

Merge branch 'dev_awg' into dev_david
合并上周五修正

data_processing/data_operation/pre_data_ftp.py

@@ -119,7 +119,7 @@ def upload_sftp(zip_path, zip_file, args):
     sftp, ssh = sftp_connect(ftp_host, ftp_port, ftp_user, ftp_pass)
     if sftp and ssh:
         # 上传文件
-        sftp_upload(sftp, zip_path, 'STOR /' + ftp_params[args['user']]['modeler'] + '/'+zip_file)
+        sftp_upload(sftp, zip_path, '/' + ftp_params[args['user']]['modeler'] + '/'+zip_file)
     # 关闭连接
     sftp_close(sftp, ssh)
     shutil.rmtree(os.path.dirname(zip_path))

run_all.py

@@ -40,4 +40,4 @@ for service, port in services:
 
 # 等待所有进程结束
 for p in processes:
-    p.wait()
+    p.wait()