1

blender/build_resize_model.py

@@ -89,8 +89,8 @@ def imagePiex(filePath,piex):
 def main():
     start = time.time()
 
-    get_printsize_url = 'https://mp.gray.api.suwa3d.com/api/printOrder/infoByOrderId'
-    upload_obj_volume_url = 'https://mp.gray.api.suwa3d.com/api/physical/add'  # ?pid=1&order_id=1&faces=1&volume=1
+    get_printsize_url = 'https://mp.api.suwa3d.com/api/printOrder/infoByOrderId'
+    upload_obj_volume_url = 'https://mp.api.suwa3d.com/api/physical/add'  # ?pid=1&order_id=1&faces=1&volume=1
 
     print(f'{get_printsize_url}?order_id={orderId}')
     res = requests.get(f'{get_printsize_url}?id={orderId}')

blender/fill_dm_code_new.py

@@ -18,7 +18,7 @@ enable('eyek_addon')
 
 #查询影棚ID
 def getPSid(pid):
-    res = requests.get("https://mp.gray.api.suwa3d.com/api/customerP3dLog/photoStudio",params={"pid":pid})
+    res = requests.get("https://mp.api.suwa3d.com/api/customerP3dLog/photoStudio",params={"pid":pid})
     res = json.loads(res.text)
     return str(res['data'])
 
@@ -86,11 +86,12 @@ def down_obj_fromoss(pid, print_type=1, order_id=None):
         shutil.rmtree(path, ignore_errors=True)
     os.makedirs(path)
     
-    prefix = f'objs/print/{pid}/'
+    prefix = f'objs/print/{pid}'
     #根据order_id 获取文件在 oss 上的存储路径
     if order_id is not None:
-        tempURL = "https://mp.gray.api.suwa3d.com/api/order/getOssSuffixByOrderId?orderId="+str(order_id)
+        tempURL = "https://mp.api.suwa3d.com/api/order/getOssSuffixByOrderId?order_id="+str(order_id)
         res = requests.get(tempURL)
+        print("ossPath res",res.json())
         resCode = res.json()['code']
         if int(resCode) != 1000:
             return -1
@@ -98,6 +99,9 @@ def down_obj_fromoss(pid, print_type=1, order_id=None):
         if res.json()['data'] != "":
             prefix = f'objs/print/{pid}/{res.json()["data"]}/{str(order_id)}/'
     
+    
+    print("最终的prefix",prefix)
+    
     # 下载分2种情况，一种是第一次打印，下载标准{pid}.obj,{pid}.mtl,{pid}Tex1.jpg，另一种是重打或加打，obj文件名可以从oss上任意获取一个，但是mtl和jpg文件名是固定的
     res = oss_client.get_object_to_file(f'{prefix}/{pid}.mtl', os.path.join(path, f'{pid}.mtl'))
     last_modified = oss_client.get_object_meta(f"{prefix}/{pid}.mtl").last_modified
@@ -157,7 +161,7 @@ def find_obj(pid, order_id):
         if f'{pid}.obj' in filename:
             find = True
             #进行图片分辨率的调整
-            # get_printsize_url = 'https://mp.gray.api.suwa3d.com/api/printOrder/info'
+            # get_printsize_url = 'https://mp.api.suwa3d.com/api/printOrder/info'
             # res = requests.get(f'{get_printsize_url}?id={order_id}')
             # print('获取订单信息:', res.text)
             # if res.status_code == 200:
@@ -455,7 +459,7 @@ def getInfoByPrintId(print_id):
         #判断是否包含 不存在
         if tempMesg == "打印订单不存在":
             print(f"打印ID{print_id}打印订单不存在，跳过")
-            # res = requests.get(f'https://mp.gray.api.suwa3d.com/api/footCode/deleteByPid?pid={pid}')
+            # res = requests.get(f'https://mp.api.suwa3d.com/api/footCode/deleteByPid?pid={pid}')
             #os.system(f'blender -b -P fill_dm_code.py')
             return False
 
