整理代码

main.py

@@ -17,21 +17,19 @@ from PyQt5.QtWidgets import QComboBox
 import sys
 from PyQt5.QtWidgets import (QApplication, QMainWindow, QTableView, QVBoxLayout,
                              QWidget, QPushButton, QHeaderView, QHBoxLayout,
-                             QDialog, QLabel, QLineEdit, QFormLayout, QFileDialog)
+                            QLabel, QFileDialog)
 from PyQt5.QtCore import Qt, QAbstractTableModel, QModelIndex, QThread
 from PyQt5.QtGui import QColor
-from PyQt5.QtWidgets import QRadioButton
 from PyQt5.QtGui import QValidator, QRegExpValidator
 from PyQt5.QtCore import QRegExp
 from multipleThread.thread_upload import Upload_Thread
 from multipleThread.thread_resume import Resume_Thread
-
+from multipleThread.config import *
 
 # 命令行查看文件md5
 # certutil -hashfile music.mp4 MD5
 
 # 上传文件固定参数
-name_prefix = "https://qgongye.oss-cn-shanghai.aliyuncs.com\\upload/order"
 
 # 当前用户
 user_now = ''
@@ -43,48 +41,12 @@ order_info_url = "https://uat.emku.laidecloud.com/console/productOrder/experimen
 # order detail
 order_detail_url = "https://uat.emku.laidecloud.com/console/productOrder/uploadorderdetail.ajax"
 
-# 上传文件回调地址
-callback_url = "https://uat.emku.laidecloud.com/console/productOrder/filePthSave.ajax"
-# 切片上传大小
-part_size = 5 * 1024 * 1024
-
 # 未完成任务列表
 job_list = {}
 
-auth = oss2.Auth("LTAI3qeEHR5SP2ph", "zsV3FnjVgBDhaAm23J2vdAmMuX0YFY")
-# 填写Bucket所在地域对应的Endpoint。以华东1（上海）为例，Endpoint填写为https://oss-cn-hangzhou.aliyuncs.com。
-endpoint = "https://oss-cn-shanghai.aliyuncs.com"
-
-# 填写Endpoint对应的Region信息，例如cn-hangzhou。注意，v4签名下，必须填写该参数
-region = "cn-shanghai"
-bucket_name = "qgongye"
-# yourBucketName填写存储空间名称。
-bucket = oss2.Bucket(auth, endpoint, bucket_name, region=region)
-
-
 # 未完成上传的json文件存储路径,json命名格式为:tmp_{key}.json,比如key="music.mp3"
 uncomplete_json_folder = "./upload_tag"
 
-
-# 验证版本输入必须为数字
-class NumberValidator(QRegExpValidator):
-    def __init__(self, parent=None):
-        # 匹配整数、浮点数(包括科学计数法)
-        reg_exp = QRegExp(r'^[+-]?(\d+\.?\d*|\.\d+)([eE][+-]?\d+)?$')
-        super().__init__(reg_exp, parent)
-
-    def validate(self, text, pos):
-        # 允许空输入
-        if not text:
-            return (QValidator.Intermediate, text, pos)
-
-        # 检查是否为纯数字
-        if text in ['+', '-', '.', '+.', '-.']:
-            return (QValidator.Intermediate, text, pos)
-
-        return super().validate(text, pos)
-
-
 # 全局线程书
 thread_index = 0
 

multipleThread/config.py

+import oss2
+aliyun_key = "LTAI3qeEHR5SP2ph"
+aliyun_secret = "zsV3FnjVgBDhaAm23J2vdAmMuX0YFY"
+auth = oss2.Auth(aliyun_key, aliyun_secret)
+endpoint = "https://oss-cn-shanghai.aliyuncs.com"
+region = "cn-shanghai"
+bucket = oss2.Bucket(auth, endpoint, "qgongye", region=region)
+
+# 分片大小
+part_size = 5 * 1024 * 1024
+#   阿里云前缀
+name_prefix = "https://qgongye.oss-cn-shanghai.aliyuncs.com\\upload/order"
+# 回调地址
+callback_url = "https://uat.emku.laidecloud.com/console/productOrder/filePthSave.ajax"
\ No newline at end of file

