From 1e8fb93d6459fbe9b6d645a3fc12af9b738ed99e Mon Sep 17 00:00:00 2001 From: spiritlhl <103393591+spiritLHLS@users.noreply.github.com> Date: Tue, 4 Nov 2025 20:38:30 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E6=9B=B4=E6=96=B0=E4=BE=9D?= =?UTF-8?q?=E8=B5=96=E4=BB=A5=E5=8F=8A=E8=87=AA=E5=8A=A8=E7=AD=BE=E5=90=8D?= =?UTF-8?q?apk=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 63 +++++++++++++++++++++++++++++++++++++ VERSION | 2 +- go.mod | 4 +-- go.sum | 8 ++--- 4 files changed, 70 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9a41096..f09b9cd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -165,6 +165,69 @@ jobs: fi done + - name: Download signing keystore + run: | + # 使用 GitHub Token 下载私有仓库的 JKS 文件 + curl -L \ + -H "Authorization: token ${{ secrets.GHT }}" \ + -H "Accept: application/vnd.github.v3.raw" \ + -o oneclickvirt.jks \ + "https://api.github.com/repos/oneclickvirt/jks/contents/oneclickvirt.jks" + + # 验证文件是否下载成功 + if [ -f oneclickvirt.jks ]; then + echo "✓ JKS 文件下载成功" + ls -lh oneclickvirt.jks + else + echo "✗ JKS 文件下载失败" + exit 1 + fi + + - name: Sign APK files + run: | + # 安装 apksigner (包含在 Android build-tools 中) + BUILD_TOOLS_VERSION="33.0.2" + APKSIGNER="$ANDROID_SDK_ROOT/build-tools/$BUILD_TOOLS_VERSION/apksigner" + + if [ ! -f "$APKSIGNER" ]; then + echo "✗ apksigner 未找到" + exit 1 + fi + + echo "使用 apksigner: $APKSIGNER" + + # 对所有 APK 文件进行签名 + for apk in goecs-gui-android-*.apk; do + if [ -f "$apk" ]; then + echo "正在签名: $apk" + SIGNED_APK="${apk%.apk}_signed.apk" + + # 签名 APK + $APKSIGNER sign \ + --ks oneclickvirt.jks \ + --ks-key-alias OneClickVirt \ + --ks-pass pass:${{ secrets.KEYSTORE_PASSWORD }} \ + --key-pass pass:${{ secrets.KEY_PASSWORD }} \ + --out "$SIGNED_APK" \ + "$apk" + + # 验证签名 + $APKSIGNER verify "$SIGNED_APK" + + if [ $? -eq 0 ]; then + echo "✓ $apk 签名成功" + # 替换原始 APK + mv "$SIGNED_APK" "$apk" + else + echo "✗ $apk 签名验证失败" + exit 1 + fi + fi + done + + # 清理 JKS 文件 + rm -f oneclickvirt.jks + - name: List build artifacts run: | ls -lh goecs-gui-android-*.apk diff --git a/VERSION b/VERSION index 7bcd0e3..6812f81 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.0.2 \ No newline at end of file +0.0.3 \ No newline at end of file diff --git a/go.mod b/go.mod index 10f3708..12388b8 100644 --- a/go.mod +++ b/go.mod @@ -13,8 +13,8 @@ require ( github.com/oneclickvirt/defaultset v0.0.2-20240624082446 github.com/oneclickvirt/disktest v0.0.10-20250924030424 github.com/oneclickvirt/memorytest v0.0.10-20250924154648 - github.com/oneclickvirt/nt3 v0.0.10-20251103023436 - github.com/oneclickvirt/pingtest v0.0.9-20251102150730 + github.com/oneclickvirt/nt3 v0.0.10-20251104114914 + github.com/oneclickvirt/pingtest v0.0.9-20251104112920 github.com/oneclickvirt/portchecker v0.0.3-20250728015900 github.com/oneclickvirt/security v0.0.7-20251030094114 github.com/oneclickvirt/speedtest v0.0.11-20251102151740 diff --git a/go.sum b/go.sum index fb84e5e..6634d9f 100644 --- a/go.sum +++ b/go.sum @@ -162,10 +162,10 @@ github.com/oneclickvirt/mbw v0.0.1-20250808061222 h1:WGXOe6QvHiDRhPVMI0VcctjzW08 github.com/oneclickvirt/mbw v0.0.1-20250808061222/go.mod h1:0Vq6NRpyLmGUdfHfL3uDcFsuZhi7KlG+OCs5ky2757Y= github.com/oneclickvirt/memorytest v0.0.10-20250924154648 h1:trk6oZ7xs1eVtr+6oIv5IX8LDVtEMG+E6GVzQ810BtU= github.com/oneclickvirt/memorytest v0.0.10-20250924154648/go.mod h1:4kiHsEWkW9r3/1ZcV5xIweU0smiKP0IRfQj74AUIiVI= -github.com/oneclickvirt/nt3 v0.0.10-20251103023436 h1:vXqiU/HE0EXGf17LHyIQx8xYJz3+MOCHtlbfKyvt3cQ= -github.com/oneclickvirt/nt3 v0.0.10-20251103023436/go.mod h1:yo1ufkduFt9QjqG7nqSUf1D3YlQOmFpdlTYniJfclQI= -github.com/oneclickvirt/pingtest v0.0.9-20251102150730 h1:pipqyJUaUI0K5waFvDNNfqbIikMp+9Kg8Dw/kLEUYF8= -github.com/oneclickvirt/pingtest v0.0.9-20251102150730/go.mod h1:gxwsxxwitNQiGq2OI0ZogYoOLwc8DtuOdSRe6/EvRqs= +github.com/oneclickvirt/nt3 v0.0.10-20251104114914 h1:P4nbdKcIA7+FH4feLLxfiJVf1f3ENi/oo37EsdyX9oI= +github.com/oneclickvirt/nt3 v0.0.10-20251104114914/go.mod h1:yo1ufkduFt9QjqG7nqSUf1D3YlQOmFpdlTYniJfclQI= +github.com/oneclickvirt/pingtest v0.0.9-20251104112920 h1:j3Fjhy0YHT/VF7iuAVVELaRXkquvRd64tWWfFLJs01o= +github.com/oneclickvirt/pingtest v0.0.9-20251104112920/go.mod h1:gxwsxxwitNQiGq2OI0ZogYoOLwc8DtuOdSRe6/EvRqs= github.com/oneclickvirt/portchecker v0.0.3-20250728015900 h1:AomzdppSOFB70AJESQhlp0IPbsHTTJGimAWDk2TzCWM= github.com/oneclickvirt/portchecker v0.0.3-20250728015900/go.mod h1:9sjMDPCd4Z40wkYB0S9gQPGH8YPtnNE1ZJthVIuHUzA= github.com/oneclickvirt/security v0.0.7-20251030094114 h1:Ax8J1TYqprXyiWNAIJJ3xhoyGhvBlKw4m9j6va5Q2nM=