From 3b0012ec30d930b98e3fa859edd78427e5886f6d Mon Sep 17 00:00:00 2001
From: john <john@johng.cn>
Date: Tue, 9 Jul 2019 08:07:50 +0800
Subject: [PATCH] fix issue in gbase64.Decode

---
 g/encoding/gbase64/gbase64.go |  5 +----
 geg/other/test.go             | 29 +++++++++++------------------
 2 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/g/encoding/gbase64/gbase64.go b/g/encoding/gbase64/gbase64.go
index e19733002..0a01680ff 100644
--- a/g/encoding/gbase64/gbase64.go
+++ b/g/encoding/gbase64/gbase64.go
@@ -22,10 +22,7 @@ func Encode(src []byte) []byte {
 func Decode(dst []byte) ([]byte, error) {
 	src := make([]byte, base64.StdEncoding.DecodedLen(len(dst)))
 	n, err := base64.StdEncoding.Decode(src, dst)
-	if err != nil {
-		return nil, err
-	}
-	return src[:n], nil
+	return src[:n], err
 }
 
 // EncodeString encodes bytes with BASE64 algorithm.
diff --git a/geg/other/test.go b/geg/other/test.go
index 9454d714c..381a581b9 100644
--- a/geg/other/test.go
+++ b/geg/other/test.go
@@ -1,26 +1,19 @@
 package main
 
 import (
+	"encoding/base64"
 	"fmt"
-
-	"github.com/gogf/gf/g"
+	"github.com/gogf/gf/g/encoding/gbase64"
 )
 
-type User struct {
-	Uid  int
-	Name string
-}
-
 func main() {
-	if r, err := g.DB().Table("user").Where("uid=?", 1).One(); r != nil {
-		u := new(User)
-		if err := r.ToStruct(u); err == nil {
-			fmt.Println(" uid:", u.Uid)
-			fmt.Println("name:", u.Name)
-		} else {
-			fmt.Println(err)
-		}
-	} else if err != nil {
-		fmt.Println(err)
-	}
+	data := "HwHsGhXMaGc==="
+	datab, err := gbase64.Decode([]byte(data))
+	fmt.Println(err)
+	fmt.Println(datab)
+	fmt.Println(string(datab))
+
+	s, e := base64.StdEncoding.DecodeString(data)
+	fmt.Println(e)
+	fmt.Println(string(s))
 }