Hermes/infinite-canvas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(handler): 统一错误处理并替换Next.js重写为路由处理器

Browse Source 
- 将所有handler中的Fail函数调用替换为FailError以统一错误处理
- 添加FailError函数实现统一的错误日志记录和响应格式
- 移除Next.js配置中的rewrites并实现统一的API路由代理处理器
- 新增路由处理器支持长连接和大文件上传场景的代理转发
- 更新错误处理逻辑避免将内部错误详情暴露给前端用户
This commit is contained in:
HouYunFei
2026-05-22 14:15:45 +08:00
parent 6edb607074
commit 499439d66b
10 changed files with 85 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
handler/admin.go
+4 -4
View File
@@ -20,7 +20,7 @@ func AdminPromptCategories(w http.ResponseWriter, r *http.Request) {
func AdminPrompts(w http.ResponseWriter, r *http.Request) {
result, err := service.ListPrompts(parseQuery(r))
if err != nil {
Fail(w, err.Error())
FailError(w, err)
return
}
OK(w, result)
@@ -31,7 +31,7 @@ func AdminSavePrompt(w http.ResponseWriter, r *http.Request) {
_ = json.NewDecoder(r.Body).Decode(&item)
result, err := service.SavePrompt(item)
if err != nil {
Fail(w, err.Error())
FailError(w, err)
return
}
OK(w, result)
@@ -39,7 +39,7 @@ func AdminSavePrompt(w http.ResponseWriter, r *http.Request) {
func AdminDeletePrompt(w http.ResponseWriter, r *http.Request, id string) {
if err := service.DeletePrompt(id); err != nil {
Fail(w, err.Error())
FailError(w, err)
return
}
OK(w, true)
@@ -52,7 +52,7 @@ func AdminSyncPromptCategories(w http.ResponseWriter, r *http.Request) {
categories, err := service.SyncPromptCategory(request.Category)
if err != nil {
log.Printf("sync prompt category failed category=%s err=%v", request.Category, err)
Fail(w, err.Error())
FailError(w, err)
return
}
log.Printf("sync prompt category done category=%s", request.Category)
handler/assets.go
+4 -4
View File
@@ -11,7 +11,7 @@ import (
func Assets(w http.ResponseWriter, r *http.Request) {
result, err := service.ListAssets(parseQuery(r))
if err != nil {
Fail(w, err.Error())
FailError(w, err)
return
}
OK(w, result)
@@ -20,7 +20,7 @@ func Assets(w http.ResponseWriter, r *http.Request) {
func AdminAssets(w http.ResponseWriter, r *http.Request) {
result, err := service.ListAssets(parseQuery(r))
if err != nil {
Fail(w, err.Error())
FailError(w, err)
return
}
OK(w, result)
@@ -31,7 +31,7 @@ func AdminSaveAsset(w http.ResponseWriter, r *http.Request) {
_ = json.NewDecoder(r.Body).Decode(&item)
result, err := service.SaveAsset(item)
if err != nil {
Fail(w, err.Error())
FailError(w, err)
return
}
OK(w, result)
@@ -39,7 +39,7 @@ func AdminSaveAsset(w http.ResponseWriter, r *http.Request) {
func AdminDeleteAsset(w http.ResponseWriter, r *http.Request, id string) {
if err := service.DeleteAsset(id); err != nil {
Fail(w, err.Error())
FailError(w, err)
return
}
OK(w, true)
handler/auth.go
+6 -6
View File
@@ -30,7 +30,7 @@ func Register(w http.ResponseWriter, r *http.Request) {
_ = json.NewDecoder(r.Body).Decode(&request)
session, err := service.Register(request.Username, request.Password)
if err != nil {
Fail(w, err.Error())
FailError(w, err)
return
}
OK(w, session)
@@ -41,7 +41,7 @@ func Login(w http.ResponseWriter, r *http.Request) {
_ = json.NewDecoder(r.Body).Decode(&request)
session, err := service.Login(request.Username, request.Password)
if err != nil {
Fail(w, err.Error())
FailError(w, err)
return
}
if session.User.Role != model.UserRoleAdmin {
@@ -56,7 +56,7 @@ func AdminLogin(w http.ResponseWriter, r *http.Request) {
_ = json.NewDecoder(r.Body).Decode(&request)
session, err := service.Login(request.Username, request.Password)
if err != nil {
Fail(w, err.Error())
FailError(w, err)
return
}
if session.User.Role != model.UserRoleAdmin {
@@ -77,7 +77,7 @@ func CurrentUser(w http.ResponseWriter, r *http.Request) {
func AdminUsers(w http.ResponseWriter, r *http.Request) {
users, err := service.ListUsers(parseQuery(r))
if err != nil {
Fail(w, err.Error())
FailError(w, err)
return
}
OK(w, users)
@@ -92,7 +92,7 @@ func AdminSaveUser(w http.ResponseWriter, r *http.Request) {
Role: request.Role,
}, request.Password)
if err != nil {
Fail(w, err.Error())
FailError(w, err)
return
}
OK(w, user)
@@ -100,7 +100,7 @@ func AdminSaveUser(w http.ResponseWriter, r *http.Request) {
func AdminDeleteUser(w http.ResponseWriter, r *http.Request, id string) {
if err := service.DeleteUser(id); err != nil {
Fail(w, err.Error())
FailError(w, err)
return
}
OK(w, true)
handler/prompts.go
+1 -1
View File
@@ -9,7 +9,7 @@ import (
func Prompts(w http.ResponseWriter, r *http.Request) {
result, err := service.ListPrompts(parseQuery(r))
if err != nil {
Fail(w, err.Error())
FailError(w, err)
return
}
OK(w, result)
handler/response.go
+6
View File
@@ -2,6 +2,7 @@ package handler
import (
"encoding/json"
"log"
"net/http"
"strconv"
@@ -22,6 +23,11 @@ func Fail(w http.ResponseWriter, msg string) {
writeJSON(w, response{Code: 1, Data: nil, Msg: msg})
}
func FailError(w http.ResponseWriter, err error) {
log.Printf("request failed: %v", err)
Fail(w, "操作失败")
}
func writeJSON(w http.ResponseWriter, value any) {
w.Header().Set("Content-Type", "application/json")
_ = json.NewEncoder(w).Encode(value)
handler/settings.go
+3 -3
View File
@@ -11,7 +11,7 @@ import (
func Settings(w http.ResponseWriter, r *http.Request) {
settings, err := service.PublicSettings()
if err != nil {
Fail(w, err.Error())
FailError(w, err)
return
}
OK(w, settings)
@@ -20,7 +20,7 @@ func Settings(w http.ResponseWriter, r *http.Request) {
func AdminSettings(w http.ResponseWriter, r *http.Request) {
settings, err := service.AdminSettings()
if err != nil {
Fail(w, err.Error())
FailError(w, err)
return
}
OK(w, settings)
@@ -31,7 +31,7 @@ func AdminSaveSettings(w http.ResponseWriter, r *http.Request) {
_ = json.NewDecoder(r.Body).Decode(&settings)
result, err := service.SaveSettings(settings)
if err != nil {
Fail(w, err.Error())
FailError(w, err)
return
}
OK(w, result)