@@ -494,7 +498,7 @@ def getQrPosition(print_id,pid,order_id):
             #跳过该笔订单
             print(f"pid={pid},打印id={print_id} order_id={order_id},重新获取qr_position 为空,跳过脚底板的处理,执行下一笔任务")
             #移除该脚底板的面积处理
-            res = requests.get(f'https://mp.gray.api.suwa3d.com/api/footCode/deleteByPid?pid={pid}')
+            res = requests.get(f'https://mp.api.suwa3d.com/api/footCode/deleteByPid?pid={pid}')
             return False
     else:
         qr_position = json.loads(qr_position)
@@ -552,7 +556,7 @@ def main(workdir, r, print_id):
     if not os.path.exists(qr_path):
         #移除该脚底板的面积处理
         print(f"pid={pid},打印id={print_id} order_id={order_id},生成的二维码为空,跳过脚底板的处理,执行下一笔任务")
-        res = requests.get(f'https://mp.gray.api.suwa3d.com/api/footCode/deleteByPid?pid={pid}')
+        res = requests.get(f'https://mp.api.suwa3d.com/api/footCode/deleteByPid?pid={pid}')
         #os.system(f'blender -b -P fill_dm_code.py')
         return
 
@@ -597,7 +601,7 @@ def main(workdir, r, print_id):
     #判断是否存在 jpg_path,不存在就执行下一个任务
     if not os.path.exists(jpg_path):
         #移除该脚底板的面积处理
-        res = requests.get(f'https://mp.gray.api.suwa3d.com/api/footCode/deleteByPid?pid={pid}')
+        res = requests.get(f'https://mp.api.suwa3d.com/api/footCode/deleteByPid?pid={pid}')
         #os.system(f'blender -b -P fill_dm_code.py')
         bpy.ops.wm.quit_blender()
         return
@@ -616,7 +620,7 @@ def main(workdir, r, print_id):
     #判断qr_path是否存在，不存在就执行下一个任务
     if not os.path.exists(qr_path):
         #移除该脚底板的面积处理
-        res = requests.get(f'https://mp.gray.api.suwa3d.com/api/footCode/deleteByPid?pid={pid}')
+        res = requests.get(f'https://mp.api.suwa3d.com/api/footCode/deleteByPid?pid={pid}')
         #os.system(f'blender -b -P fill_dm_code.py')
         bpy.ops.wm.quit_blender()
         return
@@ -766,10 +770,10 @@ if __name__ == '__main__':
     low_y_limit = 25000
     high_y_limit = 13000
     
-    get_qr_position_url = 'https://mp.gray.api.suwa3d.com/api/printOrder/getFootCodePositionData'
-    upload_qr_position_url = 'https://mp.gray.api.suwa3d.com/api/printOrder/updateFootCodeStatus'
-    get_pid_by_printid_url = 'https://mp.gray.api.suwa3d.com/api/printOrder/getPidByPrintId'
-    get_short_url_by_print_id = 'https://mp.gray.api.suwa3d.com/api/footCode/qrcode'
+    get_qr_position_url = 'https://mp.api.suwa3d.com/api/printOrder/getFootCodePositionData'
+    upload_qr_position_url = 'https://mp.api.suwa3d.com/api/printOrder/updateFootCodeStatus'
+    get_pid_by_printid_url = 'https://mp.api.suwa3d.com/api/printOrder/getPidByPrintId'
+    get_short_url_by_print_id = 'https://mp.api.suwa3d.com/api/footCode/qrcode'
     # get_qr_position_url = 'http://172.31.1.254:8199/api/printOrder/getFootCodePositionData'
     # upload_qr_position_url = 'http://172.31.1.254:8199/api/printOrder/updateFootCodeStatus'
     # get_pid_by_printid_url = 'http://172.31.1.254:8199/api/printOrder/getPidByPrintId'