huangzhenpc/newapi-yx-diy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: settings

Browse Source
This commit is contained in:
Seefs
2025-09-14 12:59:44 +08:00
parent 7d71f467d9
commit 8563eafc57
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
service/cf_worker.go
View File

@@ -6,7 +6,7 @@ import (
"fmt" "fmt"
"net/http" "net/http"
"one-api/common" "one-api/common"
"one-api/setting" "one-api/setting/system_setting"
"strings" "strings"
) )
@@ -21,14 +21,14 @@ type WorkerRequest struct {
// DoWorkerRequest 通过Worker发送请求 // DoWorkerRequest 通过Worker发送请求
func DoWorkerRequest(req *WorkerRequest) (*http.Response, error) { func DoWorkerRequest(req *WorkerRequest) (*http.Response, error) {
if !setting.EnableWorker() { if !system_setting.EnableWorker() {
return nil, fmt.Errorf("worker not enabled") return nil, fmt.Errorf("worker not enabled")
} }
if !setting.WorkerAllowHttpImageRequestEnabled && !strings.HasPrefix(req.URL, "https") { if !system_setting.WorkerAllowHttpImageRequestEnabled && !strings.HasPrefix(req.URL, "https") {
return nil, fmt.Errorf("only support https url") return nil, fmt.Errorf("only support https url")
} }
workerUrl := setting.WorkerUrl workerUrl := system_setting.WorkerUrl
if !strings.HasSuffix(workerUrl, "/") { if !strings.HasSuffix(workerUrl, "/") {
workerUrl += "/" workerUrl += "/"
} }
@@ -43,11 +43,11 @@ func DoWorkerRequest(req *WorkerRequest) (*http.Response, error) {
} }
func DoDownloadRequest(originUrl string, reason ...string) (resp *http.Response, err error) { func DoDownloadRequest(originUrl string, reason ...string) (resp *http.Response, err error) {
if setting.EnableWorker() { if system_setting.EnableWorker() {
common.SysLog(fmt.Sprintf("downloading file from worker: %s, reason: %s", originUrl, strings.Join(reason, ", "))) common.SysLog(fmt.Sprintf("downloading file from worker: %s, reason: %s", originUrl, strings.Join(reason, ", ")))
req := &WorkerRequest{ req := &WorkerRequest{
URL: originUrl, URL: originUrl,
Key: setting.WorkerValidKey, Key: system_setting.WorkerValidKey,
} }
return DoWorkerRequest(req) return DoWorkerRequest(req)
} else { } else {

6
service/user_notify.go
View File

@@ -7,7 +7,7 @@ import (
"one-api/common" "one-api/common"
"one-api/dto" "one-api/dto"
"one-api/model" "one-api/model"
"one-api/setting" "one-api/setting/system_setting"
"strings" "strings"
) )
@@ -91,11 +91,11 @@ func sendBarkNotify(barkURL string, data dto.Notify) error {
var resp *http.Response var resp *http.Response
var err error var err error
if setting.EnableWorker() { if system_setting.EnableWorker() {
// 使用worker发送请求 // 使用worker发送请求
workerReq := &WorkerRequest{ workerReq := &WorkerRequest{
URL: finalURL, URL: finalURL,
Key: setting.WorkerValidKey, Key: system_setting.WorkerValidKey,
Method: http.MethodGet, Method: http.MethodGet,
Headers: map[string]string{ Headers: map[string]string{
"User-Agent": "OneAPI-Bark-Notify/1.0", "User-Agent": "OneAPI-Bark-Notify/1.0",

6
service/webhook.go
View File

@@ -9,7 +9,7 @@ import (
"fmt" "fmt"
"net/http" "net/http"
"one-api/dto" "one-api/dto"
"one-api/setting" "one-api/setting/system_setting"
"time" "time"
) )
@@ -56,11 +56,11 @@ func SendWebhookNotify(webhookURL string, secret string, data dto.Notify) error
var req *http.Request var req *http.Request
var resp *http.Response var resp *http.Response
if setting.EnableWorker() { if system_setting.EnableWorker() {
// 构建worker请求数据 // 构建worker请求数据
workerReq := &WorkerRequest{ workerReq := &WorkerRequest{
URL: webhookURL, URL: webhookURL,
Key: setting.WorkerValidKey, Key: system_setting.WorkerValidKey,
Method: http.MethodPost, Method: http.MethodPost,
Headers: map[string]string{ Headers: map[string]string{
"Content-Type": "application/json", "Content-Type": "application/json",