cdn-d.spark-app.store

* 更新图标
* 删除文件 pkg/usr/share/icons/hicolor/scalable/apps/open-me-in-terminal.png
* 更新图标
* 删除文件 pkg/usr/share/icons/hicolor/scalable/apps/spark-store.svg
* 更新图标
* 删除文件 pkg/usr/share/icons/hicolor/scalable/apps/spark-store.svg
* update README.md.
* update README.zh.md.
* update FAQ.md.
* update FAQ.md.
* update FAQ.zh.md.
* update FAQ.zh.md.
* update FAQ.zh.md.
* update FAQ.zh.md.
* update FAQ.zh.md.
* update README.md.
* update README.md.
* update README.zh.md.
* update README.zh.md.
* update README.zh.md.
* update README.zh.md.

.gitee/callback.py

@@ -7,7 +7,7 @@ import json
 sha = os.getenv("GIT_COMMIT")
 # sha = '48fed26c51a8c42554e45f72f43e49703e04c97f'
 #get sha from environment 
-url = "https://gitee.com/api/v5/repos/deepin-community-store/spark-store/commits/{}/comments".format(sha)
+url = "https://gitee.com/api/v5/repos/spark-store-project/spark-store/commits/{}/comments".format(sha)
 
 token = os.getenv("gitee_token")
 

.gitignore

