fix: 增加修改提示信息及国际化

Author: ssongliu

backend/app/api/v1/entry.go

@@ -33,7 +33,7 @@ var (
 	sshService      = service.NewISSHService()
 	firewallService = service.NewIFirewallService()
 
-	fail2banService = service.NewIFail2banService()
+	fail2banService = service.NewIFail2BanService()
 
 	settingService = service.NewISettingService()
 	backupService  = service.NewIBackupService()

backend/app/api/v1/fail2ban.go

@@ -1,7 +1,6 @@
 package v1
 
 import (
-	"bufio"
 	"os"
 
 	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
@@ -10,13 +9,13 @@ import (
 	"github.com/gin-gonic/gin"
 )
 
-// @Tags Fail2ban
+// @Tags Fail2Ban
 // @Summary Load fail2ban base info
-// @Description 获取 Fail2ban 基础信息
-// @Success 200 {object} dto.Fail2banBaseInfo
+// @Description 获取 Fail2Ban 基础信息
+// @Success 200 {object} dto.Fail2BanBaseInfo
 // @Security ApiKeyAuth
 // @Router /toolbox/fail2ban/base [get]
-func (b *BaseApi) LoadFail2banBaseInfo(c *gin.Context) {
+func (b *BaseApi) LoadFail2BanBaseInfo(c *gin.Context) {
 	data, err := fail2banService.LoadBaseInfo()
 	if err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
@@ -26,41 +25,38 @@ func (b *BaseApi) LoadFail2banBaseInfo(c *gin.Context) {
 	helper.SuccessWithData(c, data)
 }
 
-// @Tags Fail2ban
+// @Tags Fail2Ban
 // @Summary Page fail2ban ip list
-// @Description 获取 Fail2ban ip 列表
+// @Description 获取 Fail2Ban ip
 // @Accept json
-// @Param request body dto.Fail2banSearch true "request"
-// @Success 200 {object} dto.PageResult
+// @Param request body dto.Fail2BanSearch true "request"
+// @Success 200 {Array} string
 // @Security ApiKeyAuth
 // @Router /toolbox/fail2ban/search [post]
-func (b *BaseApi) SearchFail2ban(c *gin.Context) {
-	var req dto.Fail2banSearch
+func (b *BaseApi) SearchFail2Ban(c *gin.Context) {
+	var req dto.Fail2BanSearch
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
-	total, list, err := fail2banService.SearchWithPage(req)
+	list, err := fail2banService.Search(req)
 	if err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
 	}
 
-	helper.SuccessWithData(c, dto.PageResult{
-		Items: list,
-		Total: total,
-	})
+	helper.SuccessWithData(c, list)
 }
 
-// @Tags Fail2ban
+// @Tags Fail2Ban
 // @Summary Operate fail2ban
-// @Description 修改 Fail2ban 状态
+// @Description 修改 Fail2Ban 状态
 // @Accept json
 // @Param request body dto.Operate true "request"
 // @Security ApiKeyAuth
 // @Router /toolbox/fail2ban/operate [post]
-// @x-panel-log {"bodyKeys":["operation"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"[operation] Fail2ban","formatEN":"[operation] Fail2ban"}
-func (b *BaseApi) OperateFail2ban(c *gin.Context) {
+// @x-panel-log {"bodyKeys":["operation"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"[operation] Fail2Ban","formatEN":"[operation] Fail2Ban"}
+func (b *BaseApi) OperateFail2Ban(c *gin.Context) {
 	var req dto.Operate
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
@@ -74,16 +70,15 @@ func (b *BaseApi) OperateFail2ban(c *gin.Context) {
 	helper.SuccessWithData(c, nil)
 }
 
-// @Tags Fail2ban
+// @Tags Fail2Ban
 // @Summary Operate sshd of fail2ban
 // @Description 配置 sshd
 // @Accept json
 // @Param request body dto.Operate true "request"
 // @Security ApiKeyAuth
 // @Router /toolbox/fail2ban/operate/sshd [post]
-// @x-panel-log {"bodyKeys":["operate", "ips"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"[operate] ips: [ips]","formatEN":"[operate] ips: [ips]"}
 func (b *BaseApi) OperateSSHD(c *gin.Context) {
-	var req dto.Fail2banSet
+	var req dto.Fail2BanSet
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
@@ -96,17 +91,17 @@ func (b *BaseApi) OperateSSHD(c *gin.Context) {
 	helper.SuccessWithData(c, nil)
 }
 
-// @Tags Fail2ban
+// @Tags Fail2Ban
 // @Summary Update fail2ban conf
-// @Description 修改 Fail2ban 配置
+// @Description 修改 Fail2Ban 配置
 // @Accept json
-// @Param request body dto.Fail2banUpdate true "request"
+// @Param request body dto.Fail2BanUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
 // @Router /toolbox/fail2ban/update [post]
-// @x-panel-log {"bodyKeys":["key","value"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改 Fail2ban 配置 [key] => [value]","formatEN":"update fail2ban conf [key] => [value]"}
-func (b *BaseApi) UpdateFail2banConf(c *gin.Context) {
-	var req dto.Fail2banUpdate
+// @x-panel-log {"bodyKeys":["key","value"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改 Fail2Ban 配置 [key] => [value]","formatEN":"update fail2ban conf [key] => [value]"}
+func (b *BaseApi) UpdateFail2BanConf(c *gin.Context) {
+	var req dto.Fail2BanUpdate
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
@@ -118,14 +113,14 @@ func (b *BaseApi) UpdateFail2banConf(c *gin.Context) {
 	helper.SuccessWithData(c, nil)
 }
 
-// @Tags Fail2ban
+// @Tags Fail2Ban
 // @Summary Load fail2ban conf
 // @Description 获取 fail2ban 配置文件
 // @Accept json
-// @Success 200 string
+// @Success 200
 // @Security ApiKeyAuth
 // @Router /toolbox/fail2ban/load/conf [get]
-func (b *BaseApi) LoadFail2banConf(c *gin.Context) {
+func (b *BaseApi) LoadFail2BanConf(c *gin.Context) {
 	path := "/etc/fail2ban/jail.local"
 	file, err := os.ReadFile(path)
 	if err != nil {
@@ -136,29 +131,23 @@ func (b *BaseApi) LoadFail2banConf(c *gin.Context) {
 	helper.SuccessWithData(c, string(file))
 }
 
-// @Tags Fail2ban
+// @Tags Fail2Ban
 // @Summary Update fail2ban conf by file
 // @Description 通过文件修改 fail2ban 配置
 // @Accept json
 // @Param request body dto.UpdateByFile true "request"
 // @Success 200
 // @Security ApiKeyAuth
 // @Router /toolbox/fail2ban/update/byconf [post]
-func (b *BaseApi) UpdateFail2banConfByFile(c *gin.Context) {
+func (b *BaseApi) UpdateFail2BanConfByFile(c *gin.Context) {
 	var req dto.UpdateByFile
 	if err := helper.CheckBind(&req, c); err != nil {
 		return
 	}
-	path := "/etc/fail2ban/jail.local"
-	file, err := os.OpenFile(path, os.O_WRONLY|os.O_TRUNC, 0640)
-	if err != nil {
+	if err := fail2banService.UpdateConfByFile(req); err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
 	}
-	defer file.Close()
-	write := bufio.NewWriter(file)
-	_, _ = write.WriteString(req.File)
-	write.Flush()
 
 	helper.SuccessWithData(c, nil)
 }

backend/app/dto/fail2ban.go

@@ -1,8 +1,9 @@
 package dto
 
-type Fail2banBaseInfo struct {
+type Fail2BanBaseInfo struct {
 	IsEnable bool   `json:"isEnable"`
 	IsActive bool   `json:"isActive"`
+	IsExist  bool   `json:"isExist"`
 	Version  string `json:"version"`
 
 	MaxRetry  int    `json:"maxRetry"`
@@ -11,17 +12,16 @@ type Fail2banBaseInfo struct {
 	BanAction string `json:"banAction"`
 }
 
-type Fail2banSearch struct {
-	PageInfo
+type Fail2BanSearch struct {
 	Status string `json:"status" validate:"required,oneof=banned ignore"`
 }
 
-type Fail2banUpdate struct {
-	Key   string `json:"key" validate:"required,oneof=port banTime findTime maxRetry banAction action logPath"`
+type Fail2BanUpdate struct {
+	Key   string `json:"key" validate:"required,oneof=port bantime findtime maxretry banaction"`
 	Value string `json:"value"`
 }
 
-type Fail2banSet struct {
+type Fail2BanSet struct {
 	IPs     []string `json:"ips"`
-	Operate string   `json:"status"  validate:"required,oneof=banned unbanned ignore"`
+	Operate string   `json:"operate"  validate:"required,oneof=banned ignore"`
 }