添加版本支持

multipleThread/config.py

@@ -5,11 +5,35 @@ 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)
-
+version = "release"
 # 分片大小
 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"
-goods_callback_url = "https://uat.emku.laidecloud.com/console/productOrder/goodsFilePthSave.ajax"
+if version == "test":
+    callback_url = "http://uat.vue.emku.laidecloud.com/console/productOrder/filePthSave.ajax"
\ No newline at end of file
+    goods_callback_url = "http://uat.vue.emku.laidecloud.com/console/productOrder/goodsFilePthSave.ajax"
+    login_url = 'http://uat.vue.emku.laidecloud.com/console/pc/userLoginByToken.ajax'
+    # order信息地址
+    order_info_url = "http://uat.vue.laidecloud.com/console/productOrder/experimentOrderList.ajax"
+    # order detail
+    order_detail_url = "http://uat.vue.laidecloud.com/console/productOrder/uploadorderdetail.ajax"
+    product_manager_url = "http://uat.vue.emku.laidecloud.com/console/goods/goods_list.ajax"
+    product_callback_url = "http://uat.vue.emku.laidecloud.com/console/seller/getFiles.ajax"
+    #获取上传文件列表
+    fileupload_url = "http://uat.vue.emku.laidecloud.com/console/productOrder/onupload.ajax"
+
+else:
+    callback_url = "https://emku.laidecloud.com/console/productOrder/filePthSave.ajax"
+    login_url = 'https://emku.laidecloud.com/console/pc/userLoginByToken.ajax'
+    # order信息地址
+    order_info_url = "https://emku.laidecloud.com/console/productOrder/experimentOrderList.ajax"
+    # order detail
+    order_detail_url = "https://emku.laidecloud.com/console/productOrder/uploadorderdetail.ajax"
+    product_manager_url = "http://emku.laidecloud.com/console/goods/goods_list.ajax"
+    product_callback_url = "https://emku.laidecloud.com/console/seller/getFiles.ajax"
+
+    # 获取上传文件列表
+    fileupload_url = "https://emku.laidecloud.com/console/productOrder/onupload.ajax"
+    goods_callback_url = "https://emku.laidecloud.com/console/productOrder/goodsFilePthSave.ajax"

multipleThread/thread_upload.py

@@ -11,8 +11,8 @@ from oss2 import SizedFileAdapter
 import uuid
 from oss2.models import PartInfo
 from .config import *
-product_callback_url = "https://emku.laidecloud.com/console/seller/getFiles.ajax"
 
+print(f"f{product_manager_url} ======>")
 
 def nanoseconds_to_date(nano_seconds):
     timestamp = nano_seconds/ 1000
@@ -30,7 +30,6 @@ def process_data(data):
         result.append([j["info"], "设计资料", j['addTime']])
     for j in data["obj"]["files2"]:
         result.append([j["info"], "Bom资料", j['addTime']])
-    print(result)
     return result
 
 
@@ -44,7 +43,7 @@ class Upload_Thread(QObject):
     finishSignal = pyqtSignal()
     updateSignal = pyqtSignal(tuple)
 
-    def __init__(self, thread_num=0, order_id=None, type_info=None, token=""):
+    def __init__(self, thread_num=0, order_id=None, type_info=None, token="", version_id=""):
         QObject.__init__(self)
         # 要发送的文件地址
         self._filename = ''
@@ -60,6 +59,8 @@ class Upload_Thread(QObject):
         self.type_info = type_info
         self.order_id = order_id
         self.token = token
+        print(f"-------->{self.token}")
+        self.version_id = version_id
 
     def pause(self):
         self._isPause = True
@@ -176,26 +177,32 @@ class Upload_Thread(QObject):
                 bucket.complete_multipart_upload(oss_key, upload_id, parts, headers=headers)
                 if os.path.exists("./upload_tag/tmp_" + key + ".json"):
                     os.remove("./upload_tag/tmp_" + key + ".json")
-
                 datas = {"id": str(self.order_id), "name": self.uuid_str + "." + extension, "path": name_prefix, "info": key,
-                         "type": self.type_info}
-                print(f"datas {datas}")
+                         "type": self.type_info, "product_version_id": self.version_id}
                 headers = {'token': self.token,
                            'User-Agent': "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.3"}
 
                 if self.type_info >= 12:
+
                     try:
                         response = requests.post(goods_callback_url, data=datas,headers=headers)
                         res = response.json()
-                        print(res["obj"])
-                        response = requests.post(product_callback_url, data={"id": self.order_id}, headers=headers)
+                        version_id = self.version_id
+                        if self.version_id == -1:
+                            version_id = -1
+
+                        response = requests.post(product_callback_url, data={"id": self.order_id, "product_version_id": version_id}, headers=headers)
                         data = response.json()
                         res = process_data(data)
+                        print(res)
                         self.finishSignal2.emit(res, self.order_id)
                     except Exception as e:
-                        print("wrong 1")
+                        print(f"wrong 1{e}")
                 else:
                     # try:
+                    if datas["product_version_id"] == -1:
+                        datas["product_version_id"] = ''
+                        print("-----1")
                     response = requests.post(callback_url, data=datas, headers=headers)
                     res = response.json()
                     print(res["obj"])