From 1ae63cd0e06294ab8867110b4319fd1c85e36402 Mon Sep 17 00:00:00 2001
From: kzkzzzz <lzfengyyy@gmail.com>
Date: Fri, 10 Jun 2022 17:20:53 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/hashutil/base64.go               |  8 ++++++++
 service/demo/config/config.yaml         |  2 +-
 service/demo/internal/server/handler.go | 11 ++++++-----
 3 files changed, 15 insertions(+), 6 deletions(-)
 create mode 100644 common/hashutil/base64.go

diff --git a/common/hashutil/base64.go b/common/hashutil/base64.go
new file mode 100644
index 0000000..f8c4497
--- /dev/null
+++ b/common/hashutil/base64.go
@@ -0,0 +1,8 @@
+package hashutil
+
+import "encoding/base64"
+
+func Base64Decode(src string) string {
+	res, _ := base64.StdEncoding.DecodeString(src)
+	return string(res)
+}
diff --git a/service/demo/config/config.yaml b/service/demo/config/config.yaml
index ef3be7b..836388e 100644
--- a/service/demo/config/config.yaml
+++ b/service/demo/config/config.yaml
@@ -8,7 +8,7 @@ Server:
     Addr: ""
 
 Mysql:
-  dsn: remote:admin666@tcp(127.0.0.1:3306)/test?loc=Local&charset=utf8mb4&writeTimeout=3s&readTimeout=3s&timeout=1s&parseTime=true
+  Dsn: remote:admin666@tcp(127.0.0.1:3306)/test?loc=Local&charset=utf8mb4&writeTimeout=3s&readTimeout=3s&timeout=1s&parseTime=true
   MaxConn: 8
   MaxIdleConn: 2
   MaxLifetime: 1800 # 连接有效时间,单位秒
diff --git a/service/demo/internal/server/handler.go b/service/demo/internal/server/handler.go
index e050db1..db3073d 100644
--- a/service/demo/internal/server/handler.go
+++ b/service/demo/internal/server/handler.go
@@ -22,7 +22,7 @@ func (h *handler) GetDemo(ctx context.Context, req *demo.DemoReq, resp *demo.Dem
 	if err != nil {
 		return err
 	}
-	*resp = h.convertUserModel(getDemo)
+	*resp = *h.convertUserModel(getDemo)
 	return nil
 }
 
@@ -30,7 +30,7 @@ func (h *handler) ListDemo(ctx context.Context, req *demo.ListDemoReq, resp *dem
 	if req.Limit <= 0 {
 		req.Limit = 15
 	}
-	
+
 	listDemo, err := h.svc.ListDemo(ctx, req)
 	if err != nil {
 		return err
@@ -38,7 +38,7 @@ func (h *handler) ListDemo(ctx context.Context, req *demo.ListDemoReq, resp *dem
 
 	list := make([]*demo.DemoResp, 0)
 	for _, v := range listDemo {
-		c := h.convertUserModel(v)
+		c := *h.convertUserModel(v)
 		list = append(list, &c)
 	}
 	resp.List = list
@@ -46,8 +46,8 @@ func (h *handler) ListDemo(ctx context.Context, req *demo.ListDemoReq, resp *dem
 	return nil
 }
 
-func (h *handler) convertUserModel(users *model.User) (resp demo.DemoResp) {
-	return demo.DemoResp{
+func (h *handler) convertUserModel(users *model.User) (resp *demo.DemoResp) {
+	r := &demo.DemoResp{
 		Id:        cast.ToString(users.Id),
 		Username:  users.Username,
 		Email:     users.Email,
@@ -56,4 +56,5 @@ func (h *handler) convertUserModel(users *model.User) (resp demo.DemoResp) {
 		CreatedAt: timestamppb.New(users.CreatedAt),
 		UpdatedAt: timestamppb.New(users.UpdatedAt),
 	}
+	return r
 }
-- 
2.22.0