1
0
Fork 0
forked from forgejo/forgejo

use go 1.13 (#8088)

* use go 1.13

* use go 1.13 in gomod file

* Update Makefile

* update swagger deps
This commit is contained in:
techknowlogick 2019-09-12 07:58:32 -04:00 committed by Lauris BH
parent d0ad47bd5d
commit 3f5cdfe359
121 changed files with 759 additions and 12620 deletions

View file

@ -240,11 +240,14 @@ func (b *Base64) UnmarshalText(data []byte) error { // validation is performed l
func (b *Base64) Scan(raw interface{}) error {
switch v := raw.(type) {
case []byte:
if err := b.UnmarshalText(v); err != nil {
dbuf := make([]byte, base64.StdEncoding.DecodedLen(len(v)))
n, err := base64.StdEncoding.Decode(dbuf, v)
if err != nil {
return err
}
*b = dbuf[:n]
case string:
vv, err := base64.URLEncoding.DecodeString(v)
vv, err := base64.StdEncoding.DecodeString(v)
if err != nil {
return err
}
@ -262,7 +265,7 @@ func (b Base64) Value() (driver.Value, error) {
}
func (b Base64) String() string {
return base64.URLEncoding.EncodeToString([]byte(b))
return base64.StdEncoding.EncodeToString([]byte(b))
}
// MarshalJSON returns the Base64 as JSON
@ -276,7 +279,7 @@ func (b *Base64) UnmarshalJSON(data []byte) error {
if err := json.Unmarshal(data, &b64str); err != nil {
return err
}
vb, err := base64.URLEncoding.DecodeString(b64str)
vb, err := base64.StdEncoding.DecodeString(b64str)
if err != nil {
return err
}
@ -297,7 +300,7 @@ func (b *Base64) UnmarshalBSON(data []byte) error {
}
if bd, ok := m["data"].(string); ok {
vb, err := base64.URLEncoding.DecodeString(bd)
vb, err := base64.StdEncoding.DecodeString(bd)
if err != nil {
return err
}