HI-VPN/zero-ppanel
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 引入签名认证、加密工具包及大量goctl代码生成模板，并更新API、Admin和Node服务逻辑。

Browse Source
This commit is contained in:
shanshanzhong
2026-02-27 08:49:37 -08:00
parent 9dacd85a89
commit e1896f677c
166 changed files with 2913 additions and 489 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/admin/etc/admin-dev.yaml
+14
View File
@@ -30,3 +30,17 @@ MySQL:
Redis:
Host: 127.0.0.1:6379
Type: node
CacheRedis:
Host: 127.0.0.1:6379
Type: node
AppSignature:
AppSecrets:
android-client: "uB4G,XxL2{7b"
web-client: "uB4G,XxL2{7b"
ios-client: "uB4G,XxL2{7b"
mac-client: "uB4G,XxL2{7b"
ValidWindowSeconds: 300
SkipPrefixes:
- /api/v1/admin/health
apps/admin/etc/admin-prod.yaml
+15
View File
@@ -34,3 +34,18 @@ Redis:
Host: "${REDIS_HOST}"
Type: node
Pass: "${REDIS_PASS}"
CacheRedis:
Host: "${REDIS_HOST}"
Type: node
Pass: "${REDIS_PASS}"
AppSignature:
AppSecrets:
android-client: "${APP_SECRET}"
web-client: "${APP_SECRET}"
ios-client: "${APP_SECRET}"
mac-client: "${APP_SECRET}"
ValidWindowSeconds: 300
SkipPrefixes:
- /api/v1/admin/health
apps/admin/etc/admin-test.yaml
+14
View File
@@ -32,3 +32,17 @@ MySQL:
Redis:
Host: redis:6379
Type: node
CacheRedis:
Host: redis:6379
Type: node
AppSignature:
AppSecrets:
android-client: "uB4G,XxL2{7b"
web-client: "uB4G,XxL2{7b"
ios-client: "uB4G,XxL2{7b"
mac-client: "uB4G,XxL2{7b"
ValidWindowSeconds: 300
SkipPrefixes:
- /api/v1/admin/health
apps/admin/internal/config/config.go
+7 -1
View File
@@ -3,7 +3,11 @@
package config
import "github.com/zeromicro/go-zero/rest"
import (
"github.com/zero-ppanel/zero-ppanel/pkg/signature"
"github.com/zeromicro/go-zero/core/stores/redis"
"github.com/zeromicro/go-zero/rest"
)
type Config struct {
rest.RestConf
@@ -11,4 +15,6 @@ type Config struct {
AccessSecret string
AccessExpire int64
}
CacheRedis redis.RedisConf
AppSignature signature.SignatureConf
}
apps/admin/internal/handler/announcement/createAnnouncementHandler.go
+4 -8
View File
@@ -9,23 +9,19 @@ import (
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/logic/announcement"
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/svc"
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/types"
"github.com/zeromicro/go-zero/rest/httpx"
"github.com/zero-ppanel/zero-ppanel/pkg/result"
)
func CreateAnnouncementHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req types.CreateAnnouncementReq
if err := httpx.Parse(r, &req); err != nil {
httpx.ErrorCtx(r.Context(), w, err)
if err := result.Parse(r, &req); err != nil {
result.HttpResult(r, w, nil, err)
return
}
l := announcement.NewCreateAnnouncementLogic(r.Context(), svcCtx)
resp, err := l.CreateAnnouncement(&req)
if err != nil {
httpx.ErrorCtx(r.Context(), w, err)
} else {
httpx.OkJsonCtx(r.Context(), w, resp)
}
result.HttpResult(r, w, resp, err)
}
}
apps/admin/internal/handler/announcement/deleteAnnouncementHandler.go
+4 -8
View File
@@ -9,23 +9,19 @@ import (
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/logic/announcement"
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/svc"
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/types"
"github.com/zeromicro/go-zero/rest/httpx"
"github.com/zero-ppanel/zero-ppanel/pkg/result"
)
func DeleteAnnouncementHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req types.DeleteAnnouncementReq
if err := httpx.Parse(r, &req); err != nil {
httpx.ErrorCtx(r.Context(), w, err)
if err := result.Parse(r, &req); err != nil {
result.HttpResult(r, w, nil, err)
return
}
l := announcement.NewDeleteAnnouncementLogic(r.Context(), svcCtx)
err := l.DeleteAnnouncement(&req)
if err != nil {
httpx.ErrorCtx(r.Context(), w, err)
} else {
httpx.Ok(w)
}
result.HttpResult(r, w, nil, err)
}
}
apps/admin/internal/handler/announcement/updateAnnouncementHandler.go
+4 -8
View File
@@ -9,23 +9,19 @@ import (
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/logic/announcement"
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/svc"
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/types"
"github.com/zeromicro/go-zero/rest/httpx"
"github.com/zero-ppanel/zero-ppanel/pkg/result"
)
func UpdateAnnouncementHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req types.UpdateAnnouncementReq
if err := httpx.Parse(r, &req); err != nil {
httpx.ErrorCtx(r.Context(), w, err)
if err := result.Parse(r, &req); err != nil {
result.HttpResult(r, w, nil, err)
return
}
l := announcement.NewUpdateAnnouncementLogic(r.Context(), svcCtx)
err := l.UpdateAnnouncement(&req)
if err != nil {
httpx.ErrorCtx(r.Context(), w, err)
} else {
httpx.Ok(w)
}
result.HttpResult(r, w, nil, err)
}
}
apps/admin/internal/handler/common/healthHandler.go
+2 -6
View File
@@ -8,17 +8,13 @@ import (
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/logic/common"
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/svc"
"github.com/zeromicro/go-zero/rest/httpx"
"github.com/zero-ppanel/zero-ppanel/pkg/result"
)
func HealthHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
l := common.NewHealthLogic(r.Context(), svcCtx)
resp, err := l.Health()
if err != nil {
httpx.ErrorCtx(r.Context(), w, err)
} else {
httpx.OkJsonCtx(r.Context(), w, resp)
}
result.HttpResult(r, w, resp, err)
}
}
apps/admin/internal/handler/console/getConsoleStatsHandler.go
+2 -6
View File
@@ -8,17 +8,13 @@ import (
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/logic/console"
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/svc"
"github.com/zeromicro/go-zero/rest/httpx"
"github.com/zero-ppanel/zero-ppanel/pkg/result"
)
func GetConsoleStatsHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
l := console.NewGetConsoleStatsLogic(r.Context(), svcCtx)
resp, err := l.GetConsoleStats()
if err != nil {
httpx.ErrorCtx(r.Context(), w, err)
} else {
httpx.OkJsonCtx(r.Context(), w, resp)
}
result.HttpResult(r, w, resp, err)
}
}
apps/admin/internal/handler/order/getOrderListHandler.go
+4 -8
View File
@@ -9,23 +9,19 @@ import (
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/logic/order"
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/svc"
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/types"
"github.com/zeromicro/go-zero/rest/httpx"
"github.com/zero-ppanel/zero-ppanel/pkg/result"
)
func GetOrderListHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req types.AdminOrderListReq
if err := httpx.Parse(r, &req); err != nil {
httpx.ErrorCtx(r.Context(), w, err)
if err := result.Parse(r, &req); err != nil {
result.HttpResult(r, w, nil, err)
return
}
l := order.NewGetOrderListLogic(r.Context(), svcCtx)
resp, err := l.GetOrderList(&req)
if err != nil {
httpx.ErrorCtx(r.Context(), w, err)
} else {
httpx.OkJsonCtx(r.Context(), w, resp)
}
result.HttpResult(r, w, resp, err)
}
}
apps/admin/internal/handler/order/updateOrderStatusHandler.go
+4 -8
View File
@@ -9,23 +9,19 @@ import (
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/logic/order"
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/svc"
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/types"
"github.com/zeromicro/go-zero/rest/httpx"
"github.com/zero-ppanel/zero-ppanel/pkg/result"
)
func UpdateOrderStatusHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req types.UpdateOrderStatusReq
if err := httpx.Parse(r, &req); err != nil {
httpx.ErrorCtx(r.Context(), w, err)
if err := result.Parse(r, &req); err != nil {
result.HttpResult(r, w, nil, err)
return
}
l := order.NewUpdateOrderStatusLogic(r.Context(), svcCtx)
err := l.UpdateOrderStatus(&req)
if err != nil {
httpx.ErrorCtx(r.Context(), w, err)
} else {
httpx.Ok(w)
}
result.HttpResult(r, w, nil, err)
}
}
apps/admin/internal/handler/routes.go
+1 -1
View File
@@ -10,7 +10,7 @@ import (
common "github.com/zero-ppanel/zero-ppanel/apps/admin/internal/handler/common"
console "github.com/zero-ppanel/zero-ppanel/apps/admin/internal/handler/console"
order "github.com/zero-ppanel/zero-ppanel/apps/admin/internal/handler/order"
serverhandler "github.com/zero-ppanel/zero-ppanel/apps/admin/internal/handler/server"
server serverhandler "github.com/zero-ppanel/zero-ppanel/apps/admin/internal/handler/server"
subscribe "github.com/zero-ppanel/zero-ppanel/apps/admin/internal/handler/subscribe"
system "github.com/zero-ppanel/zero-ppanel/apps/admin/internal/handler/system"
ticket "github.com/zero-ppanel/zero-ppanel/apps/admin/internal/handler/ticket"
apps/admin/internal/handler/server/createServerHandler.go
+4 -8
View File
@@ -9,23 +9,19 @@ import (
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/logic/server"
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/svc"
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/types"
"github.com/zeromicro/go-zero/rest/httpx"
"github.com/zero-ppanel/zero-ppanel/pkg/result"
)
func CreateServerHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req types.CreateServerReq
if err := httpx.Parse(r, &req); err != nil {
httpx.ErrorCtx(r.Context(), w, err)
if err := result.Parse(r, &req); err != nil {
result.HttpResult(r, w, nil, err)
return
}
l := server.NewCreateServerLogic(r.Context(), svcCtx)
resp, err := l.CreateServer(&req)
if err != nil {
httpx.ErrorCtx(r.Context(), w, err)
} else {
httpx.OkJsonCtx(r.Context(), w, resp)
}
result.HttpResult(r, w, resp, err)
}
}
apps/admin/internal/handler/server/deleteServerHandler.go
+4 -8
View File
@@ -9,23 +9,19 @@ import (
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/logic/server"
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/svc"
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/types"
"github.com/zeromicro/go-zero/rest/httpx"
"github.com/zero-ppanel/zero-ppanel/pkg/result"
)
func DeleteServerHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req types.DeleteServerReq
if err := httpx.Parse(r, &req); err != nil {
httpx.ErrorCtx(r.Context(), w, err)
if err := result.Parse(r, &req); err != nil {
result.HttpResult(r, w, nil, err)
return
}
l := server.NewDeleteServerLogic(r.Context(), svcCtx)
err := l.DeleteServer(&req)
if err != nil {
httpx.ErrorCtx(r.Context(), w, err)
} else {
httpx.Ok(w)
}
result.HttpResult(r, w, nil, err)
}
}
apps/admin/internal/handler/server/getServerListHandler.go
+4 -8
View File
@@ -9,23 +9,19 @@ import (
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/logic/server"
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/svc"
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/types"
"github.com/zeromicro/go-zero/rest/httpx"
"github.com/zero-ppanel/zero-ppanel/pkg/result"
)
func GetServerListHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req types.ServerListReq
if err := httpx.Parse(r, &req); err != nil {
httpx.ErrorCtx(r.Context(), w, err)
if err := result.Parse(r, &req); err != nil {
result.HttpResult(r, w, nil, err)
return
}
l := server.NewGetServerListLogic(r.Context(), svcCtx)
resp, err := l.GetServerList(&req)
if err != nil {
httpx.ErrorCtx(r.Context(), w, err)
} else {
httpx.OkJsonCtx(r.Context(), w, resp)
}
result.HttpResult(r, w, resp, err)
}
}
apps/admin/internal/handler/server/updateServerHandler.go
+4 -8
View File
@@ -9,23 +9,19 @@ import (
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/logic/server"
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/svc"
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/types"
"github.com/zeromicro/go-zero/rest/httpx"
"github.com/zero-ppanel/zero-ppanel/pkg/result"
)
func UpdateServerHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req types.UpdateServerReq
if err := httpx.Parse(r, &req); err != nil {
httpx.ErrorCtx(r.Context(), w, err)
if err := result.Parse(r, &req); err != nil {
result.HttpResult(r, w, nil, err)
return
}
l := server.NewUpdateServerLogic(r.Context(), svcCtx)
err := l.UpdateServer(&req)
if err != nil {
httpx.ErrorCtx(r.Context(), w, err)
} else {
httpx.Ok(w)
}
result.HttpResult(r, w, nil, err)
}
}
apps/admin/internal/handler/subscribe/createSubscribeHandler.go
+4 -8
View File
@@ -9,23 +9,19 @@ import (
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/logic/subscribe"
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/svc"
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/types"
"github.com/zeromicro/go-zero/rest/httpx"
"github.com/zero-ppanel/zero-ppanel/pkg/result"
)
func CreateSubscribeHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req types.CreateSubscribeReq
if err := httpx.Parse(r, &req); err != nil {
httpx.ErrorCtx(r.Context(), w, err)
if err := result.Parse(r, &req); err != nil {
result.HttpResult(r, w, nil, err)
return
}
l := subscribe.NewCreateSubscribeLogic(r.Context(), svcCtx)
resp, err := l.CreateSubscribe(&req)
if err != nil {
httpx.ErrorCtx(r.Context(), w, err)
} else {
httpx.OkJsonCtx(r.Context(), w, resp)
}
result.HttpResult(r, w, resp, err)
}
}
apps/admin/internal/handler/subscribe/deleteSubscribeHandler.go
+4 -8
View File
@@ -9,23 +9,19 @@ import (
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/logic/subscribe"
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/svc"
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/types"
"github.com/zeromicro/go-zero/rest/httpx"
"github.com/zero-ppanel/zero-ppanel/pkg/result"
)
func DeleteSubscribeHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req types.DeleteSubscribeReq
if err := httpx.Parse(r, &req); err != nil {
httpx.ErrorCtx(r.Context(), w, err)
if err := result.Parse(r, &req); err != nil {
result.HttpResult(r, w, nil, err)
return
}
l := subscribe.NewDeleteSubscribeLogic(r.Context(), svcCtx)
err := l.DeleteSubscribe(&req)
if err != nil {
httpx.ErrorCtx(r.Context(), w, err)
} else {
httpx.Ok(w)
}
result.HttpResult(r, w, nil, err)
}
}
apps/admin/internal/handler/subscribe/getSubscribeListHandler.go
+4 -8
View File
@@ -9,23 +9,19 @@ import (
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/logic/subscribe"
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/svc"
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/types"
"github.com/zeromicro/go-zero/rest/httpx"
"github.com/zero-ppanel/zero-ppanel/pkg/result"
)
func GetSubscribeListHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req types.AdminSubscribeListReq
if err := httpx.Parse(r, &req); err != nil {
httpx.ErrorCtx(r.Context(), w, err)
if err := result.Parse(r, &req); err != nil {
result.HttpResult(r, w, nil, err)
return
}
l := subscribe.NewGetSubscribeListLogic(r.Context(), svcCtx)
resp, err := l.GetSubscribeList(&req)
if err != nil {
httpx.ErrorCtx(r.Context(), w, err)
} else {
httpx.OkJsonCtx(r.Context(), w, resp)
}
result.HttpResult(r, w, resp, err)
}
}
apps/admin/internal/handler/subscribe/updateSubscribeHandler.go
+4 -8
View File
@@ -9,23 +9,19 @@ import (
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/logic/subscribe"
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/svc"
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/types"
"github.com/zeromicro/go-zero/rest/httpx"
"github.com/zero-ppanel/zero-ppanel/pkg/result"
)
func UpdateSubscribeHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req types.UpdateSubscribeReq
if err := httpx.Parse(r, &req); err != nil {
httpx.ErrorCtx(r.Context(), w, err)
if err := result.Parse(r, &req); err != nil {
result.HttpResult(r, w, nil, err)
return
}
l := subscribe.NewUpdateSubscribeLogic(r.Context(), svcCtx)
err := l.UpdateSubscribe(&req)
if err != nil {
httpx.ErrorCtx(r.Context(), w, err)
} else {
httpx.Ok(w)
}
result.HttpResult(r, w, nil, err)
}
}
apps/admin/internal/handler/system/getRegisterConfigHandler.go
+2 -6
View File
@@ -8,17 +8,13 @@ import (
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/logic/system"
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/svc"
"github.com/zeromicro/go-zero/rest/httpx"
"github.com/zero-ppanel/zero-ppanel/pkg/result"
)
func GetRegisterConfigHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
l := system.NewGetRegisterConfigLogic(r.Context(), svcCtx)
resp, err := l.GetRegisterConfig()
if err != nil {
httpx.ErrorCtx(r.Context(), w, err)
} else {
httpx.OkJsonCtx(r.Context(), w, resp)
}
result.HttpResult(r, w, resp, err)
}
}
apps/admin/internal/handler/system/getSiteConfigHandler.go
+2 -6
View File
@@ -8,17 +8,13 @@ import (
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/logic/system"
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/svc"
"github.com/zeromicro/go-zero/rest/httpx"
"github.com/zero-ppanel/zero-ppanel/pkg/result"
)
func GetSiteConfigHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
l := system.NewGetSiteConfigLogic(r.Context(), svcCtx)
resp, err := l.GetSiteConfig()
if err != nil {
httpx.ErrorCtx(r.Context(), w, err)
} else {
httpx.OkJsonCtx(r.Context(), w, resp)
}
result.HttpResult(r, w, resp, err)
}
}
apps/admin/internal/handler/system/updateRegisterConfigHandler.go
+4 -8
View File
@@ -9,23 +9,19 @@ import (
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/logic/system"
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/svc"
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/types"
"github.com/zeromicro/go-zero/rest/httpx"
"github.com/zero-ppanel/zero-ppanel/pkg/result"
)
func UpdateRegisterConfigHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req types.UpdateRegisterConfigReq
if err := httpx.Parse(r, &req); err != nil {
httpx.ErrorCtx(r.Context(), w, err)
if err := result.Parse(r, &req); err != nil {
result.HttpResult(r, w, nil, err)
return
}
l := system.NewUpdateRegisterConfigLogic(r.Context(), svcCtx)
err := l.UpdateRegisterConfig(&req)
if err != nil {
httpx.ErrorCtx(r.Context(), w, err)
} else {
httpx.Ok(w)
}
result.HttpResult(r, w, nil, err)
}
}
apps/admin/internal/handler/system/updateSiteConfigHandler.go
+4 -8
View File
@@ -9,23 +9,19 @@ import (
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/logic/system"
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/svc"
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/types"
"github.com/zeromicro/go-zero/rest/httpx"
"github.com/zero-ppanel/zero-ppanel/pkg/result"
)
func UpdateSiteConfigHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req types.UpdateSiteConfigReq
if err := httpx.Parse(r, &req); err != nil {
httpx.ErrorCtx(r.Context(), w, err)
if err := result.Parse(r, &req); err != nil {
result.HttpResult(r, w, nil, err)
return
}
l := system.NewUpdateSiteConfigLogic(r.Context(), svcCtx)
err := l.UpdateSiteConfig(&req)
if err != nil {
httpx.ErrorCtx(r.Context(), w, err)
} else {
httpx.Ok(w)
}
result.HttpResult(r, w, nil, err)
}
}
apps/admin/internal/handler/ticket/createTicketFollowHandler.go
+4 -8
View File
@@ -9,23 +9,19 @@ import (
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/logic/ticket"
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/svc"
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/types"
"github.com/zeromicro/go-zero/rest/httpx"
"github.com/zero-ppanel/zero-ppanel/pkg/result"
)
func CreateTicketFollowHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req types.AdminCreateTicketFollowReq
if err := httpx.Parse(r, &req); err != nil {
httpx.ErrorCtx(r.Context(), w, err)
if err := result.Parse(r, &req); err != nil {
result.HttpResult(r, w, nil, err)
return
}
l := ticket.NewCreateTicketFollowLogic(r.Context(), svcCtx)
err := l.CreateTicketFollow(&req)
if err != nil {
httpx.ErrorCtx(r.Context(), w, err)
} else {
httpx.Ok(w)
}
result.HttpResult(r, w, nil, err)
}
}
apps/admin/internal/handler/ticket/getTicketDetailHandler.go
+4 -8
View File
@@ -9,23 +9,19 @@ import (
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/logic/ticket"
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/svc"
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/types"
"github.com/zeromicro/go-zero/rest/httpx"
"github.com/zero-ppanel/zero-ppanel/pkg/result"
)
func GetTicketDetailHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req types.AdminTicketDetailReq
if err := httpx.Parse(r, &req); err != nil {
httpx.ErrorCtx(r.Context(), w, err)
if err := result.Parse(r, &req); err != nil {
result.HttpResult(r, w, nil, err)
return
}
l := ticket.NewGetTicketDetailLogic(r.Context(), svcCtx)
resp, err := l.GetTicketDetail(&req)
if err != nil {
httpx.ErrorCtx(r.Context(), w, err)
} else {
httpx.OkJsonCtx(r.Context(), w, resp)
}
result.HttpResult(r, w, resp, err)
}
}
apps/admin/internal/handler/ticket/getTicketListHandler.go
+4 -8
View File
@@ -9,23 +9,19 @@ import (
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/logic/ticket"
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/svc"
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/types"
"github.com/zeromicro/go-zero/rest/httpx"
"github.com/zero-ppanel/zero-ppanel/pkg/result"
)
func GetTicketListHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req types.AdminTicketListReq
if err := httpx.Parse(r, &req); err != nil {
httpx.ErrorCtx(r.Context(), w, err)
if err := result.Parse(r, &req); err != nil {
result.HttpResult(r, w, nil, err)
return
}
l := ticket.NewGetTicketListLogic(r.Context(), svcCtx)
resp, err := l.GetTicketList(&req)
if err != nil {
httpx.ErrorCtx(r.Context(), w, err)
} else {
httpx.OkJsonCtx(r.Context(), w, resp)
}
result.HttpResult(r, w, resp, err)
}
}
apps/admin/internal/handler/ticket/updateTicketStatusHandler.go
+4 -8
View File
@@ -9,23 +9,19 @@ import (
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/logic/ticket"
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/svc"
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/types"
"github.com/zeromicro/go-zero/rest/httpx"
"github.com/zero-ppanel/zero-ppanel/pkg/result"
)
func UpdateTicketStatusHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req types.AdminUpdateTicketStatusReq
if err := httpx.Parse(r, &req); err != nil {
httpx.ErrorCtx(r.Context(), w, err)
if err := result.Parse(r, &req); err != nil {
result.HttpResult(r, w, nil, err)
return
}
l := ticket.NewUpdateTicketStatusLogic(r.Context(), svcCtx)
err := l.UpdateTicketStatus(&req)
if err != nil {
httpx.ErrorCtx(r.Context(), w, err)
} else {
httpx.Ok(w)
}
result.HttpResult(r, w, nil, err)
}
}
apps/admin/internal/handler/user/deleteUserHandler.go
+4 -8
View File
@@ -9,23 +9,19 @@ import (
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/logic/user"
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/svc"
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/types"
"github.com/zeromicro/go-zero/rest/httpx"
"github.com/zero-ppanel/zero-ppanel/pkg/result"
)
func DeleteUserHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req types.AdminDeleteUserReq
if err := httpx.Parse(r, &req); err != nil {
httpx.ErrorCtx(r.Context(), w, err)
if err := result.Parse(r, &req); err != nil {
result.HttpResult(r, w, nil, err)
return
}
l := user.NewDeleteUserLogic(r.Context(), svcCtx)
err := l.DeleteUser(&req)
if err != nil {
httpx.ErrorCtx(r.Context(), w, err)
} else {
httpx.Ok(w)
}
result.HttpResult(r, w, nil, err)
}
}
apps/admin/internal/handler/user/getUserDetailHandler.go
+4 -8
View File
@@ -9,23 +9,19 @@ import (
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/logic/user"
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/svc"
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/types"
"github.com/zeromicro/go-zero/rest/httpx"
"github.com/zero-ppanel/zero-ppanel/pkg/result"
)
func GetUserDetailHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req types.AdminUserDetailReq
if err := httpx.Parse(r, &req); err != nil {
httpx.ErrorCtx(r.Context(), w, err)
if err := result.Parse(r, &req); err != nil {
result.HttpResult(r, w, nil, err)
return
}
l := user.NewGetUserDetailLogic(r.Context(), svcCtx)
resp, err := l.GetUserDetail(&req)
if err != nil {
httpx.ErrorCtx(r.Context(), w, err)
} else {
httpx.OkJsonCtx(r.Context(), w, resp)
}
result.HttpResult(r, w, resp, err)
}
}
apps/admin/internal/handler/user/getUserListHandler.go
+4 -8
View File
@@ -9,23 +9,19 @@ import (
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/logic/user"
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/svc"
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/types"
"github.com/zeromicro/go-zero/rest/httpx"
"github.com/zero-ppanel/zero-ppanel/pkg/result"
)
func GetUserListHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req types.AdminUserListReq
if err := httpx.Parse(r, &req); err != nil {
httpx.ErrorCtx(r.Context(), w, err)
if err := result.Parse(r, &req); err != nil {
result.HttpResult(r, w, nil, err)
return
}
l := user.NewGetUserListLogic(r.Context(), svcCtx)
resp, err := l.GetUserList(&req)
if err != nil {
httpx.ErrorCtx(r.Context(), w, err)
} else {
httpx.OkJsonCtx(r.Context(), w, resp)
}
result.HttpResult(r, w, resp, err)
}
}
apps/admin/internal/middleware/signatureMiddleware.go
+88
View File
@@ -0,0 +1,88 @@
package middleware
import (
"bytes"
"io"
"net/http"
"strings"
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/config"
"github.com/zero-ppanel/zero-ppanel/pkg/signature"
"github.com/zero-ppanel/zero-ppanel/pkg/xerr"
"github.com/zeromicro/go-zero/rest/httpx"
)
type SignatureMiddleware struct {
conf config.Config
validator *signature.Validator
}
func NewSignatureMiddleware(c config.Config, store signature.NonceStore) *SignatureMiddleware {
return &SignatureMiddleware{
conf: c,
validator: signature.NewValidator(c.AppSignature, store),
}
}
func (m *SignatureMiddleware) Handle(next http.HandlerFunc) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
appId := r.Header.Get("X-App-Id")
if appId == "" {
next(w, r)
return
}
for _, prefix := range m.conf.AppSignature.SkipPrefixes {
if strings.HasPrefix(r.URL.Path, prefix) {
next(w, r)
return
}
}
timestamp := r.Header.Get("X-Timestamp")
nonce := r.Header.Get("X-Nonce")
sig := r.Header.Get("X-Signature")
if timestamp == "" || nonce == "" || sig == "" {
httpx.WriteJson(w, http.StatusUnauthorized, buildErrResp(xerr.SignatureMissing))
return
}
var bodyBytes []byte
if r.Body != nil {
bodyBytes, _ = io.ReadAll(r.Body)
r.Body = io.NopCloser(bytes.NewBuffer(bodyBytes))
}
sts := signature.BuildStringToSign(r.Method, r.URL.Path, r.URL.RawQuery, bodyBytes, appId, timestamp, nonce)
if err := m.validator.Validate(r.Context(), appId, timestamp, nonce, sig, sts); err != nil {
code := mapSignatureErr(err)
httpx.WriteJson(w, http.StatusUnauthorized, buildErrResp(code))
return
}
next(w, r)
}
}
func mapSignatureErr(err error) int {
switch err {
case signature.ErrSignatureMissing:
return xerr.SignatureMissing
case signature.ErrSignatureExpired:
return xerr.SignatureExpired
case signature.ErrSignatureReplay:
return xerr.SignatureReplay
default:
return xerr.SignatureInvalid
}
}
func buildErrResp(code int) map[string]interface{} {
return map[string]interface{}{
"code": code,
"msg": xerr.MapErrMsg(code),
"data": nil,
}
}
apps/admin/internal/svc/serviceContext.go
+10 -2
View File
@@ -5,14 +5,22 @@ package svc
import (
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/config"
"github.com/zero-ppanel/zero-ppanel/apps/admin/internal/middleware"
"github.com/zero-ppanel/zero-ppanel/pkg/signature"
"github.com/zeromicro/go-zero/core/stores/redis"
)
type ServiceContext struct {
Config config.Config
Config config.Config
SignatureMiddleware *middleware.SignatureMiddleware
}
func NewServiceContext(c config.Config) *ServiceContext {
rds := redis.MustNewRedis(c.CacheRedis)
nonceStore := signature.NewRedisNonceStore(rds)
return &ServiceContext{
Config: c,
Config: c,
SignatureMiddleware: middleware.NewSignatureMiddleware(c, nonceStore),
}
}
apps/admin/ppaneladmin.go
+1
View File
@@ -27,6 +27,7 @@ func main() {
defer server.Stop()
ctx := svc.NewServiceContext(c)
server.Use(ctx.SignatureMiddleware.Handle)
handler.RegisterHandlers(server, ctx)
fmt.Printf("Starting server at %s:%d...\n", c.Host, c.Port)