multipleThread/thread_resume.py

@@ -2,32 +2,11 @@
 import time
 
 import requests
-from PyQt5.QtCore import QThread, pyqtSignal, QWaitCondition, QMutex, QObject, pyqtSlot
+from PyQt5.QtCore import  pyqtSignal, QWaitCondition, QMutex, QObject, pyqtSlot
 import os.path
-from PyQt5.QtWidgets import QApplication,QMainWindow
-import sys
-import oss2
-import json
-from oss2 import SizedFileAdapter, determine_part_size
-import time
-import alibabacloud_oss_v2 as oss
-import uuid
+from .config import *
 from oss2.models import PartInfo
 # 切片上传大小
-part_size = 5 * 1024 * 1024
-name_prefix = "https://qgongye.oss-cn-shanghai.aliyuncs.com\\upload/order"
-callback_url = "https://uat.emku.laidecloud.com/console/productOrder/filePthSave.ajax"
-# 未完成任务列表
-auth = oss2.Auth("LTAI3qeEHR5SP2ph", "zsV3FnjVgBDhaAm23J2vdAmMuX0YFY")
-
-# 填写Bucket所在地域对应的Endpoint。以华东1（上海）为例，Endpoint填写为https://oss-cn-hangzhou.aliyuncs.com。
-endpoint = "https://oss-cn-shanghai.aliyuncs.com"
-
-# 填写Endpoint对应的Region信息，例如cn-hangzhou。注意，v4签名下，必须填写该参数
-region = "cn-shanghai"
-
-# yourBucketName填写存储空间名称。
-bucket = oss2.Bucket(auth, endpoint, "qgongye", region=region)
 
 
 # 未完成任务类

multipleThread/thread_upload.py

 # -*- coding: utf-8 -*-
-import time
-
 import requests
 from PyQt5.QtCore import QThread, pyqtSignal, QWaitCondition, QMutex, QObject, pyqtSlot
 import os.path
 
-from PyQt5.QtWidgets import QApplication,QMainWindow
-import sys
-import oss2
 import json
-from oss2 import SizedFileAdapter, determine_part_size
+from oss2 import SizedFileAdapter
 import uuid
-import alibabacloud_oss_v2 as oss
-from oss2.credentials import EnvironmentVariableCredentialsProvider
 from oss2.models import PartInfo
-# 切片上传大小
-part_size = 5 * 1024 * 1024
-name_prefix = "https://qgongye.oss-cn-shanghai.aliyuncs.com\\upload/order"
-callback_url = "https://uat.emku.laidecloud.com/console/productOrder/filePthSave.ajax"
-
-# 未完成任务列表
-job_list = {}
-auth = oss2.Auth("LTAI3qeEHR5SP2ph", "zsV3FnjVgBDhaAm23J2vdAmMuX0YFY")
-
-# 填写Bucket所在地域对应的Endpoint。以华东1（上海）为例，Endpoint填写为https://oss-cn-hangzhou.aliyuncs.com。
-endpoint = "https://oss-cn-shanghai.aliyuncs.com"
-
-# 填写Endpoint对应的Region信息，例如cn-hangzhou。注意，v4签名下，必须填写该参数
-region = "cn-shanghai"
-
-# yourBucketName填写存储空间名称。
-bucket = oss2.Bucket(auth, endpoint, "qgongye", region=region)
-
-# self.thread = QThread()
-# self.upload = Upload_Thread()
-# self.upload.filename = filename
-# self.upload.moveToThread(self.thread)
-# self.upload.updateSignal.connect(self.changeProcessbar)
-# self.thread.started.connect(self.upload.run)
-# self.thread.start()
+from .config import *
 
 
 # 定义一个线程类