@@ -53,4 +53,4 @@ debian/*.substvars
 debian/spark-store
 
 .vscode/*
-src/spark-store
+obj-*

.workflow/dtk-build-release-tag-20220425.yml

@@ -18,22 +18,28 @@ stages:
         name: execute_by_docker
         displayName: 基于镜像的DTK构建
         certificate: ''
-        image: docker.io/debian:buster
+        image: docker.jianmuhub.com/library/debian:buster
         command:
           - sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list
           - '# 换源'
           - apt update
           - export DEBIAN_FRONTEND=noninteractive
-          - echo "安装git devscripts equivs curl..."
-          - 'apt install git devscripts equivs curl -y '
+          - echo "安装依赖..."
+          - 'apt install libgsettings-qt-dev -y '
+          - 'apt install debhelper git curl fakeroot qtbase5-dev zlib1g-dev qt5-default  -y '
           - git clone https://gitlink.org.cn/shenmo7192/dtk-old-bundle.git
           - cd dtk-old-bundle
           - apt install ./*.deb -y
           - cd ..
           - rm -rf dtk-old-bundle
           - ''
-          - 'mk-build-deps --install --tool "apt-get -o Debug::pkgProblemResolver=yes  -y" '
-          - dpkg-buildpackage -j2 -b -us -uc
+          - '#mk-build-deps --install --tool "apt-get -o Debug::pkgProblemResolver=yes  -y" '
+          - apt build-dep . -y
+          - strip --remove-section=.note.ABI-tag /usr/lib/x86_64-linux-gnu/libQt5Core.so.5
+          - uname -a
+          - sed -i 's/dh \$@ --parallel/dh \$@/' debian/rules
+          - '# Gitee的配置太低了'
+          - dpkg-buildpackage  -b -us -uc
           - cd ..
           - ls -all
           - pwd

.workflow/pipeline-dtk-build-aarch64.yml

@@ -34,7 +34,7 @@ stages:
           - tar -xf DEBIANARM.tar.xz
           - mkdir -p DEBIAN/root/build-spark
           - mv ../spark-store-git DEBIAN/root/build-spark/spark-store
-          - wget https://gitee.com/deepin-community-store/repo_auto_update_script/raw/master/spark-build-aarch64.sh && mv spark-build-aarch64.sh DEBIAN/root
+          - wget https://gitee.com/spark-store-project/repo_auto_update_script/raw/master/spark-build-aarch64.sh && mv spark-build-aarch64.sh DEBIAN/root
           - mv /usr/bin/qemu-aarch64-static DEBIAN/
           - chroot DEBIAN /qemu-aarch64-static /bin/bash /root/spark-build-aarch64.sh
           - ''

DOCS/json-api-doc.md

@@ -30,7 +30,7 @@
 `{SOURCE_URL}/{ARCH}/{CATOGARY}/applist.json`
 说明：SOURCE_URL：线路链接，目前推荐 https://cdn.d.store.deepinos.org.cn，你也可以使用其他的星火线路
 ARCH：架构文件夹 x86是store或amd64-store，arm是aarch64-store。特别的，如果你使用非https://cdn.d.store.deepinos.org.cn的线路，你可能会发现amd64-store会返回404，因为不是所有的服务器都支持软连接
-CATOGARY：分类目录。参考 https://gitee.com/deepin-community-store/spark-store/blob/dev/DOCS/spk-doc.md 中 store 直达的对应关系
+CATOGARY：分类目录。参考 https://gitee.com/spark-store-project/spark-store/blob/dev/DOCS/spk-doc.md 中 store 直达的对应关系
 
 例子：https://cdn.d.store.deepinos.org.cn/aarch64-store/tools/applist.json
 

DOCS/内网部署.md

@@ -4,4 +4,4 @@
 
 为方便使用（其实是早期屎山使然），请将仓库放置于 `/home/ftp/spark-store`
 
-仓库管理相关代码请移步 [这里](https://gitee.com/deepin-community-store/repo_auto_update_script)，update.sh请联系 @shenmo 获取
+仓库管理相关代码请移步 [这里](https://gitee.com/spark-store-project/repo_auto_update_script)，update.sh请联系 @shenmo 获取

FAQ.md

@@ -1,91 +1,91 @@
 # FAQ
-## Spark App Store FAQ and Support Guide
+## Spark Store FAQ and Support Guide
 
 ### Introduction
-The Spark App Store is an application store aimed at Linux users and supports multiple Linux distributions. Below are some commonly asked questions and solutions. Please note that this document is primarily intended for ordinary users who are not familiar with Linux and the APT package management system.
+The Spark Store is an application store designed for Linux users, supporting various Linux distributions. Below are some frequently asked questions and their solutions. Please note that this document primarily targets ordinary users unfamiliar with Linux and the `apt` package management system.
 
 ---
 
 ### Communication and Feedback
-**Q: Where can I join the community group?**  
-**A:** You can click [here](https://www.deepinos.org/) to enter the main communication platform of the Spark Store.  
-> ⚠️ If the above link doesn't work, you can also join our QQ groups as an alternative. The group numbers are 872690351 and 865927727. We also offer forums for communication.
+**Q: How can I participate in discussions?**  
+**A:** You can click [this link](https://bbs.spark-app.store/)  to enter the Spark Forum for communication.  
+> 📣 You can also join our QQ Discussion Groups: 872690351 and 865927727.
 
-#### Differences Between arm64 and amd64
+---
 
-arm64
+### Difference Between arm64 and amd64
+
+#### arm64
 
 * Full Name: Advanced RISC Machine 64-bit  
-* Main Use: Primarily used in mobile devices, embedded systems, and some new servers and desktop computers.
-* Advantages: Low power consumption, high efficiency, suitable for battery-driven and heat-sensitive devices.
-* Main Manufacturers: Apple, Qualcomm, HiSilicon, Phytium, etc.
+* Primary Use: Mainly applied to mobile devices, embedded systems, and some new servers and desktop computers  
+* Advantages: Low power consumption, high efficiency, suitable for battery-powered and heat-sensitive devices  
+* Major Manufacturers: Apple, Qualcomm, HiSilicon, Phytium, etc.
 
-amd64
+#### amd64
 
 * Full Name: AMD 64-bit, also known as x86_64  
-* Main Use: Primarily used in desktop computers, laptops, and servers.
-* Advantages: High performance, suitable for computation-intensive applications.
-* Main Manufacturers: Intel and AMD.
-* The main differences between the two are in the instruction sets and application scenarios. amd64 is usually used for high-performance computers and servers, while arm64 is more commonly used in power-sensitive settings.
+* Primary Use: Mainly applied to desktop computers, laptops, and servers  
+* Advantages: High performance, suitable for compute-intensive applications  
+* Major Manufacturers: Intel and AMD
+
+The main difference between the two lies in their instruction sets and application scenarios. amd64 is typically used for high-performance computers and servers, while arm64 is more commonly used in environments with strict power consumption requirements.
 
 #### How to Check:
 
-Linux:
-
-- Open the terminal.
-- Type `uname -m` or `arch` and press Enter.
-- You will see your processor architecture (possibly x86_64, aarch64, etc.).
+- Open the Linux terminal  
+- Enter the command `uname -m` or `arch` and press `Enter`  
+- You will see your computer's processor architecture (e.g., x86_64, aarch64)
 
 ---
 
 ### Domestic Architecture Support
-**Q: I use a domestic chip architecture, how can I get applications?**  
-**A:** Currently, Spark Store supports **arm** architecture for domestic chips. You can download deb packages suitable for arm64 architecture.  
-> ⚠️ Please note that this is experimental support. If you encounter any issues, please provide feedback via Spark's communication platform, QQ group, or forums.
+**Q: My computer uses a domestic architecture. How can I obtain the Spark Store?**  
+**A:** Currently, the Spark Store supports **ARM** architecture and **LoongArch New World** architecture. You can download deb packages (software installation packages) for arm64 and loong64 architectures.  
+> ⚠️ Please note that this support is experimental. If you encounter issues, please report them to us via the Spark Forum or QQ Discussion Group.
 
 ---
 
-### Dependency Issues
-**Q: I get errors when installing dependencies**  
-**A:** If you are using UOS or deepin, please do not install the dependency packages. For Kali Linux/Kdeneon etc., temporary support is not available, please compile and install yourself.  
-> 💡 If errors occur, try running `sudo apt update` before attempting the installation again. If the issue persists, refer to the first question and seek help on the community platform.
+### Dependency Installation Issues
+**Q: What if dependency package installation fails?**  
+**A:** If you are using UOS or deepin, do not install dependencies. Only some Linux distributions require dependency packages. For unsupported distributions, you may need to compile manually. See the [Spark Store Introduction](https://gitee.com/spark-store-project/spark-store/blob/dev/README.md).   
+> 💡 When errors occur, run `sudo apt update` first and try again. If the issue persists, refer to the above and seek help via communication platforms.
 
 ---
 
-### Submission and App Updates
-**Q: Where can I submit applications?**  
-**A:** You can find the "Submit Application" option in the upper-right corner menu of the app store interface.
+### Software Submission and Updates
+**Q: Where can I submit software?**  
+**A:** You can find the "Submit Application" option in the top-right menu of the app store interface. We provide two submission methods: **Submission Tools** and **Online Platform**.
 
 ---
 
 ### Support for Non-deepin/UOS Users
-**Q: I'm not a deepin/UOS user; can I use the Spark App Store?**  
-**A:** Yes, you can directly install if you're using Ubuntu 22.04. For Ubuntu 20.04/Debian10/Debian11, please install the dependencies first.
+**Q: Can I use Spark Store if I am not a deepin/UOS user?**  
+**A:** It can be installed normally on Debian-based distributions. For example, if you use Ubuntu 22.04, install directly. For Ubuntu 20.04 / Debian 10 / Debian 11, install dependencies first. Additionally, experience may not be guaranteed if installed on non-Debian Linux distributions.
 
 ---
 
 ### Installation Methods
-**Q: Can I use dpkg -i for installation?**  
-**A:** No! Use `sudo apt install ./xxxx.deb` to install, or use graphical installers like gdebi.  
-> ⚠️ Using dpkg directly will not handle software dependencies, which is a common mistake.
+**Q: Can I install using `dpkg -i`?**  
+**A:** We **strongly advise against this**. In the directory where the package is saved, use `sudo apt install ./spark-store*.deb` or a graphical installer like Gdebi.  
+> ⚠️ Direct use of `dpkg` generally does not handle software dependencies, potentially causing installation failures or damaging the system's dependency environment.
 
 ---
 
 ### System Updates
-**Q: Will the Spark Store affect normal system updates?**  
-**A:** No, the Spark Store has separated its application sources from system sources and will not affect regular system updates.
+**Q: Will Spark Store affect normal system updates?**  
+**A:** No. The current version of Spark Store has decoupled its application sources from system sources and will not affect normal system updates.
 
 ---
 
-### Reporting Issues and Removing Apps
-**Q: Some apps are outdated or inactive, and I want them removed**  
-**A:** You can report issues [here](https://gitee.com/deepin-community-store/software_-issue).
+### Reporting Issues and Application Removal
+**Q: Some applications are outdated or invalid. I want them removed.**  
+**A:** You can [report issues here](https://gitee.com/spark-store-project/software_-issue). 
 
 ---
 
-### Installing Spark App Store
-If you wish to install the Spark App Store, please visit the [Release page](https://gitee.com/deepin-community-store/spark-store/releases), find the latest version, and choose the package suitable for your current system.
-
-> ⚠️ Special Note: If you are using Debian10/Debian11 or Ubuntu 20.04, you may need to download additional dependency packages. After downloading, unzip multiple times until you see the software user guide. For operating systems later than Ubuntu 22.04, you do not need to install dependency packages. Just follow the steps above to install the main program directly.
+### Installing Spark Store
+If you need to install Spark Store, visit the [Release Page](https://gitee.com/spark-store-project/spark-store/releases),  find the latest version, and download the installer suitable for your system.  
 
+> ⚠️ Special Note: If you are using Debian 10 / Debian 11 or Ubuntu 20.04, you need to download the dependency supplementary package additionally. After downloading, extract multiple times until dependency instructions are visible, then follow steps to install dependencies. For Ubuntu 22.04 and later, no dependency package is required. Follow the above instructions to install the main program directly.
 ---

FAQ.zh.md

@@ -1,90 +1,91 @@
 # FAQ
-## 星火应用商店FAQ与支持指南
+## 星火应用商店 FAQ 与支持指南
 
 ### 简介
-星火应用商店是一个面向 Linux 用户的应用商店，支持多种不同的 Linux 发行版。以下是一些常见问题及解决方案。请注意，该文档主要面向对 Linux 和 APT 软件包管理系统不熟悉的普通用户。
+星火应用商店是一个面向 Linux 用户的应用商店，支持多种不同的 Linux 发行版。以下是一些常见问题及解决方案。请注意，该文档主要面向对 Linux 和 `apt` 软件包管理系统不熟悉的普通用户。
 
 ---
 
 ### 交流与反馈
-**Q: 在哪进交流群？**  
-**A:** 你可以点击[这里](https://www.deepinos.org/)进入星火商店的主交流平台。  
-> ⚠️ 如果上面的链接无法使用，你还可以加入我们的 QQ 群作为备选方案，群号是 872690351 和 865927727。我们还提供论坛作为交流平台。
+**Q: 如何参与交流讨论？**  
+**A:** 您可以点击[此链接](https://bbs.spark-app.store/)进入星火社区论坛进行交流。  
+> 📣 您还可以加入我们的 QQ 交流群，群号是 872690351 和 865927727。
 
-arm64与amd64的区别
+---
 
-arm64
+### arm64 与 amd64 的区别
 
-* 全称: Advanced RISC Machine 64-bit
-* 主要用途: 主要应用于移动设备、嵌入式系统以及一些新型的服务器和桌面计算机。
-* 优势: 低功耗、高效率，适合用在电池驱动和热敏感的设备。
+#### arm64
+
+* 全称: Advanced RISC Machine 64-bit；
+* 主要用途: 主要应用于移动设备、嵌入式系统以及一些新型的服务器和桌面计算机；
+* 优势: 低功耗、高效率，适合用在电池驱动和热敏感的设备；
 * 主要生产商: 苹果、高通、海思、飞腾等。
 
-amd64
+#### amd64
 
-* 全称: AMD 64-bit, 也被称为 x86_64
-* 主要用途: 主要应用于桌面计算机、笔记本以及服务器。
-* 优势: 高性能，适用于计算密集型应用。
-* 主要生产商: Intel和AMD。
-* 两者最主要的不同在于指令集和应用场景。amd64通常用于高性能需求的计算机和服务器，而arm64则更多应用于功耗要求更严格的场合。
+* 全称: AMD 64-bit, 也被称为 x86_64；
+* 主要用途: 主要应用于桌面计算机、笔记本以及服务器；
+* 优势: 高性能，适用于计算密集型应用；
+* 主要生产商: Intel 和 AMD。
 
-查看方法：
+两者最主要的不同在于指令集和应用场景。amd64 通常用于高性能需求的计算机和服务器，而arm64则更多应用于功耗要求更严格的场合。
 
-Linux：
+#### 查看方法：
 
-- 打开终端。
-- 输入 uname -m 或 arch 并按回车。
-- 你将看到你的处理器架构（可能是 x86_64, aarch64 等）。
+- 打开 Linux 终端；
+- 输入命令 `uname -m` 或 `arch` 并按 `Enter` 键执行；
+- 您将看到您计算机的处理器架构（可能是 x86_64, aarch64 等）。
 ---
 
 ### 国产架构支持
-**Q: 我是国产架构，怎么获取应用？**  
-**A:** 目前，星火商店支持**arm**架构的国产芯片。你可以下载适用于 arm64 架构的deb包（软件安装包）。  
-> ⚠️ 请注意，这是实验性的支持。如果遇到问题，请在星火交流平台、QQ群或论坛向我们反馈。
+**Q: 我的计算机属于国产架构，如何获取星火应用商店？**  
+**A:** 目前，星火商店支持 **ARM** 架构和**龙芯·新世界**架构的国产芯片。您可以下载适用于 arm64 架构和 loong64 架构的 deb 包（软件安装包）。  
+> ⚠️ 请注意，这项支持是实验性的。若遇到问题，请在星火社区论坛或 QQ 交流群向我们反馈。
 
 ---
 
 ### 安装依赖问题
-**Q: 安装依赖包出现错误**  
-**A:** 如果你使用UOS或deepin，请不要安装依赖包。对于Kali Linux/Kdeneon等，暂时不支持，请自行编译安装。  
-> 💡 出现错误时，尝试运行 `sudo apt update` 后再尝试安装。如果问题仍然存在，请参考第一条，进入交流平台寻求帮助。
+**Q: 安装依赖包出现错误，怎么办？**  
+**A:** 如果您使用 UOS 或 deepin，请不要安装依赖包。仅有部分 Linux 发行版需要安装依赖包，此外对于不在支持列表中的发行版可能需要您自行编译安装，详见[星火应用商店简介](https://gitee.com/spark-store-project/spark-store/blob/dev/README.zh.md)。
+> 💡 出现错误时，请运行 `sudo apt update` 后再尝试安装。如果问题仍然存在，请参考上文，进入交流平台寻求帮助。
 
 ---
 
 ### 投稿与应用更新
-**Q: 在哪里投稿？**  
-**A:** 你可以在应用商店界面的右上角菜单找到“投递应用”的选项。
+**Q: 在哪里可以投稿软件？**  
+**A:** 您可以在应用商店界面的右上角菜单找到“投递应用”的选项，我们提供了**投递工具**和**在线平台**两种投稿方案。
 
 ---
 
-### 非deepin/UOS用户支持
-**Q: 我不是deepin/UOS用户，可以使用星火应用商店吗？**  
-**A:** 可以，如果你是使用 Ubuntu 22.04，请直接安装。对于 Ubuntu 20.04/Debian10/Debian11，请先安装依赖包。
+### 非 deepin/UOS 用户支持
+**Q: 我不是 deepin/UOS 用户，可以使用星火应用商店吗？**  
+**A:** 在 Debian 系发行版可正常安装使用。例如，如果您使用 Ubuntu 22.04，请直接安装；对于 Ubuntu 20.04 / Debian 10 / Debian 11，请先安装依赖包。此外，如果您在非 Debian 系 Linux 发行版安装使用星火应用商店，软件的体验可能无法得到保证。
 
 ---
 
 ### 安装方法
-**Q: 我可以用dpkg -i安装吗？**  
-**A:** 不可以！使用 `sudo apt install ./xxxx.deb` 来安装，或者使用gdebi等图形化的安装器。  
-> ⚠️ 直接使用dpkg是不会处理软件依赖的，这是一个常见的错误。
+**Q: 我可以用 `dpkg -i` 安装吗？**  
+**A:** 我们**极不建议您这样做**。请在安装包保存目录下，使用 `sudo apt install ./spark-store*.deb` 安装，或使用 Gdebi 等图形化安装器。  
+> ⚠️ 直接使用 `dpkg` 一般不会处理软件依赖，可能致使安装失败、破坏系统依赖环境。
 
 ---
 
 ### 系统更新
-**Q: 星火商店会影响系统正常更新吗？**  
-**A:** 不会，星火商店已经将应用源与系统源分开，不会影响系统的正常更新。
+**Q: 星火应用商店会影响系统正常更新吗？**  
+**A:** 不会，当前版本的星火应用商店已将应用源与系统源解耦合，不会影响系统的正常更新。
 
 ---
 
 ### 报告问题和应用下架
-**Q: 有些应用已经过时或者失效了，我想让他下架**  
-**A:** 你可以前往 [这里](https://gitee.com/deepin-community-store/software_-issue) 报告问题。
+**Q: 有些应用已经过时或者失效了，我想让它下架。**  
+**A:** 您可以[前往这里](https://gitee.com/spark-store-project/software_-issue)报告问题。
 
 ---
 
 ### 安装星火应用商店
-如果你想安装星火应用商店，请打开[Release页面](https://gitee.com/deepin-community-store/spark-store/releases)，找到最新版本，并选择适用于当前系统的安装包下载。
+如果您需要安装星火应用商店，请打开 [Release 页面](https://gitee.com/spark-store-project/spark-store/releases)，找到最新版本，并选择适用于当前系统的安装包下载。
 
-> ⚠️ 特别提示: 如果你在使用 Debian10/Debian11 或 Ubuntu 20.04，你可能额外下载依赖补充包。您需要在下载完依赖包后，解压多次一直到看到内部的软件使用说明，对于 Ubuntu22.04 以后的操作系统版本，您无需安装依赖包，您需要按照上面的操作直接安装本体程序。
+> ⚠️ 特别提示: 如果您在使用 Debian 10 / Debian 11 或 Ubuntu 20.04，则需要额外下载依赖补充包；您需要在下载完依赖包后，解压多次直至内部的依赖包使用说明可见，按照步骤安装依赖。对于 Ubuntu 22.04 以后的操作系统版本，您无需安装依赖包，按照上面的操作直接安装本体程序即可。
 
 ---

README.md

@@ -1,40 +1,52 @@
-# Spark App Store
-[![star](https://gitee.com/spark-store-project/spark-store/badge/star.svg?theme=gvp)](https://gitee.com/spark-store-project/spark-store/stargazers) [![fork](https://gitee.com/spark-store-project/spark-store/badge/fork.svg?theme=gvp)](https://gitee.com/spark-store-project/spark-store/members)
+# Spark Store
+[![star](https://gitee.com/spark-store-project/spark-store/badge/star.svg?theme=gvp)](https://gitee.com/spark-store-project/spark-store/stargazers)  [![fork](https://gitee.com/spark-store-project/spark-store/badge/fork.svg?theme=gvp)](https://gitee.com/spark-store-project/spark-store/members)
+![star](https://gitcode.com/spark-store-project/spark-store/star/badge.svg)
+
 
 ## Introduction  
 
-Welcome to the Spark App Store! This is an app store designed for Linux users, aiming to solve the problem of dispersed and difficult-to-obtain applications in the Linux ecosystem. No matter what type of Linux distribution you are using, you may find suitable software packages here.
+Welcome to the **Spark Store**! This is an application store designed for Linux platform users, aiming to address the issues of fragmented and difficult-to-obtain software within the Linux ecosystem. Regardless of your Linux distribution, you may find suitable software packages here.
 
-The number of Linux applications is relatively limited, and the availability of Wine software is also quite challenging. Excellent development and tool resources are scattered across various communities and forums, making it difficult for the entire ecosystem to improve comprehensively.
+The number of Linux applications is relatively limited, and obtaining Wine software can also be challenging. Excellent development kits and tool resources are scattered across various communities and forums, making it difficult for the entire ecosystem to achieve comprehensive improvement.
 
-The construction of the ecosystem is not dependent on the isolated efforts of individuals but requires the participation of the entire community. Only when everyone's "sparks" gather together can they ignite a "prairie fire."
+Ecosystem construction does not rely on isolated individual efforts but requires full community participation. Only when everyone's "spark" gathers in one place can it ignite a prairie fire.
 
-To improve this situation, we have launched this app store. We have broadly included various user-demand software packages, gathered high-quality tools, and actively adapted Wine applications, all stored in our software library for easy user access.
+To improve this situation, we have launched the Spark Store. The Spark Community extensively collects software packages for various user needs, aggregates high-quality small tools, and proactively adapts Wine applications. All resources are stored in our repository, allowing users to conveniently access these applications.
 
-**Currently supported Linux distributions include:**
+**Currently supported Linux distributions include (but are not limited to):**
 
-- **amd64 architecture:** deepin 20 / deepin 23 / Ubuntu 20.04 / Ubuntu 22.04 / UOS Home Edition 20
-- **arm64 architecture:** UOS Professional Edition 1060 / Ubuntu 22.04 / deepin 23
-- **loong64 architecture:** deepin 23
+- **amd64 Architecture:** deepin 20 / deepin 23 / Ubuntu 20.04 / Ubuntu 22.04 / UOS Home Edition 20 / Debian 11+
+- **arm64 Architecture:** UOS Professional Edition 1060 / Ubuntu 22.04 / deepin 23
+- **loong64 Architecture:** deepin 23
 
-> Special Note: We also support all versions of Ubuntu operating systems higher than Ubuntu 22.04, such as Ubuntu 22.10, 23.04, 23.10, etc.
+> Special Note: Spark Store also supports all Ubuntu OS versions newer than Ubuntu 22.04, such as Ubuntu 22.10, 23.04, 23.10, etc. Additionally, Spark Store may adapt to other Linux distributions beyond the listed platforms; you may conduct installation tests accordingly.
 
-**Important Notice:** This software does not provide any form of warranty. If you plan to use it on UOS Professional Edition, please make sure to understand and enable Developer Mode. Make sure you have basic troubleshooting capabilities. It should be clear that we have not conducted extensive testing on the UOS operating system. Therefore, using the Spark client may lead to a series of issues like failed system updates, data loss, etc., all risks to be borne by the user.
+**Important Notice:** This software cannot guarantee continuous availability, uninterrupted operation, or meeting specific performance requirements. The Spark community makes no commitment to the functional completeness, stability, or error-free operation of this software. For example, if you plan to use it on UOS Professional Edition (or other similar specific platforms), please ensure you understand and enable the "Developer Mode" features. Basic troubleshooting capabilities are required. It is important to note that the Spark community cannot conduct extensive testing on some special platforms. Therefore, using the Spark Store client on these platforms may lead to various issues such as system update failures or data loss. Using this software indicates your understanding and acceptance that all risks must be borne by the user.
 
-## Team Collaboration: For detailed documentation related to branch management, please see [this link](https://wiki.spark-app.store/#/Dev/Spark-Store-Git-Repo).
+## About Team Collaboration
 
-We warmly welcome you to join our development team. Whether you want to participate in development or submit applications, you can find your place here to jointly promote the development of the Linux application ecosystem.
+Organization Repository Links:
 
-You can track our Issue handling status in real-time through the following link: [Gitee Issue Board](https://gitee.com/spark-store-project/spark-store/board).
+https://gitee.com/spark-store-project/spark-store  
 
-If you have a software package you'd like to submit, please [click here to submit](https://upload.deepinos.org.cn/index).
+https://gitcode.com/spark-store-project/spark-store   
 
-## Contents
+https://github.com/spark-store-project/spark-store  
 
-- [Read the copyright](#read-the-copyright)
-- [Determine your system architecture](#determine-your-system-architecture)
-- [System support and installation guide](#system-support-and-installation-guide)
-  - [For Deepin / UOS Users](#for-deepin-users)
+Refer to [this link](https://wiki.spark-app.store/#/Dev/Spark-Store-Git-Repo) for detailed documentation on branch management.  
+
+We warmly welcome you to join our development team. Whether you wish to participate in development or plan to submit applications, you can find your place here to jointly promote the development of the Linux application ecosystem.
+
+You can track our Issue processing status in real-time via the [Issue Board](https://gitee.com/spark-store-project/spark-store/board).  
+
+If you have software packages to submit, please [click here to contribute](https://wiki.spark-app.store/#/Submit/Submit).  
+
+## Table of Contents
+
+- [Read the Copyright Notice](#read-the-copyright-notice)
+- [Determine Your System Architecture](#determine-your-system-architecture)
+- [System Support and Installation Instructions](#system-support-and-installation-instructions)
+  - [For deepin Users](#for-deepin-users)
   - [For Ubuntu Users](#for-ubuntu-users)
   - [For Debian Users](#for-debian-users)
 - [Frequently Asked Questions (FAQ)](#frequently-asked-questions-faq)
@@ -42,126 +54,126 @@ If you have a software package you'd like to submit, please [click here to submi
 
 ---
 
-## Read [the copyright](LICENSE)
+## Read the [Copyright Notice](LICENSE)
 
 
+## Determine Your System Architecture
 
-## Determine your system architecture
+Before installing any software, you need to know which architecture your computer is running on (e.g., x86_64/amd64 or aarch64/arm64), which also applies to the Spark Store.
 
-Before installing any software, you need to know what architecture your computer runs on (such as x86_64/amd64 or aarch64/arm64).
+**How to Check:**
 
-**How to check:**
+1. Open the Linux terminal.
+2. Enter the command `uname -m` or `arch` and press `Enter`.
 
-1. Open a Linux terminal.
-2. Type `uname -m` or `arch` and press Enter.
+You will see the terminal output result, which helps determine your system architecture. Examples:
 
-You will see an output, and that's your system architecture.
+- If you see `x86_64`, your system is amd64 architecture.
+- If you see `aarch64`, your system is arm64 architecture.
 
-- If you see `x86_64`, your system is AMD64 architecture.
-- If you see `aarch64`, your system is ARM64 architecture.
+Based on this result, you need to download the corresponding version of the Spark Store installer to use it properly.
 
 ---
 
-## System support and installation guide
+## System Support and Installation Instructions
 
-### For Deepin Users
+Based on your Linux distribution and system architecture, here are detailed steps to install Spark Store.
 
-#### For Deepin Users
+### For deepin Users
+
+#### For deepin Users
 
 1. **Download and Install**
 
-   You can directly search for Spark App Store in the Deepin Store to install, or copy this link to open and install in your browser:
+   You can directly search for `Spark Store` in the deepin App Store for installation, or copy this link to your browser address bar to jump to the deepin App Store installation page.
 
    > appstore://deepin-home-appstore-client?app_detail_info/spark-store
 
-   To use the latest version, please visit the [Spark App Store Release page](https://gitee.com/spark-store-project/spark-store/releases) and download the latest version suitable for Deepin. Install to use.
+   Versions published in the deepin App Store may not be the latest. To use the latest version, visit the Spark Store [Gitee Release Page](https://gitee.com/spark-store-project/spark-store/releases) or [Gitcode Release Page](https://gitcode.com/spark-store-project/spark-store/releases) and download the latest version for deepin, then install it.
 
-   Assuming you've downloaded to the `Downloads` folder in your user directory, we recommend you use the APT tool to install:
+   Assuming you downloaded the installer to the Downloads folder under your home directory, we recommend using the `apt` tool for installation to avoid potential dependency issues:
 
-    ```shell
-    cd ~/Downloads
-    sudo apt install ./spark-store*.deb
-    ```
+   ```shell
+   cd ~/Downloads
+   sudo apt install ./spark-store*.deb
+   ```
 
 ### For Ubuntu Users
 
 #### For Ubuntu 20.04 Users
 
 1. **Download Dependencies**
-* Please visit the [Spark App Store Dependency Download page](https://gitee.com/spark-store-project/spark-store-dependencies/releases) and download the latest dependency package.
-* Unzip the dependency package multiple times until you see multiple installation packages ending with `.deb`.
-* Follow the instructions in the dependency package to install all the dependencies at once.
+   * Visit the [Spark Store Dependency Package Download Page](https://gitee.com/spark-store-project/spark-store-dependencies/releases) to download the latest dependency package;
+   * Extract the dependency package multiple times until you see numerous `.deb` installation packages;
+   * Follow the instructions inside the dependency package to install all dependencies at once.
 
 2. **Download and Install**
 
-   Visit the [Spark App Store Release page](https://gitee.com/spark-store-project/spark-store/releases), download the installation package that matches your computer's architecture, and install it.
+   Visit the Spark Store [Gitee Release Page](https://gitee.com/spark-store-project/spark-store/releases) or [Gitcode Release Page](https://gitcode.com/spark-store-project/spark-store/releases) to download and install the installer matching your computer's architecture.
 
-   Assuming you've downloaded to the `Downloads` folder in your user directory, we recommend you use the APT tool to install:
+   Assuming you downloaded the installer to the Downloads folder under your home directory, we recommend using the `apt` tool for installation to avoid potential dependency issues:
 
-    ```shell
-    cd ~/Downloads
-    sudo apt install ./spark-store*.deb
-    ```
+   ```shell
+   cd ~/Downloads
+   sudo apt install ./spark-store*.deb
+   ```
 
-#### For Ubuntu 22.04 and Higher Version Users
-
-1. **No Need to Install Dependencies**
+#### For Ubuntu 22.04 and Newer Ubuntu Versions
+1. **No Dependency Package Required**
 
 2. **Download and Install**
 
-   Visit the [Spark App Store Release page](https://gitee.com/spark-store-project/spark-store/releases), download the installation package that matches your computer's architecture, and install it.
+   Visit the Spark Store [Gitee Release Page](https://gitee.com/spark-store-project/spark-store/releases) or [Gitcode Release Page](https://gitcode.com/spark-store-project/spark-store/releases) to download and install the installer matching your computer's architecture.
 
-   Assuming you've downloaded to the `Downloads` folder in your user directory, we recommend you use the APT tool to install:
+   Assuming you downloaded the installer to the Downloads folder under your home directory, we recommend using the `apt` tool for installation to avoid potential dependency issues:
 
-    ```shell
-    cd ~/Downloads
-    sudo apt install ./spark-store*.deb
-    ```
+   ```shell
+   cd ~/Downloads
+   sudo apt install ./spark-store*.deb
+   ```
 
 ### For Debian Users
 
 #### For Debian 11 Users
 
 1. **Download Dependencies**
-* Please visit the [Spark App Store Dependency Download page](https://gitee.com/spark-store-project/spark-store-dependencies/releases) and download the latest dependency package.
-* Unzip the dependency package multiple times until you see multiple installation packages ending with `.deb`.
-* Follow the instructions in the dependency package to install all the dependencies at once.
+   * Visit the [Spark Store Dependency Package Download Page](https://gitee.com/spark-store-project/spark-store-dependencies/releases) to download the latest dependency package;
+   * Extract the dependency package multiple times until you see numerous `.deb` installation packages;
+   * Follow the instructions inside the dependency package to install all dependencies at once.
 
 2. **Download and Install**
 
-   Please visit the [Spark App Store Release page](https://gitee.com/spark-store-project/spark-store/releases) and download. Install to use.
+   Visit the Spark Store [Gitee Release Page](https://gitee.com/spark-store-project/spark-store/releases) or [Gitcode Release Page](https://gitcode.com/spark-store-project/spark-store/releases) to download and install the installer.
 
 #### For Debian 12+ Users
 
-1. **No Need to Install Dependencies**
+1. **No Dependency Package Required**
 
 2. **Download and Install**
 
-   Please visit the [Spark App Store Release page](https://gitee.com/spark-store-project/spark-store/releases), download the installation package that matches your computer's architecture, and install it.
+   Visit the Spark Store [Gitee Release Page](https://gitee.com/spark-store-project/spark-store/releases) or [Gitcode Release Page](https://gitcode.com/spark-store-project/spark-store/releases) to download and install the installer matching your computer's architecture.
 
-   Assuming you've downloaded to the `Downloads` folder in your user directory, we recommend you use the APT tool to install:
+   Assuming you downloaded the installer to the Downloads folder under your home directory, we recommend using the `apt` tool for installation to avoid potential dependency issues:
 
-    ```shell
-    cd ~/Downloads
-    sudo apt install ./spark-store*.deb
-    ```
+   ```shell
+   cd ~/Downloads
+   sudo apt install ./spark-store*.deb
+   ```
 
 ---
 
 ## Frequently Asked Questions (FAQ)
 
-Please refer to the [Spark App Store FAQ and Support Guide](https://gitee.com/spark-store-project/spark-store/blob/dev/FAQ.md).
-
-You can also check the [Chinese version](https://gitee.com/spark-store-project/spark-store/blob/dev/FAQ.zh.md) here.
+Please refer to the [Spark Store FAQ and Support Guide](https://gitee.com/spark-store-project/spark-store/blob/dev/FAQ.md);  
+For advanced users requiring custom aptss config configuration, please refer to the [aptss Repository](https://gitee.com/GXDE-OS/aptss).
 
 ---
 
 ## Contact and Feedback
 
-- If you have any questions or suggestions, please submit them via email or on our [Gitee page](https://gitee.com/spark-store-project/spark-store/issues).
-- If you want to follow our development progress, you can go to the [Spark App Store Board](https://gitee.com/spark-store-project/spark-store/board) for more information.
-- Our [Forum](https://bbs.spark-app.store/)
-- Our [QQ Group](https://blog.shenmo.tech/post/%E6%95%85%E9%9A%9C%E5%85%AC%E5%91%8A/)
-- For commercial support, please leave your issue~
-
+- If you have any questions or suggestions, please submit issues via email or the [Issue Page](https://gitee.com/spark-store-project/spark-store/issues);
+- If you want to follow our development progress, visit the [Spark Store Board](https://gitee.com/spark-store-project/spark-store/board) for more information;
+- Welcome to visit the [Spark Community Forum](https://bbs.spark-app.store/) to join discussions;
+- Our QQ Discussion Group: 872690351 and 865927727;
+- If you or your organization requires commercial support, please leave a message for consultation.
 ---

README.zh.md

@@ -1,47 +1,47 @@
 #  星火应用商店
 [![star](https://gitee.com/spark-store-project/spark-store/badge/star.svg?theme=gvp)](https://gitee.com/spark-store-project/spark-store/stargazers)  [![fork](https://gitee.com/spark-store-project/spark-store/badge/fork.svg?theme=gvp)](https://gitee.com/spark-store-project/spark-store/members)
-
+![star](https://gitcode.com/spark-store-project/spark-store/star/badge.svg)
 
 
 ## 简介
 
-欢迎来到星火应用商店！这是一个为Linux用户设计的应用商店，旨在解决Linux生态下应用分散、难以获取的问题。无论你是使用什么类型的Linux发行版，这里都有可能找到适合你的软件包。
+欢迎来到**星火应用商店**！这是一个为 Linux 平台用户设计的应用商店，旨在解决 Linux 生态下应用分散、难以获取的问题。无论您使用什么类型的 Linux 发行版，在这里都有可能找到适合您的软件包。
 
-
-Linux 应用的数量相对有限，Wine 软件的可获得性也颇为困难。优秀的开发和工具资源散布在各大社区和论坛之间，这种分散化让整个生态系统难以得到全面的提升。
+Linux 应用的数量相对有限，Wine 软件的可获取性也颇为困难。优秀的开发套件和工具资源散布在各大社区和论坛之间，这种分散化让整个生态系统难以得到全面的提升。
 
 生态系统的构建并非依赖个体的孤立努力，而需要全社区共同参与。只有当大家的“星火”聚集一处，方可引发“燎原之势”。
 
-为了改善这一现状，我们推出了这个应用商店。我们广泛地收录了各种用户需求的软件包，汇集了高质量的小工具，并主动对 Wine 应用进行了适配，一切都储存在我们的软件库中，使得用户可以方便地获取这些应用。
+为了改善这一现状，我们推出了星火应用商店。星火社区广泛地收录了各种用户需求的软件包，汇集了高质量的小工具，并主动对 Wine 应用进行了适配，一切都储存在我们的软件库中，使得用户可以方便地获取这些应用。
 
-**当前支持的Linux发行版包括：**
+**当前支持的 Linux 发行版包括（但不限于）：**
 
-- **amd64架构：** deepin 20 / deepin 23 / Ubuntu 20.04 / Ubuntu 22.04 / UOS家庭版20
-- **arm64架构：** UOS专业版1060 / Ubuntu 22.04 / deepin 23
-- **loong64架构：** deepin 23
+- **amd64 架构：** deepin 20 / deepin 23 / Ubuntu 20.04 / Ubuntu 22.04 / UOS 家庭版 20 / Debian 11＋
+- **arm64 架构：** UOS 专业版 1060 / Ubuntu 22.04 / deepin 23
+- **loong64 架构：** deepin 23
 
-> 特别说明：我们还支持所有版本高于Ubuntu 22.04的Ubuntu操作系统，例如Ubuntu 22.10、23.04、23.10等。
+> 特别说明：星火应用商店还支持所有版本高于 Ubuntu 22.04 的 Ubuntu 操作系统，例如 Ubuntu 22.10、23.04、23.10 等。此外星火应用商店也可能适配除上述平台的其他 Linux 发行版，您可自行进行安装测试。
 
-**重要须知：** 本软件不提供任何形式的保证。若您计划在UOS专业版上使用，请务必了解并启用开发者模式。请确保您具备基础的故障排查能力。需要明确的是，我们没有在UOS操作系统上进行广泛的测试。因此，使用星火客户端可能会导致一系列问题，如系统更新失败、数据丢失等，所有风险需由用户自行承担。
+**重要须知：** 本软件无法保证持续可用、无中断运行或满足特定性能要求。星火社区对其功能完整性、稳定性及无错误运行不作任何承诺。例如，若您计划在 UOS 专业版（或其他类似特定平台）上使用，请务必了解并启用“开发者模式”相关功能。请确保您具备基础的故障排查能力。需要明确的是，星火社区无法在部分特殊平台上进行广泛测试。因此，在这些平台上使用星火应用商店客户端可能会导致一系列问题，如系统更新失败、数据丢失等；使用该软件，即代表您理解并同意所有风险需由用户自行承担。
 
 
 
 ## 关于团队协作
 
 组织仓库链接：
+
 https://gitee.com/spark-store-project/spark-store
 
 https://gitcode.com/spark-store-project/spark-store 
 
 https://github.com/spark-store-project/spark-store
 
-分支管理相关的详细文档可参见 [此链接](https://wiki.spark-app.store/#/Dev/Spark-Store-Git-Repo)。
+参见[此链接](https://wiki.spark-app.store/#/Dev/Spark-Store-Git-Repo)以获取分支管理相关的详细文档。
 
-我们热忱欢迎您加入我们的开发团队。无论您是想参与开发，还是想提交应用，都能在这里找到属于您的一席之地，共同推动Linux应用生态的发展。
+我们热忱欢迎您加入我们的开发团队。无论您是希望参与开发，还是计划提交应用，都能在这里找到属于您的一席之地，共同推动 Linux 应用生态的发展。
 
-您可以通过以下链接，实时跟踪我们的Issue处理状态：[Gitee Issue看板](https://gitee.com/spark-store-project/spark-store/board)。
+您可以通过以下链接，实时跟踪我们的 Issue 处理状态：[Issue 看板](https://gitee.com/spark-store-project/spark-store/board)。
 
-若您有软件包想要提交，敬请 [点击此处进行投稿](https://wiki.spark-app.store/#/Submit/Submit)。
+若您有软件包需要提交，敬请[点击此处进行投稿](https://wiki.spark-app.store/#/Submit/Submit)。
 
 
 
@@ -49,9 +49,9 @@ https://github.com/spark-store-project/spark-store
 ## 目录
 
 - [阅读版权声明](#阅读版权声明)
-- [确定你的系统架构](#确定你的系统架构)
+- [确定您的系统架构](#确定你的系统架构)
 - [系统支持与安装指引](#系统支持与安装指引)
-  - [对于 Deepin / UOS 用户](#对于deepin用户)
+  - [对于 deepin / UOS 用户](#对于deepin用户)
   - [对于 Ubuntu 用户](#对于ubuntu用户)
   - [对于 Debian 用户](#对于debian用户)
 - [常见问题（FAQ）](#常见问题faq)
@@ -64,38 +64,40 @@ https://github.com/spark-store-project/spark-store
 
 ## 确定你的系统架构
 
-在安装任何软件之前，你需要知道你的计算机运行的是哪种架构（如x86_64/amd64或aarch64/arm64）。
+在安装任何软件之前，您需要知道你的计算机运行在何种架构之上（如 x86_64/amd64 或 aarch64/arm64），对于星火应用商店亦是如此。
 
 **如何检查：**
 
-1. 打开Linux终端。
-2. 输入 `uname -m` 或 `arch` 并按回车。
+1. 打开 Linux 终端。
+2. 输入命令 `uname -m` 或 `arch` 并按 `Enter` 键执行。
 
-你会看到一个输出，这就是你的系统架构。
+您会看到终端输出结果，借此您可判断计算机的系统架构。举例：
 
-- 如果看到 `x86_64`，你的系统是AMD64架构。
-- 如果看到 `aarch64`，你的系统是ARM64架构。
+- 如果您看到 `x86_64`，说明您的系统为 amd64 架构。
+- 如果您看到 `aarch64`，说明您的系统为 arm64 架构。
+
+根据这一结果，您需要下载对应版本的星火应用商店安装包以正常使用。
 
 ---
 
 ## 系统支持与安装指引
 
-根据你的Linux发行版和系统架构，以下是安装星火应用商店的详细步骤。
+根据您的 Linux 发行版和系统架构，以下是安装星火应用商店的详细步骤。
 
-### 对于 Deepin 用户
+### 对于 deepin 用户
 
-#### 对于 Deepin 用户
+#### 对于 deepin 用户
 
 1.  **下载并安装**
 
-    您可直接在深度商店搜索 星火应用商店 安装，或复制此链接到浏览器打开安装 
+    您可直接在深度应用商店搜索 `星火应用商店` 安装，或复制此链接到浏览器地址栏，跳转至深度应用商店安装。 
 
     > appstore://deepin-home-appstore-client?app_detail_info/spark-store
 
 
-    若要使用最新版本，请访问[星火应用商店的Release页面](https://gitee.com/spark-store-project/spark-store/releases)或[Gitcode的Release页面](https://gitcode.com/spark-store-project/spark-store/releases)并下载适用于Deepin的最新版本。安装后即可使用。
+    深度应用商店发布的版本可能不是最新的。若要使用最新版本，请访问星火应用商店 [Gitee 的 Release 页面](https://gitee.com/spark-store-project/spark-store/releases)或 [Gitcode 的 Release 页面](https://gitcode.com/spark-store-project/spark-store/releases)并下载适用于 deepin 的最新版本，安装后即可使用。
 
-    假设您下载到用户目录下的 Downloads 文件夹， 我们推荐您使用 APT 工具安装：
+    假设您将安装包下载至用户目录下的 Downloads 文件夹，我们推荐您使用 `apt` 工具进行安装以避免潜在的依赖问题：
 
     ```shell
     cd ~/Downloads
@@ -107,16 +109,16 @@ https://github.com/spark-store-project/spark-store
 #### 对于 Ubuntu 20.04 用户
 
 1. **下载依赖包**
-* 请访问[星火应用商店依赖包下载页面](https://gitee.com/spark-store-project/spark-store-dependencies/releases)， 下载最新的依赖包。
-* 请多次解压依赖包，直到你可以看到诸多以 deb 结尾的安装包。
+* 请访问[星火应用商店依赖包下载页面](https://gitee.com/spark-store-project/spark-store-dependencies/releases)，下载最新的依赖包；
+* 请多次解压依赖包，直至您可以看到诸多以 deb 结尾的安装包；
 * 依据依赖包内的说明，一次性安装所有的依赖包。
 
 
 2. **下载并安装**
 
-    请访问[星火应用商店的Release页面](https://gitee.com/spark-store-project/spark-store/releases)或[Gitcode的Release页面](https://gitcode.com/spark-store-project/spark-store/releases)，下载和您电脑相同架构的安装包并安装。
+    请访问星火应用商店 [Gitee 的 Release 页面](https://gitee.com/spark-store-project/spark-store/releases)或 [Gitcode 的 Release 页面](https://gitcode.com/spark-store-project/spark-store/releases)，下载和您电脑相同架构的安装包并安装。
 
-    假设您下载到用户目录下的 Downloads 文件夹， 我们推荐您使用 APT 工具安装：
+    假设您将安装包下载至用户目录下的 Downloads 文件夹，我们推荐您使用 `apt` 工具进行安装以避免潜在的依赖问题：
 
     ```shell
     cd ~/Downloads
@@ -129,9 +131,9 @@ https://github.com/spark-store-project/spark-store
 
 2. **下载并安装**
 
-    请访问[星火应用商店的Release页面](https://gitee.com/spark-store-project/spark-store/releases)或[Gitcode的Release页面](https://gitcode.com/spark-store-project/spark-store/releases)，下载和您电脑相同架构的安装包并安装。
+    请访问星火应用商店 [Gitee 的 Release 页面](https://gitee.com/spark-store-project/spark-store/releases)或 [Gitcode 的 Release 页面](https://gitcode.com/spark-store-project/spark-store/releases)，下载和您电脑相同架构的安装包并安装。
 
-    假设您下载到用户目录下的 Downloads 文件夹， 我们推荐您使用 APT 工具安装：
+    假设您将安装包下载至用户目录下的 Downloads 文件夹，我们推荐您使用 `apt` 工具进行安装以避免潜在的依赖问题：
 
     ```shell
     cd ~/Downloads
@@ -143,13 +145,13 @@ https://github.com/spark-store-project/spark-store
 #### 对于 Debian 11 用户
 
 1. **下载依赖包**
-* 请访问[星火应用商店依赖包下载页面](https://gitee.com/spark-store-project/spark-store-dependencies/releases)， 下载最新的依赖包。
-* 请多次解压依赖包，直到你可以看到诸多以 deb 结尾的安装包。
+* 请访问[星火应用商店依赖包下载页面](https://gitee.com/spark-store-project/spark-store-dependencies/releases)， 下载最新的依赖包；
+* 请多次解压依赖包，直到您可以看到诸多以 deb 结尾的安装包；
 * 依据依赖包内的说明，一次性安装所有的依赖包。
 
 2. **下载并安装**
 
-    请访问[星火应用商店的Release页面](https://gitee.com/spark-store-project/spark-store/releases)或[Gitcode的Release页面](https://gitcode.com/spark-store-project/spark-store/releases)并下载，安装后即可使用。
+    请访问星火应用商店 [Gitee 的 Release 页面](https://gitee.com/spark-store-project/spark-store/releases)或 [Gitcode 的 Release 页面](https://gitcode.com/spark-store-project/spark-store/releases)并下载，安装后即可使用。
 
 
 #### 对于 Debian 12+ 用户
@@ -159,9 +161,9 @@ https://github.com/spark-store-project/spark-store
 
 2. **下载并安装**
 
-    请访问[星火应用商店的Release页面](https://gitee.com/spark-store-project/spark-store/releases)或[Gitcode的Release页面](https://gitcode.com/spark-store-project/spark-store/releases)，下载和您电脑相同架构的安装包并安装。
+    请访问星火应用商店 [Gitee 的 Release 页面](https://gitee.com/spark-store-project/spark-store/releases)或 [Gitcode 的 Release 页面](https://gitcode.com/spark-store-project/spark-store/releases)，下载和您电脑相同架构的安装包并安装。
 
-    假设您下载到用户目录下的 Downloads 文件夹， 我们推荐您使用 APT 工具安装：
+    假设您将安装包下载至用户目录下的 Downloads 文件夹，我们推荐您使用 `apt` 工具进行安装以避免潜在的依赖问题：
 
     ```shell
     cd ~/Downloads
@@ -171,18 +173,20 @@ https://github.com/spark-store-project/spark-store
 
 ## 常见问题（FAQ）
 
-请参见[星火应用商店FAQ与支持指南](https://gitee.com/spark-store-project/spark-store/blob/dev/FAQ.md)。
+请参见[星火应用商店 FAQ 与支持指南](https://gitee.com/spark-store-project/spark-store/blob/dev/FAQ.zh.md)；
+
+对于高级用户，如需自定义配置 aptss config，请参阅 [aptss 软件仓库](https://gitee.com/GXDE-OS/aptss)。
+
 
-在这里可以查阅[中文版本](https://gitee.com/spark-store-project/spark-store/blob/dev/FAQ.zh.md)。
 
 ---
 
 ## 联系与反馈
 
-- 如果您有任何问题或建议，请通过邮件或在[Gitee页面](https://gitee.com/spark-store-project/spark-store/issues)上提交问题。
-- 如果你想关注我们的开发进度，可以跳转[星火应用商店Board](https://gitee.com/spark-store-project/spark-store/board)获取更多信息。
-- 我们的[论坛](https://bbs.spark-app.store/)
-- 我们的QQ群 872690351
-- 商业支持请留言咨询~
+- 如果您有任何问题或建议，请通过邮件或在 [Issue 页面](https://gitee.com/spark-store-project/spark-store/issues)上提交问题；
+- 如果你想关注我们的开发进度，可以跳转至[星火应用商店 Board](https://gitee.com/spark-store-project/spark-store/board) 获取更多信息；
+- 欢迎访问[星火社区论坛](https://bbs.spark-app.store/)加入讨论；
+- 我们的 QQ 交流群号：872690351 和 865927727；
+- 若您和您的组织需要寻求商业支持，请留言咨询。
 
 ---

debian/changelog

@@ -1,6 +1,51 @@
-spark-store (4.3.2.1) UNRELEASED; urgency=medium
+spark-store (4.8.0) UNRELEASED; urgency=medium
 
-  * 修复 aptss policy / aptss search 需要root的问题
+  * ssinstall重写，支持安装到ACE和自动安装到ACE，支持只允许安装到本地
+  * 商店支持展示ACE标识，支持识别 native amber-ce-bookworm amber-ce-trixie amber-ce-sid amber-ce-deepin23
+  * 投稿器支持新版spec
+  
+ -- shenmo <shenmo@spark-app.store>  Tue, 24 Sep 2024 11:27:08 +0800
+
+spark-store (4.5.2) UNRELEASED; urgency=medium
+
+  * 支持安装到 ACE Bookworm 
+  
+ -- shenmo <shenmo@spark-app.store>  Tue, 24 Sep 2024 11:27:08 +0800
+ 
+ spark-store (4.5.1) UNRELEASED; urgency=medium
+
+  * 修复 aptss 部分报错
+  * 重新设计了 Tag 区的展示方式
+  * 新增 Fish 补全
+  
+ -- shenmo <shenmo@spark-app.store>  Tue, 24 Sep 2024 11:27:08 +0800
+
+spark-store (4.5.0) UNRELEASED; urgency=medium
+
+  * 支持从商店中直接启动应用
+  * ssinstall 修复安装时不再指定版本号以避免出现问题
+  * aptss支持fish补全
+  * 修复: distrobox下无法正常校验应用hash
+  * aptss 4.5.0
+  * 应用更新新增进度条
+  * 支持识别Debian
+
+ -- shenmo <shenmo@spark-app.store>  Tue, 24 Sep 2024 11:27:08 +0800
+
+spark-store (4.3.3.2) UNRELEASED; urgency=medium
+
+  * 提升升级工具体验，不再反复弹窗
+  * 提升aptss使用体验，汇报目前所在阶段而不是卡住不动
+  * 修复debian sid 无法卸载
+
+ -- shenmo <shenmo@spark-app.store>  Tue, 24 Sep 2024 11:27:08 +0800
+
+spark-store (4.3.3.1) UNRELEASED; urgency=medium
+
+  * 修复点击更新需要输入密码的问题
+  * 修复安装速度下降的问题
+  * 修复闪退问题
+  * 修复错误地展示已安装
 
  -- shenmo <shenmo@spark-app.store>  Tue, 24 Sep 2024 11:27:08 +0800
 
@@ -169,7 +214,7 @@ spark-store (4.2.7.3) stable; urgency=medium
 
   * 修复：aptss现在会正确地透传错误码而不是exit 0
   * 修复：下载时如果卡0%(无法下载metalink)，会在超时后报错中断而不是一直傻等
-  * 修复：排队下载时CPU占满单核的bug https://gitee.com/deepin-community-store/spark-store/issues/I7B91V
+  * 修复：排队下载时CPU占满单核的bug https://gitee.com/spark-store-project/spark-store/issues/I7B91V
   * 修复：在终端中打开的icon过大导致无法投稿到UOS
   * 修复：v23下编译出错
   * 薪怎：支持崩溃日志收集系统
@@ -406,7 +451,7 @@ spark-store (4.2.3~test2) stable; urgency=medium
 spark-store (4.2.3~test1) stable; urgency=medium
 
   * 修复：因判断安装状态错误创建多个相同任务的bug
-  * 测试中：尝试修复安装结束的闪退问题 https://gitee.com/deepin-community-store/spark-store/commit/cb093dcc2bb0a193db89aa0ce5f20ea9cc5d56eb
+  * 测试中：尝试修复安装结束的闪退问题 https://gitee.com/spark-store-project/spark-store/commit/cb093dcc2bb0a193db89aa0ce5f20ea9cc5d56eb
   * 修复：Deepin 显示开发者模式未开启
   * 修复：从托盘打开主窗口时透明度动画不流畅
   * 修复：主窗口关闭后，从托盘打开关于窗口会被主窗口遮挡
@@ -488,8 +533,8 @@ spark-store (4.1.2) stable; urgency=medium
   * chore: 去除安装依赖:g++
   * fix: 修复下载列表中进度提示文字显示不完整的问题
   * feat: ssinstall支持从单独文件夹中校验软件包
-  * feat： 支持分单文件夹下载。具体内容参见：https://gitee.com/deepin-community-store/repo_auto_update_script/blob/master/mirror-list-for-apt-fast/sources.list.d/sparkstore.list
-  * info: 非常感谢 @jwyh 对星火商店代码仓库设计了很多标准，参见 https://deepin-community-store.gitee.io/spark-wiki/#/Dev/Spark-Store-Git-Repo?id=%e6%9b%b4%e6%96%b0%e6%97%a5%e5%bf%97%e8%a7%84%e5%88%99 ，不过shenmo是自由的
+  * feat： 支持分单文件夹下载。具体内容参见：https://gitee.com/spark-store-project/repo_auto_update_script/blob/master/mirror-list-for-apt-fast/sources.list.d/sparkstore.list
+  * info: 非常感谢 @jwyh 对星火商店代码仓库设计了很多标准，参见 https://wiki.spark-app.store/#/Dev/Spark-Store-Git-Repo?id=%e6%9b%b4%e6%96%b0%e6%97%a5%e5%bf%97%e8%a7%84%e5%88%99 ，不过shenmo是自由的
 
 
   * chore: 添加 Application 类，继承 DApplication，将 main 函数中设置属性、关于信息等操作移至 Application 构造函数中进行
@@ -508,8 +553,8 @@ spark-store (4.1.2) stable; urgency=medium
 spark-store (4.1.2~test2) stable; urgency=medium
 
   * feat: ssinstall支持从单独文件夹中校验软件包
-  * feat： 支持分单文件夹下载。具体内容参见：https://gitee.com/deepin-community-store/repo_auto_update_script/blob/master/mirror-list-for-apt-fast/sources.list.d/sparkstore.list
-  * info: 非常感谢 @jwyh 对星火商店代码仓库设计了很多标准，参见 https://deepin-community-store.gitee.io/spark-wiki/#/Dev/Spark-Store-Git-Repo ，不过shenmo是自由的
+  * feat： 支持分单文件夹下载。具体内容参见：https://gitee.com/spark-store-project/repo_auto_update_script/blob/master/mirror-list-for-apt-fast/sources.list.d/sparkstore.list
+  * info: 非常感谢 @jwyh 对星火商店代码仓库设计了很多标准，参见 https://wiki.spark-app.store/#/Dev/Spark-Store-Git-Repo ，不过shenmo是自由的
 
  -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
 
@@ -720,7 +765,7 @@ spark-store (3.2.4) stable; urgency=medium
 
 spark-store (3.2.4~test4) stable; urgency=medium
 
-  * 现在在商店启动后点击spk链接仍会正常启动 https://gitee.com/deepin-community-store/spark-store/commit/dd6780d636042bf12d77414e6f1552cc7d1ed24c
+  * 现在在商店启动后点击spk链接仍会正常启动 https://gitee.com/spark-store-project/spark-store/commit/dd6780d636042bf12d77414e6f1552cc7d1ed24c
 
  -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
 

debian/control

@@ -30,6 +30,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  libnotify-bin,
  qtwayland5,
  desktop-file-utils,
- dpkg-dev
+ dpkg-dev,
+ lsb-release,
 Description: Spark Store
  A community powered app store, based on DTK.

debian/copyright

@@ -1,6 +1,6 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: spark-store
-Source: https://gitee.com/deepin-community-store/spark-store
+Source: https://gitee.com/spark-store-project/spark-store
 
 Files: *
 Copyright: The Spark Project Developers

debian/rules

@@ -36,4 +36,6 @@ override_dh_auto_install:
 # Ignore the dpkg-shlibdeps: warning (it uses none of the library's symbols)
 # Qt Mutidedia lib will ref to network libraray.
 override_dh_shlibdeps:
-	dh_shlibdeps --dpkg-shlibdeps-params=--warnings=0
+	dh_shlibdeps --dpkg-shlibdeps-params=--warnings=0 --exclude=opt/durapps/spark-store/bin/ss-feedback/
+override_dh_strip:
+	dh_strip --exclude=opt/durapps/spark-store/bin/ss-feedback/

debian/source/format

@@ -1 +1 @@
-1.0
+3.0 (native)

debian/spark-store.prerm

@@ -51,7 +51,7 @@ for username in `ls /home`
 
 	# Remove gpg key file
 	rm -f /etc/apt/trusted.gpg.d/spark-store.gpg
-	apt-key del '9D9A A859 F750 24B1 A1EC  E16E 0E41 D354 A29A 440C'
+	apt-key del '9D9A A859 F750 24B1 A1EC  E16E 0E41 D354 A29A 440C' || true
 else
 	
 	if [ ! -z "`pidof spark-store`" ] ; then

patchs/README.md

@@ -5,7 +5,7 @@
     > 用于 zinface-community-cmake-build-system.patch 补丁化构建方式
 
     ```shell
-    git clone https://gitee.com/deepin-community-store/spark-store
+    git clone https://gitee.com/spark-store-project/spark-store
     cd spark-store
     git am < patchs/zinface-community-cmake-build-system.patch
     make package

pkg/usr/lib/systemd/system/spark-update-notifier.service

@@ -2,13 +2,14 @@
 Description=Spark Store update notifier
 After=apt-daily.service network.target network-online.target systemd-networkd.service NetworkManager.service connman.service
 
-
 [Service]
 Type=simple
 RemainAfterExit=yes
 ExecStart=/opt/durapps/spark-store/bin/update-upgrade/ss-update-notifier.sh
 Restart=on-failure
-RestartSec=10
+RestartSec=15  # 可以设置为更长的重试间隔，比如 15 秒或 30 秒
+StartLimitIntervalSec=1h  # 设置为 1 小时的时间窗口
+StartLimitBurst=3  # 最大允许失败次数为 3 次
 
 [Install]
 WantedBy=multi-user.target

pkg/usr/share/bash-completion/completions/aptss

@@ -40,7 +40,7 @@ _aptss()
         "list"
         "search"
         "show" "showsrc"
-        "install" "remove" "purge" "autoremove"
+        "install" "remove" "purge" "autoremove" "autopurge"
         "update"
         "upgrade" "full-upgrade" "dist-upgrade"
         "edit-sources"

pkg/usr/share/fish/completions/aptss.fish

@@ -0,0 +1,242 @@
+# 清除已有的 aptss 补全（如果有的话）
+complete -c aptss -e
+
+# 禁用默认的文件补全（避免显示当前目录文件）
+complete -c aptss -f
+
+########################################################################
+# aptss Fish 补全脚本（中文说明版，软件包补全显示简介）
+#
+# 说明：
+# 1. 子命令和选项的说明采用中文显示。
+# 2. 软件包补全部分不再调用 apt-cache，而是解析 aptss 自有的软件源索引文件，
+#    从 /var/lib/aptss/lists/*Packages（或 *Sources）中提取软件包名称及简介信息。
+#
+# 注意：如果你的 aptss 软件源索引文件位置或格式有变化，请相应修改下面的 awk 命令。
+########################################################################
+
+### 辅助函数
+
+# 解析 /var/lib/aptss/lists/*Packages 文件，输出符合当前输入前缀的“软件包<TAB>简介”
+function __fish_aptss_print_packages
+    set cur (commandline -ct)
+    # 将所有匹配的 Packages 文件拼接后，用 awk 分段解析（RS="" 表示以空行为分段）
+    awk -v cur="$cur" '
+      BEGIN { RS=""; FS="\n" }
+      {
+         pkg = ""; desc = "";
+         for(i=1; i<=NF; i++){
+            if($i ~ /^Package: /) { pkg = substr($i, 10) }  # “Package: ”共9个字符
+            else if($i ~ /^Description: /) { desc = substr($i, 14) }  # “Description: ”共13个字符
+         }
+         if(pkg != "" && (cur == "" || pkg ~ ("^" cur))) {
+             print pkg "\t" desc
+         }
+      }
+    ' /var/lib/aptss/lists/*Packages 2>/dev/null
+end
+
+# 解析已安装软件包（这里仍使用 dpkg-query，如果需要使用 aptss 数据，可另外构造）
+function __fish_aptss_print_installed_packages
+    set cur (commandline -ct)
+    dpkg-query -W -f='${Package}\t${Description}\n' 2>/dev/null | grep -i "^$cur"
+end
+
+# 解析 /var/lib/aptss/lists/*Sources 文件，输出源代码包信息（如果存在）
+function __fish_aptss_print_source_packages
+    set cur (commandline -ct)
+    awk -v cur="$cur" '
+      BEGIN { RS=""; FS="\n" }
+      {
+         pkg = ""; desc = "";
+         for(i=1; i<=NF; i++){
+            if($i ~ /^Package: /) { pkg = substr($i, 10) }
+            else if($i ~ /^Description: /) { desc = substr($i, 14) }
+         }
+         if(pkg != "" && (cur == "" || pkg ~ ("^" cur))) {
+             print pkg "\t" desc
+         }
+      }
+    ' /var/lib/aptss/lists/*Sources 2>/dev/null
+end
+
+# 翻译子命令为中文说明（用于补全时显示在括号内）
+function __fish_translate_aptss_cmd
+    switch $argv[1]
+        case ssupdate
+            echo "更新软件源"
+        case list
+            echo "列出软件包"
+        case search
+            echo "搜索软件包"
+        case show
+            echo "显示软件包信息"
+        case showsrc
+            echo "显示源包信息"
+        case install
+            echo "安装软件包"
+        case remove
+            echo "移除软件包"
+        case purge
+            echo "彻底移除软件包"
+        case autoremove
+            echo "自动移除不必要的软件包"
+        case update
+            echo "更新软件包列表"
+        case upgrade
+            echo "升级软件包"
+        case full-upgrade
+            echo "完全升级（可能移除其他软件包）"
+        case dist-upgrade
+            echo "发行版升级"
+        case edit-sources
+            echo "编辑软件源列表"
+        case help
+            echo "显示帮助信息"
+        case source
+            echo "下载源代码包"
+        case build-dep
+            echo "安装构建依赖"
+        case clean
+            echo "清除软件包缓存"
+        case autoclean
+            echo "自动清理旧缓存"
+        case download
+            echo "下载软件包"
+        case changelog
+            echo "显示更新日志"
+        case moo
+            echo "彩蛋"
+        case depends
+            echo "显示软件包依赖"
+        case rdepends
+            echo "显示软件包逆向依赖"
+        case policy
+            echo "显示软件包策略"
+        case '*'
+            echo $argv[1]
+    end
+end
+
+### 定义各类子命令组
+
+# 所有子命令列表
+set -g __aptss_commands ssupdate list search show showsrc install remove purge autoremove update upgrade full-upgrade dist-upgrade edit-sources help source build-dep clean autoclean download changelog moo depends rdepends policy
+
+# 需要补全二进制软件包名称的子命令（例如 install、show、search、download、changelog、depends、rdepends）
+set -l __aptss_pkg_subcmds install show search download changelog depends rdepends
+
+# 需要补全已安装软件包的子命令（例如 remove、purge、autoremove）
+set -l __aptss_installed_pkg_subcmds remove purge autoremove
+
+# 需要补全源代码包的子命令（例如 source、build-dep、showsrc、policy）
+set -l __aptss_src_pkg_subcmds source build-dep showsrc policy
+
+### 子命令补全
+# 未输入子命令时，显示所有候选子命令，并在括号中显示中文说明
+for cmd in $__aptss_commands
+    set desc (__fish_translate_aptss_cmd $cmd)
+    complete -c aptss -a $cmd -d "$desc" -n "not __fish_seen_subcommand_from $__aptss_commands"
+end
+
+### 公共选项（适用于一组子命令）
+set -l group1 "install remove purge upgrade dist-upgrade full-upgrade autoremove"
+
+complete -c aptss -n "__fish_seen_subcommand_from $group1" -l show-progress -d '显示进度'
+complete -c aptss -n "__fish_seen_subcommand_from $group1" -l fix-broken -d '修复损坏的依赖'
+complete -c aptss -n "__fish_seen_subcommand_from $group1" -l purge -d '清除配置文件'
+complete -c aptss -n "__fish_seen_subcommand_from $group1" -l verbose-versions -d '显示详细版本'
+complete -c aptss -n "__fish_seen_subcommand_from $group1" -l auto-remove -d '自动移除依赖'
+complete -c aptss -n "__fish_seen_subcommand_from $group1" -s s -l simulate -d '模拟/试运行'
+complete -c aptss -n "__fish_seen_subcommand_from $group1" -l download -d '下载软件包'
+complete -c aptss -n "__fish_seen_subcommand_from $group1" -l fix-missing -d '修复丢失文件'
+complete -c aptss -n "__fish_seen_subcommand_from $group1" -l fix-policy -d '修复策略'
+complete -c aptss -n "__fish_seen_subcommand_from $group1" -l ignore-hold -d '忽略锁定'
+complete -c aptss -n "__fish_seen_subcommand_from $group1" -l force-yes -d '强制确认'
+complete -c aptss -n "__fish_seen_subcommand_from $group1" -l trivial-only -d '仅处理简单情况'
+complete -c aptss -n "__fish_seen_subcommand_from $group1" -l reinstall -d '重新安装'
+complete -c aptss -n "__fish_seen_subcommand_from $group1" -l solver -d '使用求解器'
+complete -c aptss -n "__fish_seen_subcommand_from $group1" -s t -l target-release -d '目标版本'
+
+# 附加的 GENERIC 选项
+complete -c aptss -n "__fish_seen_subcommand_from $group1" -s d -l download-only -d '仅下载'
+complete -c aptss -n "__fish_seen_subcommand_from $group1" -s y -l assume-yes -d '默认确认'
+complete -c aptss -n "__fish_seen_subcommand_from $group1" -l assume-no -d '默认否定'
+complete -c aptss -n "__fish_seen_subcommand_from $group1" -s u -l show-upgraded -d '显示升级情况'
+complete -c aptss -n "__fish_seen_subcommand_from $group1" -s m -l ignore-missing -d '忽略缺失'
+
+### 针对各个子命令的专用选项
+
+# update 命令
+complete -c aptss -n "__fish_seen_subcommand_from update" -l list-cleanup -d '清理列表'
+complete -c aptss -n "__fish_seen_subcommand_from update" -l print-uris -d '显示 URI'
+complete -c aptss -n "__fish_seen_subcommand_from update" -l allow-insecure-repositories -d '允许不安全的仓库'
+
+# list 命令
+complete -c aptss -n "__fish_seen_subcommand_from list" -l installed -d '已安装的软件包'
+complete -c aptss -n "__fish_seen_subcommand_from list" -l upgradable -d '可升级的软件包'
+complete -c aptss -n "__fish_seen_subcommand_from list" -l manual-installed -d '手动安装的软件包'
+complete -c aptss -n "__fish_seen_subcommand_from list" -s v -l verbose -d '详细模式'
+complete -c aptss -n "__fish_seen_subcommand_from list" -s a -l all-versions -d '显示所有版本'
+complete -c aptss -n "__fish_seen_subcommand_from list" -s t -l target-release -d '目标版本'
+
+# show 命令
+complete -c aptss -n "__fish_seen_subcommand_from show" -s a -l all-versions -d '显示所有版本'
+
+# depends 和 rdepends 命令（逐项添加各选项）
+for opt in i important installed pre-depends depends recommends suggests replaces breaks conflicts enhances recurse implicit
+    complete -c aptss -n "__fish_seen_subcommand_from depends rdepends" -l $opt -d $opt
+end
+complete -c aptss -n "__fish_seen_subcommand_from depends rdepends" -s i -d '选项 -i'
+
+# search 命令
+complete -c aptss -n "__fish_seen_subcommand_from search" -s n -l names-only -d '仅匹配名称'
+complete -c aptss -n "__fish_seen_subcommand_from search" -s f -l full -d '全文搜索'
+
+# showsrc 命令
+complete -c aptss -n "__fish_seen_subcommand_from showsrc" -l only-source -d '仅显示源代码'
+
+# source 命令
+complete -c aptss -n "__fish_seen_subcommand_from source" -s s -l simulate -d '模拟'
+complete -c aptss -n "__fish_seen_subcommand_from source" -s b -l compile -d '编译/构建'
+complete -c aptss -n "__fish_seen_subcommand_from source" -s P -l build-profiles -d '构建配置'
+complete -c aptss -n "__fish_seen_subcommand_from source" -l diff-only -d '仅显示差异'
+complete -c aptss -n "__fish_seen_subcommand_from source" -l debian-only -d '仅限 Debian'
+complete -c aptss -n "__fish_seen_subcommand_from source" -l tar-only -d '仅打包 tar'
+complete -c aptss -n "__fish_seen_subcommand_from source" -l dsc-only -d '仅下载 DSC'
+complete -c aptss -n "__fish_seen_subcommand_from source" -s t -l target-release -d '目标版本'
+
+# build-dep 命令
+complete -c aptss -n "__fish_seen_subcommand_from build-dep" -s a -l host-architecture -d '主机架构'
+complete -c aptss -n "__fish_seen_subcommand_from build-dep" -s s -l simulate -d '模拟'
+complete -c aptss -n "__fish_seen_subcommand_from build-dep" -s P -l build-profiles -d '构建配置'
+complete -c aptss -n "__fish_seen_subcommand_from build-dep" -s t -l target-release -d '目标版本'
+complete -c aptss -n "__fish_seen_subcommand_from build-dep" -l purge -d '清除'
+complete -c aptss -n "__fish_seen_subcommand_from build-dep" -l solver -d '求解依赖'
+
+# moo 命令
+complete -c aptss -n "__fish_seen_subcommand_from moo" -l color -d '彩蛋模式'
+
+# clean 和 autoclean 命令
+complete -c aptss -n "__fish_seen_subcommand_from clean autoclean" -s s -l simulate -d '模拟'
+
+### 针对 -t/--target-release 的特殊补全
+complete -c aptss -n '
+    begin
+        set -l prev (commandline -poc | string trim)
+        test "$prev" = "-t" -o "$prev" = "--target-release"
+    end
+' -a '(__fish_aptss_target_release)' -d '目标版本'
+
+### 软件包补全
+# 对于需要二进制软件包名称的子命令，调用 __fish_aptss_print_packages，
+# 输出的每一行格式为 "包名<TAB>简介"，Fish 会将 TAB 后内容显示为注释。
+complete -c aptss -n "__fish_seen_subcommand_from $__aptss_pkg_subcmds" -a '(__fish_aptss_print_packages)'
+
+# 对于 remove、purge、autoremove 命令，补全已安装的软件包（使用 dpkg-query 输出）
+complete -c aptss -n "__fish_seen_subcommand_from $__aptss_installed_pkg_subcmds" -a '(__fish_aptss_print_installed_packages)' -d '已安装软件包'
+
+# 对于 source、build-dep、showsrc、policy 命令，补全源代码包，
+# 如果存在对应的 Sources 索引文件，则调用 __fish_aptss_print_source_packages，
+# 否则可考虑默认使用二进制包的索引。
+complete -c aptss -n "__fish_seen_subcommand_from $__aptss_src_pkg_subcmds" -a '(__fish_aptss_print_source_packages)' -d '源代码包'

pkg/usr/share/ssinstall-local/transhell/ssinstall-local_en_US.transhell

@@ -0,0 +1,6 @@
+#!/bin/bash
+TRANSHELL_CONTENT_HASH_CHECK_FAILED="Failed in checking package hash! \nPossibly reason can be the package is broken, laggy in sync of Spark Store repository, or, there is a malware attempt to attack. \nIf you don't know what happend, please try install again after execute the command below\n sudo aptss update\n\nIf the problem still happen, please click APP Feedback button in the APP information page to feedback to us.\n\n If you are in the Audition Group，Please use ssaudit instead of ssinstall to audit APPs，for ssinstall is used for password-free install now.\nIf you want to install an app that is removed from Spark Store repository，you can also use ssaudit."
+TRANSHELL_CONTENT_PLEASE_RUN_AS_ROOT="Please run ssinstall as root"
+TRANSHELL_CONTENT_FILE_NOT_EXIST="File not exist"
+TRANSHELL_CONTENT_WILL_NOT_DELETE_DEB="No delete after install option given, will not delete the deb"
+TRANSHELL_CONTENT_DEB_IS_DELETED="--delete-after-install option is given and the installation is succeeded, delete the deb file."

pkg/usr/share/ssinstall-local/transhell/ssinstall-local_zh_CN.transhell

@@ -0,0 +1,6 @@
+#!/bin/bash
+TRANSHELL_CONTENT_HASH_CHECK_FAILED="软件包校验失败！这不应该发生！\n可能是因为软件包已损坏，星火仓库未同步，或者最坏的情况：恶意软件尝试利用自动安装来入侵系统！\n如果你不清楚发生了什么，请执行 sudo aptss update 后再尝试安装。\n如果问题仍然存在，请在应用信息界面点击 应用反馈 来提交反馈给我们！\n\n 如果你是审核人员，请使用 ssaudit来替代ssinstall进行审核工作，因为现在ssinstall已经被用于免密安装。\n如果你正在尝试安装已经下架的星火应用，也可用ssaudit来替代ssinstall"
+TRANSHELL_CONTENT_PLEASE_RUN_AS_ROOT="请使用root启动ssinstall"
+TRANSHELL_CONTENT_FILE_NOT_EXIST="文件不存在"
+TRANSHELL_CONTENT_WILL_NOT_DELETE_DEB="未指定安装后删除或安装出错，不删除deb包"
+TRANSHELL_CONTENT_DEB_IS_DELETED="使用了--delete-after-install选项且安装未出错，删除deb包"

spark-store-project.pro

@@ -40,6 +40,9 @@ qm.path = /usr/share/spark-store/translations
 bash_completion.files += pkg/usr/share/bash-completion/completions/aptss
 bash_completion.path = /usr/share/bash-completion/completions
 
+fish_completion.files += pkg/usr/share/fish/completions/aptss.fish
+fish_completion.path = /usr/share/fish/completions/
+
 desktop.files += pkg/usr/share/applications/*.desktop
 desktop.path = /usr/share/applications
 
@@ -73,5 +76,6 @@ INSTALLS += \
         tmp \
         service \
         bash_completion \
+        fish_completion \
         polkit-1 
 #   暂时不添加

src/application.cpp

@@ -35,14 +35,13 @@ Application::Application(int &argc, char **argv)
     setApplicationName("spark-store"); // 影响 ~/.config/spark-union ~/.local/share/spark-union 下文件夹名称
     setApplicationDisplayName(QObject::tr("Spark Store")); // 设置窗口显示标题 (Wayland 下会显示 Qt 原生标题栏)
     setProductName(QObject::tr("Spark Store"));
-    setProductIcon(QIcon::fromTheme("spark-store"));
+    setProductIcon(QIcon(":/icon/sparky.png"));
     setApplicationHomePage("https://gitee.com/spark-store-project");
     setApplicationDescription(
         QObject::tr(
             "<span style=' font-size:10pt;font-weight:60;'>An appstore powered by community</span><br/>"
-            "<a href='https://www.spark-app.store/'>https://www.spark-app.store</a><br/>"
-            "<span style=' font-size:12pt;'>Spark developers</span>"));
-    setApplicationLicense(" <a href='https://gitee.com/spark-store-project/spark-store/blob/Flamescion/LICENSE'>Spark Opensource License</a> ");
+            "<span style=' font-size:10pt;font-weight:60;'>Sparky is our mascot, designed by <a href='https://tai3.cn/'>Tyson Tan</a></span><br/>"));
+    setApplicationLicense(" <a href='https://gitee.com/spark-store-project/spark-store/blob/Flamescion/LICENSE'>GPL V3</a> ");
 
     // 检查 ~/.config/spark-union/spark-store 文件夹是否存在
     checkAppConfigLocation();

src/assets/assets.qrc

@@ -44,24 +44,50 @@
         <file>icon/light/text.svg</file>
         <file>icon/light/update.svg</file>
         <file>icon/logo.svg</file>
+        <file>icon/sparky.png</file>
         <file>json/features.json</file>
-        <file>tags/a2d-small.png</file>
+        <file>tags/a2d_full.svg</file>
         <file>tags/a2d.png</file>
-        <file>tags/community-small.png</file>
+        <file>tags/a2d.svg</file>
+        <file>tags/community_full.svg</file>
         <file>tags/community.png</file>
         <file>tags/community.svg</file>
-        <file>tags/deepin-small.png</file>
+        <file>tags/debian_full.svg</file>
+        <file>tags/debian.png</file>
+        <file>tags/debian.svg</file>
+        <file>tags/deepin_full.svg</file>
+        <file>tags/deepin.png</file>
         <file>tags/deepin.svg</file>
-        <file>tags/dtk-small.png</file>
-        <file>tags/dwine2-small.png</file>
-        <file>tags/dwine5-small.png</file>
+        <file>tags/dtk_full.svg</file>
+        <file>tags/dtk.png</file>
+        <file>tags/dtk.svg</file>
+        <file>tags/dwine2_full.svg</file>
+        <file>tags/dwine2.png</file>
+        <file>tags/dwine2.svg</file>
+        <file>tags/dwine5_full.svg</file>
+        <file>tags/dwine5.png</file>
         <file>tags/dwine5.svg</file>
-        <file>tags/logo_icon.svg</file>
-        <file>tags/ubuntu-small.png</file>
+        <file>tags/ubuntu_full.svg</file>
         <file>tags/ubuntu.png</file>
-        <file>tags/uos-authorize.svg</file>
-        <file>tags/uos-small.png</file>
+        <file>tags/ubuntu.svg</file>
+        <file>tags/uos_full.svg</file>
+        <file>tags/uos.png</file>
         <file>tags/uos.svg</file>
+        <file>tags/amber-ce-bookworm_full.svg</file>
+        <file>tags/amber-ce-bookworm.png</file>
+        <file>tags/amber-ce-bookworm.svg</file>
+        <file>tags/amber-ce-sid_full.svg</file>
+        <file>tags/amber-ce-sid.png</file>
+        <file>tags/amber-ce-sid.svg</file>
+        <file>tags/amber-ce-trixie_full.svg</file>
+        <file>tags/amber-ce-trixie.png</file>
+        <file>tags/amber-ce-trixie.svg</file>
+        <file>tags/native_full.svg</file>
+        <file>tags/native.png</file>
+        <file>tags/native.svg</file>
         <file>translations/qtwebengine_zh.qm</file>
+        <file>tags/amber-ce-deepin_full.svg</file>
+        <file>tags/amber-ce-deepin.svg</file>
+        <file>tags/amber-ce-deepin.png</file>
     </qresource>
 </RCC>

src/assets/json/features.json

@@ -20,6 +20,6 @@
             "description": "Fix 1 detailed description..."
         }
     ],
-    "linkUrl": "https://gitee.com/deepin-community-store/spark-store/releases/",
+    "linkUrl": "https://gitee.com/spark-store-project/spark-store/releases/",
     "linkButtonVisible": true
 }

src/assets/tags/logo_icon.svg

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>logo icon</title>
-    <defs>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
-            <stop stop-color="#00F1FF" offset="0%"></stop>
-            <stop stop-color="#008AFF" offset="100%"></stop>
-        </linearGradient>
-    </defs>
-    <g id="light" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="1" transform="translate(-460.000000, -159.000000)">
-            <g id="tittlebar" transform="translate(450.000000, 150.000000)">
-                <g id="logo-icon" transform="translate(10.000000, 9.000000)">
-                    <g>
-                        <rect id="矩形" fill="url(#linearGradient-1)" x="0" y="0" width="32" height="32" rx="8"></rect>
-                        <path d="M23,25 L23,24.0002278 C21.6666667,24.0002278 21,24.0002278 21,24.0002278 L21,20 L22,20 L22,19 L21,19 L21,17 L20,17.5 L20,19 L19,19 L19,20 L20,20 L20,24.0002278 C20,24.0002278 20,24.0002278 20,24.0002278 C20,24.5523868 20.4476132,25 20.9997722,25 C20.9998481,25 20.9999241,25 21,25 L23,25 Z M24.0210414,23.9789586 L24.0210414,22.2215556 L24.0210414,22.2215556 L24.6565969,21.6226667 L27.2207674,25 L29.0052118,25 L25.6099302,20.7304444 L28.4678057,18.0074755 L26.6711391,18.0074755 L24.0210414,20.6204444 L24,15.5 L23,15 L23,25 C23.5639056,25 24.0210414,24.5428642 24.0210414,23.9789586 Z" id="tk" fill="#FFFFFF" fill-rule="nonzero"></path>
-                        <path d="M10.275,24 C13.175,24 15.35,23.2 16.85,21.6 C18.275,20.075 19,17.825 19,15 C19,12.15 18.275,10.05 16.85,8.55 C15.35,6.95 13.175,6 10.275,6 L4,6 L4,24 L10.275,24 Z M9.725,21 L7,21 L7,9 L9.725,9 C11.95,9 13.575,9.15 14.6,10.175 C15.6,11.175 16,12.75 16,15 C16,17.2 15.6,18.9 14.6,19.95 C13.575,20.975 11.95,21 9.725,21 Z" id="D" fill="#FFFFFF" fill-rule="nonzero"></path>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>

src/assets/tags/uos-authorize.svg

@@ -1,13 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <defs>
-    <linearGradient id="uos-托盘1-a" x1="15.968%" x2="100%" y1="14.224%" y2="60.554%">
-      <stop offset="0%" stop-color="#0071FF"/>
-      <stop offset="48.72%" stop-color="#00E8FC"/>
-      <stop offset="100%" stop-color="#00A2FF"/>
-    </linearGradient>
-  </defs>
-  <g fill="none" transform="translate(1 1)">
-    <circle cx="9" cy="9" r="9" fill="url(#uos-托盘1-a)"/>
-    <path fill="#FFF" d="M13,4.5 C13.5128358,4.5 13.9355072,4.88604019 13.9932723,5.38337887 L14,5.5 L14,9.5 C14,12.5 12,14.5 9,14.5 C6,14.5 4,12.5 4.0043492,9.70016408 L4,9.5 L4,5.5 C4,4.94771525 4.44771525,4.5 5,4.5 C5.51283584,4.5 5.93550716,4.88604019 5.99327227,5.38337887 L6,5.5 L6,9.5 C6,11.5 7.5,12.5 9,12.5 C10.5,12.5 12,11.5 12,9.5 L12,5.5 C12,4.94771525 12.4477153,4.5 13,4.5 Z"/>
-  </g>
-</svg>

src/backend/DataCollectorAndUploader.cpp

@@ -8,6 +8,8 @@
 #include <QSettings>
 #include <QProcess>
 #include <QDebug>
+#include <QFile>
+#include <QTextStream>
 
 DataCollectorAndUploader::DataCollectorAndUploader(QObject *parent) : QObject(parent)
 {
@@ -28,20 +30,21 @@ void DataCollectorAndUploader::collectData()
     QString version = config.value("build/version").toString();
     QString uuid = config.value("info/uuid").toString();
 
-
-    // Execute lsb_release --all and capture the output
-    QProcess lsbProcess;
-    lsbProcess.start("lsb_release", QStringList() << "--all");
-    lsbProcess.waitForFinished();
-    QString lsbOutput = lsbProcess.readAllStandardOutput();
-
-    QStringList lines = lsbOutput.split('\n');
-    for (const QString &line : lines) {
-        if (line.contains("Distributor ID:")) {
-            distributor_id = line.split(":").last().trimmed();
-        } else if (line.contains("Release:")) {
-            release = line.split(":").last().trimmed();
+    // Read /etc/os-release file
+    QFile osReleaseFile("/etc/os-release");
+    if (osReleaseFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
+        QTextStream in(&osReleaseFile);
+        while (!in.atEnd()) {
+            QString line = in.readLine();
+            if (line.startsWith("ID=")) {
+                distributor_id = line.mid(3).remove('"').trimmed();
+            } else if (line.startsWith("VERSION_ID=")) {
+                release = line.mid(11).remove('"').trimmed();
+            }
         }
+        osReleaseFile.close();
+    } else {
+        qWarning() << "Could not open /etc/os-release file";
     }
 
     // Execute uname -m to get the architecture
@@ -58,8 +61,6 @@ void DataCollectorAndUploader::collectData()
     json.insert("Store_Version", version);
     json.insert("UUID", uuid);
 
-
-
     // Convert to byte array
     QJsonDocument doc(json);
     QByteArray jsonData = doc.toJson();

src/main.cpp

@@ -142,18 +142,18 @@ int main(int argc, char *argv[])
     // 龙芯机器配置,使得 DApplication 能正确加载 QtWebEngine
     qputenv("DTK_FORCE_RASTER_WIDGETS", "FALSE");
 
+    // 设置 QtWebEngine 环境变量
+    QStringList chromium_flags;
     // 浏览器开启 GPU 支持
-    // qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--disable-features=UseModernMediaControls");
-    // qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--disable-web-security");
+    // chromium_flags.append("--disable-features=UseModernMediaControls");
+    // chromium_flags.append("--disable-web-security");
     // 全平台软件渲染Webkit
-    qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--disable-gpu");
-#ifdef __sw_64__
-    qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--no-sandbox");
+    chromium_flags.append("--disable-gpu");
+#if defined __sw_64__ || __loongarch__
+    chromium_flags.append("--no-sandbox");
 #endif
+    qputenv("QTWEBENGINE_CHROMIUM_FLAGS", chromium_flags.join(" ").toUtf8());
 
-#ifdef __loongarch__
-    qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--no-sandbox");
-#endif
     /**
      * NOTE: https://zhuanlan.zhihu.com/p/550285855
      * 避免 wayland 环境下从 QtWebEngine 后退回到 QWidget 时黑屏闪烁
@@ -163,8 +163,6 @@ int main(int argc, char *argv[])
         DApplication::setAttribute(Qt::AA_UseSoftwareOpenGL);
     }
 
-
-
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
     // 开启 Hidpi 支持
     qDebug() << "Enable HiDPI Support.";

src/pages/appintopage.cpp

@@ -151,24 +151,25 @@ void AppIntoPage::openUrl(const QUrl &url)
             {
                 isInstalled = true;
 
-                QProcess isUpdate;
-                isUpdate.start("dpkg-query", QStringList() << "--showformat='${Version}'"
-                                                           << "--show" << info["Pkgname"].toString());
-                isUpdate.waitForFinished(180 * 1000); // 默认超时 3 分钟
-                QString localVersion = isUpdate.readAllStandardOutput();
-                localVersion.replace("'", "");
+                // QProcess isUpdate;
+                // isUpdate.start("dpkg-query", QStringList() << "--showformat='${Version}'"
+                //                                            << "--show" << info["Pkgname"].toString());
+                // isUpdate.waitForFinished(180 * 1000); // 默认超时 3 分钟
+                // QString localVersion = isUpdate.readAllStandardOutput();
+                // localVersion.replace("'", "");
 
-                isUpdate.start("dpkg", QStringList() << "--compare-versions" << localVersion << "ge" << info["Version"].toString());
-                isUpdate.waitForFinished(180 * 1000); // 默认超时 3 分钟
-                if (isUpdate.exitCode() == 0 && isUpdate.exitStatus() == QProcess::NormalExit)
-                {
-                    isUpdated = true;
-                }
-                else
-                {
-                    isUpdated = false;
-                }
-                isUpdate.close();
+                // isUpdate.start("dpkg", QStringList() << "--compare-versions" << localVersion << "ge" << info["Version"].toString());
+                // isUpdate.waitForFinished(180 * 1000); // 默认超时 3 分钟
+                // if (isUpdate.exitCode() == 0 && isUpdate.exitStatus() == QProcess::NormalExit)
+                // {
+                //     isUpdated = true;
+                // }
+                // else
+                // {
+                //     isUpdated = false;
+                // }
+                // isUpdate.close();
+                isUpdated = true; //去掉直接点击升级的功能
             }
             else
             {
@@ -180,7 +181,19 @@ void AppIntoPage::openUrl(const QUrl &url)
             {
                 if (isUpdated)
                 {
-                    ui->downloadButton->setText(tr("Reinstall"));
+                    QProcess process;
+                    QStringList arguments;
+                    arguments << "check" << info["Pkgname"].toString();
+                    process.start("/opt/durapps/spark-store/bin/store-helper/ss-launcher", arguments);
+                    if (process.waitForFinished()) {
+                            exitCode = process.exitCode();
+                            exitStatus = process.exitStatus();
+                            if (exitCode != 0){
+                                ui->downloadButton->setText(tr("Reinstall"));
+                            }else{
+                                ui->downloadButton->setText(tr("Launch"));
+                            }
+                    }
                     ui->downloadButton->setEnabled(true);
                     ui->downloadButton->show();
                     ui->pushButton_3->show();
@@ -219,8 +232,15 @@ void AppIntoPage::clear()
     ui->tag_deepin->hide();
     ui->tag_dwine2->hide();
     ui->tag_dwine5->hide();
+    ui->tag_debian->hide();
     ui->tag_ubuntu->hide();
     ui->tag_community->hide();
+    ui->tag_native->hide();
+    ui->tag_amber_ce_bookworm->hide();
+    ui->tag_amber_ce_trixie->hide();
+    ui->tag_amber_ce_sid->hide();
+    ui->tag_amber_ce_deepin23->hide();
+
     ui->icon->clear();
     ui->title->clear();
     ui->version->clear();
@@ -287,8 +307,10 @@ void AppIntoPage::setDownloadWidget(DownloadListWidget *w)
     }
 
     dw = w;
-    connect(w, &DownloadListWidget::downloadFinished, [=]()
-    { isDownloading(SparkAPI::getServerUrl() + SparkAPI::getArchDir() + spk.path() + "/" + info["Filename"].toString()); });
+    connect(w, &DownloadListWidget::downloadFinished, this, [=]() {
+            isDownloading(SparkAPI::getServerUrl() + SparkAPI::getArchDir() + spk.path() + "/" + info["Filename"].toString());
+        },
+            Qt::QueuedConnection);
 }
 
 void AppIntoPage::initUI()
@@ -355,14 +377,25 @@ void AppIntoPage::isDownloading(const QUrl &url)
 
         int exitCode = process.exitCode();
         QProcess::ExitStatus exitStatus = process.exitStatus();
-        process.close();
 
         if (exitCode == 0 && exitStatus == QProcess::NormalExit)
         {
+            QStringList arguments;
+            arguments << "check" << info["Pkgname"].toString();
+            process.start("/opt/durapps/spark-store/bin/store-helper/ss-launcher", arguments);
+            if (process.waitForFinished()) {
+                    exitCode = process.exitCode();
+                    exitStatus = process.exitStatus();
+                    if (exitCode != 0){
+                        ui->downloadButton->setText(tr("Reinstall"));
+                    }else{
+                        ui->downloadButton->setText(tr("Launch"));
+                    }
+            }
             ui->downloadButton->setEnabled(true);
-            ui->downloadButton->setText(tr("Reinstall"));
             ui->downloadButton->show();
             ui->pushButton_3->show();
+            process.close();
         }
         else
         {
@@ -377,49 +410,89 @@ void AppIntoPage::setAppinfoTags(const QStringList &tagList)
     bool ubuntuSupport = false;
     bool deepinSupport = false;
     bool uosSupport = false;
+    bool debianSupport = false;
+    bool hasAmberTag = false;
+
+    // First pass: Check if any Amber tags exist
     foreach (const QString &tag, tagList)
     {
-        if (tag == "community")
+        if (tag.startsWith("amber-ce-"))
         {
-            ui->tag_community->show();
-        }
-        else if (tag == "ubuntu")
-        {
-            ui->tag_ubuntu->show();
-            ubuntuSupport = true;
-        }
-        else if (tag == "deepin")
-        {
-            ui->tag_deepin->show();
-            deepinSupport = true;
-        }
-        else if (tag == "uos")
-        {
-            ui->tag_uos->show();
-            uosSupport = true;
-
-        }
-        else if (tag == "dtk5")
-        {
-            ui->tag_dtk5->show();
-        }
-        else if (tag == "dwine2")
-        {
-            ui->tag_dwine2->show();
-        }
-        else if (tag == "dwine5")
-        {
-            ui->tag_dwine5->show();
-        }
-        else if (tag == "a2d")
-        {
-            ui->tag_a2d->show();
+            hasAmberTag = true;
+            break;  // No need to continue checking
         }
     }
-    notifyUserUnsupportedTags(ubuntuSupport, deepinSupport, uosSupport);
+
+
+    // Second pass: Apply tags based on whether we have Amber tags
+    foreach (const QString &tag, tagList)
+    {
+        if (tag.isEmpty())
+            continue;
+
+        if (tag == "native")
+            ui->tag_native->show();
+
+        else if (tag == "community")
+            ui->tag_community->show();
+
+        else if (tag == "dtk5")
+            ui->tag_dtk5->show();
+
+        else if (tag == "dwine2")
+            ui->tag_dwine2->show();
+
+        else if (tag == "dwine5")
+            ui->tag_dwine5->show();
+
+        else if (tag == "a2d")
+            ui->tag_a2d->show();
+
+        else if (tag == "amber-ce-bookworm")
+            ui->tag_amber_ce_bookworm->show();
+
+        else if (tag == "amber-ce-trixie")
+            ui->tag_amber_ce_trixie->show();
+
+        else if (tag == "amber-ce-deepin23")
+            ui->tag_amber_ce_deepin23->show();
+
+        else if (tag == "amber-ce-sid")
+            ui->tag_amber_ce_sid->show();
+
+        // Only process distro tags if there are no Amber tags
+        else if (!hasAmberTag)
+        {
+            if (tag == "debian")
+            {
+                ui->tag_debian->show();
+                debianSupport = true;
+            }
+            else if (tag == "ubuntu")
+            {
+                ui->tag_ubuntu->show();
+                ubuntuSupport = true;
+            }
+            else if (tag == "deepin")
+            {
+                ui->tag_deepin->show();
+                deepinSupport = true;
+            }
+            else if (tag == "uos")
+            {
+                ui->tag_uos->show();
+                uosSupport = true;
+            }
+        }
+    }
+
+    if (!hasAmberTag)
+        notifyUserUnsupportedTags(ubuntuSupport, deepinSupport, uosSupport, debianSupport);
 }
 
-void AppIntoPage::notifyUserUnsupportedTags(bool ubuntuSupport, bool deepinSupport, bool uosSupport)
+
+
+void AppIntoPage::notifyUserUnsupportedTags(bool ubuntuSupport, bool deepinSupport, bool uosSupport, bool debianSupport)
 {
     if (!SettingsPage::needUncompatibleNotification) {
         return;
@@ -430,30 +503,21 @@ void AppIntoPage::notifyUserUnsupportedTags(bool ubuntuSupport, bool deepinSuppo
     bool checkdeepin = (isDeepin && !deepinSupport);
     bool checkuos = (isUOS && !uosSupport);
     bool isUbuntu = false;
+    bool isDebian = false;
     if (!checkdeepin && !checkuos)
     {
-        // 检查是否为 ubuntu 系统
-        QFile lsb("/etc/lsb-release");
-        if (!lsb.open(QIODevice::ReadOnly))
-        {
-            qDebug() << "打开 /etc/lsb-release 失败";
-        }
-        else {
-            QString lsbInfo = lsb.readAll();  // 因为使用 readAll 读取后会默认跳转到文件末尾导致读出的数据为空，所以用单独一个 string 存储
-            if (lsbInfo.contains("Ubuntu"))
-            {
-                isUbuntu = true;
-                lsb.close();
-            }
-            else if (lsbInfo.contains("GXDE"))
-            {
-                // GXDE 使用 Ubuntu 的 tag
-                isUbuntu = true;
-                lsb.close();
-            }
+        // 使用更可靠的/etc/os-release检测
+        QFile osRelease("/etc/os-release");
+        if (osRelease.open(QIODevice::ReadOnly)) {
+            QString content = osRelease.readAll();
+            isUbuntu = content.contains("ID=ubuntu");
+            isDebian = content.contains("ID=debian") || content.contains("ID_LIKE=debian"); // 合并Debian系检测
+            osRelease.close();
         }
     }
+
     bool checkubuntu = (isUbuntu && !ubuntuSupport);
+    bool checkdebian = (isDebian && !debianSupport);
 
     if (checkdeepin)
     {
@@ -467,12 +531,17 @@ void AppIntoPage::notifyUserUnsupportedTags(bool ubuntuSupport, bool deepinSuppo
     {
         Utils::sendNotification("spark-store", tr("Warning"), tr("The current application does not support or tested on Ubuntu, there may be problems"));
     }
-    else if (!isUbuntu && !isDeepin && !isUOS)
+    else if (checkdebian)
+    {
+        Utils::sendNotification("spark-store", tr("Warning"), tr("The current application does not support or tested on Debian, there may be problems"));
+    }
+    if (!isUbuntu && !isDeepin && !isUOS && !isDebian)
     {
         Utils::sendNotification("spark-store", tr("Warning"), tr("The current application does not support or tested on current platform, there may be problems"));
     }
 
     return;
+
 }
 
 void AppIntoPage::on_downloadButton_clicked()
@@ -486,28 +555,62 @@ void AppIntoPage::on_downloadButton_clicked()
             return;
         }
 
-        connect(item, &DownloadItem::finished, [=]() { isDownloading(downloadUrl); });
+        connect(item, &DownloadItem::finished, this, [=]() {
+                isDownloading(downloadUrl);
+            },
+                Qt::QueuedConnection);
 
         item->install(0);
         isDownloading(downloadUrl);
 
         return;
     }
+    else if (ui->downloadButton->text() == tr("Launch"))
+    {
+        QString scriptPath = "/opt/durapps/spark-store/bin/store-helper/ss-launcher";
+        QStringList arguments;
+        arguments << "launch" << info["Pkgname"].toString();
+        QProcess process;
+        process.startDetached(scriptPath, arguments);
+        return;
+    }
 
     emit clickedDownloadBtn();
 
-    DownloadItem *item = dw->addItem(info["Name"].toString(), info["Filename"].toString(), info["Pkgname"].toString(), iconpixmap, downloadUrl);
+    // 处理 tags，设置 installExtraArg
+    QString installExtraArg;
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
+    QStringList taglist = info["Tags"].toString().split(";", Qt::SkipEmptyParts);
+#else
+    QStringList taglist = info["Tags"].toString().split(";", QString::SkipEmptyParts);
+#endif
+    if (taglist.contains("native")) {
+        installExtraArg = "--native";
+    } else if (taglist.contains("amber-ce-bookworm")) {
+        installExtraArg = "--amber-ce-bookworm";
+    } else if (taglist.contains("amber-ce-trixie")) {
+        installExtraArg = "--amber-ce-trixie";
+    } else if (taglist.contains("amber-ce-sid")) {
+        installExtraArg = "--amber-ce-sid";
+    } else if (taglist.contains("amber-ce-deepin23")) {
+        installExtraArg = "--amber-ce-deepin23";
+    }
+
+    DownloadItem *item = dw->addItem(info["Name"].toString(), info["Filename"].toString(), info["Pkgname"].toString(),
+                                     iconpixmap, downloadUrl, installExtraArg);
     if (item == nullptr)
     {
         return;
     }
-
     if (ui->downloadButton->text() == tr("Reinstall"))
     {
         item->reinstall = true;
     }
     ui->downloadButton->setEnabled(false);
-    connect(item, &DownloadItem::finished, [=]() { isDownloading(downloadUrl); });
+    connect(item, &DownloadItem::finished, this, [=]() {
+        isDownloading(downloadUrl);
+    },
+        Qt::QueuedConnection);
 
     isDownloading(downloadUrl);
 }
@@ -520,15 +623,15 @@ void AppIntoPage::on_pushButton_3_clicked()
         ui->pushButton_3->setEnabled(false);
 
         QProcess uninstall;
-        uninstall.start("pkexec", QStringList() << "apt" << "autopurge" << "-y" << info["Pkgname"].toString().toLower());
+        uninstall.start("pkexec", QStringList() << "/opt/durapps/spark-store/bin/store-helper/uninstaller" << info["Pkgname"].toString().toLower());
         uninstall.waitForFinished(-1);
         uninstall.close();
 
-        QProcess check;
-        check.start("dpkg", QStringList() << "-s" << info["Pkgname"].toString().toLower());
-        check.waitForFinished(-1);
+        // QProcess check;
+        // check.start("dpkg", QStringList() << "-s" << info["Pkgname"].toString().toLower());
+        // check.waitForFinished(-1);
 
-        if (check.exitCode() != 0 || check.exitStatus() != QProcess::NormalExit)
+        if (uninstall.exitCode() != 0 || uninstall.exitStatus() != QProcess::NormalExit)
         {
             ui->downloadButton->setText(tr("Download and Install"));
             ui->pushButton_3->hide();
@@ -539,7 +642,7 @@ void AppIntoPage::on_pushButton_3_clicked()
         ui->downloadButton->setEnabled(true);
         ui->pushButton_3->setEnabled(true);
 
-        check.close();
+        // check.close();
     });
 }
 
@@ -553,16 +656,6 @@ void AppIntoPage::on_shareButton_clicked()
 
 void AppIntoPage::on_updateButton_clicked()
 {
-    QString feedbackSpk = "spk://store/chat/store.spark-app.feedback";
-    QFileInfo actionSubmissionClientStatus("/opt/durapps/store.spark-app.feedback");
-    if (actionSubmissionClientStatus.exists() && actionSubmissionClientStatus.isDir())
-    {
-        qDebug() << "反馈器存在";
-        QProcess::startDetached("sh", QStringList() << "/opt/durapps/store.spark-app.feedback/launch.sh");
-    }
-    else
-    {
-        qDebug() << "反馈器不存在，跳转页面";
-        openUrl(feedbackSpk);
-    }
+    QString feedbackURL = "https://bbs.spark-app.store/";
+    QProcess::startDetached("xdg-open", QStringList{feedbackURL});
 }

src/pages/appintopage.h

@@ -29,7 +29,7 @@ private:
     void initConnections();
     void isDownloading(const QUrl &url);
     void setAppinfoTags(const QStringList &tagList);
-    void notifyUserUnsupportedTags(bool ubuntuSupport, bool deepinSupport, bool uosSupport);
+    void notifyUserUnsupportedTags(bool ubuntuSupport, bool deepinSupport, bool uosSupport, bool debianSupport);
 
 signals:
     void clickedDownloadBtn();

src/pages/appintopage.ui

@@ -160,7 +160,6 @@
            <property name="font">
             <font>
              <pointsize>14</pointsize>
-             <weight>75</weight>
              <bold>true</bold>
             </font>
            </property>
@@ -369,24 +368,273 @@
            <property name="orientation">
             <enum>Qt::Vertical</enum>
            </property>
-           <property name="sizeType">
-            <enum>QSizePolicy::Expanding</enum>
-           </property>
            <property name="sizeHint" stdset="0">
             <size>
              <width>20</width>
-             <height>20</height>
+             <height>40</height>
             </size>
            </property>
           </spacer>
          </item>
          <item>
           <layout class="QHBoxLayout" name="horizontalLayout_4">
-           <property name="topMargin">
-            <number>0</number>
-           </property>
+           <item>
+            <spacer name="horizontalSpacer_6">
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>13</width>
+               <height>37</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+           <item>
+            <widget class="CustomLabel" name="tag_ubuntu">
+             <property name="minimumSize">
+              <size>
+               <width>40</width>
+               <height>40</height>
+              </size>
+             </property>
+             <property name="maximumSize">
+              <size>
+               <width>40</width>
+               <height>40</height>
+              </size>
+             </property>
+             <property name="toolTip">
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Capable to Ubuntu 22.04&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             </property>
+             <property name="whatsThis">
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Capable to Ubuntu 22.04&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             </property>
+             <property name="pixmap">
+              <pixmap resource="../assets/assets.qrc">:/tags/ubuntu.png</pixmap>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="CustomLabel" name="tag_uos">
+             <property name="minimumSize">
+              <size>
+               <width>40</width>
+               <height>40</height>
+              </size>
+             </property>
+             <property name="maximumSize">
+              <size>
+               <width>40</width>
+               <height>40</height>
+              </size>
+             </property>
+             <property name="toolTip">
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Capable to UOS home 20&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             </property>
+             <property name="whatsThis">
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Capable to UOS home 20&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             </property>
+             <property name="pixmap">
+              <pixmap resource="../assets/assets.qrc">:/tags/uos.png</pixmap>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="CustomLabel" name="tag_deepin">
+             <property name="minimumSize">
+              <size>
+               <width>40</width>
+               <height>40</height>
+              </size>
+             </property>
+             <property name="maximumSize">
+              <size>
+               <width>40</width>
+               <height>40</height>
+              </size>
+             </property>
+             <property name="toolTip">
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Capable to deepin 23&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             </property>
+             <property name="whatsThis">
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Capable to deepin 23&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             </property>
+             <property name="pixmap">
+              <pixmap resource="../assets/assets.qrc">:/tags/deepin.png</pixmap>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="CustomLabel" name="tag_debian">
+             <property name="minimumSize">
+              <size>
+               <width>40</width>
+               <height>40</height>
+              </size>
+             </property>
+             <property name="maximumSize">
+              <size>
+               <width>40</width>
+               <height>40</height>
+              </size>
+             </property>
+             <property name="toolTip">
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Capable to Debian Stable&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             </property>
+             <property name="whatsThis">
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Capable to Debian Stable&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             </property>
+             <property name="pixmap">
+              <pixmap resource="../assets/assets.qrc">:/tags/debian.png</pixmap>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="CustomLabel" name="tag_native">
+             <property name="minimumSize">
+              <size>
+               <width>40</width>
+               <height>40</height>
+              </size>
+             </property>
+             <property name="maximumSize">
+              <size>
+               <width>40</width>
+               <height>40</height>
+              </size>
+             </property>
+             <property name="toolTip">
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This app can only be installed natively&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             </property>
+             <property name="whatsThis">
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This app can only be installed natively&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             </property>
+             <property name="pixmap">
+              <pixmap resource="../assets/assets.qrc">:/tags/native.png</pixmap>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="CustomLabel" name="tag_amber_ce_bookworm">
+             <property name="minimumSize">
+              <size>
+               <width>40</width>
+               <height>40</height>
+              </size>
+             </property>
+             <property name="maximumSize">
+              <size>
+               <width>40</width>
+               <height>40</height>
+              </size>
+             </property>
+             <property name="toolTip">
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This app will be installed to debian12 ACE&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             </property>
+             <property name="whatsThis">
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This app will be installed to debian12 ACE&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             </property>
+             <property name="pixmap">
+              <pixmap resource="../assets/assets.qrc">:/tags/amber-ce-bookworm.png</pixmap>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="CustomLabel" name="tag_amber_ce_trixie">
+             <property name="minimumSize">
+              <size>
+               <width>40</width>
+               <height>40</height>
+              </size>
+             </property>
+             <property name="maximumSize">
+              <size>
+               <width>40</width>
+               <height>40</height>
+              </size>
+             </property>
+             <property name="toolTip">
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This app will be installed to debian13 ACE&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             </property>
+             <property name="whatsThis">
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This app will be installed to debian13 ACE&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             </property>
+             <property name="pixmap">
+              <pixmap resource="../assets/assets.qrc">:/tags/amber-ce-trixie.png</pixmap>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="CustomLabel" name="tag_amber_ce_sid">
+             <property name="minimumSize">
+              <size>
+               <width>40</width>
+               <height>40</height>
+              </size>
+             </property>
+             <property name="maximumSize">
+              <size>
+               <width>40</width>
+               <height>40</height>
+              </size>
+             </property>
+             <property name="toolTip">
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This app will be installed to debian SID ACE&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             </property>
+             <property name="whatsThis">
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This app will be installed to debian SID ACE&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             </property>
+             <property name="pixmap">
+              <pixmap resource="../assets/assets.qrc">:/tags/amber-ce-sid.png</pixmap>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="CustomLabel" name="tag_amber_ce_deepin23">
+             <property name="minimumSize">
+              <size>
+               <width>40</width>
+               <height>40</height>
+              </size>
+             </property>
+             <property name="maximumSize">
+              <size>
+               <width>40</width>
+               <height>40</height>
+              </size>
+             </property>
+             <property name="toolTip">
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This app will be installed to deepin23 ACE&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             </property>
+             <property name="whatsThis">
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This app will be installed to deepin23 ACE&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             </property>
+             <property name="pixmap">
+              <pixmap resource="../assets/assets.qrc">:/tags/amber-ce-deepin.png</pixmap>
+             </property>
+            </widget>
+           </item>
            <item>
             <spacer name="horizontalSpacer_5">
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>18</width>
+               <height>37</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <layout class="QHBoxLayout" name="horizontalLayout_13">
+           <item>
+            <spacer name="horizontalSpacer_13">
              <property name="orientation">
               <enum>Qt::Horizontal</enum>
              </property>
@@ -399,125 +647,17 @@
             </spacer>
            </item>
            <item>
-            <widget class="QLabel" name="tag_community">
-             <property name="maximumSize">
+            <widget class="CustomLabel" name="tag_a2d">
+             <property name="minimumSize">
               <size>
-               <width>30</width>
-               <height>16777215</height>
+               <width>40</width>
+               <height>40</height>
               </size>
              </property>
-             <property name="toolTip">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This app is developed by community user,we give this tag to honor those who contribute to the Linux Ecology&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-             </property>
-             <property name="whatsThis">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This app is developed by community user,we give this tag to honor those who contribute to the Linux Ecology&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-             </property>
-             <property name="text">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/tags/community-small.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLabel" name="tag_ubuntu">
              <property name="maximumSize">
               <size>
-               <width>30</width>
-               <height>16777215</height>
-              </size>
-             </property>
-             <property name="toolTip">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Capable to Ubuntu 22.04&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-             </property>
-             <property name="whatsThis">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Capable to Ubuntu 22.04&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-             </property>
-             <property name="text">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/tags/ubuntu-small.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLabel" name="tag_uos">
-             <property name="maximumSize">
-              <size>
-               <width>30</width>
-               <height>16777215</height>
-              </size>
-             </property>
-             <property name="toolTip">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Capable to UOS home 20&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-             </property>
-             <property name="whatsThis">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Capable to UOS home 20&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-             </property>
-             <property name="text">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/tags/uos-small.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLabel" name="tag_dwine2">
-             <property name="maximumSize">
-              <size>
-               <width>30</width>
-               <height>16777215</height>
-              </size>
-             </property>
-             <property name="toolTip">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A deepin-wine2 app. Spark Store will automatically configure the wine kit for you.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-             </property>
-             <property name="whatsThis">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A deepin-wine2 app. Spark Store will automatically configure the wine kit for you.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-             </property>
-             <property name="text">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/tags/dwine2-small.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLabel" name="tag_dtk5">
-             <property name="maximumSize">
-              <size>
-               <width>30</width>
-               <height>16777215</height>
-              </size>
-             </property>
-             <property name="toolTip">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is a  DTK5 app,which means it would have better effect on Deepin Desktop Environment&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-             </property>
-             <property name="whatsThis">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is a  DTK5 app,which means it would have better effect on Deepin Desktop Environment&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-             </property>
-             <property name="text">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/tags/dtk-small.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLabel" name="tag_deepin">
-             <property name="maximumSize">
-              <size>
-               <width>30</width>
-               <height>16777215</height>
-              </size>
-             </property>
-             <property name="toolTip">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Capable to deepin 20&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-             </property>
-             <property name="whatsThis">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Capable to deepin 20&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-             </property>
-             <property name="text">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/tags/deepin-small.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLabel" name="tag_a2d">
-             <property name="maximumSize">
-              <size>
-               <width>30</width>
-               <height>16777215</height>
+               <width>40</width>
+               <height>40</height>
               </size>
              </property>
              <property name="toolTip">
@@ -526,17 +666,98 @@
              <property name="whatsThis">
               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;An Appimage to deb app.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
              </property>
-             <property name="text">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/tags/a2d-small.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             <property name="pixmap">
+              <pixmap resource="../assets/assets.qrc">:/tags/a2d.png</pixmap>
              </property>
             </widget>
            </item>
            <item>
-            <widget class="QLabel" name="tag_dwine5">
+            <widget class="CustomLabel" name="tag_community">
+             <property name="minimumSize">
+              <size>
+               <width>40</width>
+               <height>40</height>
+              </size>
+             </property>
              <property name="maximumSize">
               <size>
-               <width>30</width>
-               <height>16777215</height>
+               <width>40</width>
+               <height>40</height>
+              </size>
+             </property>
+             <property name="toolTip">
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This app is developed by community user,we give this tag to honor those who contribute to the Linux Ecology&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             </property>
+             <property name="whatsThis">
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This app is developed by community user,we give this tag to honor those who contribute to the Linux Ecology&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             </property>
+             <property name="pixmap">
+              <pixmap resource="../assets/assets.qrc">:/tags/community.png</pixmap>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="CustomLabel" name="tag_dtk5">
+             <property name="minimumSize">
+              <size>
+               <width>40</width>
+               <height>40</height>
+              </size>
+             </property>
+             <property name="maximumSize">
+              <size>
+               <width>40</width>
+               <height>40</height>
+              </size>
+             </property>
+             <property name="toolTip">
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is a  DTK5 app,which means it would have better effect on Deepin Desktop Environment&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             </property>
+             <property name="whatsThis">
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is a  DTK5 app,which means it would have better effect on Deepin Desktop Environment&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             </property>
+             <property name="pixmap">
+              <pixmap resource="../assets/assets.qrc">:/tags/dtk.png</pixmap>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="CustomLabel" name="tag_dwine2">
+             <property name="minimumSize">
+              <size>
+               <width>40</width>
+               <height>40</height>
+              </size>
+             </property>
+             <property name="maximumSize">
+              <size>
+               <width>40</width>
+               <height>40</height>
+              </size>
+             </property>
+             <property name="toolTip">
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A deepin-wine2 app. Spark Store will automatically configure the wine kit for you.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             </property>
+             <property name="whatsThis">
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A deepin-wine2 app. Spark Store will automatically configure the wine kit for you.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             </property>
+             <property name="pixmap">
+              <pixmap resource="../assets/assets.qrc">:/tags/dwine2.png</pixmap>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="CustomLabel" name="tag_dwine5">
+             <property name="minimumSize">
+              <size>
+               <width>40</width>
+               <height>40</height>
+              </size>
+             </property>
+             <property name="maximumSize">
+              <size>
+               <width>40</width>
+               <height>40</height>
               </size>
              </property>
              <property name="toolTip">
@@ -545,13 +766,13 @@
              <property name="whatsThis">
               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A Wine app.Spark Store will automatically configure the wine kit for you&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
              </property>
-             <property name="text">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/tags/dwine5-small.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             <property name="pixmap">
+              <pixmap resource="../assets/assets.qrc">:/tags/dwine5.png</pixmap>
              </property>
             </widget>
            </item>
            <item>
-            <spacer name="horizontalSpacer_6">
+            <spacer name="horizontalSpacer_14">
              <property name="orientation">
               <enum>Qt::Horizontal</enum>
              </property>
@@ -757,7 +978,6 @@
                  <property name="font">
                   <font>
                    <pointsize>12</pointsize>
-                   <weight>75</weight>
                    <bold>true</bold>
                   </font>
                  </property>
@@ -895,7 +1115,6 @@
                  <property name="font">
                   <font>
                    <pointsize>12</pointsize>
-                   <weight>75</weight>
                    <bold>true</bold>
                   </font>
                  </property>
@@ -1060,7 +1279,6 @@ QListWidget::item::selected
                  <property name="font">
                   <font>
                    <pointsize>12</pointsize>
-                   <weight>75</weight>
                    <bold>true</bold>
                   </font>
                  </property>
@@ -1413,6 +1631,15 @@ QListWidget::item::selected
    </item>
   </layout>
  </widget>
- <resources/>
+ <customwidgets>
+  <customwidget>
+   <class>CustomLabel</class>
+   <extends>QLabel</extends>
+   <header>widgets/common/customlabel.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources>
+  <include location="../assets/assets.qrc"/>
+ </resources>
  <connections/>
 </ui>

src/pages/settingspage.cpp

@@ -8,7 +8,7 @@
 #include <QDebug>
 
 #define TMP_PATH "/tmp/spark-store"
-#define DEFAULT_SERVER_URL "https://cdn.d.store.deepinos.org.cn/"
+#define DEFAULT_SERVER_URL "https://cdn-d.spark-app.store/"
 
 
 bool SettingsPage::needUncompatibleNotification = true;

src/spark-store.pro

@@ -47,6 +47,7 @@ SOURCES += \
         utils/utils.cpp \
         utils/widgetanimation.cpp \
         widgets/base/basewidgetopacity.cpp \
+        widgets/common/customlabel.cpp \
         widgets/common/downloaditem.cpp \
         widgets/common/progressbutton.cpp \
         widgets/common/smoothlistwidget.cpp \
@@ -73,6 +74,7 @@ HEADERS += \
         utils/utils.h \
         utils/widgetanimation.h \
         widgets/base/basewidgetopacity.h \
+        widgets/common/customlabel.h \
         widgets/common/downloaditem.h \
         widgets/common/progressbutton.h \
         widgets/common/smoothlistwidget.h \
@@ -106,3 +108,5 @@ TRANSLATIONS += \
 qnx: target.path = /tmp/$${TARGET}/bin
 else: unix:!android: target.path = /opt/durapps/$${TARGET}/bin
 !isEmpty(target.path): INSTALLS += target
+
+DISTFILES +=

src/utils/utils.cpp

@@ -198,7 +198,7 @@ void Utils::setQPAPlatform()
     // }
     else
     {
-        qputenv("QT_QPA_PLATFORM", "dxcb");
+        qputenv("QT_QPA_PLATFORM", "dxcb;xcb");
     }
 }
 

src/widgets/common/customlabel.cpp

@@ -0,0 +1,24 @@
+#include "customlabel.h"
+#include <QGuiApplication>
+
+CustomLabel::CustomLabel(QWidget *parent, Qt::WindowFlags f)
+    : QLabel(parent, f)
+{
+}
+
+QPixmap CustomLabel::pixmap() const
+{
+    const QPixmap *p = QLabel::pixmap();
+    return p ? *p : QPixmap();
+}
+
+void CustomLabel::setPixmap(const QPixmap &pixmap)
+{
+    QPixmap _pixmap = pixmap;
+    _pixmap.setDevicePixelRatio(qApp->devicePixelRatio());
+    _pixmap = _pixmap.scaled(size() * _pixmap.devicePixelRatio(),
+                             Qt::KeepAspectRatio,
+                             Qt::SmoothTransformation);
+
+    QLabel::setPixmap(_pixmap);
+}

src/widgets/common/customlabel.h

@@ -0,0 +1,19 @@
+#ifndef CUSTOMLABEL_H
+#define CUSTOMLABEL_H
+
+#include <QLabel>
+
+class CustomLabel : public QLabel
+{
+    Q_OBJECT
+    Q_PROPERTY(QPixmap pixmap READ pixmap WRITE setPixmap)
+
+public:
+    explicit CustomLabel(QWidget *parent = nullptr,
+                         Qt::WindowFlags f = Qt::WindowFlags());
+
+    virtual QPixmap pixmap() const;
+    virtual void setPixmap(const QPixmap &pixmap);
+};
+
+#endif // CUSTOMLABEL_H

src/widgets/common/downloaditem.cpp

@@ -175,8 +175,16 @@ void DownloadItem::slotAsyncInstall(int t)
     switch (t)
     {
     case 0:
-        installer.start("pkexec", QStringList() << "/usr/local/bin/ssinstall"
-                                                << "/tmp/spark-store/" + ui->label_filename->text().toUtf8() << "--delete-after-install");
+        {
+            QStringList args;
+            args << "/usr/local/bin/ssinstall"
+                 << "/tmp/spark-store/" + ui->label_filename->text().toUtf8();
+            if (!installExtraArg.isEmpty()) {
+                args << installExtraArg;
+            }
+            args << "--delete-after-install";
+            installer.start("pkexec", args);
+        }
         break;
     case 1:
         installer.start("deepin-deb-installer", QStringList() << "/tmp/spark-store/" + ui->label_filename->text().toUtf8());
@@ -208,11 +216,11 @@ void DownloadItem::slotAsyncInstall(int t)
         }
     }
 
-    QProcess isInstall;
-    isInstall.start("dpkg", QStringList() << "-s" << pkgName);
-    isInstall.waitForFinished(180 * 1000); // 默认超时 3 分钟
-    int error = QString::fromStdString(isInstall.readAllStandardError().toStdString()).length();
-    if (error == 0 && !haveError)
+    // QProcess isInstall;
+    // isInstall.start("dpkg", QStringList() << "-s" << pkgName);
+    // isInstall.waitForFinished(180 * 1000); // 默认超时 3 分钟
+    // int error = QString::fromStdString(isInstall.readAllStandardError().toStdString()).length();
+    if ( !haveError)
     {
         ui->pushButton_install->hide();
         Utils::sendNotification("spark-store", tr("Spark Store"), ui->label->text() + " " + tr("Installation complete."));
@@ -244,8 +252,5 @@ void DownloadItem::slotAsyncInstall(int t)
     ui->widget_spinner->hide();
     DownloadItem::isInstall = false;
 
-    installer.deleteLater();
-    isInstall.deleteLater();
-
-    emit finished(error == 0 && !haveError && !notRoot);
+    emit finished(!haveError && !notRoot);
 }

src/widgets/common/downloaditem.h

@@ -43,6 +43,9 @@ public:
 
     void install(int);
 
+    // 新增：安装时额外参数
+    QString installExtraArg;
+
 private:
     Ui::DownloadItem *ui;
 

src/widgets/downloadlistwidget.cpp

@@ -85,7 +85,9 @@ void DownloadListWidget::clearItem()
     ui->listWidget->clear();
 }
 
-DownloadItem* DownloadListWidget::addItem(QString name, QString fileName, QString pkgName, const QPixmap icon, QString downloadurl)
+DownloadItem* DownloadListWidget::addItem(QString name, QString fileName, QString pkgName,
+                                          const QPixmap icon, QString downloadurl,
+                                          const QString &installExtraArg)
 {
     if (fileName.isEmpty())
     {
@@ -104,6 +106,7 @@ DownloadItem* DownloadListWidget::addItem(QString name, QString fileName, QStrin
     di->setName(name);
     di->setFileName(fileName);
     di->pkgName = pkgName;
+    di->installExtraArg = installExtraArg;
     di->seticon(icon);
     QListWidgetItem *pItem = new QListWidgetItem();
     pItem->setSizeHint(QSize(240, 56)); // ui 中单个 downloaditem 高度固定 56px（上下 margin 8px，图片固定 48x48）

src/widgets/downloadlistwidget.h

@@ -19,7 +19,9 @@ class DownloadListWidget : public DBlurEffectWidget
     Q_OBJECT
 
 public:
-    DownloadItem *addItem(QString name, QString fileName, QString pkgName, const QPixmap icon, QString downloadurl);
+    DownloadItem *addItem(QString name, QString fileName, QString pkgName,
+                          const QPixmap icon, QString downloadurl,
+                          const QString &installExtraArg);
     int nowDownload = 0;
     int allDownload = 0;
     int toDownload = 0;

tool/apt-fast-conf/aptss-apt.conf

@@ -7,6 +7,8 @@ Dir::State::lists "/var/lib/aptss/lists/";
 APT::Get::Fix-Broken true;
 APT::Get::List-Cleanup="0";
 
+Acquire::GzipIndexes "false";
+
 #clear APT::Update::Post-Invoke-Success;
 
 #clear DPkg::Post-Invoke;

tool/apt-fast/ss-apt-fast

@@ -1,21 +1,25 @@
 #!/bin/bash
 #
-# apt-fast v1.9
+# apt-fast v1.10.0
 # Use this just like aptitude or apt-get for faster package downloading.
 #
 # Copyright: 2008-2012 Matt Parnell, http://www.mattparnell.com
-# Improvements, maintenance, revisions - 2012, 2017-2018 Dominique Lasserre
+# Improvements, maintenance, revisions - 2012, 2017-2019 Dominique Lasserre
 #
 # You may distribute this file under the terms of the GNU General
 # Public License as published by the Free Software Foundation; either
 # version 3 of the License, or (at your option) any later version.
 #
+
+shopt -s nullglob
 [ -n "$DEBUG" ] && set -xv
 
 # Print colored messages.
 # Usage: msg "message text" "message type" "optional: err"
 # Message types are 'normal', 'hint' or 'warning'. Warnings and messages with a
 # third argument are piped to stderr.
+
+THREADS=$(nproc 2>/dev/null || echo 4)
 msg(){
   msg_options=()
   case "$2" in
@@ -34,7 +38,7 @@ msg(){
 }
 
 # Search for known options and decide if root privileges are needed.
-root=1  # default value: we need root privileges
+root=$#
 option=
 for argument in "$@"; do
   case "$argument" in
@@ -52,7 +56,7 @@ for argument in "$@"; do
       option="source"
       root=0
       ;;
-    changelog|search|policy)
+    *)
       root=0
       ;;
   esac
@@ -70,7 +74,6 @@ TMP__APTMGR="${_APTMGR-${TMP_RANDOM}}"
 TMP_APTCACHE="${APTCACHE-${TMP_RANDOM}}"
 TMP_DLDIR="${DLDIR-${TMP_RANDOM}}"
 TMP_DLLIST="${DLLIST-${TMP_RANDOM}}"
-TMP_LISTDIR="${LISTDIR-${TMP_RANDOM}}"
 TMP__MAXNUM="${MAXNUM-${TMP_RANDOM}}"
 TMP__MAXCONPERSRV="${MAXCONPERSRV-${TMP_RANDOM}}"
 TMP__SPLITCON="${SPLITCON-${TMP_RANDOM}}"
@@ -78,6 +81,7 @@ TMP__MINSPLITSZ=${MINSPLITSZ-${TMP_RANDOM}}
 TMP__PIECEALGO=${PIECEALGO-${TMP_RANDOM}}
 TMP_aptfast_prefix="${aptfast_prefix-${TMP_RANDOM}}"
 TMP_APT_FAST_TIMEOUT="${APT_FAST_TIMEOUT-${TMP_RANDOM}}"
+TMP_APT_FAST_APT_AUTH="${APT_FAST_APT_AUTH-${TMP_RANDOM}}"
 TMP_VERBOSE_OUTPUT="${VERBOSE_OUTPUT-${TMP_RANDOM}}"
 TMP_ftp_proxy="${ftp_proxy-${TMP_RANDOM}}"
 TMP_http_proxy="${http_proxy-${TMP_RANDOM}}"
@@ -85,7 +89,7 @@ TMP_https_proxy="${https_proxy-${TMP_RANDOM}}"
 
 # Check for proper privileges.
 # Call explicitly with environment variables to get them into root conext.
-if [ "$root" = 1 ] && [ "$UID" != 0 ]; then
+if [ "$root" -ne 0 ] && [ "$UID" != 0 ]; then
   exec sudo DEBUG="$DEBUG" \
             LCK_FILE="$TMP_LCK_FILE" \
             DOWNLOADBEFORE="$TMP_DOWNLOADBEFORE" \
@@ -93,7 +97,6 @@ if [ "$root" = 1 ] && [ "$UID" != 0 ]; then
             APTCACHE="$TMP_APTCACHE" \
             DLDIR="$TMP_DLDIR" \
             DLLIST="$TMP_DLLIST" \
-            LISTDIR="$TMP_LISTDIR" \
             _MAXNUM="$TMP__MAXNUM" \
             _MAXCONPERSRV="$TMP__MAXCONPERSRV" \
             _SPLITCON="$TMP__SPLITCON" \
@@ -101,6 +104,7 @@ if [ "$root" = 1 ] && [ "$UID" != 0 ]; then
             _PIECEALGO="$TMP__PIECEALGO" \
             aptfast_prefix="$TMP_aptfast_prefix" \
             APT_FAST_TIMEOUT="$TMP_APT_FAST_TIMEOUT" \
+            APT_FAST_APT_AUTH="$TMP_APT_FAST_APT_AUTH" \
             VERBOSE_OUTPUT="$TMP_VERBOSE_OUTPUT" \
             ftp_proxy="$TMP_ftp_proxy" \
             http_proxy="$TMP_http_proxy" \
@@ -108,7 +112,6 @@ if [ "$root" = 1 ] && [ "$UID" != 0 ]; then
             "$0" "$@"
 fi
 
-
 # Define lockfile.
 # Use /tmp as directory because everybody (not only root) has to have write
 # permissions.
@@ -128,22 +131,34 @@ eval "$(apt-config shell APTCACHE Dir::Cache::archives/d)"
 # Check if APT config option Dir::Cache::archives::apt-fast-partial is set.
 eval "$(apt-config shell apt_fast_partial Dir::Cache::archives::apt-fast-partial/d)"
 if [ -z "$apt_fast_partial" ]; then
-  eval "$(apt-config -o Dir::Cache::archives::apt-fast-partial=apt-fast shell DLDIR Dir::Cache::archives::apt-fast-partial/d)"
+  DLDIR="$(realpath "${APTCACHE}/../apt-fast")"
 else
-  eval "$(apt-config shell DLDIR Dir::Cache::archives::apt-fast-partial/d)"
+  DLDIR="${apt_fast_partial}"
 fi
-# Currently not needed.
-eval "$(apt-config shell LISTDIR Dir::State::lists/d)"
+
+# Check for apt auth files
+eval "$(apt-config shell NETRC Dir::Etc::netrc/f)"
+eval "$(apt-config shell NETRCDIR Dir::Etc::netrcparts/d)"
+APTAUTHFILES=()
+if [ -f "$NETRC" ]; then
+    APTAUTHFILES=("$NETRC")
+fi
+APTAUTHFILES+=("$NETRCDIR"*)
+
 if [ "$IS_ACE_ENV" != "" ];then
 DLLIST="/tmp/apt-fast-in-container.list"
 else
 DLLIST="/tmp/apt-fast.list"
 fi
+
+
+
 _MAXNUM=5
 _MAXCONPERSRV=10
 _SPLITCON=8
 _MINSPLITSZ="1M"
 _PIECEALGO="default"
+MIRRORS=()
 
 # Prefix in front of apt-fast output:
 aptfast_prefix=
@@ -162,18 +177,30 @@ APT_FAST_TIMEOUT=60
 # Ask for download confirmation if unset
 DOWNLOADBEFORE=
 
+# Enable APT authentication support
+APT_FAST_APT_AUTH=1
+
 # Formatted package list in download confirmation if unset
 VERBOSE_OUTPUT=
 
 # Download command.
 _DOWNLOADER='aria2c --no-conf -c -j ${_MAXNUM} -x ${_MAXCONPERSRV} -s ${_SPLITCON} -i ${DLLIST} --min-split-size=${_MINSPLITSZ} --stream-piece-selector=${_PIECEALGO} --connect-timeout=60 --timeout=600 -m0'
 
-# Load config file.
-CONFFILE="/tmp/aptss-conf/apt-fast.conf"
-#### Spark Store apt-fast conf is in /tmp
-if [ -e "$CONFFILE" ]; then
-    source "$CONFFILE"
-fi
+# 定义默认的配置文件列表（按加载顺序排列）
+CONFIG_FILES=(
+    "/tmp/aptss-conf/apt-fast.conf"  # 原始配置文件位置
+    "/etc/aptss/apt-fast.conf"             # 系统级配置
+)
+
+
+# 按顺序加载所有配置文件
+for conf_file in "${CONFIG_FILES[@]}"; do
+    if [ -e "$conf_file" ]; then
+        source "$conf_file"
+    fi
+done
+
+
 
 # no proxy as default
 ftp_proxy=
@@ -188,7 +215,6 @@ https_proxy=
 [ "$TMP_APTCACHE" = "$TMP_RANDOM" ] || APTCACHE="$TMP_APTCACHE"
 [ "$TMP_DLDIR" = "$TMP_RANDOM" ] || DLDIR="$TMP_DLDIR"
 [ "$TMP_DLLIST" = "$TMP_RANDOM" ] || DLLIST="$TMP_DLLIST"
-[ "$TMP_LISTDIR" = "$TMP_RANDOM" ] || LISTDIR="$TMP_LISTDIR"
 [ "$TMP__MAXNUM" = "$TMP_RANDOM" ] || _MAXNUM="$TMP__MAXNUM"
 [ "$TMP__MAXCONPERSRV" = "$TMP_RANDOM" ] || _MAXCONPERSRV="$TMP__MAXCONPERSRV"
 [ "$TMP__SPLITCON" = "$TMP_RANDOM" ] || _SPLITCON="$TMP__SPLITCON"
@@ -196,6 +222,7 @@ https_proxy=
 [ "$TMP__PIECEALGO" = "$TMP_RANDOM" ] || _PIECEALGO="$TMP__PIECEALGO"
 [ "$TMP_aptfast_prefix" = "$TMP_RANDOM" ] || aptfast_prefix="$TMP_aptfast_prefix"
 [ "$TMP_APT_FAST_TIMEOUT" = "$TMP_RANDOM" ] || APT_FAST_TIMEOUT="$TMP_APT_FAST_TIMEOUT"
+[ "$TMP_APT_FAST_APT_AUTH" = "$TMP_RANDOM" ] || APT_FAST_APT_AUTH="$TMP_APT_FAST_APT_AUTH"
 [ "$TMP_VERBOSE_OUTPUT" = "$TMP_RANDOM" ] || VERBOSE_OUTPUT="$TMP_VERBOSE_OUTPUT"
 [ "$TMP_ftp_proxy" = "$TMP_RANDOM" ] || ftp_proxy="$TMP_ftp_proxy"
 [ "$TMP_http_proxy" = "$TMP_RANDOM" ] || http_proxy="$TMP_http_proxy"
@@ -231,17 +258,25 @@ _create_lock()
 {
     eval "exec $LCK_FD>\"$LCK_FILE.lock\""
 
-#    trap "cleanup_aptfast; exit_cleanup_state" EXIT
-#    This will hide the exit code
+    # 设置 trap 来清理资源
     trap "cleanup_aptfast" EXIT
     trap "cleanup_aptfast; exit 1" INT TERM
-	timer=0
-	until $(flock -xn $LCK_FD);do 
-	msg_already_running
-	sleep 1
-	let timer+=1
-	done
-	unset timer
+
+    timer=0
+    max_wait=180  # 最大等待时间为180秒（3分钟）
+
+    until $(flock -xn $LCK_FD); do
+        msg_already_running
+        sleep 1
+        let timer+=1
+
+        if [ $timer -ge $max_wait ]; then
+            echo "timeout"
+            exit 1
+        fi
+    done
+
+    unset timer
 }
 
 # unlock and remove the lock file
@@ -271,7 +306,8 @@ cleanup_dllist()
 
 cleanup_aptfast()
 {
-  [ "$CLEANUP_STATE" -eq 0 ] && CLEANUP_STATE=$?
+  local last_exit_code=$?
+  [ "$CLEANUP_STATE" -eq 0 ] && CLEANUP_STATE=$last_exit_code
   cleanup_dllist
   _remove_lock
 }
@@ -300,7 +336,7 @@ get_mirrors(){
     for mirror in "${mirrors[@]}"; do
       # Real expension.
       if [[ "$1" == "$mirror"* ]]; then
-        filepath=${1#${mirror}}
+        filepath="${1#"${mirror}"}"
         # Build list for aria download list.
         list="${mirrors[*]:1}"
         echo -e "${list// /${filepath}\\t}$filepath\n"
@@ -311,75 +347,132 @@ get_mirrors(){
   # No other mirrors found.
   echo "$1"
 }
+
 ##########SPARK ADJUST: END
+
+AUTH_INFO_PARSED=()
+# Parse apt authentication files.
+# Undefined behavior on whitespaces in host, username or password.
+prepare_auth(){
+  if [ "$APT_FAST_APT_AUTH" -eq 0 ]; then
+    return
+  fi
+  for auth_file in "${APTAUTHFILES[@]}"; do
+    # auth files have netrc syntax, possible multiline entries starting with "machine"
+    auth_info="$(tr '\n' ' ' < "$auth_file" | sed 's/\(\<machine\>\)/\n\1/g' | sed '1d')"
+    while IFS= read -r auth; do
+      machine="$(echo "$auth" | sed 's/.*\<machine\>[ \t]\+\([^ \t]\+\).*/\1/')"
+      login="$(echo "$auth" | sed 's/.*\<login\>[ \t]\+\([^ \t]\+\).*/\1/')"
+      password="$(echo "$auth" | sed 's/.*\<password\>[ \t]\+\([^ \t]\+\).*/\1/')"
+      # if machine does not have protocol, try https://
+      if ! [[ "$machine" =~ ^.*:// ]]; then
+        machine="https://$machine"
+      fi
+      if [ -z "$machine" ] || [ -z "$login" ] || [ -z "$password" ]; then
+        msg "Could not parse apt authentication (skipping): $auth ($auth_file)" "warning"
+        continue
+      fi
+      # use space separated string to convert back to array later
+      AUTH_INFO_PARSED+=("$machine $login $password")
+    done <<< "$auth_info"
+  done
+  if [ "${#AUTH_INFO_PARSED[@]}" -eq 0 ]; then
+    # acts like auth disabled when no auth info is provided to improve performance
+    APT_FAST_APT_AUTH=0
+  fi
+}
+
+# Gets URI as parameter and tries to add basic http credentials. Will fail on
+# credentials that contain characters that need URL-encoding.
+get_auth(){
+  for auth_info in "${AUTH_INFO_PARSED[@]}"; do
+    # convert to array, don't escape variable here
+    auth_info_arr=($auth_info)
+    machine="${auth_info_arr[0]}"
+    # takes first match
+    if [[ "$1" == "$machine"* ]]; then
+      login="${auth_info_arr[1]}"
+      password="${auth_info_arr[2]}"
+      uri="$(echo "$1" | sed "s|^\([^:]\+://\)|\1$login:$password@|")"
+      echo "$uri"
+      return
+    fi
+  done
+  echo "$1"
+}
+
 # Globals to save package name, version, size and overall size.
 DOWNLOAD_DISPLAY=
 DOWNLOAD_SIZE=0
 
+# 获取包的URI
 # Get the package URLs.
 get_uris(){
-
   if [ ! -d "$(dirname "$DLLIST")" ]
   then
     if ! mkdir -p -- "$(dirname "$DLLIST")"
     then
       msg "Could not create download file directory." "warning"
-      msg "无法创建下载文件夹" "warning"
-      exit 1
+      msg "无法创建下载目录" "warning"
+      CLEANUP_STATE=1
+      exit
     fi
   elif [ -f "$DLLIST" ]; then
     if ! rm -f -- "$DLLIST" 2>/dev/null && ! touch -- "$DLLIST" 2>/dev/null
     then
-      msg "Unable to write to download file. Try restarting with root permissions or run 'aptss clean' first." "warning"
+      msg "Unable to write to download file. Try restarting with root permissions or run 'apt-fast clean' first." "warning"
       msg "无法下载文件。尝试使用root权限，或者运行 'aptss clean'" "warning"
-      exit 1
+      CLEANUP_STATE=1
+      exit
     fi
   fi
 
   # Add header to overwrite file.
   echo "# apt-fast mirror list: $(date)" > "$DLLIST"
-  #NOTE: aptitude doesn't have this functionality, so we use apt-get to get
-  #      package URIs.
-#  case "$_APTMGR" in
-#    apt|apt-get) uri_mgr=$_APTMGR;;
-#    *) uri_mgr=apt-get;;
-#  esac
-  # NOTE:apt可能出现变动，不建议在脚本中使用，因此在此统一改用apt-get
-uri_mgr=apt-get
+  # NOTE: "aptitude" doesn't have this functionality
+  # so we use "${_APTMGR}" to get package URI's
+  case "$(basename "${_APTMGR}")" in
+    'apt'|'apt-get') uri_mgr="${_APTMGR}";;
+    *) uri_mgr='apt-get';;
+  esac
   uris_full="$("$uri_mgr" "${APT_SCRIPT_WARNING[@]}" -y --print-uris "$@")"
-  uris_full_ret="$?"
-  if [ "$uris_full_ret" -ne 0 ]
+  CLEANUP_STATE="$?"
+  if [ "$CLEANUP_STATE" -ne 0 ]
   then
-    msg "Package manager quit with exit code.Here is the log" "warning"
+    msg "Package manager quit with exit code. Here is the log" "warning"
     msg "包管理器以错误代码退出.日志如下" "warning"
     msg "${uris_full}"
-    exit "$uris_full_ret"
+    exit "$CLEANUP_STATE"
   fi
-  while read -r pkg_uri_info
-  do
-    [ -z "$pkg_uri_info" ] && continue
-    ## --print-uris format is:
-    # 'fileurl' filename filesize checksum_hint:filechecksum
-    uri="$(echo "$pkg_uri_info" | cut -d' ' -f1 | tr -d "'")"
-    filename="$(echo "$pkg_uri_info" | cut -d' ' -f2)"
-    filesize="$(echo "$pkg_uri_info" | cut -d' ' -f3)"
-    checksum_string="$(echo "$pkg_uri_info" | cut -d' ' -f4)"
-    hash_algo="$(echo "$checksum_string" | cut -d':' -f1)"
-    checksum="$(echo "$checksum_string" | cut -d':' -f2)"
+  prepare_auth
+  local tmpdir
+  tmpdir=$(mktemp -d) || {
+    msg "Failed to create tmp dir" "warning"
+    msg "无法创建临时目录" "warning"
+    exit 1
+  }
+  ## --print-uris format is:
+  # 'fileurl' filename filesize checksum_hint:filechecksum
+  # 修改：process_package函数增加第二个参数表示当前线程的临时输出文件
+  process_package() {
+    local pkg_uri_info="$1"
+    local thread_file="$2"
+    local display_line=""   # 初始化显示信息为空
+    IFS=' ' read -r uri filename filesize checksum_string _ <<<"$pkg_uri_info"
+    [ -z "$uri" ] && return
+    uri="${uri//"'"/}"
+    [ "$APT_FAST_APT_AUTH" -ne 0 ] && uri="$(get_auth "$uri")"
+    IFS=':' read -r hash_algo checksum _ <<<"$checksum_string"
 
-    filename_decoded="$(urldecode "$filename")"
-    DOWNLOAD_DISPLAY="${DOWNLOAD_DISPLAY}$(echo "$filename_decoded" | cut -d'_' -f1)"
-    DOWNLOAD_DISPLAY="${DOWNLOAD_DISPLAY} $(echo "$filename_decoded" | cut -d'_' -f2)"
-    DOWNLOAD_DISPLAY="${DOWNLOAD_DISPLAY} $(echo "$filesize" | numfmt --to=iec-i --suffix=B)\n"
-    DOWNLOAD_SIZE=$((DOWNLOAD_SIZE + filesize))
-
-    ## whole uri comes encoded (urlencoded). Filename must NOT be decoded because
-    # plain aptitude do not decode it when download and install it. Therefore, we
-    # will have ugly named packages at /var/cache/apt/archives but is the standard
-    # behavior.
-    # But package version must be decoded, otherways package=version calls will
-    # not work.
+    if [[ "$filename" == *%* ]]; then
+      # decode url string
+      filename_decoded="$(printf '%b' "${filename//%/\\x}")"
+    else
+      filename_decoded="$filename"
+    fi
+    IFS='_' read -r pkg_name_decoded pkg_version_decoded _ <<<"$filename_decoded"
     
+    display_line+="$pkg_name_decoded $pkg_version_decoded $filesize\n"
     if [ -n "$HASH_SUPPORTED" ]; then
       case "$hash_algo" in
         SHA512) [ -z "$SHA512_SUPPORTED" ] && hash_algo= || hash_algo=sha-512 ;;
@@ -389,40 +482,44 @@ uri_mgr=apt-get
         *) hash_algo=
       esac
 
-      # Using apt-cache show package=version to ensure recover single and
+
+       # Using apt-cache show package=version to ensure recover single and
       # correct package version.
       # Warning: assuming that package naming uses '_' as field separator.
-      # Therefore, this code expects package-name_version_arch.deb Otherways
+      # Therefore, this code expects package-name_version_arch.deb Otherwise
       # below code will fail resoundingly
       if [ -z "$hash_algo" ]; then
-        pkg_name="$(echo "$filename" | cut -d'_' -f1)"
-        pkg_version="$(echo "$filename" | cut -d'_' -f2)"
-        pkg_version="$(urldecode "$pkg_version")"
-        package_info="$(apt-cache show "$pkg_name=$pkg_version")"
+        IFS='_' read -r pkg_name _ <<<"$filename"
+        pkg_version="$pkg_version_decoded"
+        # Transform multi-line field output from apt-cache to single line and sort checksums, strongest first
+        package_info="$(apt-cache show "$pkg_name=$pkg_version" | sed ':r;$!{N;br};s/\n / /g' | sort -r)"
 
-        patch_checksum=
-        if [ -n "$SHA512_SUPPORTED" ]; then
-          patch_checksum="$(echo "$package_info" | grep SHA512 | head -n 1)"
-          [ -n "$patch_checksum" ] && hash_algo="sha-512"
-        fi
-        if [ -z "$patch_checksum" ] && [ -n "$SHA256_SUPPORTED" ]; then
-          patch_checksum="$(echo "$package_info" | grep SHA256 | head -n 1)"
-          [ -n "$patch_checksum" ] && hash_algo="sha-256"
-        fi
-        if [ -z "$patch_checksum" ] && [ -n "$SHA1_SUPPORTED" ]; then
-          patch_checksum="$(echo "$package_info" | grep SHA1 | head -n 1)"
-          [ -n "$patch_checksum" ] && hash_algo="sha-1"
-        fi
-        if [ -z "$patch_checksum" ] && [ -n "$MD5sum_SUPPORTED" ]; then
-          patch_checksum="$(echo "$package_info" | grep MD5sum | head -n 1)"
-          [ -n "$patch_checksum" ] && hash_algo="md5"
-        fi
+        while IFS=': ' read -r field checksum _
+        do
+          case "$field" in
+            SHA512)
+              [ -n "$SHA512_SUPPORTED" ] || continue
+              hash_algo="sha-512"
+              break ;;
+            SHA256)
+              [ -n "$SHA256_SUPPORTED" ] || continue
+              hash_algo="sha-256"
+              break ;;
+            SHA1)
+              [ -n "$SHA1_SUPPORTED" ] || continue
+              hash_algo="sha-1"
+              break ;;
+            MD5sum)
+              [ -n "$MD5sum_SUPPORTED" ] || continue
+              hash_algo="md5"
+              break ;;
+          esac
+        done <<<"$package_info"
 
