From c048d7631d02eca55488ea7d9545c96e4d2b2618 Mon Sep 17 00:00:00 2001
From: guzeng <gz@flyrise.cn>
Date: Tue, 17 Aug 2021 11:30:57 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E6=9C=8D=E5=8A=A1=E6=97=B6?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=B9=E9=85=8D=E7=BD=AE=E7=9A=84=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common.go            | 14 +++++++++++---
 go.mod               |  1 +
 go.sum               |  2 ++
 third.client_test.go | 30 +++++++++++++++++++-----------
 4 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/common.go b/common.go
index 255fc12..a46ba25 100644
--- a/common.go
+++ b/common.go
@@ -1,5 +1,9 @@
 package userrpc
 
+import (
+	"git.tetele.net/tgo/conf"
+)
+
 const DES_KEY = "usersrpc"
 
 type Req struct {
@@ -52,12 +56,16 @@ type Business struct {
 
 func rpc_server_conn(url ...string) (*UserServiceClient, error) {
 
-	var user_rpc_url string = "127.0.0.1:7976"
+	var rpc_url string
 	if len(url) > 0 && url[0] != "" {
-		user_rpc_url = url[0]
+		rpc_url = url[0]
+	} else if conf.USER_RPC_URL != "" {
+		rpc_url = conf.USER_RPC_URL
+	} else {
+		rpc_url = "127.0.0.1:" + conf.USER_RPC_PORT
 	}
 
-	conn, _, err := DialUserService("tcp", user_rpc_url)
+	conn, _, err := DialUserService("tcp", rpc_url)
 	if err != nil {
 		return nil, err
 	}
diff --git a/go.mod b/go.mod
index ac4d69d..2079333 100644
--- a/go.mod
+++ b/go.mod
@@ -3,6 +3,7 @@ module git.tetele.net/tgo/userrpc
 go 1.14
 
 require (
+	git.tetele.net/tgo/conf v0.33.1 // indirect
 	git.tetele.net/tgo/crypter v0.2.2 // indirect
 	github.com/chai2010/protorpc v1.0.0
 	github.com/golang/protobuf v1.0.0
diff --git a/go.sum b/go.sum
index c6beb24..61a4576 100644
--- a/go.sum
+++ b/go.sum
@@ -1,3 +1,5 @@
+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=
 github.com/chai2010/protorpc v1.0.0 h1:aJ45G9sl1utSKo35EqnBSTs5jqTpdJDJAuZMMYPAtFo=
diff --git a/third.client_test.go b/third.client_test.go
index 7ac4655..cbc3a52 100644
--- a/third.client_test.go
+++ b/third.client_test.go
@@ -2,19 +2,27 @@ package userrpc
 
 import (
 	"testing"
+
+	"git.tetele.net/tgo/crypter"
 )
 
 func Test_BindThird(t *testing.T) {
-	dbname := "test1_tetele_com"
-	site_id := "1001"
-	platform := "deliver_mini"
-	user_id := "1"
-	openid := "CasfoieFsdfsdfiDiodf_df"
-	openname := "测试中"
-	avatar := "https://ssss.ttt.ddd/sfsd"
-	mobile := "1234456456"
-	res, err := BindThird(site_id, dbname, platform, user_id, openid, openname, "", avatar, mobile)
-	t.Log(res)
-	t.Log(err)
+	// dbname := "test1_tetele_com"
+	// site_id := "1001"
+	// platform := "deliver_mini"
+	// user_id := "1"
+	// openid := "CasfoieFsdfsdfiDiodf_df"
+	// openname := "测试中"
+	// avatar := "https://ssss.ttt.ddd/sfsd"
+	// mobile := "1234456456"
+	// res, err := BindThird(site_id, dbname, platform, user_id, openid, openname, "", avatar, mobile)
+	// t.Log(res)
+	// t.Log(err)
+
+	// data := "E5B2642BDEA1FBC85BA958C398E58DEC2E1425E26E25D6A178DBD078AD0DFC6859DF5634B0A01CE01F84E056380981A1F1433044FB197D8965FD8F3322DF2373619AD4ACB158605B45AC3947B200C8B62C2B30256B2D2D7283492F268F609944"
+	data := "E5B2642BDEA1FBC85BA958C398E58DEC2E1425E26E25D6A178DBD078AD0DFC6859DF5634B0A01CE01F84E056380981A1F1433044FB197D89AF51E05A9E9F5C76BE8F563F2E4D42AB3C3C649B4187A7C48E98988C734CEACD"
+
+	org := crypter.DesDe(data, DES_KEY)
 
+	t.Log(org)
 }