diff --git a/common/hashutil/base64.go b/common/hashutil/base64.go new file mode 100644 index 0000000000000000000000000000000000000000..f8c4497d87f8886325f5a9c202768cd09a82e7e9 --- /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 ef3be7b83e57a78bc426f4c90c0997d4a30add7a..836388e072fdf25aa6bcd873004fa001568e64d7 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 e050db1e5b5ba3c66a59644de4b9ec4c02a77c0b..db3073dee670eed413b73be151f85c064e8b3ebd 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 }