-        if [ -n "$patch_checksum" ]; then
-          checksum="$(echo "$patch_checksum" | cut -d' ' -f2)"
-        else
+        if [ -z "$hash_algo" ]; then
+          checksum=
           msg "Couldn't get supported checksum for $pkg_name ($pkg_version)." "warning"
-	  msg "无法获得 $pkg_name ($pkg_version) 的受支持的散列验证值" "warning"
+          msg "无法获得 $pkg_name ($pkg_version) 版本受到支持的散列验证值" "warning"
           REMOVE_WORKING_MESSAGE=
         fi
       fi
@@ -430,21 +527,68 @@ uri_mgr=apt-get
       hash_algo=
     fi
 
+    # 原来利用文件锁写入，现在改为写入当前线程的临时文件
     {
       get_mirrors "$uri"
-      #echo " dir=$DLDIR"
-      if [ -n "$hash_algo" ]; then
-        echo " checksum=$hash_algo=$checksum"
-      fi
+      [ -n "$hash_algo" ] && echo " checksum=$hash_algo=$checksum"
       echo " out=$filename"
-    } >> "$DLLIST"
-  done <<<"$(echo "$uris_full" | grep -E "^'(http(s|)|(s|)ftp)://")"
+    } >> "$thread_file"
 
-  #cat "$DLLIST"
-  #LCK_RM
-  #exit
+    echo -e "$display_line" >> "$tmpdir/display"
+    echo "$filesize" >> "$tmpdir/sizes"
+  }
+
+  # 主并行处理逻辑
+  mapfile -t pkg_uri_list < <(echo "$uris_full" | grep -E "^'(http(s|)|(s|)ftp)://")
+  total_pkgs=${#pkg_uri_list[@]}
+  threads=${THREADS:-4}  # 默认4线程
+  per_thread=$(( (total_pkgs + threads - 1) / threads ))  # 向上取整
+
+  # 分配任务到不同线程，每个线程使用自己的临时文件
+  for ((i=0; i<threads; i++)); do
+    thread_file="${DLLIST}.thread.${i}"
+    > "$thread_file"  # 清空或创建临时文件
+    start=$((i * per_thread))
+    end=$((start + per_thread -1))
+    [ $end -ge $total_pkgs ] && end=$((total_pkgs -1))
+    
+    # 启动后台线程处理任务块
+    (
+      for ((j=start; j<=end; j++)); do
+        [ -z "${pkg_uri_list[j]}" ] && continue
+        process_package "${pkg_uri_list[j]}" "$thread_file"
+      done
+    ) &
+  done
+
+  # 等待所有后台任务完成
+  wait
+
+  # 合并所有线程的临时文件到最终的 $DLLIST 中（保留之前添加的 header）
+  for ((i=0; i<threads; i++)); do
+    thread_file="${DLLIST}.thread.${i}"
+    if [ -f "$thread_file" ]; then
+      cat "$thread_file" >> "$DLLIST"
+      rm -f "$thread_file"
+    fi
+  done
+
+  # 合并显示信息
+  if [ -f "$tmpdir/display" ]; then
+    DOWNLOAD_DISPLAY+="\n$(cat "$tmpdir/display")"
+  fi
+
+  # 计算总下载大小
+  if [ -f "$tmpdir/sizes" ]; then
+    DOWNLOAD_SIZE=$(awk '{sum+=$1} END{print sum}' "$tmpdir/sizes")
+  fi
+
+  # 清理临时目录
+  rm -rf "$tmpdir"
 }
 
