From 9026dbe9816300a125f768637a3d37f1646d37c1 Mon Sep 17 00:00:00 2001
From: zhang hongbo <zhanghongbokami@outlook.com>
Date: Sat, 9 May 2026 11:56:48 +0800
Subject: [PATCH] =?UTF-8?q?Jenkins=E4=B8=8A=E4=BC=A0apk=20=E5=8C=85=20=20t?=
 =?UTF-8?q?oken=E5=BD=93=E4=BD=9Cpython=E5=8F=82=E6=95=B0=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Jenkinsfile_dev              |  2 +-
 uploadfolder/Jenkinsfile_dev | 14 ++++++++++++++
 vars/uploadApk.groovy        | 16 ++++++++++++++--
 3 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 uploadfolder/Jenkinsfile_dev

diff --git a/Jenkinsfile_dev b/Jenkinsfile_dev
index 2489ec8..6912540 100644
--- a/Jenkinsfile_dev
+++ b/Jenkinsfile_dev
@@ -10,5 +10,5 @@ Pipeline_dev(
     winbakeLabel: "unity_2022_3_dev", // optional node labels. Valid entries: macbakeLabel, linuxbakeLabel, winbakeLabel, syncLabel
     execUnityMethod:"MyBuildTool.StartBuildAndroid_dev",
     uploadEnabled: true,
-    uploadTokenCredentialsId: "apk-upload-token",
+    uploadToken: "apk-upload-token",
 )
\ No newline at end of file
diff --git a/uploadfolder/Jenkinsfile_dev b/uploadfolder/Jenkinsfile_dev
new file mode 100644
index 0000000..6912540
--- /dev/null
+++ b/uploadfolder/Jenkinsfile_dev
@@ -0,0 +1,14 @@
+//=================================================================
+// Byway Studios Inc. Confidential Information.
+// Copyright Byway Studios Inc. All rights reserved
+//=================================================================
+
+// The configuration is done in Jenkins -> Manage Jenkins -> Configure System -> Global Pipeline Libraries
+@Library("my-shared-lib") _
+
+Pipeline_dev(
+    winbakeLabel: "unity_2022_3_dev", // optional node labels. Valid entries: macbakeLabel, linuxbakeLabel, winbakeLabel, syncLabel
+    execUnityMethod:"MyBuildTool.StartBuildAndroid_dev",
+    uploadEnabled: true,
+    uploadToken: "apk-upload-token",
+)
\ No newline at end of file
diff --git a/vars/uploadApk.groovy b/vars/uploadApk.groovy
index 788ac17..964a5cc 100644
--- a/vars/uploadApk.groovy
+++ b/vars/uploadApk.groovy
@@ -8,7 +8,8 @@ def call(Map config)
     def publishSubFolder = config.publishSubFolder
     def uploadEnv = config.uploadEnv
     def uploadUrl = config.uploadUrl ?: 'https://gadmin.bywaystudios.com/api/open/apk/upload/'
-    def uploadTokenCredentialsId = config.uploadTokenCredentialsId ?: 'apk-upload-token'
+    def uploadToken = (config.uploadToken ?: '').trim()
+    def uploadTokenCredentialsId = (config.uploadTokenCredentialsId ?: 'apk-upload-token').trim()
     def packageType = config.packageType ?: 'with_sdk'
 
     if (!publishSubFolder) {
@@ -56,11 +57,22 @@ def call(Map config)
         pythonArgs << "  --version \"${version}\""
     }
 
-    withCredentials([string(credentialsId: uploadTokenCredentialsId, variable: 'APK_UPLOAD_TOKEN')]) {
+    if (uploadToken) {
+        pythonArgs << "  --token \"${uploadToken}\""
         bat(
             label: 'Upload APK to server',
             script: "@echo off\r\n" + pythonArgs.join(" ^\r\n")
         )
+    } else if (uploadTokenCredentialsId) {
+        withCredentials([string(credentialsId: uploadTokenCredentialsId, variable: 'APK_UPLOAD_TOKEN')]) {
+            pythonArgs << "  --token \"%APK_UPLOAD_TOKEN%\""
+            bat(
+                label: 'Upload APK to server',
+                script: "@echo off\r\n" + pythonArgs.join(" ^\r\n")
+            )
+        }
+    } else {
+        error('Either uploadToken or uploadTokenCredentialsId must be provided for APK upload.')
     }
 
     return [