Merge branch refs/heads/develop into refs/heads/hotfix/优化多次编程单下发

This commit is contained in:
杨金灵
2024-06-06 09:29:39 +08:00
23 changed files with 910 additions and 596 deletions

View File

@@ -32,6 +32,9 @@ class FtpController():
logging.error(f"Error checking file: {e}")
return False
# # 检测字符串的编码
# def detect_encoding(self, s):
# result = chardet.detect(s)
@@ -43,6 +46,8 @@ class FtpController():
os.makedirs(serverdir)
try:
logging.info("进入FTP目录 ")
self.ftp.pwd()
logging.info('当前目录:%s' % self.ftp.pwd())
logging.info('目录:%s' % target_dir)
target_dir1 = target_dir.split('/')
logging.info('目录1:%s' % target_dir1[1])