添加判断操作系统关键字和修改ftp登录

04-CustomLibrary/Custometest/cmd_cer.py

@@ -1,6 +1,8 @@
 import os
 import subprocess
 from time import sleep
+import platform
+
 
 
 class Order:
@@ -116,14 +118,24 @@ class Order:
 
     # FTP 登录
     def FTP_login(self, ftp_url,file_content):
-        data = 'curl -m 10 '+ftp_url+' | iconv -f utf-8 -t gbk'
-        d = self.CMD(data)
-        # print(d)
+        SYS = self.Operating_System()
+        if SYS == "Windows":
+            data = 'curl -m 10 '+ftp_url+' | iconv -f utf-8 -t gbk'
+            d = self.CMD(data)
+        else:
+            data = 'curl -m 10 '+ftp_url
+            d = self.CMD(data)
+
         if file_content in d:
             return "Success"
         else:
             return "Fail"
 
+    # 判断当前操作系统
+    def Operating_System(self):
+        os_name = platform.system()
+        return os_name
+
 if __name__ == '__main__':
     datas = {"url":['https://www.baidu.com'],
 "Certificate":"Tango Secure Gateway CA",