+
+
 display_downloadfile(){
   if [ -n "$VERBOSE_OUTPUT" ]; then
     cat "$DLLIST"
@@ -452,18 +596,16 @@ display_downloadfile(){
     DISPLAY_SORT_OPTIONS=(-k 1,1)
     # Sort output after package download size (decreasing):
     #DISPLAY_SORT_OPTIONS=(-k 3,3 -hr)
-    while read -r line; do
-        [ -z "$line" ] && continue
-        pkg="$(echo "$line" | cut -d' ' -f1)"
-        ver="$(echo "$line" | cut -d' ' -f2)"
-        size="$(echo "$line" | cut -d' ' -f3)"
+    while IFS=' ' read -r pkg ver size _; do
+        [ -z "$pkg" ] && continue
         printf '%s%-40s %-20s %10s\n' "$aptfast_prefix" "$pkg" "$ver" "$size"
-    done <<<"$(echo -e "$DOWNLOAD_DISPLAY" | sort "${DISPLAY_SORT_OPTIONS[@]}")"
+    done <<<"$(echo -e "$DOWNLOAD_DISPLAY" | sort "${DISPLAY_SORT_OPTIONS[@]}" | numfmt --to=iec-i --suffix=B --field=3)"
   fi
   msg "Download size: $(echo "$DOWNLOAD_SIZE" | numfmt --to=iec-i --suffix=B)" "normal"
   msg "下载大小: $(echo "$DOWNLOAD_SIZE" | numfmt --to=iec-i --suffix=B)" "normal"
 }
 
+
 # Create and insert a PID number to lockfile.
 
 _create_lock
@@ -473,19 +615,21 @@ CMD="$(echo "$_DOWNLOADER" | sed 's/^\s*\([^ ]\+\).*$/\1/')"
 if [ ! "$(command -v "$CMD")" ]; then
   msg "Command not found: $CMD" "normal" "err"
   msg "You must configure $CONFFILE to use aria2c or another supported download manager" "normal" "err"
-  exit 1
+  CLEANUP_STATE=1
+  exit
 fi
 
 # Make sure package manager is available.
 if [ ! "$(command -v "$_APTMGR")" ]; then
   msg "\`$_APTMGR\` command not available." "warning"
   msg "You must configure $CONFFILE to use either apt-get or aptitude." "normal" "err"
-  exit 1
+  CLEANUP_STATE=1
+  exit
 fi
 
 # Disable script warning if apt is used.
 APT_SCRIPT_WARNING=()
-if [ "$_APTMGR" == "apt" ]; then
+if [ "$(basename "${_APTMGR}")" == 'apt' ]; then
     APT_SCRIPT_WARNING=(-o "Apt::Cmd::Disable-Script-Warning=true")
 fi
 
@@ -532,6 +676,8 @@ while true; do
       d)
         DOWNLOAD_ONLY=true
         ;;
