去除日志

client.all.go

@@ -0,0 +1,182 @@
+package siterpc
+
+import (
+	"encoding/json"
+	"errors"
+	"log"
+	"reflect"
+
+	"git.tetele.net/tgo/helper"
+)
+
+/**
+ * 取所有配置
+ * 2021/09/04
+ * GZ
+ */
+func GetAllConfig(site_id, dbname string, url ...string) (map[string]string, error) {
+
+	if dbname == "" {
+		return nil, errors.New("参数错误")
+	}
+
+	conn, err := rpc_server_conn(url...)
+
+	if err != nil {
+		return nil, err
+	}
+	defer conn.Close()
+
+	arg := SiteConfigItemReqArg{site_id, dbname, ""}
+
+	req, err := SetReqData(arg)
+	if err != nil {
+		return nil, err
+	}
+	res := &Response{}
+
+	err = conn.GetAllConfig(req, res)
+
+	if err != nil {
+		return nil, err
+	}
+
+	res_data_de, err := GetResData(res)
+	if err != nil {
+		return nil, err
+	}
+	if res_data_de == "" {
+		return nil, nil
+	}
+	var res_arr []map[string]string
+
+	err = json.Unmarshal([]byte(res_data_de), &res_arr)
+
+	if err != nil {
+		return nil, err
+	}
+
+	var res_map map[string]string = make(map[string]string)
+	if len(res_arr) > 0 {
+		var value string
+		for _, info := range res_arr {
+			value = ""
+			switch info["Type"] {
+
+			case "select":
+
+				var content interface{}
+				err = json.Unmarshal([]byte(info["Content"]), &content)
+				if err != nil {
+					log.Println(err)
+				}
+
+				content_type := reflect.TypeOf(content).String() //数据字典的类型
+
+				switch content_type {
+				case "[]interface {}": //数组形式，value字段对应数组的key
+					list := content.([]interface{})
+					val_key := helper.ToInt(info["Value"])
+					value = helper.ToString(list[val_key])
+				case "map[string]interface {}": //map形式，value字段对应key
+					list := content.(map[string]interface{})
+					value = helper.ToString(list[info["Value"]])
+
+				}
+			default:
+				value = info["Value"]
+			}
+			res_map[info["Name"]] = value
+
+		}
+	}
+
+	return res_map, nil
+
+}
+
+/**
+ * 分组下所有配置
+ * 2021/09/04
+ * GZ
+ */
+func GetGroupConfig(site_id, dbname string, groupname string, url ...string) (map[string]string, error) {
+
+	if dbname == "" {
+		return nil, errors.New("参数错误")
+	}
+
+	conn, err := rpc_server_conn(url...)
+	if err != nil {
+		return nil, err
+	}
+	defer conn.Close()
+
+	arg := SiteConfigItemReqArg{site_id, dbname, groupname}
+
+	req, err := SetReqData(arg)
+	if err != nil {
+		return nil, err
+	}
+	res := &Response{}
+
+	err = conn.GetGroupConfig(req, res)
+
+	if err != nil {
+		return nil, err
+	}
+
+	res_data_de, err := GetResData(res)
+	if err != nil {
+		return nil, err
+	}
+	if res_data_de == "" {
+		return nil, nil
+	}
+	var res_arr []map[string]string
+
+	err = json.Unmarshal([]byte(res_data_de), &res_arr)
+
+	if err != nil {
+		return nil, err
+	}
+
+	var res_map map[string]string = make(map[string]string)
+
+	if len(res_arr) > 0 {
+		var value string
+		for _, info := range res_arr {
+			value = ""
+			switch info["Type"] {
+
+			case "select":
+
+				var content interface{}
+				err = json.Unmarshal([]byte(info["Content"]), &content)
+				if err != nil {
+					log.Println(err)
+				}
+
+				content_type := reflect.TypeOf(content).String() //数据字典的类型
+
+				switch content_type {
+				case "[]interface {}": //数组形式，value字段对应数组的key
+					list := content.([]interface{})
+					val_key := helper.ToInt(info["Value"])
+					value = helper.ToString(list[val_key])
+				case "map[string]interface {}": //map形式，value字段对应key
+					list := content.(map[string]interface{})
+					value = helper.ToString(list[info["Value"]])
+
+				}
+			default:
+				value = info["Value"]
+			}
+			res_map[info["Name"]] = value
+
+		}
+	}
+
+	return res_map, nil
+
+}

client.all_test.go

@@ -0,0 +1,13 @@
+package siterpc
+
+import (
+	"testing"
+)
+
+func Test_GetAllConfig(t *testing.T) {
+
+	list, err := GetGroupConfig("1056475", "shop_v2", "basic")
+
+	t.Log(list)
+	t.Log(err)
+}

client.go

@@ -11,18 +11,6 @@ import (
 	"github.com/golang/protobuf/proto"
 )
 
-type SiteConfigItemReqArg struct {
-	SiteId string `json:"site_id"`
-	Dbname string `json:"dbname"`
-	Key    string `json:"key"`
-}
-
-type SiteConfigItemRes struct {
-	Type  string
-	Value string
-	Exist bool
-}
-
 /**
  * 由配置key取对应value
  * 请求及回均加密验签

client.siteinfo.go

@@ -1,15 +1,15 @@
 package siterpc
 
-// import (
-// 	"encoding/json"
-// 	"errors"
-// 	"strconv"
-// 	"time"
+import (
+	"encoding/json"
+	"strconv"
+	"time"
 
-// 	"git.tetele.net/tgo/crypter"
+	"git.tetele.net/tgo/conf"
+	"git.tetele.net/tgo/crypter"
 
-// 	"github.com/golang/protobuf/proto"
-// )
+	"github.com/golang/protobuf/proto"
+)
 
 type SiteInfoReq struct {
 	Master string
@@ -17,9 +17,9 @@ type SiteInfoReq struct {
 }
 
 type SiteInfoRes struct {
-	SiteId     string
-	Dbname     string
-	Domainname string
+	SiteId     string `json:"site_id"`
+	Dbname     string `json:"database"`
+	Domainname string `json:"domainname"`
 }
 
 /**
@@ -27,16 +27,33 @@ type SiteInfoRes struct {
  * 请求及回均加密验签
  * 2021/06/24
  * GZ
+ */
+func GetSiteInfoByHost(host string, params ...string) (*SiteInfoRes, error) {
 
-func GetSiteInfoByHost(host string, url ...string) (*SiteInfoRes, error) {
+	var res_arr SiteInfoRes
+
+	if conf.IS_PRIVATE {
+		res_arr.Dbname = conf.DBNAME
+		res_arr.SiteId = conf.SITE_ID
+		res_arr.Domainname = conf.DOMAIN
+		return &res_arr, nil
+	}
 
-	conn, err := rpc_server_conn(url...)
+	var url string = ""
+	var master string = ""
+	if len(params) > 1 {
+		master = params[1]
+	}
+	if len(params) > 0 {
+		url = params[0]
+	}
+	conn, err := rpc_server_conn(url)
 	if err != nil {
 		return nil, err
 	}
 	defer conn.Close()
 
-	arg := SiteInfoReq{host}
+	arg := SiteInfoReq{master, host}
 
 	data_json, err := json.Marshal(arg)
 	if err != nil {
@@ -60,9 +77,11 @@ func GetSiteInfoByHost(host string, url ...string) (*SiteInfoRes, error) {
 		return nil, err
 	}
 
-	res_data := GetOrgData(res)
+	res_data, err := GetOrgData(res)
 
-	var res_arr SiteInfoRes
+	if err != nil {
+		return nil, err
+	}
 
 	err = json.Unmarshal([]byte(res_data), &res_arr)
 
@@ -71,4 +90,3 @@ func GetSiteInfoByHost(host string, url ...string) (*SiteInfoRes, error) {
 	}
 	return &res_arr, nil
 }
-*/

client.siteinfo_test.go

@@ -0,0 +1,15 @@
+package siterpc
+
+import (
+	"testing"
+
+	"git.tetele.net/tgo/conf"
+)
+
+func Test_GetSiteInfoByHost(t *testing.T) {
+	conf.IS_PRIVATE = true
+	res, err := GetSiteInfoByHost("dev.tetele.net")
+	t.Log(res)
+	t.Log(err)
+
+}

code_bank.go

@@ -0,0 +1,57 @@
+package siterpc
+
+import (
+	"encoding/json"
+	"errors"
+)
+
+/**
+ * 获取code_bank一条可用记录
+ * 2021/09/09
+ * linsen
+ */
+func GetOneCode(site_id, dbname string, url ...string) (string, error) {
+
+	if dbname == "" {
+		return "", errors.New("参数错误")
+	}
+
+	conn, err := rpc_server_conn(url...)
+
+	if err != nil {
+		return "", err
+	}
+	defer conn.Close()
+
+	arg := SiteConfigItemReqArg{site_id, dbname, ""}
+
+	req, err := SetReqData(arg)
+	if err != nil {
+		return "", err
+	}
+	res := &Response{}
+
+	err = conn.GetOneCode(req, res)
+
+	if err != nil {
+		return "", err
+	}
+
+	res_data_de, err := GetResData(res)
+	if err != nil {
+		return "", err
+	}
+
+	var bankCode string
+	err = json.Unmarshal([]byte(res_data_de),&bankCode)
+
+	if err != nil {
+		return "", err
+	}
+
+	if res_data_de == "" {
+		return "", nil
+	}
+
+	return bankCode, nil
+}

code_bank_test.go

@@ -0,0 +1,9 @@
+package siterpc
+
+import "testing"
+
+func Test_getcode(t *testing.T){
+	res,err := GetOneCode("1058278","shop_v2")
+	t.Log(res)
+	t.Log(err)
+}

common.go

@@ -1,14 +1,23 @@
 package siterpc
 
+import (
+	"git.tetele.net/tgo/conf"
+)
+
 var DES_KEY = "confdata"
 
 func rpc_server_conn(url ...string) (*SiteServiceClient, error) {
 
-	var wx_rpc_url string = "127.0.0.1:7971"
+	var rpc_url string
 	if len(url) > 0 && url[0] != "" {
-		wx_rpc_url = url[0]
+		rpc_url = url[0]
+	} else if conf.SITE_RPC_URL != "" {
+		rpc_url = conf.SITE_RPC_URL
+	} else {
+		rpc_url = "127.0.0.1:" + conf.SITE_RPC_PORT
 	}
-	conn, _, err := DialSiteService("tcp", wx_rpc_url)
+
+	conn, _, err := DialSiteService("tcp", rpc_url)
 	if err != nil {
 		return nil, err
 	}

data.go

@@ -0,0 +1,106 @@
+package siterpc
+
+import (
+	"encoding/json"
+	"errors"
+	"strconv"
+	"time"
+
+	"git.tetele.net/tgo/crypter"
+	"github.com/golang/protobuf/proto"
+)
+
+func SetResData(data interface{}, res *Response) {
+	res_data_json, err := json.Marshal(data)
+	if err == nil {
+
+		encryData := crypter.DesEn(string(res_data_json), DES_KEY)
+
+		now_str := strconv.FormatInt(time.Now().Unix(), 10)
+
+		res_sign := Sign(encryData, now_str)
+
+		res.Data = proto.String(encryData)
+		res.Time = proto.String(now_str)
+		res.Sign = proto.String(res_sign)
+	}
+
+}
+
+func SetReqData(arg interface{}) (*Request, error) {
+	data_json, err := json.Marshal(arg)
+	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)
+
+	return &Request{proto.String(encryData), proto.String(now), proto.String(sign), nil}, nil
+
+}
+
+func GetReqData(req *Request) (string, error) {
+	res_data := req.GetData()
+
+	if res_data != "" {
+
+		time_int64, err := strconv.ParseInt(req.GetTime(), 10, 64)
+		if err != nil {
+			return "", err
+		}
+
+		now_int64 := time.Now().Unix()
+
+		if now_int64-time_int64 > 10 || time_int64-now_int64 > 10 {
+			//时间误差前后10秒，返回
+			return "", errors.New("返回时间错误")
+		}
+
+		check_sign := CheckSign(req.GetSign(), res_data, req.GetTime())
+		if !check_sign {
+			return "", errors.New("返回数据签名错误")
+		}
+
+		//解密
+		return crypter.DesDe(res_data, DES_KEY), nil
+
+	}
+
+	return "", nil
+}
+
+func GetResData(res *Response) (string, error) {
+	res_data := res.GetData()
+
+	if res_data != "" {
+
+		time_int64, err := strconv.ParseInt(res.GetTime(), 10, 64)
+		if err != nil {
+			return "", err
+		}
+
+		now_int64 := time.Now().Unix()
+
+		if now_int64-time_int64 > 10 || time_int64-now_int64 > 10 {
+			//时间误差前后10秒，返回
+			return "", errors.New("返回时间错误")
+		}
+
+		check_sign := CheckSign(res.GetSign(), res_data, res.GetTime())
+		if !check_sign {
+			return "", errors.New("返回数据签名错误")
+		}
+
+		//解密
+		return crypter.DesDe(res_data, DES_KEY), nil
+
+	}
+
+	return "", nil
+}

go.mod

@@ -3,8 +3,10 @@ module git.tetele.net/tgo/siterpc
 go 1.14
 
 require (
-	git.tetele.net/tgo/crypter v0.2.2 // indirect
-	github.com/chai2010/protorpc v1.0.0 // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
+	git.tetele.net/tgo/conf v0.33.1
+	git.tetele.net/tgo/crypter v0.2.2
+	git.tetele.net/tgo/helper v0.1.8
+	github.com/chai2010/protorpc v1.1.3
+	github.com/golang/protobuf v1.5.2
 	golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e // indirect
 )

go.sum

@@ -1,13 +1,21 @@
+git.tetele.net/tgo/conf v0.33.1 h1:ZEIv3Vq35RCv5f3T3Uz97s2mkZLl7W5OlmXvzI3/sS8=
+git.tetele.net/tgo/conf v0.33.1/go.mod h1:AWVIBEDE5dtotthUgR0SWaR2Qa6/f+O5WQ3s7Tj8q7A=
 git.tetele.net/tgo/crypter v0.2.2 h1:YMQJh2Gj5Po4ZfelJUmXBKi01UbmtiSy3bmqRfnYQMo=
 git.tetele.net/tgo/crypter v0.2.2/go.mod h1:vfvRLZA8+lHNgNXneOcgvVhDyuv25ZRb+C6xHOmXNx0=
+git.tetele.net/tgo/helper v0.1.8 h1:6eeUYmO0Xv2n+HluHKAOm6y2CcLmr2QPnGxzHy3yyWc=
+git.tetele.net/tgo/helper v0.1.8/go.mod h1:89mQwyfqZ+t8YXiVwzSxA70gLlUNqoZGDEUxvV46jXk=
 github.com/chai2010/protorpc v1.0.0 h1:aJ45G9sl1utSKo35EqnBSTs5jqTpdJDJAuZMMYPAtFo=
 github.com/chai2010/protorpc v1.0.0/go.mod h1:woR3WwjaQDqFjlzdVsFEKiK5Ur12QL8mYxVPjfr5z54=
+github.com/chai2010/protorpc v1.1.3 h1:VJK5hIoZn0XCGol0GmbxZkUG6FbTI5LP2Lam6RVd15w=
+github.com/chai2010/protorpc v1.1.3/go.mod h1:/wO0kiyVdu7ug8dCMrA2yDr2vLfyhsLEuzLa9J2HJ+I=
 github.com/golang/protobuf v1.0.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/snappy v0.0.0-20170215233205-553a64147049 h1:K9KHZbXKpGydfDN0aZrsoHpLJlZsBrGMFWbgLDGnPZk=
 github.com/golang/snappy v0.0.0-20170215233205-553a64147049/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/golang/snappy v0.0.3 h1:fHPg5GQYlCeLIPB9BZqMVR5nR9A+IM5zcgeTdjMYmLA=
+github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e h1:gsTQYXdTw2Gq7RBsWvlQ91b+aEQ6bXFUngBGuR8sPpI=
@@ -18,6 +26,7 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=

site.pb.go

@@ -102,6 +102,9 @@ type SiteService interface {
 	GetBalanceType(in *Request, out *Response) error
 	GetAllSite(in *Request, out *Response) error
 	GetSiteInfoByHost(in *Request, out *Response) error
+	GetAllConfig(in *Request, out *Response) error
+	GetGroupConfig(in *Request, out *Response) error
+	GetOneCode(in *Request, out *Response) error
 }
 
 // AcceptSiteServiceClient accepts connections on the listener and serves requests
@@ -185,6 +188,15 @@ func (c *SiteServiceClient) GetAllSite(in *Request, out *Response) error {
 func (c *SiteServiceClient) GetSiteInfoByHost(in *Request, out *Response) error {
 	return c.Call("SiteService.GetSiteInfoByHost", in, out)
 }
+func (c *SiteServiceClient) GetAllConfig(in *Request, out *Response) error {
+	return c.Call("SiteService.GetAllConfig", in, out)
+}
+func (c *SiteServiceClient) GetGroupConfig(in *Request, out *Response) error {
+	return c.Call("SiteService.GetGroupConfig", in, out)
+}
+func (c *SiteServiceClient) GetOneCode(in *Request, out *Response) error {
+	return c.Call("SiteService.GetOneCode", in, out)
+}
 
 // DialSiteService connects to an SiteService at the specified network address.
 func DialSiteService(network, addr string) (*SiteServiceClient, *rpc.Client, error) {

site.proto

@@ -22,4 +22,7 @@ service SiteService {
     rpc getBalanceType (Request) returns (Response);    // 查询账户类型信息
     rpc getAllSite(Request) returns (Response);//缓存的所有站点
     rpc getSiteInfoByHost(Request) returns (Response);//根据host获取站点关键信息
+    rpc getAllConfig (Request) returns (Response);    // 查询所有配置信息
+    rpc getGroupConfig (Request) returns (Response);    // 查询分组下所有配置信息
+    rpc getOneCode (Request) returns (Response);        // 获取code_bank未使用的一条code
 }

valiable.go

@@ -0,0 +1,17 @@
+package siterpc
+
+type SiteConfigItemReqArg struct {
+	SiteId string `json:"site_id"`
+	Dbname string `json:"dbname"`
+	Key    string `json:"key"`
+}
+
+type SiteConfigItemRes struct {
+	Type  string
+	Value string
+	Exist bool
+}
+
+type ConfigListRes struct {
+	list string
+}