提交 4095a391 authored 作者: mooncake9527's avatar mooncake9527

update

上级 908d5f74
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
package middleware package middleware
import ( import (
"strings"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"gitlab.wanzhuangkj.com/tush/xpkg/errcode" "gitlab.wanzhuangkj.com/tush/xpkg/errcode"
"gitlab.wanzhuangkj.com/tush/xpkg/gin/ctxUtils" "gitlab.wanzhuangkj.com/tush/xpkg/gin/ctxUtils"
...@@ -122,14 +124,7 @@ func AuthCustom(verify VerifyCustomFn, opts ...JwtOption) gin.HandlerFunc { ...@@ -122,14 +124,7 @@ func AuthCustom(verify VerifyCustomFn, opts ...JwtOption) gin.HandlerFunc {
return func(c *gin.Context) { return func(c *gin.Context) {
authorization := c.GetHeader(HeaderAuthorizationKey) authorization := c.GetHeader(HeaderAuthorizationKey)
if len(authorization) < 150 { token := strings.TrimPrefix(authorization, "Bearer ")
logger.Warn("authorization is illegal")
responseUnauthorized(c, o.isSwitchHTTPCode)
c.Abort()
return
}
token := authorization[7:] // remove Bearer prefix
claims, err := jwt.ParseCustomToken(token) claims, err := jwt.ParseCustomToken(token)
if err != nil { if err != nil {
logger.Warn("ParseToken error", logger.Err(err)) logger.Warn("ParseToken error", logger.Err(err))
......
...@@ -4,6 +4,7 @@ import ( ...@@ -4,6 +4,7 @@ import (
"io" "io"
"mime/multipart" "mime/multipart"
"gitlab.wanzhuangkj.com/tush/xpkg/logger"
"gitlab.wanzhuangkj.com/tush/xpkg/xerrors/xerror" "gitlab.wanzhuangkj.com/tush/xpkg/xerrors/xerror"
"github.com/aliyun/aliyun-oss-go-sdk/oss" "github.com/aliyun/aliyun-oss-go-sdk/oss"
...@@ -24,14 +25,12 @@ type AliOssConfig struct { ...@@ -24,14 +25,12 @@ type AliOssConfig struct {
} }
func NewClient(cfg *AliOssConfig) (bucket *oss.Bucket, err error) { func NewClient(cfg *AliOssConfig) (bucket *oss.Bucket, err error) {
client, err := oss.New(cfg.Endpoint, // client, err := oss.New(cfg.Endpoint, cfg.AccessKeyId, cfg.AccessKeySecret, oss.AuthVersion(oss.AuthV4), oss.Region(cfg.Region))
cfg.AccessKeyId, client, err := oss.New(cfg.Endpoint, cfg.AccessKeyId, cfg.AccessKeySecret)
cfg.AccessKeySecret,
oss.AuthVersion(oss.AuthV4),
oss.Region(cfg.Region))
if err != nil { if err != nil {
return nil, xerror.New(err.Error()) return nil, xerror.New(err.Error())
} }
logger.Info("bucker name" + cfg.BucketName)
bucket, err = client.Bucket(cfg.BucketName) bucket, err = client.Bucket(cfg.BucketName)
return return
} }
......
...@@ -3,6 +3,7 @@ package xtime ...@@ -3,6 +3,7 @@ package xtime
import ( import (
"database/sql/driver" "database/sql/driver"
"fmt" "fmt"
"reflect"
"regexp" "regexp"
"strconv" "strconv"
"time" "time"
...@@ -19,12 +20,31 @@ const ( ...@@ -19,12 +20,31 @@ const (
// 定义time.Time的别名 // 定义time.Time的别名
type DateTime time.Time type DateTime time.Time
func (ct *DateTime) UnmarshalParam(src string) error {
field, _ := reflect.TypeOf(ct).Elem().FieldByName("DateTime")
format := field.Tag.Get("format")
if format == "" {
format = time.DateTime
}
t, err := time.Parse(format, src)
if err != nil {
return fmt.Errorf("time format should be %s", format)
}
*ct = DateTime(t)
return nil
}
// 自定义json序列化 // 自定义json序列化
func (x DateTime) MarshalJSON() ([]byte, error) { func (x DateTime) MarshalJSON() ([]byte, error) {
if x.IsZero() { if x.IsZero() {
return []byte(`""`), nil return []byte(`""`), nil
} }
var jsonTimeStr = fmt.Sprintf(`"%s"`, time.Time(x).Format("2006-01-02 15:04:05")) field, _ := reflect.TypeOf(x).Elem().FieldByName("DateTime")
format := field.Tag.Get("format")
if format == "" {
format = "2006-01-02 15:04:05"
}
var jsonTimeStr = fmt.Sprintf(`"%s"`, time.Time(x).Format(format))
return []byte(jsonTimeStr), nil return []byte(jsonTimeStr), nil
} }
...@@ -34,7 +54,12 @@ func (x *DateTime) UnmarshalJSON(data []byte) error { ...@@ -34,7 +54,12 @@ func (x *DateTime) UnmarshalJSON(data []byte) error {
*x = DateTime{} *x = DateTime{}
return nil return nil
} }
t, err := time.Parse(`"2006-01-02 15:04:05"`, string(data)) field, _ := reflect.TypeOf(x).Elem().FieldByName("DateTime")
format := field.Tag.Get("format")
if format == "" {
format = "2006-01-02 15:04:05"
}
t, err := time.Parse(format, string(data))
if err != nil { if err != nil {
return err return err
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论