+      *)
+        ;;
     esac
   done
   ((OPTIND++))
@@ -574,7 +720,7 @@ if [ "$option" == "install" ]; then
     msg "Do you want to download the packages? [Y/n] " "question"
 
     while ((!updsys)); do
-      read -r -sn1 -t "$APT_FAST_TIMEOUT" answer || { msg; msg "Timed out." "warning"; exit 1; }
+      read -r -sn1 -t "$APT_FAST_TIMEOUT" answer || { msg; msg "Timed out." "warning"; CLEANUP_STATE=1; exit; }
       case "$answer" in
         [JjYy])    result=1; updsys=1 ;;
         [Nn])      result=0; updsys=1 ;;
@@ -596,7 +742,7 @@ if [ "$option" == "install" ]; then
           mkdir -p -- "$DLDIR"
         fi
 
-        cd "$DLDIR" &>/dev/null || exit 1
+        cd "$DLDIR" &>/dev/null || { msg; msg "Not able to change into download directory." "warning"; CLEANUP_STATE=1; exit; }
 
         eval "${_DOWNLOADER}"  # execute downloadhelper command
         if [ "$(find "$DLDIR" -printf . | wc -c)" -gt 1 ]; then
@@ -616,22 +762,26 @@ if [ "$option" == "install" ]; then
         cd - &>/dev/null || msg "Failed to change back directory" "warning"
       fi
     else
