From 49685de016140708e0fd93cc7c7de185e5059548 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Thu, 26 Dec 2024 17:50:38 +0800
Subject: [PATCH] fix: ci

---
 .drone.yml    | 22 +---------------------
 iot_upload.py | 19 ++++---------------
 2 files changed, 5 insertions(+), 36 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 9c4442b..013ba27 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -59,21 +59,7 @@ steps:
     - git describe --abbrev=0 --tags > .tags
     - cat .tags
 
-
-  - name: 编译构建上传
-    pull: if-not-exists
-    image: registry.cn-hangzhou.aliyuncs.com/qmiot/init:nsis20241212
-    commands:
-      - makensis Sources/nbn.nsi
-      - ls Sources/Setup.exe
-      - du -sh Sources/Setup.exe
-
-
-    when:
-      branch:
-        - test
-
-  - name: 上传exe和zip到iot测试接口platformAppAdd
+  - name: windows构建上传exe和zip到iot测试接口platformAppAdd
     pull: if-not-exists
     image: registry.cn-hangzhou.aliyuncs.com/qmiot/init:nsis20241212
     environment:
@@ -101,15 +87,9 @@ steps:
       - export sourceId="8" # 应用来源id（默认为8 即测试环境专用） //如需更改查看测试环境平台级下应用管理新增应用的/api/platform/v1/platformProgram/platformProgramAdd接口
       - export genre="localpack" # 应用类型 本地资源包 [outchain, localpack]
       - export resolution="2160*3840竖屏" # 分辨率（自行填写）[1080*1920竖屏, 1920*1080横屏, 3840*2160横屏, 2160*3840竖屏]
-      - export package="/drone/src/Sources/Setup.exe" # 包名称
       - export des=$CI_COMMIT_MESSAGE # 应用描述
       - python3 iot_upload.py WindowsAPP
 
-      - export name=${DRONE_REPO_NAMESPACE}-${DRONE_REPO_NAME}.zip # 应用名称（自行填写 必填）
-      - export package="/drone/src/IOTContainer/$DRONE_REPO_NAME.$(cat .tags).zip" # 包名称
-      - export version=zip_$(cat .tags) # 应用版本
-      - python3 iot_upload.py WindowsAPP
-
     when:
       branch:
         - test
diff --git a/iot_upload.py b/iot_upload.py
index 2e1af1d..81c4454 100644
--- a/iot_upload.py
+++ b/iot_upload.py
@@ -174,11 +174,6 @@ def build_for_windowsApp():
     os.system('du -sh Sources/Setup.exe')
     
 
-def build_for_windowsAppZIP():
-    print ("开始打包zip流程")
-    os.system('unzip ' + the_last_windowsAppZIP + ' -d /tmp/a/')
-    os.system('unzip ' + the_current_windowsAppZIP + ' -d /tmp/b/')
-
 def build_the_current_windowsApp(name):
     the_last_windowsAppZIP = get_the_last_windowsAppZIP(name)
     if the_last_windowsAppZIP == None:
@@ -197,28 +192,22 @@ def build_the_current_windowsApp(name):
             os.system('unzip ' + the_current_windowsAppZIP + ' -d /tmp/b/')
             os.system('/bin/sh -c zip_diff.sh')
             diff_zip=os.getenv('DRONE_REPO_NAME') + '.' + os.getenv('version') + '.zip'
+            platformAppAdd(diff_zip, '.zip')
             build_for_windowsApp()
             platformAppAdd('/drone/src/Sources/Setup.exe', '.exe')
-            platformAppAdd(diff_zip, '.zip')
         else:
             print ("\033[34m比对结果: 程序版本无更新,流程终止\033[0m")
 
-    
-
-
 
 
 if os.getenv("isiot") != 'False':
     name=os.getenv('name')
+    cdn_url = os.getenv('cdn_url')
     build_the_current_windowsApp(name)
 else:
     print ("is not iot")
-    if os.getenv("DRONE_BRANCH") == 'master':
-        cdn_url = 'https://qianmu-iot.1000my.com/'
-    else:
-        cdn_url = 'https://test-598d.1000my.com/'
-    packageUrl = os.getenv('DRONE_REPO_NAMESPACE') + '-' + os.getenv('DRONE_REPO_NAME') + '-' + os.getenv('DRONE_BRANCH') + '/' +  os.getenv('DRONE_REPO_NAME') + '.' + os.getenv('version')+ '.zip'
-    dingtalk(cdn_url,packageUrl)
+
+