[优化] response 结构调整

This commit is contained in:
ryan
2026-06-05 11:42:25 +08:00
parent 4dc4c745c8
commit 43e8ef154f
29 changed files with 578 additions and 605 deletions
+48 -46
View File
@@ -1,6 +1,8 @@
package controller
import (
"openflare/common/response"
"openflare/controller/bind"
"openflare/service"
"strconv"
@@ -14,82 +16,82 @@ type wafIDsRequest struct {
func ListWAFRuleGroups(c *gin.Context) {
groups, err := service.ListWAFRuleGroups()
if err != nil {
respondFailure(c, err.Error())
response.RespondFailure(c, err.Error())
return
}
respondSuccess(c, groups)
response.RespondSuccess(c, groups)
}
func GetWAFRuleGroup(c *gin.Context) {
id, ok := parseIDParam(c)
id, ok := bind.IDParam(c)
if !ok {
return
}
group, err := service.GetWAFRuleGroup(id)
if err != nil {
respondFailure(c, err.Error())
response.RespondFailure(c, err.Error())
return
}
respondSuccess(c, group)
response.RespondSuccess(c, group)
}
func CreateWAFRuleGroup(c *gin.Context) {
var input service.WAFRuleGroupInput
if !bindJSON(c, &input) {
if !bind.JSON(c, &input) {
return
}
group, err := service.CreateWAFRuleGroup(input)
if err != nil {
respondFailure(c, err.Error())
response.RespondFailure(c, err.Error())
return
}
respondSuccess(c, group)
response.RespondSuccess(c, group)
}
func UpdateWAFRuleGroup(c *gin.Context) {
id, ok := parseIDParam(c)
id, ok := bind.IDParam(c)
if !ok {
return
}
var input service.WAFRuleGroupInput
if !bindJSON(c, &input) {
if !bind.JSON(c, &input) {
return
}
group, err := service.UpdateWAFRuleGroup(id, input)
if err != nil {
respondFailure(c, err.Error())
response.RespondFailure(c, err.Error())
return
}
respondSuccess(c, group)
response.RespondSuccess(c, group)
}
func DeleteWAFRuleGroup(c *gin.Context) {
id, ok := parseIDParam(c)
id, ok := bind.IDParam(c)
if !ok {
return
}
if err := service.DeleteWAFRuleGroup(id); err != nil {
respondFailure(c, err.Error())
response.RespondFailure(c, err.Error())
return
}
respondSuccessMessage(c, "")
response.RespondSuccessMessage(c, "")
}
func ReplaceWAFRuleGroupSites(c *gin.Context) {
id, ok := parseIDParam(c)
id, ok := bind.IDParam(c)
if !ok {
return
}
var request wafIDsRequest
if !bindJSON(c, &request) {
if !bind.JSON(c, &request) {
return
}
group, err := service.ReplaceWAFRuleGroupSites(id, request.IDs)
if err != nil {
respondFailure(c, err.Error())
response.RespondFailure(c, err.Error())
return
}
respondSuccess(c, group)
response.RespondSuccess(c, group)
}
func GetWAFSiteRuleGroups(c *gin.Context) {
@@ -99,10 +101,10 @@ func GetWAFSiteRuleGroups(c *gin.Context) {
}
view, err := service.GetWAFSiteRuleGroups(routeID)
if err != nil {
respondFailure(c, err.Error())
response.RespondFailure(c, err.Error())
return
}
respondSuccess(c, view)
response.RespondSuccess(c, view)
}
func ReplaceWAFSiteRuleGroups(c *gin.Context) {
@@ -111,111 +113,111 @@ func ReplaceWAFSiteRuleGroups(c *gin.Context) {
return
}
var request wafIDsRequest
if !bindJSON(c, &request) {
if !bind.JSON(c, &request) {
return
}
view, err := service.ReplaceWAFSiteRuleGroups(routeID, request.IDs)
if err != nil {
respondFailure(c, err.Error())
response.RespondFailure(c, err.Error())
return
}
respondSuccess(c, view)
response.RespondSuccess(c, view)
}
func ListWAFIPGroups(c *gin.Context) {
groups, err := service.ListWAFIPGroups()
if err != nil {
respondFailure(c, err.Error())
response.RespondFailure(c, err.Error())
return
}
respondSuccess(c, groups)
response.RespondSuccess(c, groups)
}
func GetWAFIPGroup(c *gin.Context) {
id, ok := parseIDParam(c)
id, ok := bind.IDParam(c)
if !ok {
return
}
group, err := service.GetWAFIPGroup(id)
if err != nil {
respondFailure(c, err.Error())
response.RespondFailure(c, err.Error())
return
}
respondSuccess(c, group)
response.RespondSuccess(c, group)
}
func CreateWAFIPGroup(c *gin.Context) {
var input service.WAFIPGroupInput
if !bindJSON(c, &input) {
if !bind.JSON(c, &input) {
return
}
group, err := service.CreateWAFIPGroup(input)
if err != nil {
respondFailure(c, err.Error())
response.RespondFailure(c, err.Error())
return
}
respondSuccess(c, group)
response.RespondSuccess(c, group)
}
func UpdateWAFIPGroup(c *gin.Context) {
id, ok := parseIDParam(c)
id, ok := bind.IDParam(c)
if !ok {
return
}
var input service.WAFIPGroupInput
if !bindJSON(c, &input) {
if !bind.JSON(c, &input) {
return
}
group, err := service.UpdateWAFIPGroup(id, input)
if err != nil {
respondFailure(c, err.Error())
response.RespondFailure(c, err.Error())
return
}
respondSuccess(c, group)
response.RespondSuccess(c, group)
}
func DeleteWAFIPGroup(c *gin.Context) {
id, ok := parseIDParam(c)
id, ok := bind.IDParam(c)
if !ok {
return
}
if err := service.DeleteWAFIPGroup(id); err != nil {
respondFailure(c, err.Error())
response.RespondFailure(c, err.Error())
return
}
respondSuccessMessage(c, "")
response.RespondSuccessMessage(c, "")
}
func SyncWAFIPGroup(c *gin.Context) {
id, ok := parseIDParam(c)
id, ok := bind.IDParam(c)
if !ok {
return
}
result, err := service.SyncWAFIPGroup(id)
if err != nil {
respondFailure(c, err.Error())
response.RespondFailure(c, err.Error())
return
}
respondSuccess(c, result)
response.RespondSuccess(c, result)
}
func TestWAFIPGroupAutoConfig(c *gin.Context) {
var input service.WAFIPGroupAutoTestInput
if !bindJSON(c, &input) {
if !bind.JSON(c, &input) {
return
}
result, err := service.TestWAFIPGroupAutoConfig(input)
if err != nil {
respondFailure(c, err.Error())
response.RespondFailure(c, err.Error())
return
}
respondSuccess(c, result)
response.RespondSuccess(c, result)
}
func parseUintPathParam(c *gin.Context, name string) (uint, bool) {
id, err := strconv.ParseUint(c.Param(name), 10, 64)
if err != nil || id == 0 {
respondBadRequest(c, "invalid id")
response.RespondBadRequest(c, "invalid id")
return 0, false
}
return uint(id), true