-      exit 1
+      CLEANUP_STATE=1
+      exit
     fi
   else
     [ -t 1 ] && tput el
   fi
 
-  if [ -z "$DOWNLOAD_ONLY" ] || [ "$_APTMGR" == "aptitude" ]; then
+  # different problem resolving for aptitude
+  if [ -z "$DOWNLOAD_ONLY" ] || [ "$(basename "${_APTMGR}")" == 'aptitude' ]; then
     "${_APTMGR}" "${APT_SCRIPT_WARNING[@]}" "$@"
   fi
 
 
 elif [ "$option" == "clean" ]; then
   "${_APTMGR}" "${APT_SCRIPT_WARNING[@]}" "$@" && {
-    find "$DLDIR" -maxdepth 1 -type f -delete
-    CLEANUP_STATE="$?"
-    [ -f "$DLLIST" ] && rm -f -- "$DLLIST"* || true
+    if [ -d "$DLDIR" ]; then
+      find "$DLDIR" -maxdepth 1 -type f -delete
+      CLEANUP_STATE="$?"
+      [ -f "$DLLIST" ] && rm -f -- "$DLLIST"* || true
+    fi
   }
 
 elif [ "$option" == "download" ]; then
@@ -649,7 +799,8 @@ elif [ "$option" == "download" ]; then
     eval "${_DOWNLOADER}"
   fi
 
