diff --git a/CHANGELOG.md b/CHANGELOG.md index c2162bc..38a6aa3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1 +1,5 @@ -## 变更记录 \ No newline at end of file +## 变更记录 +- 2024-08-02 +1. 修复桌面更换背景文字颜色问题 +2. 修复安装插件没有配置binPath的问题 +3. 新增linux环境下获取安装命令的方法 \ No newline at end of file diff --git a/README.en.md b/README.en.md index 10fc11a..25d092e 100644 --- a/README.en.md +++ b/README.en.md @@ -13,31 +13,34 @@ English | [简体中文](README.md) [FAQ](./docs/Faq.md) | [API](./docs/Api.md) | [AppStore](./docs/Store.en.md) -### Install + -[![Windows][Windows-image]][Windows-url] -[![MacOS][MacOS-image]][MacOS-url] -[![Linux][Linux-image]][Linux-url] +### 👇 Download and Install -[license-image]: ./docs/img/license_%20MIT.svg +1. ![Download for MacOS][Windows-image] **Windows User**: + +- Windows (AMD64) [**gitee Download**](https://gitee.com/ruitao_admin/godoos/releases/download/v1.0.0/godoos-amd64-installer.exe) | [**github Download**](https://github.com/phpk/godoos/releases/download/v1.0.0/godoos-amd64-installer.exe) -[license-url]: https://spdx.org/licenses/MIT.html +- Windows (ARM64) [**gitee Download**](https://gitee.com/ruitao_admin/godoos/releases/download/v1.0.0/godoos-arm64-installer.exe) | [**github Download**](https://github.com/phpk/godoos/releases/download/v1.0.0/godoos-arm64-installer.exe) -[Windows-image]: ./docs/img/Windows.svg +2. ![Download for MacOS][MacOS-image] **MacOS User**: -[Windows-url]: https://gitee.com/ruitao_admin/godoos/releases/download/v1.0.0/godoos-windows.exe +- MacOS (AMD64) [**gitee Download**](https://gitee.com/ruitao_admin/godoos/releases/download/v1.0.0/godoos-macos-amd64.zip) | [**github Download**](https://github.com/phpk/godoos/releases/download/v1.0.0/godoos-macos-amd64.zip) -[MacOS-image]: ./docs/img/MacOS.svg - -[MacOS-url]: https://gitee.com/ruitao_admin/godoos/releases/download/v1.0.0/godoos-macos-amd64.zip +- MacOS (ARM64) [**gitee Download**](https://gitee.com/ruitao_admin/godoos/releases/download/v1.0.0/godoos-macos-arm64.zip) | [**github Download**](https://github.com/phpk/godoos/releases/download/v1.0.0/godoos-macos-arm64.zip) -[Linux-image]: ./docs/img/Linux.svg +3. ![Download for Linux][Linux-image] **Linux User**: -[Linux-url]: https://gitee.com/ruitao_admin/godoos/releases/download/v1.0.0/godoos-linux-amd64.zip +- Linux (AMD64) [**gitee Download**](https://gitee.com/ruitao_admin/godoos/releases/download/v1.0.0/godoos-linux-amd64.zip) | [**github Download**](https://github.com/phpk/godoos/releases/download/v1.0.0/godoos-macos-arm64.zip) - + +[Windows-image]: ./docs/img/Windows.svg +[MacOS-image]: ./docs/img/MacOS.svg +[Linux-image]: ./docs/img/Linux.svg +[license-image]: ./docs/img/license_%20MIT.svg +[license-url]: https://spdx.org/licenses/MIT.html ## Highlights - ***No need for internet connection, fully open source*** diff --git a/README.md b/README.md index 38448ef..d5639dc 100644 --- a/README.md +++ b/README.md @@ -13,32 +13,35 @@ [FAQ](./docs/Faq.md) | [API](./docs/Api.md) | [应用开发](./docs/Store.md) + -### 📚 安装 +### 👇 下载安装 -[![Windows][Windows-image]][Windows-url] -[![MacOS][MacOS-image]][MacOS-url] -[![Linux][Linux-image]][Linux-url] +1. ![Download for MacOS][Windows-image] **Windows 用户**: + +- Windows (AMD64) [**国内下载**](https://gitee.com/ruitao_admin/godoos/releases/download/v1.0.0/godoos-amd64-installer.exe) | [**github下载**](https://github.com/phpk/godoos/releases/download/v1.0.0/godoos-amd64-installer.exe) -[license-image]: ./docs/img/license_%20MIT.svg +- Windows (ARM64) [**国内下载**](https://gitee.com/ruitao_admin/godoos/releases/download/v1.0.0/godoos-arm64-installer.exe) | [**github下载**](https://github.com/phpk/godoos/releases/download/v1.0.0/godoos-arm64-installer.exe) -[license-url]: https://spdx.org/licenses/MIT.html +2. ![Download for MacOS][MacOS-image] **MacOS 用户**: -[Windows-image]: ./docs/img/Windows.svg +- MacOS (AMD64) [**国内下载**](https://gitee.com/ruitao_admin/godoos/releases/download/v1.0.0/godoos-macos-amd64.zip) | [**github下载**](https://github.com/phpk/godoos/releases/download/v1.0.0/godoos-macos-amd64.zip) -[Windows-url]: https://gitee.com/ruitao_admin/godoos/releases/download/v1.0.0/godoos-amd64-installer.exe +- MacOS (ARM64) [**国内下载**](https://gitee.com/ruitao_admin/godoos/releases/download/v1.0.0/godoos-macos-arm64.zip) | [**github下载**](https://github.com/phpk/godoos/releases/download/v1.0.0/godoos-macos-arm64.zip) -[MacOS-image]: ./docs/img/MacOS.svg - -[MacOS-url]: https://gitee.com/ruitao_admin/godoos/releases/download/v1.0.0/godoos-macos-amd64.zip +3. ![Download for Linux][Linux-image] **Linux 用户**: -[Linux-image]: ./docs/img/Linux.svg +- Linux (AMD64) [**国内下载**](https://gitee.com/ruitao_admin/godoos/releases/download/v1.0.0/godoos-linux-amd64.zip) | [**github下载**](https://github.com/phpk/godoos/releases/download/v1.0.0/godoos-macos-arm64.zip) -[Linux-url]: https://gitee.com/ruitao_admin/godoos/releases/download/v1.0.0/godoos-linux-amd64.zip - + +[Windows-image]: ./docs/img/Windows.svg +[MacOS-image]: ./docs/img/MacOS.svg +[Linux-image]: ./docs/img/Linux.svg +[license-image]: ./docs/img/license_%20MIT.svg +[license-url]: https://spdx.org/licenses/MIT.html ## 💝 亮点 - ***无需联网使用,全开源*** @@ -50,6 +53,10 @@ - ***支持多平台,Windows、Linux、MacOS*** - ***完善的应用商店体系,简单学习一下[应用商店配置](./docs/Store.md)即可开发出复杂的应用*** +## 💖 开源地址 +- [Gitee](https://gitee.com/ruitao_admin/godoos) +- [Github](https://github.com/phpk/godoos) + ## 🚀 演示视频 - [全程操作](https://www.bilibili.com/video/BV1NdvaeEEz3/?vd_source=739e0e59aeefdb2e9f760e5037d00245) diff --git a/build.linux.sh b/build.linux.sh old mode 100644 new mode 100755 index a864dae..1b64392 --- a/build.linux.sh +++ b/build.linux.sh @@ -1,4 +1,25 @@ -wails build -platform linux/amd64 -s -o godoos-linux-amd64 -wails build -platform linux/arm64 -s -o godoos-linux-arm64 -wails build -platform darwin/amd64 -s -o godoos-darwin-amd64 -wails build -platform darwin/arm64 -s -o godoos-darwin-arm64 \ No newline at end of file +#!/bin/bash + +# 定义一个函数来执行压缩操作 +compress_to_zip() { + local target_file="./build/bin/godoos$2" + local zip_name="./build/bin/$1.zip" + + # 检查ZIP文件是否已经存在,如果存在则跳过压缩 + if [ ! -f "$zip_name" ]; then + echo "Compressing $target_file to $zip_name" + zip -j "$zip_name" "$target_file" + else + echo "$zip_name already exists. Skipping compression." + fi +} + +# 构建和压缩 +wails build -platform linux/amd64 -s +compress_to_zip "godoos-linux-amd64" "" +wails build -platform linux/arm64 -s +compress_to_zip "godoos-linux-arm64" "" +wails build -platform darwin/amd64 -s +compress_to_zip "godoos-darwin-amd64" ".app" +wails build -platform darwin/arm64 -s +compress_to_zip "godoos-darwin-arm64" ".app" \ No newline at end of file diff --git a/docs/Store.md b/docs/Store.md index 0b128b0..fad114e 100644 --- a/docs/Store.md +++ b/docs/Store.md @@ -220,7 +220,7 @@ const comp = await fetch('http://localhost:56780/store/setting', { 2. `static`目录下的在执行install时文件会自动复制到`.godoos/static/`应用目录下 3. `store.json`如果设置了`icon`,并且`static`目录下存在该文件,则应用图标为该文件。否则为`install.json`中的icon -### 内置应用说明 +### `commands`内置函数说明 - 系统封装了一些用于处理进程控制和文件操作的功能函数,以下是各函数的详细描述: 1. `start` 启动应用 2. `stop` 停止应用 @@ -235,6 +235,8 @@ const comp = await fetch('http://localhost:56780/store/setting', { 11. `startApp` 启动其他应用,content为应用名 12. `stopApp` 停止其他应用,content为应用名 +- 保留命令`uninstall`,如果设置了`uninstall`,系统在卸载的时候将会执行它 + ### 进阶操作 1. 下载[mysql8.0](https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-8.0.39-winx64.zip) 2. 参考demo下的mysql8.0目录,尝试自己制作安装包 diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 6b9b1b9..4844e0d 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -1262,17 +1262,6 @@ "integrity": "sha512-uJcB/FKZtBMCJpK8MQji6bJHgu1tixKPxRLeGkNzBoOZzpnZUJm0jm2/sBDWcuBx1dYgxV4JU+g5hmNxCyAmdA==", "dev": true }, - "node_modules/core-js": { - "version": "3.37.1", - "resolved": "https://registry.npmmirror.com/core-js/-/core-js-3.37.1.tgz", - "integrity": "sha512-Xn6qmxrQZyB0FFY8E3bgRXei3lWDJHhvI+u0q9TKIYM49G8pAr0FgnnrFRAmsbptZL1yxRADVXn+x5AGsbBfyw==", - "hasInstallScript": true, - "peer": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/core-js" - } - }, "node_modules/core-util-is": { "version": "1.0.3", "resolved": "https://registry.npmmirror.com/core-util-is/-/core-util-is-1.0.3.tgz", @@ -2191,7 +2180,7 @@ "version": "5.5.4", "resolved": "https://registry.npmmirror.com/typescript/-/typescript-5.5.4.tgz", "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==", - "devOptional": true, + "dev": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" diff --git a/frontend/public/image/bg/bg6.jpg b/frontend/public/image/bg/bg6.jpg index 6816c10..b61b9a3 100644 Binary files a/frontend/public/image/bg/bg6.jpg and b/frontend/public/image/bg/bg6.jpg differ diff --git a/frontend/public/image/bg/bg7.jpg b/frontend/public/image/bg/bg7.jpg new file mode 100644 index 0000000..a6a813e Binary files /dev/null and b/frontend/public/image/bg/bg7.jpg differ diff --git a/frontend/public/image/bg/bg8.jpg b/frontend/public/image/bg/bg8.jpg new file mode 100644 index 0000000..fae1a53 Binary files /dev/null and b/frontend/public/image/bg/bg8.jpg differ diff --git a/frontend/public/image/bg/bg9.jpg b/frontend/public/image/bg/bg9.jpg new file mode 100644 index 0000000..7687cee Binary files /dev/null and b/frontend/public/image/bg/bg9.jpg differ diff --git a/frontend/src/components/desktop/DeskItem.vue b/frontend/src/components/desktop/DeskItem.vue index 7a2b6cb..89fb922 100644 --- a/frontend/src/components/desktop/DeskItem.vue +++ b/frontend/src/components/desktop/DeskItem.vue @@ -1,15 +1,19 @@ - diff --git a/frontend/src/components/setting/SetCustom.vue b/frontend/src/components/setting/SetCustom.vue index e68ec9b..2ee4e94 100644 --- a/frontend/src/components/setting/SetCustom.vue +++ b/frontend/src/components/setting/SetCustom.vue @@ -29,7 +29,7 @@ - -
- - - {{ t("confirm") }} - -