From acaf38b88dbbb686d4987704f04cc8ca5039cb1f Mon Sep 17 00:00:00 2001 From: wjqserver <114663932+WJQSERVER@users.noreply.github.com> Date: Fri, 28 Mar 2025 11:06:18 +0800 Subject: [PATCH] e3.0.5 --- .github/workflows/build.yml | 8 ++++++-- CHANGELOG.md | 15 +++++++++++++-- VERSION | 2 +- go.mod | 8 ++++---- go.sum | 8 ++++---- 5 files changed, 28 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 76d37ef..3396766 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,7 +4,7 @@ on: workflow_dispatch: push: branches: - - 'main' + - 'v3' paths: - 'VERSION' @@ -49,6 +49,8 @@ jobs: steps: - uses: actions/checkout@v3 + with: + ref: v3 - name: 加载版本号 run: | if [ -f VERSION ]; then @@ -107,6 +109,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 + with: + ref: v3 - name: Load VERSION run: | if [ -f VERSION ]; then @@ -135,4 +139,4 @@ jobs: push: true tags: | ${{ env.IMAGE_NAME }}:${{ env.VERSION }} - ${{ env.IMAGE_NAME }}:latest \ No newline at end of file + ${{ env.IMAGE_NAME }}:v3 diff --git a/CHANGELOG.md b/CHANGELOG.md index 723710a..a189c35 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,16 @@ # 更新日志 +e3.0.5 - 2025-03-28 +--- +- ATTENTION: 此版本是实验性的, 请确保了解这一点 +- CHANGE: 增加默认配置生成 +- CHANGE: 优化前端资源加载 + +2.6.1 - 2025-03-27 +--- +- CHANGE: 改进`matcher`组件 +- CHANGE: 加入优雅关闭 + e3.0.3 - 2025-03.27 --- - ATTENTION: 此版本是实验性的, 请确保了解这一点 @@ -37,7 +48,7 @@ e3.0.3rc1 - 2025-03-26 e3.0.2 - 2025-03-21 --- - ATTENTION: 此版本是实验性的, 请确保了解这一点 -- RELEASE: 在此表达对各位的歉意, v3迁移到HertZ带来了许多问题; 此版本完善v3的同时, 修正已知问题; v3会与v2.4.0及以上版本保证兼容关系, 可平顺升级; +- RELEASE: 在此表达对各位的歉意, v3迁移到HertZ带来了许多问题; 此版本完善v3的同时, 修正已知问题; - FIX: 使用等效`c.Writer()`, 回归v2.5.0 func以修正问题 - CHANGE: 更新相关依赖 @@ -49,7 +60,7 @@ e3.0.2 - 2025-03-21 e3.0.1 - 2025-03-21 --- - ATTENTION: 此版本是实验性的, 请确保了解这一点 -- RELEASE: Next Step; 下一步; 完善v3的同时, 修正已知问题; v3会与v2.4.0及以上版本保证兼容关系, 可平顺升级; +- RELEASE: Next Step; 下一步; 完善v3的同时, 修正已知问题; - CHANGE: 改进cli - CHANGE: 重写`ProcessLinksAndWriteChunked`(脚本嵌套加速处理器), 修正已知问题的同时提高性能与效率 - CHANGE: 完善`gitreq`部分 diff --git a/VERSION b/VERSION index d9c62ed..5f259a6 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.0.2 \ No newline at end of file +e3.0.5 \ No newline at end of file diff --git a/go.mod b/go.mod index 8b44303..c11d2f9 100644 --- a/go.mod +++ b/go.mod @@ -4,17 +4,16 @@ go 1.24.1 require ( github.com/BurntSushi/toml v1.5.0 - github.com/WJQSERVER-STUDIO/go-utils/copyb v0.0.4 github.com/WJQSERVER-STUDIO/go-utils/logger v1.5.0 github.com/cloudwego/hertz v0.9.6 github.com/hertz-contrib/http2 v0.1.8 github.com/satomitouka/touka-httpc v0.3.3 - github.com/valyala/bytebufferpool v1.0.0 - golang.org/x/net v0.37.0 + golang.org/x/net v0.38.0 golang.org/x/time v0.11.0 ) require ( + github.com/WJQSERVER-STUDIO/go-utils/copyb v0.0.4 // indirect github.com/WJQSERVER-STUDIO/go-utils/log v0.0.1 // indirect github.com/bytedance/gopkg v0.1.1 // indirect github.com/bytedance/sonic v1.13.2 // indirect @@ -30,9 +29,10 @@ require ( github.com/tidwall/match v1.1.1 // indirect github.com/tidwall/pretty v1.2.1 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect + github.com/valyala/bytebufferpool v1.0.0 // indirect golang.org/x/arch v0.15.0 // indirect golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 // indirect golang.org/x/sys v0.31.0 // indirect golang.org/x/text v0.23.0 // indirect - google.golang.org/protobuf v1.36.5 // indirect + google.golang.org/protobuf v1.36.6 // indirect ) diff --git a/go.sum b/go.sum index 6ce4816..85397e5 100644 --- a/go.sum +++ b/go.sum @@ -77,8 +77,8 @@ golang.org/x/arch v0.15.0/go.mod h1:JmwW7aLIoRUKgaTzhkiEFxvcEiQGyOg9BMonBJUS7EE= golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 h1:nDVHiLt8aIbd/VzvPWN6kSOPE7+F/fNFDSXLVYkE/Iw= golang.org/x/exp v0.0.0-20250305212735-054e65f0b394/go.mod h1:sIifuuw/Yco/y6yb6+bDNfyeQ/MdPUy/hKEMYQV17cM= golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= -golang.org/x/net v0.37.0 h1:1zLorHbz+LYj7MQlSf1+2tPIIgibq2eL5xkrGk6f+2c= -golang.org/x/net v0.37.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8= +golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8= +golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -91,8 +91,8 @@ golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4= golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0= golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM= -google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY= +google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=