From ebb211b42e28e72d14e4c4a85c0f90c69e155d47 Mon Sep 17 00:00:00 2001 From: guzeng Date: Mon, 27 Sep 2021 10:21:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=9E=E6=8E=A5=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- user.client.go | 36 ++++++++++++++---------------------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/user.client.go b/user.client.go index 04e1b07..6c5ffed 100644 --- a/user.client.go +++ b/user.client.go @@ -12,14 +12,11 @@ import ( func GetUserByToken(dbname, token string, url ...string) (map[string]string, error) { - var user_rpc_url string = "127.0.0.1:7976" - if len(url) > 0 && url[0] != "" { - user_rpc_url = url[0] - } - conn, _, err := DialUserService("tcp", user_rpc_url) + conn, err := rpc_server_conn(url...) if err != nil { return map[string]string{}, err } + defer conn.Close() req := &UserRequest{proto.String(dbname), proto.String(token), nil} @@ -47,8 +44,9 @@ func GetUserByToken(dbname, token string, url ...string) (map[string]string, err "Usercode": res.GetUsercode(), "GroupId": res.GetGroupId(), "Type": res.GetType(), - "ThirdId": res.GetThirdId(), - "Platform": res.GetPlatform(), + "ThirdId": res.GetThirdId(), + "Platform": res.GetPlatform(), + "LockFans": res.LockFans(), }, nil } @@ -60,12 +58,10 @@ func GetUserByToken(dbname, token string, url ...string) (map[string]string, err */ func GetUserByUsername(dbname, username string, url ...string) (*UserResponse, error) { - var user_rpc_url string = "127.0.0.1:7976" - if len(url) > 0 && url[0] != "" { - user_rpc_url = url[0] + conn, err := rpc_server_conn(url...) + if err != nil { + return map[string]string{}, err } - - conn, _, err := DialUserService("tcp", user_rpc_url) if err != nil { return nil, err } @@ -89,12 +85,10 @@ func GetUserByUsername(dbname, username string, url ...string) (*UserResponse, e */ func GetUserByUsercode(dbname, usercode string, url ...string) (*UserResponse, error) { - var user_rpc_url string = "127.0.0.1:7976" - if len(url) > 0 && url[0] != "" { - user_rpc_url = url[0] + conn, err := rpc_server_conn(url...) + if err != nil { + return map[string]string{}, err } - - conn, _, err := DialUserService("tcp", user_rpc_url) if err != nil { return nil, err } @@ -115,12 +109,10 @@ func GetUserByUsercode(dbname, usercode string, url ...string) (*UserResponse, e func Login(dbname, account, password string, url ...string) (map[string]string, error) { - var user_rpc_url string = "127.0.0.1:7976" - if len(url) > 0 && url[0] != "" { - user_rpc_url = url[0] + conn, err := rpc_server_conn(url...) + if err != nil { + return map[string]string{}, err } - - conn, _, err := DialUserService("tcp", user_rpc_url) if err != nil { return map[string]string{}, err }