1 parent
7c8b71c33f
commit
2660fc7b13
42 files changed
+701
-634
No files matched your search
@@ -9,10 +9,12 @@ import (
|
||||
"pmail/dto"
|
||||
"pmail/dto/response"
|
||||
"pmail/i18n"
|
||||
"pmail/models"
|
||||
"pmail/services/rule"
|
||||
"pmail/utils/address"
|
||||
"pmail/utils/array"
|
||||
"pmail/utils/context"
|
||||
"pmail/utils/errors"
|
||||
)
|
||||
|
||||
func GetRule(ctx *context.Context, w http.ResponseWriter, req *http.Request) {
|
||||
@@ -48,7 +50,7 @@ func UpsertRule(ctx *context.Context, w http.ResponseWriter, req *http.Request)
|
||||
}
|
||||
}
|
||||
|
||||
err = data.Encode().Save(ctx)
|
||||
err = save(ctx, data.Encode())
|
||||
if err != nil {
|
||||
response.NewErrorResponse(response.ServerError, "server error", err).FPrint(w)
|
||||
return
|
||||
@@ -56,6 +58,24 @@ func UpsertRule(ctx *context.Context, w http.ResponseWriter, req *http.Request)
|
||||
response.NewSuccessResponse("succ").FPrint(w)
|
||||
}
|
||||
|
||||
func save(ctx *context.Context, p *models.Rule) error {
|
||||
|
||||
if p.Id > 0 {
|
||||
_, err := db.Instance.Exec(db.WithContext(ctx, "update rule set name=? ,value = ? ,action = ?,params = ?,sort = ? where id = ?"), p.Name, p.Value, p.Action, p.Params, p.Sort, p.Id)
|
||||
if err != nil {
|
||||
return errors.Wrap(err)
|
||||
}
|
||||
return nil
|
||||
} else {
|
||||
_, err := db.Instance.Exec(db.WithContext(ctx, "insert into rule (name,value,user_id,action,params,sort) values (?,?,?,?,?,?)"), p.Name, p.Value, ctx.UserID, p.Action, p.Params, p.Sort)
|
||||
if err != nil {
|
||||
return errors.Wrap(err)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
type delRuleReq struct {
|
||||
Id int `json:"id"`
|
||||
}
|
||||
|
||||
@@ -135,7 +135,7 @@ func Setup(ctx *context.Context, w http.ResponseWriter, req *http.Request) {
|
||||
}
|
||||
|
||||
if reqData["step"] == "ssl" && reqData["action"] == "set" {
|
||||
err := ssl.SetSSL(reqData["ssl_type"])
|
||||
err := ssl.SetSSL(reqData["ssl_type"], reqData["key_path"], reqData["crt_path"])
|
||||
if err != nil {
|
||||
response.NewErrorResponse(response.ServerError, err.Error(), "").FPrint(w)
|
||||
return
|
||||
|
||||
Reference in new issue
Block a user