improve gbase64

g/encoding/gbase64/gbase64.go

@@ -21,11 +21,11 @@ func Encode(src []byte) []byte {
 // Decode decodes bytes with BASE64 algorithm.
 func Decode(dst []byte) ([]byte, error) {
 	src := make([]byte, base64.StdEncoding.DecodedLen(len(dst)))
-	_, err := base64.StdEncoding.Decode(src, dst)
+	n, err := base64.StdEncoding.Decode(src, dst)
 	if err != nil {
 		return nil, err
 	}
-	return src, nil
+	return src[:n], nil
 }
 
 // EncodeString encodes bytes with BASE64 algorithm.

g/encoding/gbase64/gbase64_test.go

@@ -6,9 +6,10 @@
 package gbase64_test
 
 import (
+	"testing"
+
 	"github.com/gogf/gf/g/encoding/gbase64"
 	"github.com/gogf/gf/g/test/gtest"
-	"testing"
 )
 
 type testpair struct {
@@ -42,10 +43,17 @@ var pairs = []testpair{
 }
 
 func TestBase64(t *testing.T) {
-	for k := range pairs {
-		gtest.Assert(gbase64.Encode(pairs[k].decoded), pairs[k].encoded)
+	gtest.Case(t, func() {
+		for k := range pairs {
+			// []byte
+			gtest.Assert(gbase64.Encode([]byte(pairs[k].decoded)), []byte(pairs[k].encoded))
+			e1, _ := gbase64.Decode([]byte(pairs[k].encoded))
+			gtest.Assert(e1, []byte(pairs[k].decoded))
 
-		e, _ := gbase64.Decode(pairs[k].encoded)
-		gtest.Assert(e, pairs[k].decoded)
-	}
+			// string
+			gtest.Assert(gbase64.EncodeString([]byte(pairs[k].decoded)), pairs[k].encoded)
+			e2, _ := gbase64.DecodeString(pairs[k].encoded)
+			gtest.Assert(e2, []byte(pairs[k].decoded))
+		}
+	})
 }

geg/other/test.go

@@ -1,21 +1,8 @@
 package main
 
-import (
-	"fmt"
-
-	"github.com/gogf/gf/g/encoding/gbase64"
-	"github.com/gogf/gf/g/net/ghttp"
-)
-
-type Order struct{}
-
-func (order *Order) Get(r *ghttp.Request) {
-	r.Response.Write("GET")
-}
+import "fmt"
 
 func main() {
-	s := `BgsnyD6IBEzExNDUzNjEzNDg4MzYxOTMzNjQSShAJGgzns7vnu5/pgJrnn6UiOGh0dHA6Ly9wdWItbWVkLWxvZ28uaW1ncy5tZWRsaW5rZXIubmV0L25ldy1zeXN0ZW1AM3gucG5`
-	b, err := gbase64.DecodeString(s)
-	fmt.Println(err)
-	fmt.Println(string(b))
+	s := "123"
+	fmt.Println([]byte(s))
 }