From aec238aec9f468cad0b322a47fdd9b108889d3f0 Mon Sep 17 00:00:00 2001 From: Buer <42402987+MartialBE@users.noreply.github.com> Date: Fri, 26 Jan 2024 18:41:11 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=93=9D=20doc:=20modify=20information=20(#?= =?UTF-8?q?57)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/FUNDING.yml | 2 +- .github/ISSUE_TEMPLATE/config.yml | 5 +---- common/image/image_test.go | 2 +- common/init.go | 5 +++-- controller/channel-billing.go | 2 +- middleware/recover.go | 5 +++-- pull_request_template.md | 11 +++++------ 7 files changed, 15 insertions(+), 17 deletions(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 250e7972..256a8616 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1 +1 @@ -custom: ['https://iamazing.cn/page/reward'] \ No newline at end of file +custom: ['https://github.com/MartialBE/one-api/wiki/Coffee'] \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 83a0f3f4..35508b2a 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,8 +1,5 @@ blank_issues_enabled: false contact_links: - - name: 项目群聊 - url: https://openai.justsong.cn/ - about: QQ 群:828520184,自动审核,备注 One API - name: 赞赏支持 - url: https://iamazing.cn/page/reward + url: https://github.com/MartialBE/one-api/wiki/Coffee about: 请作者喝杯咖啡,以激励作者持续开发 diff --git a/common/image/image_test.go b/common/image/image_test.go index 2445b559..e3f6cf54 100644 --- a/common/image/image_test.go +++ b/common/image/image_test.go @@ -193,7 +193,7 @@ func TestGetImageFromUrl(t *testing.T) { }) } - url := "https://raw.githubusercontent.com/songquanpeng/one-api/main/README.md" + url := "https://raw.githubusercontent.com/MartialBE/one-api/main/README.md" _, _, err := img.GetImageFromUrl(url) assert.Error(t, err) encodedBase64 := "data:image/text;base64," diff --git a/common/init.go b/common/init.go index 7e3fb16f..5e852638 100644 --- a/common/init.go +++ b/common/init.go @@ -19,8 +19,9 @@ var ( func printHelp() { fmt.Println("One API " + Version + " - All in one API service for OpenAI API.") - fmt.Println("Copyright (C) 2023 JustSong. All rights reserved.") - fmt.Println("GitHub: https://github.com/songquanpeng/one-api") + fmt.Println("Copyright (C) 2023 MartialBE. All rights reserved.") + fmt.Println("Original copyright holder: JustSong") + fmt.Println("GitHub: https://github.com/MartialBE/one-api") fmt.Println("Usage: one-api [--port ] [--log-dir ] [--version] [--help]") } diff --git a/controller/channel-billing.go b/controller/channel-billing.go index 90241d64..f6bb523b 100644 --- a/controller/channel-billing.go +++ b/controller/channel-billing.go @@ -14,7 +14,7 @@ import ( "github.com/gin-gonic/gin" ) -// https://github.com/songquanpeng/one-api/issues/79 +// https://github.com/MartialBE/one-api/issues/79 type OpenAISubscriptionResponse struct { Object string `json:"object"` diff --git a/middleware/recover.go b/middleware/recover.go index 8338a514..6f1c1aed 100644 --- a/middleware/recover.go +++ b/middleware/recover.go @@ -2,10 +2,11 @@ package middleware import ( "fmt" - "github.com/gin-gonic/gin" "net/http" "one-api/common" "runtime/debug" + + "github.com/gin-gonic/gin" ) func RelayPanicRecover() gin.HandlerFunc { @@ -16,7 +17,7 @@ func RelayPanicRecover() gin.HandlerFunc { common.SysError(fmt.Sprintf("stacktrace from panic: %s", string(debug.Stack()))) c.JSON(http.StatusInternalServerError, gin.H{ "error": gin.H{ - "message": fmt.Sprintf("Panic detected, error: %v. Please submit a issue here: https://github.com/songquanpeng/one-api", err), + "message": fmt.Sprintf("Panic detected, error: %v. Please submit a issue here: https://github.com/MartialBE/one-api", err), "type": "one_api_panic", }, }) diff --git a/pull_request_template.md b/pull_request_template.md index a313004f..08578104 100644 --- a/pull_request_template.md +++ b/pull_request_template.md @@ -1,9 +1,8 @@ -[//]: # (请按照以下格式关联 issue) -[//]: # (请在提交 PR 前确认所提交的功能可用,附上截图即可,这将有助于项目维护者 review & merge 该 PR,谢谢) -[//]: # (项目维护者一般仅在周末处理 PR,因此如若未能及时回复希望能理解) -[//]: # (开发者交流群:910657413) -[//]: # (请在提交 PR 之前删除上面的注释) +[//]: # "请按照以下格式关联 issue" +[//]: # "请在提交 PR 前确认所提交的功能可用,附上截图即可,这将有助于项目维护者 review & merge 该 PR,谢谢" +[//]: # "项目维护者一般仅在周末处理 PR,因此如若未能及时回复希望能理解" +[//]: # "请在提交 PR 之前删除上面的注释" close #issue_number -我已确认该 PR 已自测通过,相关截图如下: \ No newline at end of file +我已确认该 PR 已自测通过,相关截图如下: