mirror of
https://github.com/0xJacky/nginx-ui.git
synced 2025-05-12 02:45:49 +02:00
[v1.1] 新增自动续签并修复了一些 bug
修复后端可能会 panic 的问题 修复前端逻辑问题,新增证书自动续签
This commit is contained in:
parent
27c4b82d54
commit
882fe8c074
121 changed files with 1656 additions and 798 deletions
|
@ -1,43 +1,42 @@
|
|||
package api
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"encoding/json"
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/gin-gonic/gin/binding"
|
||||
"github.com/go-playground/locales/zh"
|
||||
"log"
|
||||
"bytes"
|
||||
"encoding/json"
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/gin-gonic/gin/binding"
|
||||
"github.com/go-playground/locales/zh"
|
||||
ut "github.com/go-playground/universal-translator"
|
||||
val "github.com/go-playground/validator/v10"
|
||||
zhTranslations "github.com/go-playground/validator/v10/translations/zh"
|
||||
"log"
|
||||
"net/http"
|
||||
"regexp"
|
||||
"strings"
|
||||
|
||||
ut "github.com/go-playground/universal-translator"
|
||||
val "github.com/go-playground/validator/v10"
|
||||
zhTranslations "github.com/go-playground/validator/v10/translations/zh"
|
||||
"reflect"
|
||||
"regexp"
|
||||
)
|
||||
|
||||
type JsonSnakeCase struct {
|
||||
Value interface{}
|
||||
Value interface{}
|
||||
}
|
||||
|
||||
func (c JsonSnakeCase) MarshalJSON() ([]byte, error) {
|
||||
// Regexp definitions
|
||||
var keyMatchRegex = regexp.MustCompile(`\"(\w+)\":`)
|
||||
var wordBarrierRegex = regexp.MustCompile(`(\w)([A-Z])`)
|
||||
marshalled, err := json.Marshal(c.Value)
|
||||
converted := keyMatchRegex.ReplaceAllFunc(
|
||||
marshalled,
|
||||
func(match []byte) []byte {
|
||||
return bytes.ToLower(wordBarrierRegex.ReplaceAll(
|
||||
match,
|
||||
[]byte(`${1}_${2}`),
|
||||
))
|
||||
},
|
||||
)
|
||||
return converted, err
|
||||
// Regexp definitions
|
||||
var keyMatchRegex = regexp.MustCompile(`\"(\w+)\":`)
|
||||
var wordBarrierRegex = regexp.MustCompile(`(\w)([A-Z])`)
|
||||
marshalled, err := json.Marshal(c.Value)
|
||||
converted := keyMatchRegex.ReplaceAllFunc(
|
||||
marshalled,
|
||||
func(match []byte) []byte {
|
||||
return bytes.ToLower(wordBarrierRegex.ReplaceAll(
|
||||
match,
|
||||
[]byte(`${1}_${2}`),
|
||||
))
|
||||
},
|
||||
)
|
||||
return converted, err
|
||||
}
|
||||
|
||||
func ErrorHandler(c *gin.Context, err error) {
|
||||
func ErrHandler(c *gin.Context, err error) {
|
||||
log.Println(err)
|
||||
c.JSON(http.StatusInternalServerError, gin.H{
|
||||
"message": err.Error(),
|
||||
|
@ -49,41 +48,44 @@ type ValidError struct {
|
|||
Message string
|
||||
}
|
||||
|
||||
func BindAndValid(c *gin.Context, v interface{}) bool {
|
||||
errs := make(map[string]string)
|
||||
err := c.ShouldBindJSON(v)
|
||||
if err != nil {
|
||||
log.Println(err)
|
||||
uni := ut.New(zh.New())
|
||||
trans, _ := uni.GetTranslator("zh")
|
||||
v, ok := binding.Validator.Engine().(*val.Validate)
|
||||
func BindAndValid(c *gin.Context, target interface{}) bool {
|
||||
errs := make(map[string]string)
|
||||
err := c.ShouldBindJSON(target)
|
||||
if err != nil {
|
||||
log.Println("raw err", err)
|
||||
uni := ut.New(zh.New())
|
||||
trans, _ := uni.GetTranslator("zh")
|
||||
v, ok := binding.Validator.Engine().(*val.Validate)
|
||||
if ok {
|
||||
_ = zhTranslations.RegisterDefaultTranslations(v, trans)
|
||||
}
|
||||
|
||||
if ok {
|
||||
_ = zhTranslations.RegisterDefaultTranslations(v, trans)
|
||||
}
|
||||
verrs, ok := err.(val.ValidationErrors)
|
||||
|
||||
verrs, ok := err.(val.ValidationErrors)
|
||||
if !ok {
|
||||
log.Println(verrs)
|
||||
c.JSON(http.StatusNotAcceptable, gin.H{
|
||||
"message": "请求参数错误",
|
||||
"code": http.StatusNotAcceptable,
|
||||
})
|
||||
return false
|
||||
}
|
||||
if !ok {
|
||||
log.Println("verrs", verrs)
|
||||
c.JSON(http.StatusNotAcceptable, gin.H{
|
||||
"message": "请求参数错误",
|
||||
"code": http.StatusNotAcceptable,
|
||||
})
|
||||
return false
|
||||
}
|
||||
|
||||
for key, value := range verrs.Translate(trans) {
|
||||
errs[key[strings.Index(key, ".")+1:]] = value
|
||||
}
|
||||
for _, value := range verrs {
|
||||
t := reflect.ValueOf(target)
|
||||
realType := t.Type().Elem()
|
||||
field, _ := realType.FieldByName(value.StructField())
|
||||
errs[field.Tag.Get("json")] = value.Translate(trans)
|
||||
}
|
||||
|
||||
c.JSON(http.StatusNotAcceptable, gin.H{
|
||||
"errors": JsonSnakeCase{errs},
|
||||
"message": "请求参数错误",
|
||||
"code": http.StatusNotAcceptable,
|
||||
})
|
||||
c.JSON(http.StatusNotAcceptable, gin.H{
|
||||
"errors": errs,
|
||||
"message": "请求参数错误",
|
||||
"code": http.StatusNotAcceptable,
|
||||
})
|
||||
|
||||
return false
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
return true
|
||||
return true
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue