修改readme

README.md

@@ -1,3 +1,3 @@
-# rpc
+# 此目录将作废
 
 rpc

pay/client.go

@@ -0,0 +1,141 @@
+package pay
+
+import (
+	"crypto/md5"
+	"encoding/hex"
+	"encoding/json"
+	"errors"
+	"strconv"
+	"strings"
+	"time"
+
+	"git.tetele.net/tgo/crypter"
+
+	"github.com/golang/protobuf/proto"
+)
+
+type PayToBusinessReq struct {
+	SiteId        string  `json:"site_id"`
+	Dbname        string  `json:"dbname"`
+	UserId        string  `json:"user_id"`
+	BusinessId    string  `json:"business_id"`
+	BalanceTypeId string  `json:"balance_type"`
+	Money         float64 `json:"money"`
+	Payer         string  `json:"payer"`
+	Memo          string  `json:"memo"`
+	PayType       string  `json:"pay_type"`
+}
+
+type PayToBusinessRes struct {
+	Id string
+	Sn string
+}
+
+const DES_KEY string = "paypayda"
+
+/**
+ * 向商家支付
+ * 请求及回均加密验签
+ * 2021/02/18
+ * GZ
+ */
+func Pay(req PayToBusinessReq, url ...string) (*PayToBusinessRes, error) {
+
+	var pay_rpc_url string = "127.0.0.1:7967"
+	if len(url) > 0 && url[0] != "" {
+		pay_rpc_url = url[0]
+	}
+	conn, _, err := DialSiteService("tcp", pay_rpc_url)
+	if err != nil {
+		return nil, err
+	}
+	defer conn.Close()
+
+	data_json, err := json.Marshal(req)
+	if err != nil {
+		return nil, err
+	}
+	now_int64 := time.Now().Unix()
+
+	encryData := crypter.DesEn(string(data_json), DES_KEY)
+
+	now := strconv.FormatInt(now_int64, 10)
+
+	sign := Sign(encryData, now)
+
+	req := &PayRequest{proto.String(encryData), proto.String(now), proto.String(sign), nil}
+
+	res := &PayResponse{}
+
+	err = conn.PayToBusiness(req, res)
+
+	if err != nil {
+		return nil, err
+	}
+
+	res_data := res.GetData()
+
+	if res_data != "" {
+
+		time_int64, err := strconv.ParseInt(res.GetTime(), 10, 64)
+		if err != nil {
+			return nil, err
+		}
+
+		now_int64 = time.Now().Unix()
+
+		if now_int64-time_int64 > 10 || time_int64-now_int64 > 10 {
+			//时间误差前后10秒，返回
+			return nil, errors.New("返回时间错误")
+		}
+
+		check_sign := CheckSign(res.GetSign(), res_data, res.GetTime())
+		if !check_sign {
+			return nil, errors.New("返回数据签名错误")
+		}
+
+		//解密
+		res_data_de := crypter.DesDe(res_data, DES_KEY)
+
+		var res_arr PayToBusinessRes
+
+		err = json.Unmarshal([]byte(res_data_de), &res_arr)
+
+		if err != nil {
+			return nil, err
+		}
+		return &res_arr, nil
+	}
+
+	return nil, nil
+}
+
+/**
+ * 签名
+ */
+func Sign(data string, salt string) string {
+
+	var build strings.Builder
+
+	build.WriteString(data)
+	build.WriteString(salt)
+	build.WriteString("pay66sign33")
+
+	data_str := build.String()
+
+	h := md5.New()
+	h.Write([]byte(data_str))             // 需要加密的字符串
+	return hex.EncodeToString(h.Sum(nil)) // 输出加密结果
+
+}
+
+/**
+ * 验证签名
+ */
+func CheckSign(sign_str, data, salt string) bool {
+	sign := Sign(data, salt)
+	if strings.Compare(sign_str, sign) > -1 {
+		return true
+	}
+	return false
+}

pay/pay.pb.go

@@ -0,0 +1,198 @@
+// Code generated by protoc-gen-go.
+// source: pay.proto
+// DO NOT EDIT!
+
+/*
+Package pay is a generated protocol buffer package.
+
+It is generated from these files:
+	pay.proto
+
+It has these top-level messages:
+	PayRequest
+	PayResponse
+*/
+package pay
+
+import proto "github.com/chai2010/protorpc/proto"
+import math "math"
+
+import "io"
+import "log"
+import "net"
+import "net/rpc"
+import "time"
+import protorpc "github.com/chai2010/protorpc"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = math.Inf
+
+// 配置信息请求结构
+type PayRequest struct {
+	Data             *string `protobuf:"bytes,1,opt,name=data" json:"data,omitempty"`
+	Time             *string `protobuf:"bytes,2,opt,name=time" json:"time,omitempty"`
+	Sign             *string `protobuf:"bytes,3,opt,name=sign" json:"sign,omitempty"`
+	XXX_unrecognized []byte  `json:"-"`
+}
+
+func (m *PayRequest) Reset()         { *m = PayRequest{} }
+func (m *PayRequest) String() string { return proto.CompactTextString(m) }
+func (*PayRequest) ProtoMessage()    {}
+
+func (m *PayRequest) GetData() string {
+	if m != nil && m.Data != nil {
+		return *m.Data
+	}
+	return ""
+}
+
+func (m *PayRequest) GetTime() string {
+	if m != nil && m.Time != nil {
+		return *m.Time
+	}
+	return ""
+}
+
+func (m *PayRequest) GetSign() string {
+	if m != nil && m.Sign != nil {
+		return *m.Sign
+	}
+	return ""
+}
+
+// 配置信息响应结构
+type PayResponse struct {
+	Data             *string `protobuf:"bytes,1,opt,name=data" json:"data,omitempty"`
+	Time             *string `protobuf:"bytes,2,opt,name=time" json:"time,omitempty"`
+	Sign             *string `protobuf:"bytes,3,opt,name=sign" json:"sign,omitempty"`
+	XXX_unrecognized []byte  `json:"-"`
+}
+
+func (m *PayResponse) Reset()         { *m = PayResponse{} }
+func (m *PayResponse) String() string { return proto.CompactTextString(m) }
+func (*PayResponse) ProtoMessage()    {}
+
+func (m *PayResponse) GetData() string {
+	if m != nil && m.Data != nil {
+		return *m.Data
+	}
+	return ""
+}
+
+func (m *PayResponse) GetTime() string {
+	if m != nil && m.Time != nil {
+		return *m.Time
+	}
+	return ""
+}
+
+func (m *PayResponse) GetSign() string {
+	if m != nil && m.Sign != nil {
+		return *m.Sign
+	}
+	return ""
+}
+
+func init() {
+}
+
+type PayService interface {
+	PayToBusiness(in *PayRequest, out *PayResponse) error
+	PayToUser(in *PayRequest, out *PayResponse) error
+}
+
+// AcceptPayServiceClient accepts connections on the listener and serves requests
+// for each incoming connection.  Accept blocks; the caller typically
+// invokes it in a go statement.
+func AcceptPayServiceClient(lis net.Listener, x PayService) {
+	srv := rpc.NewServer()
+	if err := srv.RegisterName("PayService", x); err != nil {
+		log.Fatal(err)
+	}
+
+	for {
+		conn, err := lis.Accept()
+		if err != nil {
+			log.Fatalf("lis.Accept(): %v\n", err)
+		}
+		go srv.ServeCodec(protorpc.NewServerCodec(conn))
+	}
+}
+
+// RegisterPayService publish the given PayService implementation on the server.
+func RegisterPayService(srv *rpc.Server, x PayService) error {
+	if err := srv.RegisterName("PayService", x); err != nil {
+		return err
+	}
+	return nil
+}
+
+// NewPayServiceServer returns a new PayService Server.
+func NewPayServiceServer(x PayService) *rpc.Server {
+	srv := rpc.NewServer()
+	if err := srv.RegisterName("PayService", x); err != nil {
+		log.Fatal(err)
+	}
+	return srv
+}
+
+// ListenAndServePayService listen announces on the local network address laddr
+// and serves the given PayService implementation.
+func ListenAndServePayService(network, addr string, x PayService) error {
+	lis, err := net.Listen(network, addr)
+	if err != nil {
+		return err
+	}
+	defer lis.Close()
+
+	srv := rpc.NewServer()
+	if err := srv.RegisterName("PayService", x); err != nil {
+		return err
+	}
+
+	for {
+		conn, err := lis.Accept()
+		if err != nil {
+			log.Fatalf("lis.Accept(): %v\n", err)
+		}
+		go srv.ServeCodec(protorpc.NewServerCodec(conn))
+	}
+}
+
+type PayServiceClient struct {
+	*rpc.Client
+}
+
+// NewPayServiceClient returns a PayService rpc.Client and stub to handle
+// requests to the set of PayService at the other end of the connection.
+func NewPayServiceClient(conn io.ReadWriteCloser) (*PayServiceClient, *rpc.Client) {
+	c := rpc.NewClientWithCodec(protorpc.NewClientCodec(conn))
+	return &PayServiceClient{c}, c
+}
+
+func (c *PayServiceClient) PayToBusiness(in *PayRequest, out *PayResponse) error {
+	return c.Call("PayService.PayToBusiness", in, out)
+}
+func (c *PayServiceClient) PayToUser(in *PayRequest, out *PayResponse) error {
+	return c.Call("PayService.PayToUser", in, out)
+}
+
+// DialPayService connects to an PayService at the specified network address.
+func DialPayService(network, addr string) (*PayServiceClient, *rpc.Client, error) {
+	c, err := protorpc.Dial(network, addr)
+	if err != nil {
+		return nil, nil, err
+	}
+	return &PayServiceClient{c}, c, nil
+}
+
+// DialPayServiceTimeout connects to an PayService at the specified network address.
+func DialPayServiceTimeout(network, addr string,
+	timeout time.Duration) (*PayServiceClient, *rpc.Client, error) {
+	c, err := protorpc.DialTimeout(network, addr, timeout)
+	if err != nil {
+		return nil, nil, err
+	}
+	return &PayServiceClient{c}, c, nil
+}

pay/pay.proto

@@ -0,0 +1,23 @@
+syntax = "proto3";
+package pay;
+
+// 配置信息请求结构
+message PayRequest {
+	string data = 1;
+	string time = 2;
+    string sign = 3;
+}
+
+// 配置信息响应结构
+message PayResponse {
+	string data = 1;
+    string time = 2;
+    string sign = 3;
+}
+
+
+// rpc方法
+service PayService {
+    rpc payToBusiness (PayRequest) returns (PayResponse);    // 用户各商家支付
+    rpc payToUser (PayRequest) returns (PayResponse);    // 商家向用户支付（退款）
+}

user/user.client.go

@@ -47,6 +47,64 @@ func GetUserByToken(dbname, token string, url ...string) (map[string]string, err
 	return map[string]string{}, nil
 }
 
+/**
+ * 使用用户名查询
+ */
+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 := DialUserService("tcp", user_rpc_url)
+	if err != nil {
+		return nil, err
+	}
+	defer conn.Close()
+
+	req := &UserInfoByUsername{proto.String(dbname), proto.String(username), nil}
+
+	res := &UserResponse{}
+
+	err = conn.GetByUsername(req, res)
+
+	if err != nil {
+		return nil, err
+	}
+
+	return res, nil
+}
+
+/**
+ * 使用编号查询
+ */
+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 := DialUserService("tcp", user_rpc_url)
+	if err != nil {
+		return nil, err
+	}
+	defer conn.Close()
+
+	req := &UserInfoByUsercode{proto.String(dbname), proto.String(usercode), nil}
+
+	res := &UserResponse{}
+
+	err = conn.GetByUsercode(req, res)
+
+	if err != nil {
+		return nil, err
+	}
+
+	return res, nil
+}
+
 func Login(dbname, account, password string, url ...string) (map[string]string, error) {
 
 	var user_rpc_url string = "127.0.0.1:7976"

user/user.client_test.go

@@ -12,10 +12,15 @@ func Test_GetUserByToken(t *testing.T) {
 	t.Log(res["UserId"])
 	t.Log(err)
 
-	// res, err = GetUserById(dbname, "114")
-	// t.Log(res)
-	// t.Log(res["UserId"])
-	// t.Log(err)
+	res, err = GetUserByUsername(dbname, "tetele")
+	t.Log(res)
+	t.Log(res["UserId"])
+	t.Log(err)
+
+	res, err = GetUserByUsercode(dbname, "2233")
+	t.Log(res)
+	t.Log(res["UserId"])
+	t.Log(err)
 }
 
 func Test_Login(t *testing.T) {

user/user.pb.go

@@ -10,6 +10,8 @@ It is generated from these files:
 
 It has these top-level messages:
 	UserRequest
+	UserInfoByUsername
+	UserInfoByUsercode
 	UserResponse
 	LoginRequest
 	LoginResponse
@@ -55,6 +57,56 @@ func (m *UserRequest) GetToken() string {
 	return ""
 }
 
+// 使用username查询用户信息请求结构
+type UserInfoByUsername struct {
+	Dbname           *string `protobuf:"bytes,1,opt,name=dbname" json:"dbname,omitempty"`
+	Username         *string `protobuf:"bytes,2,opt,name=username" json:"username,omitempty"`
+	XXX_unrecognized []byte  `json:"-"`
+}
+
+func (m *UserInfoByUsername) Reset()         { *m = UserInfoByUsername{} }
+func (m *UserInfoByUsername) String() string { return proto.CompactTextString(m) }
+func (*UserInfoByUsername) ProtoMessage()    {}
+
+func (m *UserInfoByUsername) GetDbname() string {
+	if m != nil && m.Dbname != nil {
+		return *m.Dbname
+	}
+	return ""
+}
+
+func (m *UserInfoByUsername) GetUsername() string {
+	if m != nil && m.Username != nil {
+		return *m.Username
+	}
+	return ""
+}
+
+// 使用usercode查询用户信息请求结构
+type UserInfoByUsercode struct {
+	Dbname           *string `protobuf:"bytes,1,opt,name=dbname" json:"dbname,omitempty"`
+	Usercode         *string `protobuf:"bytes,2,opt,name=usercode" json:"usercode,omitempty"`
+	XXX_unrecognized []byte  `json:"-"`
+}
+
+func (m *UserInfoByUsercode) Reset()         { *m = UserInfoByUsercode{} }
+func (m *UserInfoByUsercode) String() string { return proto.CompactTextString(m) }
+func (*UserInfoByUsercode) ProtoMessage()    {}
+
+func (m *UserInfoByUsercode) GetDbname() string {
+	if m != nil && m.Dbname != nil {
+		return *m.Dbname
+	}
+	return ""
+}
+
+func (m *UserInfoByUsercode) GetUsercode() string {
+	if m != nil && m.Usercode != nil {
+		return *m.Usercode
+	}
+	return ""
+}
+
 // 使用token查询用户信息响应结构
 type UserResponse struct {
 	UserId           *string `protobuf:"bytes,1,opt,name=user_id" json:"user_id,omitempty"`

user/user.proto

@@ -6,7 +6,17 @@ message UserRequest {
 	string dbname = 1;
     string token = 2;
 }
+// 使用username查询用户信息请求结构
+message UserInfoByUsername {
+	string dbname = 1;
+    string username = 2;
+}
 
+// 使用usercode查询用户信息请求结构
+message UserInfoByUsercode {
+	string dbname = 1;
+    string usercode = 2;
+}
 // 使用token查询用户信息响应结构
 message UserResponse {
     string user_id = 1;  //ID