-  if [ "$_APTMGR" == "aptitude" ]; then
+  # different problem resolving for aptitude
+  if [ "$(basename "${_APTMGR}")" == 'aptitude' ]; then
     "${_APTMGR}" "$@"
   fi
 
@@ -685,3 +836,4 @@ else
 fi
 
 # After error or all done remove our lockfile (done with EXIT trap)
+

tool/aptss

@@ -3,10 +3,11 @@
 SPARK_DOWNLOAD_SERVER_URL="https://d.spark-app.store/"
 SPARK_DOWNLOAD_SERVER_URL_NO_PROTOCOL="d.spark-app.store"
 source /opt/durapps/spark-store/bin/bashimport/transhell.amber
+source /opt/durapps/spark-store/bin/bashimport/log.amber
 load_transhell
 
 case `arch` in
-   x86_64)
+   x86_64 | i686 | i386)
 	STORE_URL="store"
 	STORE_LIST_URL=""
 	;;
@@ -18,6 +19,10 @@ case `arch` in
    	STORE_URL="loong64-store"
    	STORE_LIST_URL="-loong64"
    	;;
+   riscv64)
+   	STORE_URL="riscv64-store"
+   	STORE_LIST_URL="-riscv64"
+   	;;
 esac
 SS_APT_FAST="/opt/durapps/spark-store/bin/apt-fast/ss-apt-fast"
 
