From 45ecf1f54931619ea10ebb0964943301ddaa75e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= Date: Sat, 1 Mar 2025 22:33:38 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=E5=8F=8A=E5=BC=80=E6=94=BEHelper=E5=B7=A5=E5=85=B7=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin/think-plugs-account/readme.md | 2 +- plugin/think-plugs-admin/license | 2 +- plugin/think-plugs-admin/readme.md | 2 +- plugin/think-plugs-center/readme.md | 2 +- .../.github/workflows/release.yml | 75 +++++++++++++++++++ plugin/think-plugs-helper/composer.json | 1 + plugin/think-plugs-helper/license | 26 +++++++ plugin/think-plugs-helper/readme.md | 47 ++++++++++++ plugin/think-plugs-payment/readme.md | 2 +- plugin/think-plugs-static/readme.md | 2 +- plugin/think-plugs-wechat-service/readme.md | 2 +- plugin/think-plugs-wechat/readme.md | 2 +- plugin/think-plugs-wemall/readme.md | 2 +- plugin/think-plugs-worker/readme.md | 2 +- plugin/think-plugs-wuma/readme.md | 2 +- 15 files changed, 160 insertions(+), 11 deletions(-) create mode 100644 plugin/think-plugs-helper/.github/workflows/release.yml create mode 100644 plugin/think-plugs-helper/license create mode 100644 plugin/think-plugs-helper/readme.md diff --git a/plugin/think-plugs-account/readme.md b/plugin/think-plugs-account/readme.md index a14128598..82359b44b 100644 --- a/plugin/think-plugs-account/readme.md +++ b/plugin/think-plugs-account/readme.md @@ -171,4 +171,4 @@ var_dump($types); 未获得此插件授权时仅供参考学习不可商用，了解商用授权请阅读 [《会员授权》](https://thinkadmin.top/vip-introduce)。 -版权所有 Copyright © 2014-2024 by ThinkAdmin (https://thinkadmin.top) All rights reserved。 \ No newline at end of file +版权所有 Copyright © 2014-2025 by ThinkAdmin (https://thinkadmin.top) All rights reserved。 \ No newline at end of file diff --git a/plugin/think-plugs-admin/license b/plugin/think-plugs-admin/license index bd510dd5b..b09b6bae7 100644 --- a/plugin/think-plugs-admin/license +++ b/plugin/think-plugs-admin/license @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2014-2024 Anyon +Copyright (c) 2014-2025 Anyon Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/plugin/think-plugs-admin/readme.md b/plugin/think-plugs-admin/readme.md index ca7986aad..b9fd6180c 100644 --- a/plugin/think-plugs-admin/readme.md +++ b/plugin/think-plugs-admin/readme.md @@ -76,4 +76,4 @@ composer remove zoujingli/think-plugs-admin 本项目包含的第三方源码和二进制文件的版权信息将另行标注，请在对应文件查看。 -版权所有 Copyright © 2014-2024 by ThinkAdmin (https://thinkadmin.top) All rights reserved。 +版权所有 Copyright © 2014-2025 by ThinkAdmin (https://thinkadmin.top) All rights reserved。 diff --git a/plugin/think-plugs-center/readme.md b/plugin/think-plugs-center/readme.md index c4739b7f1..72d3fa3df 100644 --- a/plugin/think-plugs-center/readme.md +++ b/plugin/think-plugs-center/readme.md @@ -48,6 +48,6 @@ composer remove zoujingli/think-plugs-center 本项目包含的第三方源码和二进制文件之版权信息另行标注。 -版权所有 Copyright © 2014-2024 by ThinkAdmin (https://thinkadmin.top) All rights reserved。 +版权所有 Copyright © 2014-2025 by ThinkAdmin (https://thinkadmin.top) All rights reserved。 更多细节参阅 [LICENSE.txt](license) diff --git a/plugin/think-plugs-helper/.github/workflows/release.yml b/plugin/think-plugs-helper/.github/workflows/release.yml new file mode 100644 index 000000000..39d622da8 --- /dev/null +++ b/plugin/think-plugs-helper/.github/workflows/release.yml @@ -0,0 +1,75 @@ +####### 可解析的提交前缀 ######## +# ci: 持续集成 +# fix: 修改 +# feat: 新增 +# refactor: 重构 +# docs: 文档 +# style: 样式 +# chore: 其他 +# build: 构建 +# pref: 优化 +# test: 测试 +############################### + +on: + push: + tags: + - 'v*' # 仅匹配 v* 版本标签，如 v1.0、v20.15.10 + +name: Create Release +permissions: write-all + +jobs: + release: + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Setup Node.js + uses: actions/setup-node@v4 + with: + node-version: 18 + + - name: Install dependencies + run: npm install -g gen-git-log + + - name: Find Last Tag + id: last_tag + run: | + # 获取所有标签，按版本号降序排序 + all_tags=$(git tag --list --sort=-version:refname) + + # 获取最新的标签 + LATEST_TAG=$(echo "$all_tags" | head -n 1) + + # 获取倒数第二个标签（如果有） + SECOND_LATEST_TAG=$(echo "$all_tags" | sed -n '2p') + + # 如果没有任何标签，默认 v1.0.0 + LATEST_TAG=${LATEST_TAG:-v1.0.0} + SECOND_LATEST_TAG=${SECOND_LATEST_TAG:-v1.0.0} + + # 设置环境变量 + echo "LATEST_TAG=$LATEST_TAG" >> $GITHUB_ENV + echo "SECOND_LATEST_TAG=$SECOND_LATEST_TAG" >> $GITHUB_ENV + + - name: Generate Release Notes + run: | + rm -rf log + mkdir -p log + git-log -m tag -f -S $SECOND_LATEST_TAG -v ${LATEST_TAG#v} + + - name: Create Release + id: create_release + uses: actions/create-release@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + tag_name: ${{ env.LATEST_TAG }} + release_name: Release ${{ env.LATEST_TAG }} + body_path: log/${{ env.LATEST_TAG }}.md + draft: false + prerelease: false \ No newline at end of file diff --git a/plugin/think-plugs-helper/composer.json b/plugin/think-plugs-helper/composer.json index e70bcb1d9..8f21740c0 100644 --- a/plugin/think-plugs-helper/composer.json +++ b/plugin/think-plugs-helper/composer.json @@ -1,6 +1,7 @@ { "type": "library", "name": "zoujingli/think-plugs-helper", + "license": "Apache-2.0", "homepage": "https://thinkadmin.top", "description": "Developer Tools for ThinkAdmin", "authors": [ diff --git a/plugin/think-plugs-helper/license b/plugin/think-plugs-helper/license new file mode 100644 index 000000000..375e45700 --- /dev/null +++ b/plugin/think-plugs-helper/license @@ -0,0 +1,26 @@ +ThinkPlugsCenter 遵循 Apache2 开源协议发布，并提供免费使用。 + +版权所有 Copyright © 2022-2024 by ThinkAdmin (https://thinkadmin.top) All rights reserved。 + +Apache Licence 是著名的非盈利开源组织 Apache 采用的协议。该协议和 BSD 类似， +鼓励代码共享和尊重原作者的著作权，允许代码修改，再作为开源或商业软件发布。需要满足的条件： +1． 需要给代码的用户一份 Apache Licence ； +2． 如果你修改了代码，需要在被修改的文件中说明； +3． 在延伸的代码中（修改和有源代码衍生的代码中）需要带有原来代码中的协议， + 商标，专利声明和其他原来作者规定需要包含的说明； +4． 如果再发布的产品中包含一个 Notice 文件，则在 Notice 文件中需要带有本协议内容。 + 你可以在 Notice 中增加自己的许可，但不可以表现为对 Apache Licence 构成更改。 +具体的协议参考：http://www.apache.org/licenses/LICENSE-2.0 + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. diff --git a/plugin/think-plugs-helper/readme.md b/plugin/think-plugs-helper/readme.md new file mode 100644 index 000000000..bef59972d --- /dev/null +++ b/plugin/think-plugs-helper/readme.md @@ -0,0 +1,47 @@ +# ThinkPlugsHelper for ThinkAdmin + +[![Latest Stable Version](https://poser.pugx.org/zoujingli/think-plugs-helper/v/stable)](https://packagist.org/packages/zoujingli/think-plugs-helper) +[![Total Downloads](https://poser.pugx.org/zoujingli/think-plugs-helper/downloads)](https://packagist.org/packages/zoujingli/think-plugs-helper) +[![Monthly Downloads](https://poser.pugx.org/zoujingli/think-plugs-helper/d/monthly)](https://packagist.org/packages/zoujingli/think-plugs-helper) +[![Daily Downloads](https://poser.pugx.org/zoujingli/think-plugs-helper/d/daily)](https://packagist.org/packages/zoujingli/think-plugs-helper) +[![PHP Version](https://thinkadmin.top/static/icon/php-7.1.svg)](https://thinkadmin.top) +[![License](https://thinkadmin.top/static/icon/license-apache2.svg)](https://www.apache.org/licenses/LICENSE-2.0) + +*ThinkPlugsHelper** 是为便捷 ThinkAdmin 开发而给的工具包。 + +### 加入我们 + +我们的代码仓库已移至 **Github**，而 **Gitee** 则仅作为国内镜像仓库，方便广大开发者获取和使用。若想提交 **PR** 或 **ISSUE** 请在 [ThinkAdminDeveloper](https://github.com/zoujingli/ThinkAdminDeveloper) 仓库进行操作，如果在其他仓库操作或提交问题将无法处理！。 + +### 安装插件 + +```shell +### 安装前建议尝试更新所有组件 +composer update --optimize-autoloader + +### 安装稳定版本 ( 插件仅支持在 ThinkAdmin v6.1 中使用 ) +composer require zoujingli/think-plugs-helper --optimize-autoloader --dev + +### 安装测试版本（ 插件仅支持在 ThinkAdmin v6.1 中使用 ） +composer require zoujingli/think-plugs-helper dev-master --optimize-autoloader --dev +``` + +### 卸载插件 + +```shell +composer remove zoujingli/think-plugs-helper +``` + +### 插件数据 + +该插件未使用独立数据表； + +### 版权说明 + +**ThinkPlugsHelper** 遵循 **Apache2** 开源协议发布，并提供免费使用。 + +本项目包含的第三方源码和二进制文件之版权信息另行标注。 + +版权所有 Copyright © 2014-2025 by ThinkAdmin (https://thinkadmin.top) All rights reserved。 + +更多细节参阅 [LICENSE.txt](license) diff --git a/plugin/think-plugs-payment/readme.md b/plugin/think-plugs-payment/readme.md index adc440dea..03548b2f2 100644 --- a/plugin/think-plugs-payment/readme.md +++ b/plugin/think-plugs-payment/readme.md @@ -75,4 +75,4 @@ composer remove zoujingli/think-plugs-payment 未获得此插件授权时仅供参考学习不可商用，了解商用授权请阅读 [《会员授权》](https://thinkadmin.top/vip-introduce)。 -版权所有 Copyright © 2014-2024 by ThinkAdmin (https://thinkadmin.top) All rights reserved。 \ No newline at end of file +版权所有 Copyright © 2014-2025 by ThinkAdmin (https://thinkadmin.top) All rights reserved。 \ No newline at end of file diff --git a/plugin/think-plugs-static/readme.md b/plugin/think-plugs-static/readme.md index 6f0233390..718704705 100644 --- a/plugin/think-plugs-static/readme.md +++ b/plugin/think-plugs-static/readme.md @@ -43,4 +43,4 @@ composer remove zoujingli/think-plugs-static 本项目包含的第三方源码和二进制文件的版权信息将另行标注，请在对应文件查看。 -版权所有 Copyright © 2014-2024 by ThinkAdmin (https://thinkadmin.top) All rights reserved。 \ No newline at end of file +版权所有 Copyright © 2014-2025 by ThinkAdmin (https://thinkadmin.top) All rights reserved。 \ No newline at end of file diff --git a/plugin/think-plugs-wechat-service/readme.md b/plugin/think-plugs-wechat-service/readme.md index 3872b024b..f64cdb0af 100644 --- a/plugin/think-plugs-wechat-service/readme.md +++ b/plugin/think-plugs-wechat-service/readme.md @@ -83,4 +83,4 @@ var_dump($userInfo); 未获得此插件授权时仅供参考学习不可商用，了解商用授权请阅读 [《会员授权》](https://thinkadmin.top/vip-introduce)。 -版权所有 Copyright © 2014-2024 by ThinkAdmin (https://thinkadmin.top) All rights reserved。 \ No newline at end of file +版权所有 Copyright © 2014-2025 by ThinkAdmin (https://thinkadmin.top) All rights reserved。 \ No newline at end of file diff --git a/plugin/think-plugs-wechat/readme.md b/plugin/think-plugs-wechat/readme.md index 5b3bae2f6..745ce86af 100644 --- a/plugin/think-plugs-wechat/readme.md +++ b/plugin/think-plugs-wechat/readme.md @@ -75,4 +75,4 @@ composer remove zoujingli/think-plugs-wechat 本项目包含的第三方源码和二进制文件的版权信息将另行标注，请在对应文件查看。 -版权所有 Copyright © 2014-2024 by ThinkAdmin (https://thinkadmin.top) All rights reserved。 +版权所有 Copyright © 2014-2025 by ThinkAdmin (https://thinkadmin.top) All rights reserved。 diff --git a/plugin/think-plugs-wemall/readme.md b/plugin/think-plugs-wemall/readme.md index 0e5ba6036..2348c30da 100644 --- a/plugin/think-plugs-wemall/readme.md +++ b/plugin/think-plugs-wemall/readme.md @@ -57,4 +57,4 @@ composer remove zoujingli/think-plugs-wemall 未获得此插件授权时仅供参考学习不可商用，了解商用授权请阅读 [《会员授权》](https://thinkadmin.top/vip-introduce)。 -版权所有 Copyright © 2014-2024 by ThinkAdmin (https://thinkadmin.top) All rights reserved。 \ No newline at end of file +版权所有 Copyright © 2014-2025 by ThinkAdmin (https://thinkadmin.top) All rights reserved。 \ No newline at end of file diff --git a/plugin/think-plugs-worker/readme.md b/plugin/think-plugs-worker/readme.md index fffbf5d82..dcc70f6c6 100644 --- a/plugin/think-plugs-worker/readme.md +++ b/plugin/think-plugs-worker/readme.md @@ -320,6 +320,6 @@ location ^~ / { 本项目包含的第三方源码和二进制文件之版权信息另行标注。 -版权所有 Copyright © 2014-2024 by ThinkAdmin (https://thinkadmin.top) All rights reserved。 +版权所有 Copyright © 2014-2025 by ThinkAdmin (https://thinkadmin.top) All rights reserved。 更多细节参阅 [LICENSE.txt](license) diff --git a/plugin/think-plugs-wuma/readme.md b/plugin/think-plugs-wuma/readme.md index db44c9b62..ca753cf6a 100644 --- a/plugin/think-plugs-wuma/readme.md +++ b/plugin/think-plugs-wuma/readme.md @@ -49,4 +49,4 @@ composer remove zoujingli/think-plugs-wuma 未获得此插件授权时仅供参考学习不可商用，了解商用授权请阅读 [《付费授权》](https://thinkadmin.top/fee-introduce.html)。 -版权所有 Copyright © 2014-2024 by ThinkAdmin (https://thinkadmin.top) All rights reserved。 \ No newline at end of file +版权所有 Copyright © 2014-2025 by ThinkAdmin (https://thinkadmin.top) All rights reserved。 \ No newline at end of file