solax-py-library 1.0.0.9__py3-none-any.whl → 1.0.0.10__py3-none-any.whl

solax_py_library/upload/core/upload_service/ftp.py

@@ -24,6 +24,7 @@ class FTPUploadService(BaseUploadService):
         super().__init__(**kwargs)
         config = self._init_config(**kwargs)
         self.host = config.host
+        self.port = config.port
         self.user = config.user
         self.password = config.password
         self.remote_path = config.remote_path
@@ -40,6 +41,7 @@ class FTPUploadService(BaseUploadService):
             self.close()
         try:
             self._client = ftplib.FTP(self.host, timeout=self.timeout)
+            self._client.connect(self.host, self.port, timeout=self.timeout)
             self._client.login(self.user, self.password)
             print(f"Connected to {self.host}")
             self._is_connect = True

solax_py_library/upload/test/test_ftp.py

@@ -10,8 +10,9 @@ class FTPTest(unittest.TestCase):
     def test_ftp_upload(self):
         ftp_config = {
             "host": "10.1.31.181",  # 测试host
+            "port": 21,
             "user": "solax",
-            "password": "sly402",
+            "password": "123456",
             "remote_path": "/xixi",
         }
         asyncio.run(

solax_py_library/upload/types/ftp.py

@@ -26,6 +26,7 @@ class FTPData(BaseModel):
 
 class FTPServiceConfig(BaseModel):
     host: str
+    port: int
     user: Optional[str]
     password: Optional[str]
     remote_path: str

{solax_py_library-1.0.0.9.dist-info → solax_py_library-1.0.0.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: solax-py-library
-Version: 1.0.0.9
+Version: 1.0.0.10
 Summary: some common tool
 Author: shenlvyu
 Author-email: 13296718439@163.com

{solax_py_library-1.0.0.9.dist-info → solax_py_library-1.0.0.10.dist-info}/RECORD

@@ -8,15 +8,15 @@ solax_py_library/upload/core/data_adapter/base.py,sha256=Va-SEe0eL3gobhNOnzHGkYB
 solax_py_library/upload/core/data_adapter/csv.py,sha256=8nlnV_43mMAR3re50MQJymzT5HYpZOo7eSeMsEfnEVE,861
 solax_py_library/upload/core/upload_service/__init__.py,sha256=uA-UeH31rDNxByeZwvPhNFHPV_-J8JyCev8geuc---k,269
 solax_py_library/upload/core/upload_service/base.py,sha256=dxCBVtPxDhN7oRTjnwnjtc2XAF4hyIz9HsYCJePlggg,912
-solax_py_library/upload/core/upload_service/ftp.py,sha256=ZJqRpPrh0qOjmYW-7VykzevWioCqMnFyM4-Svju4nlI,2685
+solax_py_library/upload/core/upload_service/ftp.py,sha256=2h7_Wwv_ozd24t5B4abCAs4VrWi7l1ByYJh8vvTiyzU,2794
 solax_py_library/upload/errors/__init__.py,sha256=pVAcSOXvlsPJW3PjHLBOdbl7KvntiYmz7TP0XuRwZ_A,243
 solax_py_library/upload/errors/base.py,sha256=T01ZrZHF25PWgCrOv76Vhg26hds3I1Yy8Kl2LZRKOxo,258
 solax_py_library/upload/errors/upload_error.py,sha256=9pCZzR_y3-VkBWSs5w7mMHYFRJjzVosIcxi-5SO8N1U,409
 solax_py_library/upload/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-solax_py_library/upload/test/test_ftp.py,sha256=frKyW8TydfL7WMLhnZVxTig08A-Gxv-hxPubdOsMhrM,1396
+solax_py_library/upload/test/test_ftp.py,sha256=_d9JJ6KOaefTpbi9LO1YH84fUSsFlzdRdjedAlz36b8,1420
 solax_py_library/upload/types/__init__.py,sha256=og9KBpYbcs36_S1izURj3vyHeuNOLJQrD9GpxK_JJaw,244
 solax_py_library/upload/types/client.py,sha256=fG674_QEpOw3ibO171lcxJ0cz27yGR_sd3zgiyr4yuI,492
-solax_py_library/upload/types/ftp.py,sha256=OLaNGJHsDNmdGu-e3W-bFI3O7-jcTP4auH83_3IpaUQ,665
-solax_py_library-1.0.0.9.dist-info/METADATA,sha256=DDYjCShCa47iwub8T-Rb9TGPC8uEuDoT1_6esn817Ck,1789
-solax_py_library-1.0.0.9.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-solax_py_library-1.0.0.9.dist-info/RECORD,,
+solax_py_library/upload/types/ftp.py,sha256=9kCeLB0g5Je19v4ifz8YYEsGOhJL1lKBO2C6V2VBndc,679
+solax_py_library-1.0.0.10.dist-info/METADATA,sha256=FR6Bc8lPlFYFS0AcERkefUdOLTRBbr79Cgq9LGVsSSc,1790
+solax_py_library-1.0.0.10.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+solax_py_library-1.0.0.10.dist-info/RECORD,,