@@ -26,7 +31,17 @@ is_empty_dir(){
     return `ls -A $1|wc -w`
 }
 
+function update_list(){
+curl --progress-bar -o  /opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list "${SPARK_DOWNLOAD_SERVER_URL}/sparkstore${STORE_LIST_URL}.list"
+log.info "sparkstore${STORE_LIST_URL}.list update done"  
+}
 
+function update_conf(){
+mkdir -p /tmp/aptss-conf/
+curl  --progress-bar -o  /tmp/aptss-conf/apt-fast.conf "${SPARK_DOWNLOAD_SERVER_URL}/apt-fast.conf"
+log.info "apt-fast.conf update done"
+chmod -R 755 /tmp/aptss-conf  
+}
 
 if [ "$(id -u)" != "0" ];then
 #############################无root权限时
@@ -46,8 +61,7 @@ if [ ! -e "/tmp/aptss-conf/apt-fast.conf" ];then
 mkdir -p /tmp/aptss-conf/
 echo -e "\e[1;32m${TRANSHELL_CONTENT_GETTING_SERVER_CONFIG_AND_MIRROR_LIST}\e[0m"
 echo
-curl --progress-bar -o /tmp/aptss-conf/apt-fast.conf "${SPARK_DOWNLOAD_SERVER_URL}/apt-fast.conf"
-chmod -R 755 /tmp/aptss-conf
+update_conf
 
 fi
 
@@ -57,11 +71,9 @@ if [ ! -e "/var/lib/aptss/lists/${SPARK_DOWNLOAD_SERVER_URL_NO_PROTOCOL}_${STORE
 mkdir -p /tmp/aptss-conf/
 echo -e "\e[1;32m${TRANSHELL_CONTENT_GETTING_SERVER_CONFIG_AND_MIRROR_LIST}\e[0m"
 echo
-curl  --silent -o  /tmp/aptss-conf/apt-fast.conf "${SPARK_DOWNLOAD_SERVER_URL}/apt-fast.conf"
-chmod -R 755 /tmp/aptss-conf    
 
-curl --silent -o  /opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list "${SPARK_DOWNLOAD_SERVER_URL}/sparkstore${STORE_LIST_URL}.list"
-/usr/bin/apt update -c /opt/durapps/spark-store/bin/apt-fast-conf/aptss-apt.conf
+update_list
+update_conf 
 
 #只更新星火源
 
@@ -93,11 +105,10 @@ elif [ "$1" = "ssupdate" ];then
 mkdir -p /tmp/aptss-conf/
 echo -e "\e[1;32m${TRANSHELL_CONTENT_GETTING_SERVER_CONFIG_AND_MIRROR_LIST}\e[0m"
 echo
-curl  --silent -o  /tmp/aptss-conf/apt-fast.conf "${SPARK_DOWNLOAD_SERVER_URL}/apt-fast.conf"
-chmod -R 755 /tmp/aptss-conf    
  
-curl --silent -o  /opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list "${SPARK_DOWNLOAD_SERVER_URL}/sparkstore${STORE_LIST_URL}.list"
 
+update_list
+update_conf
  
 /usr/bin/apt update -c /opt/durapps/spark-store/bin/apt-fast-conf/aptss-apt.conf -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0" -o Dir::Etc::sourcelist="/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list"
 
@@ -107,10 +118,8 @@ elif [ "$1" = "update" ];then
 
 echo -e "\e[1;32m${TRANSHELL_CONTENT_GETTING_SERVER_CONFIG_AND_MIRROR_LIST}\e[0m"
 echo
-curl --progress-bar -o /opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list "${SPARK_DOWNLOAD_SERVER_URL}/sparkstore${STORE_LIST_URL}.list"
-mkdir -p /tmp/aptss-conf/
-curl --progress-bar -o /tmp/aptss-conf/apt-fast.conf "${SPARK_DOWNLOAD_SERVER_URL}/apt-fast.conf"
-chmod -R 755 /tmp/aptss-conf    
+update_list
+update_conf
 ### 额外一份拿来给aptss自动补全用
 
                 ${SS_APT_FAST} "$@" -c /opt/durapps/spark-store/bin/apt-fast-conf/aptss-apt.conf