update v2 *

3 years ago · 5fbb50b31e
parent c1a6b25346
commit 5fbb50b31e
45 changed files with 884 additions and 214 deletions
--- a/.gitignore
+++ b/.gitignore
@ -4,5 +4,5 @@
 .idea
 .vscode
 *.log
-*_test.go
+git.sh
 gittag.sh
--- a/README.md
+++ b/README.md
@ -1,15 +1,15 @@
 <h1><a href="https://www.dtapp.net/">Golang Library</a></h1>

-📦 Golang扩展包
+📦 Golang 扩展包

 [comment]: <> (go)
-[![godoc](https://pkg.go.dev/badge/github.com/dtapps/go-library?status.svg)](https://pkg.go.dev/github.com/dtapps/go-library)
-[![goproxy.cn](https://goproxy.cn/stats/github.com/dtapps/go-library/badges/download-count.svg)](https://goproxy.cn/stats/github.com/dtapps/go-library)
-[![goreportcard.com](https://goreportcard.com/badge/github.com/dtapps/go-library)](https://goreportcard.com/report/github.com/dtapps/go-library)
-[![deps.dev](https://img.shields.io/badge/deps-go-red.svg)](https://deps.dev/go/github.com%2Fdtapps%2Fgo-library)
+[![godoc](https://pkg.go.dev/badge/gopkg.in/dtapps/go-library.v2?status.svg)](https://pkg.go.dev/gopkg.in/dtapps/go-library.v2)
+[![goproxy.cn](https://goproxy.cn/stats/gopkg.in/dtapps/go-library.v2/badges/download-count.svg)](https://goproxy.cn/stats/gopkg.in/dtapps/go-library.v2)
+[![goreportcard.com](https://goreportcard.com/badge/gopkg.in/dtapps/go-library.v2)](https://goreportcard.com/report/gopkg.in/dtapps/go-library.v2)
+[![deps.dev](https://img.shields.io/badge/deps-go-red.svg)](https://deps.dev/go/gopkg.in%2Fdtapps%2Fgo-library.v2)

-## Install
+## Install 安装

 ```Importing
-go get github.com/dtapps/go-library
+go get -u gopkg.in/dtapps/go-library.v2
 ```
--- a/helper/aes/aes.go
+++ b/helper/aes/aes.go
--- a/helper/decimal/decimal.go
+++ b/helper/decimal/decimal.go
--- a/dingtalk/dingtalk.go
+++ b/dingtalk/dingtalk.go
@ -0,0 +1,57 @@
+package dingtalk
+
+import (
+	"crypto/hmac"
+	"crypto/sha256"
+	"encoding/base64"
+	"encoding/json"
+	"fmt"
+	"gopkg.in/dtapps/go-library.v2/dingtalk/message"
+	"io/ioutil"
+	"net/http"
+	"strings"
+	"time"
+)
+
+const api = "https://oapi.dingtalk.com/robot/send"
+
+type DingBot struct {
+	Secret      string
+	AccessToken string
+}
+
+type response struct {
+	Errcode int64  `json:"errcode"`
+	Errmsg  string `json:"errmsg"`
+}
+
+func (bot *DingBot) Send(msg message.Message) (response, error) {
+	timestamp := time.Now().UnixNano() / 1e6
+	var response response
+	signStr := sign(timestamp, bot.Secret)
+	dingUrl := fmt.Sprintf("%s?access_token=%s&timestamp=%d&sign=%s", api, bot.AccessToken, timestamp, signStr)
+	j, e := json.Marshal(msg)
+	if e != nil {
+		return response, e
+	}
+	resp, e := http.Post(dingUrl, "application/json", strings.NewReader(string(j)))
+	if e != nil {
+		return response, e
+	}
+	defer resp.Body.Close()
+
+	body, _ := ioutil.ReadAll(resp.Body)
+	e = json.Unmarshal(body, &response)
+	if e != nil {
+		return response, e
+	}
+	return response, nil
+}
+
+func sign(t int64, secret string) string {
+	secStr := fmt.Sprintf("%d\n%s", t, secret)
+	hmac256 := hmac.New(sha256.New, []byte(secret))
+	hmac256.Write([]byte(secStr))
+	result := hmac256.Sum(nil)
+	return base64.StdEncoding.EncodeToString(result)
+}
--- a/dingtalk/dingtalk_test.go
+++ b/dingtalk/dingtalk_test.go
@ -0,0 +1,26 @@
+package dingtalk
+
+import (
+	"gopkg.in/dtapps/go-library.v2/dingtalk/message"
+	"log"
+	"testing"
+)
+
+func TestName(t *testing.T) {
+	bot := DingBot{
+		Secret:      "",
+		AccessToken: "",
+	}
+	msg := message.Message{
+		MsgType: message.TextStr,
+		Text: message.Text_{
+			Content: "测试",
+		},
+	}
+	send, err := bot.Send(msg)
+	if err != nil {
+		log.Printf("err：%v\n", err)
+		return
+	}
+	log.Printf("send：%v\n", send)
+}
--- a/dingtalk/message/message.go
+++ b/dingtalk/message/message.go
@ -0,0 +1,69 @@
+package message
+
+type Message struct {
+	MsgType    MsgType_    `json:"msgtype"`
+	Text       Text_       `json:"text"`
+	Link       Link_       `json:"link"`
+	Markdown   Markdown_   `json:"markdown"`
+	ActionCard ActionCard_ `json:"actionCard"`
+	FeedCard   FeedCard_   `json:"feedCard"`
+}
+
+type MsgType_ string
+
+const (
+	TextStr       MsgType_ = "text"
+	LinkStr       MsgType_ = "link"
+	MarkdownStr   MsgType_ = "markdown"
+	ActionCardStr MsgType_ = "actionCard"
+	FeedCardStr   MsgType_ = "feedCard"
+)
+
+// Text_ text类型
+type Text_ struct {
+	Content string `json:"content"`
+	At      At_    `json:"at"`
+}
+
+// At_ At类型
+type At_ struct {
+	AtMobiles []string `json:"atMobiles"`
+	IsAtAll   bool     `json:"isAtAll"`
+}
+
+// Link_ link类型
+type Link_ struct {
+	Text       string `json:"text"`
+	Title      string `json:"title"`
+	PicUrl     string `json:"picUrl"`
+	MessageUrl string `json:"messageUrl"`
+}
+
+// Markdown_ markdown类型
+type Markdown_ struct {
+	Title string `json:"title"`
+	Text  string `json:"text"`
+	At    At_    `json:"at"`
+}
+
+// ActionCard_ 整体跳转actionCard
+type ActionCard_ struct {
+	Title          string `json:"title"`
+	Text           string `json:"text"`
+	BtnOrientation string `json:"btnOrientation"`
+	SingleTitle    string `json:"singleTitle"`
+	SingleURL      string `json:"singleUrl"`
+	HideAvatar     string `json:"hideAvatar"`
+	BtnS           []Btn_ `json:"btns"`
+}
+
+// Btn_ Btn类型
+type Btn_ struct {
+	Title     string `json:"title"`
+	ActionURL string `json:"actionURL"`
+}
+
+// FeedCard_ FeedCard类型
+type FeedCard_ struct {
+	Links []Link_ `json:"links"`
+}
--- a/helper/files/files.go
+++ b/helper/files/files.go
--- a/go.mod
+++ b/go.mod
@ -1,15 +1,16 @@
-module github.com/dtapps/go-library
+module gopkg.in/dtapps/go-library.v2

 go 1.16

 require (
-	github.com/baidubce/bce-sdk-go v0.9.73 // indirect
 	github.com/bitly/go-simplejson v0.5.0
 	github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
+	github.com/go-redis/redis/v8 v8.11.0
 	github.com/google/uuid v1.2.0
 	github.com/kr/pretty v0.2.1 // indirect
 	github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32 // indirect
 	github.com/nilorg/sdk v0.0.0-20210429091026-95b6cdc95c84
+	golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97
 	golang.org/x/net v0.0.0-20210525063256-abc453219eb5 // indirect
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
 	gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
--- a/go.sum
+++ b/go.sum
@ -1,11 +1,30 @@
-github.com/baidubce/bce-sdk-go v0.9.73 h1:g260lAife0Pam2Nmj/SzwunporSbv+qHw2ioHB9JHqI=
-github.com/baidubce/bce-sdk-go v0.9.73/go.mod h1:zbYJMQwE4IZuyrJiFO8tO8NbtYiKTFTbwh4eIsqjVdg=
 github.com/bitly/go-simplejson v0.5.0 h1:6IH+V8/tVMab511d5bn4M7EwGXZf9Hj6i2xSwkNEM+Y=
 github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA=
 github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY=
 github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=
+github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
+github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
+github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
+github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
+github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
+github.com/go-redis/redis/v8 v8.11.0 h1:O1Td0mQ8UFChQ3N9zFQqo6kTU2cJ+/it88gDB+zg0wo=
+github.com/go-redis/redis/v8 v8.11.0/go.mod h1:DLomh7y2e3ggQXQLd1YgmvIfecPJoFl7WU5SOQ/r06M=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
+github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
+github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
+github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
+github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
+github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs=
 github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
@ -15,16 +34,77 @@ github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32 h1:W6apQkHrMkS0Muv8G/TipAy
 github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms=
 github.com/nilorg/sdk v0.0.0-20210429091026-95b6cdc95c84 h1:Nxk1uViXfb9MHgtHBlQFWzlQCsJbDQuotfTsAFcFP3o=
 github.com/nilorg/sdk v0.0.0-20210429091026-95b6cdc95c84/go.mod h1:X1swpPdqguAZaBDoEPyEWHSsJii0YQ1o+3piMv6W3JU=
+github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78=
+github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
+github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
+github.com/onsi/ginkgo v1.15.0 h1:1V1NfVQR87RtWAgp1lv9JZJ5Jap+XFGKPi00andXGi4=
+github.com/onsi/ginkgo v1.15.0/go.mod h1:hF8qUzuuC8DJGygJH3726JnCZX4MYbRB8yFfISqnKUg=
+github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
+github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
+github.com/onsi/gomega v1.10.5 h1:7n6FEkpFmfCoo2t+YYqXH0evK+a9ICQz0xcAy9dYcaQ=
+github.com/onsi/gomega v1.10.5/go.mod h1:gza4q3jKQJijlu05nKWRCW/GavJumGt8aNRxWg7mt48=
+github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 h1:/UOmuWzQfxxo9UtlXMwuQU8CMgg1eZXqTRwkSQJWKOI=
+golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210525063256-abc453219eb5 h1:wjuX4b5yYQnEQHzd+CBcrcC6OVR2J1CN6mUy0oSxIPo=
 golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7VEz+7w9tdXTPOZ7+l4=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
+google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
+google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
+google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
+google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
+google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk=
 gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df h1:n7WqCuqOuCbNr617RXOY0AWRXxgwEyPp2z+p0+hgMuE=
 gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df/go.mod h1:LRQQ+SO6ZHR7tOkpBDuZnXENFzX8qRjMDMyPD6BRkCw=
 gopkg.in/h2non/gentleman.v2 v2.0.5 h1:ckmb6cLxL2DDk7WN7LSdxXDq7jNkOicFg4JZ4ZnDNuE=
 gopkg.in/h2non/gentleman.v2 v2.0.5/go.mod h1:A1c7zwrTgAyyf6AbpvVksYtBayTB4STBUGmdkEtlHeA=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
+gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
--- a/go_test.go
+++ b/go_test.go
@ -0,0 +1,11 @@
+package go_library
+
+import (
+	"fmt"
+	"gopkg.in/dtapps/go-library.v2/library"
+	"testing"
+)
+
+func TestName(t *testing.T) {
+	fmt.Println(library.Version())
+}
--- a/helper/header/header.go
+++ b/helper/header/header.go
--- a/helper/http/http.go
+++ b/helper/http/http.go
@ -3,7 +3,7 @@ package http
 import (
 	"encoding/json"
 	"github.com/bitly/go-simplejson"
-	"github.com/dtapps/go-library/helper/request"
+	"gopkg.in/dtapps/go-library.v2/request"
 	"gopkg.in/h2non/gentleman.v2"
 	"gopkg.in/h2non/gentleman.v2/plugins/body"
 )
--- a/helper/json/json.go
+++ b/helper/json/json.go
--- a/library/go-library.go
+++ b/library/go-library.go
@ -1,5 +1,5 @@
 package library

 func Version() string {
-	return "1.0.18"
+	return "2.0.0"
 }
--- a/helper/mail/mail.go
+++ b/helper/mail/mail.go
--- a/helper/md5/md5.go
+++ b/helper/md5/md5.go
--- a/helper/params/params.go
+++ b/helper/params/params.go
--- a/helper/preg/preg.go
+++ b/helper/preg/preg.go
--- a/helper/preg/preg_test.go
+++ b/helper/preg/preg_test.go
--- a/qywechat/message/message.go
+++ b/qywechat/message/message.go
@ -0,0 +1,48 @@
+package message
+
+type Message struct {
+	MsgType  MsgType_  `json:"msgtype"`
+	Text     Text_     `json:"text"`
+	Markdown Markdown_ `json:"markdown"`
+	News     News_     `json:"link"`
+	File     File_     `json:"file"`
+}
+
+type MsgType_ string
+
+const (
+	TextStr     MsgType_ = "text"
+	NewsStr     MsgType_ = "news"
+	MarkdownStr MsgType_ = "markdown"
+	fileStr     MsgType_ = "file"
+)
+
+// Text_ text类型
+type Text_ struct {
+	Content             string   `json:"content"`               // 文本内容，最长不超过2048个字节，必须是utf8编码
+	MentionedList       []string `json:"mentioned_list"`        // userid的列表，提醒群中的指定成员(@某个成员)，@all表示提醒所有人，如果开发者获取不到userid，可以使用mentioned_mobile_list
+	MentionedMobileList []string `json:"mentioned_mobile_list"` // 手机号列表，提醒手机号对应的群成员(@某个成员)，@all表示提醒所有人
+}
+
+// Markdown_ markdown类型
+type Markdown_ struct {
+	Content string `json:"content"` // markdown内容，最长不超过4096个字节，必须是utf8编码
+}
+
+// News_ news类型
+type News_ struct {
+	Articles []articles `json:"articles"` // 图文消息，一个图文消息支持1到8条图文
+}
+
+//  articles
+type articles struct {
+	Title       string `json:"title"`       // 标题，不超过128个字节，超过会自动截断
+	Description string `json:"description"` // 描述，不超过512个字节，超过会自动截断
+	Url         string `json:"url"`         // 点击后跳转的链接。
+	Picurl      string `json:"picurl"`      // 图文消息的图片链接，支持JPG、PNG格式，较好的效果为大图 1068*455，小图150*150。
+}
+
+// File_ file类型
+type File_ struct {
+	MediaId string `json:"media_id"` // 文件id，通过下文的文件上传接口获取
+}
--- a/qywechat/qywechat.go
+++ b/qywechat/qywechat.go
@ -0,0 +1,45 @@
+package qywechat
+
+import (
+	"encoding/json"
+	"fmt"
+	"gopkg.in/dtapps/go-library.v2/qywechat/message"
+	"io/ioutil"
+	"net/http"
+	"strings"
+)
+
+const api = "https://qyapi.weixin.qq.com/cgi-bin/webhook/send"
+
+type QyBot struct {
+	Key string
+}
+
+type response struct {
+	Errcode   int64  `json:"errcode"`
+	Errmsg    string `json:"errmsg"`
+	Type      string `json:"type"`
+	MediaId   string `json:"media_id"`
+	CreatedAt string `json:"created_at"`
+}
+
+func (bot *QyBot) Send(msg message.Message) (response, error) {
+	var response response
+	qyUrl := fmt.Sprintf("%s?key=%s", api, bot.Key)
+	j, e := json.Marshal(msg)
+	if e != nil {
+		return response, e
+	}
+	resp, e := http.Post(qyUrl, "application/json", strings.NewReader(string(j)))
+	if e != nil {
+		return response, e
+	}
+	defer resp.Body.Close()
+
+	body, _ := ioutil.ReadAll(resp.Body)
+	e = json.Unmarshal(body, &response)
+	if e != nil {
+		return response, e
+	}
+	return response, nil
+}
--- a/qywechat/qywechat_test.go
+++ b/qywechat/qywechat_test.go
@ -0,0 +1,25 @@
+package qywechat
+
+import (
+	"gopkg.in/dtapps/go-library.v2/qywechat/message"
+	"log"
+	"testing"
+)
+
+func TestName(t *testing.T) {
+	bot := QyBot{
+		Key: "",
+	}
+	msg := message.Message{
+		MsgType: message.TextStr,
+		Text: message.Text_{
+			Content: "测试",
+		},
+	}
+	send, err := bot.Send(msg)
+	if err != nil {
+		log.Printf("err：%v\n", err)
+		return
+	}
+	log.Printf("send：%v\n", send)
+}
--- a/redis/Iterator.go
+++ b/redis/Iterator.go
@ -0,0 +1,22 @@
+package redis
+
+type Iterator struct {
+	data  []interface{}
+	index int
+}
+
+func NewIterator(data []interface{}) *Iterator {
+	return &Iterator{data: data}
+}
+func (i *Iterator) HasNext() bool {
+	if i.data == nil || len(i.data) == 0 {
+		return false
+	}
+	return i.index < len(i.data)
+}
+
+func (i *Iterator) Next() (Ret interface{}) {
+	Ret = i.data[i.index]
+	i.index = i.index + 1
+	return
+}
--- a/redis/client.go
+++ b/redis/client.go
@ -0,0 +1,65 @@
+package redis
+
+import (
+	"context"
+	"fmt"
+	"github.com/go-redis/redis/v8"
+	"time"
+)
+
+var (
+	Rdb  *redis.Client
+	RdbC *redis.ClusterClient
+)
+
+// InitRedis 初始化连接 普通连接
+func InitRedis(host string, port int, password string, db int) (err error) {
+	dsn := fmt.Sprintf("%s:%v", host, port)
+	fmt.Printf("【redis.普通】数据库配置 %s \n", dsn)
+	Rdb = redis.NewClient(&redis.Options{
+		Addr:     dsn,
+		Password: password, // no password set
+		DB:       db,       // use default DB
+		PoolSize: 100,      // 连接池大小
+	})
+
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	defer cancel()
+
+	_, err = Rdb.Ping(ctx).Result()
+	return err
+}
+
+// InitSentinelRedis 初始化连接 哨兵模式
+func InitSentinelRedis(adds []string, masterName string, password string, db int) (err error) {
+	fmt.Printf("【redis.哨兵】数据库配置 %s \n", adds)
+	Rdb = redis.NewFailoverClient(&redis.FailoverOptions{
+		MasterName:    masterName,
+		SentinelAddrs: adds,
+		Password:      password, // no password set
+		DB:            db,       // use default DB
+		PoolSize:      100,      // 连接池大小
+	})
+
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	defer cancel()
+
+	_, err = Rdb.Ping(ctx).Result()
+	return err
+}
+
+// InitClusterRedis 初始化连接 集群
+func InitClusterRedis(adds []string, password string) (err error) {
+	fmt.Printf("【redis.集群】数据库配置 %v \n", adds)
+	RdbC = redis.NewClusterClient(&redis.ClusterOptions{
+		Addrs:    adds,
+		Password: password, // no password set
+		PoolSize: 100,      // 连接池大小
+	})
+
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	defer cancel()
+
+	_, err = RdbC.Ping(ctx).Result()
+	return err
+}
--- a/redis/operation_attr.go
+++ b/redis/operation_attr.go
@ -0,0 +1,35 @@
+package redis
+
+import "time"
+
+type empty struct{}
+
+const (
+	AttrExpr = "expr" //过期时间
+	AttrNx   = "nx"   // setNx
+)
+
+type OperationAttr struct {
+	Name  string
+	Value interface{}
+}
+
+type OperationAttrs []*OperationAttr
+
+func (a OperationAttrs) Find(name string) interface{} {
+	for _, attr := range a {
+		if attr.Name == name {
+			return attr.Value
+		}
+	}
+	return nil
+}
+
+// WithExpire 过期时间
+func WithExpire(t time.Duration) *OperationAttr {
+	return &OperationAttr{Name: AttrExpr, Value: t}
+}
+
+func WithNX() *OperationAttr {
+	return &OperationAttr{Name: AttrNx, Value: empty{}}
+}
--- a/redis/redis_test.go
+++ b/redis/redis_test.go
@ -0,0 +1,80 @@
+package redis
+
+import (
+	"github.com/bitly/go-simplejson"
+	"log"
+	"testing"
+	"time"
+)
+
+func TestName(t *testing.T) {
+	// 连接
+	err := InitRedis("127.0.0.1", 6379, "", 2)
+	if err != nil {
+		panic(err)
+	}
+	jsonSimpleJson()
+}
+
+func set() {
+	// 设置
+	NewStringOperation().Set("test", "test", WithExpire(time.Second*1))
+}
+
+func mGet() {
+	// 获取
+	iter := NewStringOperation().MGet("test1", "test2").Iter()
+	for iter.HasNext() {
+		log.Println("MGet：", iter.Next())
+	}
+}
+
+func json() {
+	newCache := NewSimpleCache(NewStringOperation(), time.Second*10, SerializerJson)
+	newCache.JsonGetter = func() interface{} {
+		log.Println("【没有命中】SerializerJson")
+		type a []string
+		b := a{
+			"me", "she", "you",
+		}
+		return b
+	}
+	cacheJSon := newCache.GetCache("test123")
+	log.Printf("【GetCache】cacheJSon：%v\n", cacheJSon)
+}
+
+func dbString() {
+	newCache := NewSimpleCache(NewStringOperation(), time.Second*10, SerializerString)
+	newCache.DBGetter = func() string {
+		log.Println("【没有命中】SerializerString")
+		return "data by id=123"
+	}
+	cacheString := newCache.GetCache("test456")
+	log.Printf("【GetCache】cacheString：%v\n", cacheString)
+}
+
+func simpleJson() {
+	newCache := NewSimpleCache(NewStringOperation(), time.Second*50, SerializerSimpleJson)
+	newCache.SimpleJsonGetter = func() *simplejson.Json {
+		log.Println("_test【没有命中】SerializerSimpleJson")
+		js := simplejson.New()
+		js.Set("name", "test")
+		return js
+	}
+	cacheSimpleJson := newCache.GetCacheSimpleJson("test789")
+	log.Printf("_test【GetCache】cacheSimpleJson：%v\n", cacheSimpleJson.Get("name"))
+}
+
+func jsonSimpleJson() {
+	newCache := NewSimpleCache(NewStringOperation(), time.Second*50, SerializerJson)
+	newCache.JsonGetter = func() interface{} {
+		log.Println("【没有命中】SerializerJson")
+		type a []string
+		b := a{
+			"me", "she", "you",
+		}
+		return b
+	}
+	cacheJson := newCache.GetCacheSimpleJson("test789")
+	log.Printf("_test【JsonGetter GetCacheSimpleJson】jsonSimpleJson：%v\n", cacheJson.GetIndex(1))
+}
--- a/redis/simple_cache.go
+++ b/redis/simple_cache.go
@ -0,0 +1,102 @@
+package redis
+
+import (
+	"encoding/json"
+	"github.com/bitly/go-simplejson"
+	"time"
+)
+
+const (
+	SerializerJson       = "json"
+	SerializerSimpleJson = "simplejson"
+	SerializerString     = "string"
+)
+
+type JsonGttFunc func() interface{}
+
+type SimpleJsonGttFunc func() *simplejson.Json
+
+type DBGttFunc func() string
+
+// SimpleCache 缓存
+type SimpleCache struct {
+	Operation        *StringOperation  // 操作类
+	Expire           time.Duration     // 过去时间
+	DBGetter         DBGttFunc         // 缓存不存在的操作 DB
+	JsonGetter       JsonGttFunc       // 缓存不存在的操作 JSON
+	SimpleJsonGetter SimpleJsonGttFunc // 缓存不存在的操作 SimpleJson
+	Serializer       string            // 序列化方式
+}
+
+func NewSimpleCache(operation *StringOperation, expire time.Duration, serializer string) *SimpleCache {
+	return &SimpleCache{Operation: operation, Expire: expire, Serializer: serializer}
+}
+
+// SetCache 设置缓存
+func (c *SimpleCache) SetCache(key string, value interface{}) {
+	c.Operation.Set(key, value, WithExpire(c.Expire)).Unwrap()
+}
+
+// GetCache 获取缓存
+func (c *SimpleCache) GetCache(key string) (ret interface{}) {
+	if c.Serializer == SerializerJson {
+		f := func() string {
+			obj := c.JsonGetter()
+			b, err := json.Marshal(obj)
+			if err != nil {
+				return ""
+			}
+			return string(b)
+		}
+		ret = c.Operation.Get(key).UnwrapOrElse(f)
+		c.SetCache(key, ret)
+	} else if c.Serializer == SerializerString {
+		f := func() string {
+			return c.DBGetter()
+		}
+		ret = c.Operation.Get(key).UnwrapOrElse(f)
+		c.SetCache(key, ret)
+	} else if c.Serializer == SerializerSimpleJson {
+		f := func() string {
+			obj := c.SimpleJsonGetter()
+			encode, err := obj.Encode()
+			if err != nil {
+				return ""
+			}
+			return string(encode)
+		}
+		ret = c.Operation.Get(key).UnwrapOrElse(f)
+		c.SetCache(key, ret)
+	}
+	return
+}
+
+// GetCacheSimpleJson 获取缓存配合SimpleJson插件
+func (c *SimpleCache) GetCacheSimpleJson(key string) (js *simplejson.Json) {
+	if c.Serializer == SerializerJson {
+		f := func() string {
+			obj := c.JsonGetter()
+			b, err := json.Marshal(obj)
+			if err != nil {
+				return ""
+			}
+			return string(b)
+		}
+		ret := c.Operation.Get(key).UnwrapOrElse(f)
+		c.SetCache(key, ret)
+		js, _ = simplejson.NewJson([]byte(ret))
+	} else if c.Serializer == SerializerSimpleJson {
+		f := func() string {
+			obj := c.SimpleJsonGetter()
+			encode, err := obj.Encode()
+			if err != nil {
+				return ""
+			}
+			return string(encode)
+		}
+		ret := c.Operation.Get(key).UnwrapOrElse(f)
+		c.SetCache(key, ret)
+		js, _ = simplejson.NewJson([]byte(ret))
+	}
+	return
+}
--- a/redis/slice_result.go
+++ b/redis/slice_result.go
@ -0,0 +1,30 @@
+package redis
+
+type SliceResult struct {
+	Result []interface{}
+	Err    error
+}
+
+func NewSliceResult(result []interface{}, err error) *SliceResult {
+	return &SliceResult{Result: result, Err: err}
+}
+
+// Unwrap 空值情况下返回错误
+func (r *SliceResult) Unwrap() []interface{} {
+	if r.Err != nil {
+		panic(r.Err)
+	}
+	return r.Result
+}
+
+// UnwrapOr 空值情况下设置返回默认值
+func (r *SliceResult) UnwrapOr(defaults []interface{}) []interface{} {
+	if r.Err != nil {
+		return defaults
+	}
+	return r.Result
+}
+
+func (r *SliceResult) Iter() *Iterator {
+	return NewIterator(r.Result)
+}
--- a/redis/string_operation.go
+++ b/redis/string_operation.go
@ -0,0 +1,33 @@
+package redis
+
+import (
+	"context"
+	"time"
+)
+
+type StringOperation struct {
+	ctx context.Context
+}
+
+func NewStringOperation() *StringOperation {
+	return &StringOperation{ctx: context.Background()}
+}
+
+// Set 设置
+func (o *StringOperation) Set(key string, value interface{}, attrs ...*OperationAttr) *StringResult {
+	exp := OperationAttrs(attrs).Find(AttrExpr)
+	if exp == nil {
+		exp = time.Second * 0
+	}
+	return NewStringResult(Rdb.Set(o.ctx, key, value, exp.(time.Duration)).Result())
+}
+
+// Get 获取单个
+func (o *StringOperation) Get(key string) *StringResult {
+	return NewStringResult(Rdb.Get(o.ctx, key).Result())
+}
+
+// MGet 获取多个
+func (o *StringOperation) MGet(keys ...string) *SliceResult {
+	return NewSliceResult(Rdb.MGet(o.ctx, keys...).Result())
+}
--- a/redis/string_result.go
+++ b/redis/string_result.go
@ -0,0 +1,33 @@
+package redis
+
+type StringResult struct {
+	Result string
+	Err    error
+}
+
+func NewStringResult(result string, err error) *StringResult {
+	return &StringResult{Result: result, Err: err}
+}
+
+// Unwrap 空值情况下返回错误
+func (r *StringResult) Unwrap() string {
+	if r.Err != nil {
+		panic(r.Err)
+	}
+	return r.Result
+}
+
+// UnwrapOr 空值情况下设置返回默认值
+func (r *StringResult) UnwrapOr(defaults string) string {
+	if r.Err != nil {
+		return defaults
+	}
+	return r.Result
+}
+
+func (r *StringResult) UnwrapOrElse(f func() string) string {
+	if r.Err != nil {
+		return f()
+	}
+	return r.Result
+}
--- a/helper/request/request.go
+++ b/helper/request/request.go
--- a/helper/rsa/rsa.go
+++ b/helper/rsa/rsa.go
--- a/service/baidubce/DrCdn.go
+++ b/service/baidubce/DrCdn.go
@ -1,196 +0,0 @@
-package baidubce
-
-import (
-	"bytes"
-	"crypto/md5"
-	"encoding/hex"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"github.com/bitly/go-simplejson"
-	time2 "github.com/dtapps/go-library/helper/time"
-	"github.com/dtapps/go-library/helper/uuid"
-	"github.com/dtapps/go-library/service"
-	"github.com/nilorg/sdk/convert"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"net/url"
-	"sort"
-	"strconv"
-	"strings"
-	"time"
-)
-
-var (
-	// AccessKeyId 应用Key
-	AccessKeyId string
-	// SecretAccessKey 秘密
-	SecretAccessKey string
-	// Router 环境请求地址
-	Router = "http://cdn.baidubce.com"
-	// Timeout ...
-	Timeout time.Duration
-)
-
-// Parameter 参数
-type Parameter map[string]interface{}
-
-// ParameterJsonEncode 参数
-type ParameterJsonEncode []string
-
-// copyParameter 复制参数
-func copyParameter(srcParams Parameter) Parameter {
-	newParams := make(Parameter)
-	for key, value := range srcParams {
-		newParams[key] = value
-	}
-	return newParams
-}
-
-// execute 执行API接口
-func execute(method string, url string, param Parameter) (bytes []byte, err error) {
-	err = checkConfig()
-	if err != nil {
-		return
-	}
-
-	//Authorization := auth.GetAuthorizationV2(AccessKeyId, SecretAccessKey, "guangdong", "drcdn", method, url, param.getRequestData(), "")
-	//fmt.Printf("Authorization：%#v\n", Authorization)
-
-	var req *http.Request
-	req, err = http.NewRequest(method, Router, strings.NewReader(param.getRequestData()))
-	if err != nil {
-		return
-	}
-
-	//req.Header.Add("Authorization", Authorization)
-	req.Header.Add("x-bce-date", time2.GetCurrentDate())
-	req.Header.Add("x-bce-request-id", uuid.GenUUID())
-	req.Header.Add("Content-Type", "application/x-www-form-urlencoded;charset=utf-8")
-	httpClient := &http.Client{}
-	httpClient.Timeout = Timeout
-	var response *http.Response
-	response, err = httpClient.Do(req)
-	if err != nil {
-		return
-	}
-
-	fmt.Printf("Body：%#v\n", response.Body)
-	if response.StatusCode != 200 {
-		err = fmt.Errorf("请求错误:%d", response.StatusCode)
-		return
-	}
-	defer response.Body.Close()
-	bytes, err = ioutil.ReadAll(response.Body)
-	return
-}
-
-// Execute 执行API接口
-func Execute(method string, url string, param Parameter) (res *simplejson.Json, err error) {
-	// 更新参数
-	param.setRequestData()
-
-	var bodyBytes []byte
-	bodyBytes, err = execute(method, url, param)
-	if err != nil {
-		return
-	}
-
-	return bytesToResult(bodyBytes)
-}
-
-func bytesToResult(bytes []byte) (res *simplejson.Json, err error) {
-	res, err = simplejson.NewJson(bytes)
-	if err != nil {
-		return
-	}
-
-	if responseError, ok := res.CheckGet("error_response"); ok {
-		if subMsg, subOk := responseError.CheckGet("sub_msg"); subOk {
-			err = errors.New(subMsg.MustString())
-		} else {
-			err = errors.New(responseError.Get("msg").MustString())
-		}
-		res = nil
-	}
-	return
-}
-
-// 检查配置
-func checkConfig() error {
-	if AccessKeyId == "" {
-		return errors.New("AccessKeyId 不能为空")
-	}
-	if SecretAccessKey == "" {
-		return errors.New("SecretAccessKey 不能为空")
-	}
-	if Router == "" {
-		return errors.New("Router 不能为空")
-	}
-	return nil
-}
-
-func (p Parameter) setRequestData() {
-	hh, _ := time.ParseDuration("8h")
-	loc := time.Now().UTC().Add(hh)
-	p["timestamp"] = strconv.FormatInt(loc.Unix(), 10)
-	p["client_id"] = AccessKeyId
-	p["data_type"] = "JSON"
-	p["version"] = "v1"
-	// 设置签名
-	p["sign"] = getSign(p)
-}
-
-// 获取请求数据
-func (p Parameter) getRequestData() string {
-	// 公共参数
-	args := url.Values{}
-	// 请求参数
-	for key, val := range p {
-		args.Set(key, interfaceToString(val))
-	}
-	return args.Encode()
-}
-
-// 获取签名
-func getSign(params Parameter) string {
-	// 获取Key
-	keys := []string{}
-	for k := range params {
-		keys = append(keys, k)
-	}
-	// 排序asc
-	sort.Strings(keys)
-	// 把所有参数名和参数值串在一起
-	query := bytes.NewBufferString(SecretAccessKey)
-	for _, k := range keys {
-		query.WriteString(k)
-		query.WriteString(interfaceToString(params[k]))
-	}
-	query.WriteString(SecretAccessKey)
-	// 使用MD5加密
-	h := md5.New()
-	io.Copy(h, query)
-	// 把二进制转化为大写的十六进制
-	return strings.ToUpper(hex.EncodeToString(h.Sum(nil)))
-}
-
-func interfaceToString(src interface{}) string {
-	if src == nil {
-		panic(service.ErrTypeIsNil)
-	}
-	switch src.(type) {
-	case string:
-		return src.(string)
-	case int, int8, int32, int64:
-	case uint8, uint16, uint32, uint64:
-	case float32, float64:
-		return convert.ToString(src)
-	}
-	data, err := json.Marshal(src)
-	if err != nil {
-		panic(err)
-	}
-	return string(data)
-}
--- a/service/ddk/Ddk.go
+++ b/service/ddk/Ddk.go
@ -8,8 +8,8 @@ import (
 	"errors"
 	"fmt"
 	"github.com/bitly/go-simplejson"
-	"github.com/dtapps/go-library/service"
 	"github.com/nilorg/sdk/convert"
+	"gopkg.in/dtapps/go-library.v2/service"
 	"io"
 	"io/ioutil"
 	"net/http"
--- a/service/ddk/Ddk_test.go
+++ b/service/ddk/Ddk_test.go
@ -0,0 +1,29 @@
+package ddk
+
+import (
+	"fmt"
+	"testing"
+)
+
+func init() {
+	ClientId = "c0372aa7ffa149cbbce852e4d397a577"
+	ClientSecret = "7d527f81d80bc41527dd8d680a462ff06fbfb14b"
+}
+
+func TestName(t *testing.T) {
+	fmt.Println("Hello World")
+	res, err := Execute("pdd.ddk.goods.recommend.get", Parameter{
+		"limit":        10,
+		"channel_type": 3,
+		"offset":       0,
+		"pid":          "1923953_141325051",
+		"goods_sign_list": ParameterJsonEncode{
+			"Y9v2lh2s6e1GWdnxwfbZF9sHlepFWs13_JmF4wnW72",
+		},
+	})
+
+	if err != nil {
+		fmt.Printf("错误：%#v\n", err)
+	}
+	fmt.Printf("结果：%#v\n", res)
+}
--- a/service/jdk/Jdk.go
+++ b/service/jdk/Jdk.go
@ -8,8 +8,8 @@ import (
 	"errors"
 	"fmt"
 	"github.com/bitly/go-simplejson"
-	"github.com/dtapps/go-library/service"
 	"github.com/nilorg/sdk/convert"
+	"gopkg.in/dtapps/go-library.v2/service"
 	"io"
 	"io/ioutil"
 	"net/http"
--- a/service/tbk/Tbk.go
+++ b/service/tbk/Tbk.go
@ -8,8 +8,8 @@ import (
 	"errors"
 	"fmt"
 	"github.com/bitly/go-simplejson"
-	"github.com/dtapps/go-library/service"
 	"github.com/nilorg/sdk/convert"
+	"gopkg.in/dtapps/go-library.v2/service"
 	"io"
 	"io/ioutil"
 	"net/http"
--- a/ssh/ssh.go
+++ b/ssh/ssh.go
@ -0,0 +1,66 @@
+package ssh
+
+import (
+	"fmt"
+	"golang.org/x/crypto/ssh"
+	"io"
+	"net"
+	"time"
+)
+
+// 转发
+func sForward(serverAddr string, remoteAddr string, localConn net.Conn, config *ssh.ClientConfig) {
+	// 设置sshClientConn
+	sshClientConn, err := ssh.Dial("tcp", serverAddr, config)
+	if err != nil {
+		fmt.Printf("ssh.Dial failed: %s", err)
+	}
+
+	// 设置Connection
+	sshConn, err := sshClientConn.Dial("tcp", remoteAddr)
+
+	// 将localConn.Reader复制到sshConn.Writer
+	go func() {
+		_, err = io.Copy(sshConn, localConn)
+		if err != nil {
+			fmt.Printf("io.Copy failed: %v", err)
+		}
+	}()
+
+	// 将sshConn.Reader复制到localConn.Writer
+	go func() {
+		_, err = io.Copy(localConn, sshConn)
+		if err != nil {
+			fmt.Printf("io.Copy failed: %v", err)
+		}
+	}()
+}
+func Tunnel(username string, password string, serverAddr string, remoteAddr string, localAddr string) {
+	// 设置SSH配置
+	fmt.Printf("%s，服务器：%s；远程：%s；本地：%s\n", "设置SSH配置", serverAddr, remoteAddr, localAddr)
+	config := &ssh.ClientConfig{
+		User: username,
+		Auth: []ssh.AuthMethod{
+			ssh.Password(password),
+		},
+		Timeout: 30 * time.Second,
+		HostKeyCallback: func(hostname string, remote net.Addr, key ssh.PublicKey) error {
+			return nil
+		},
+	}
+
+	// 设置本地监听器
+	localListener, err := net.Listen("tcp", localAddr)
+	if err != nil {
+		fmt.Printf("net.Listen failed: %v\n", err)
+	}
+
+	for {
+		// 设置本地
+		localConn, err := localListener.Accept()
+		if err != nil {
+			fmt.Printf("localListener.Accept failed: %v\n", err)
+		}
+		go sForward(serverAddr, remoteAddr, localConn, config)
+	}
+}
--- a/ssh/ssh_test.go
+++ b/ssh/ssh_test.go
@ -0,0 +1,9 @@
+package ssh
+
+import (
+	"testing"
+)
+
+func TestName(t *testing.T) {
+	Tunnel("root", "", ":22", ":3306", "localhost:13306")
+}
--- a/helper/string/string.go
+++ b/helper/string/string.go
--- a/helper/time/time.go
+++ b/helper/time/time.go
--- a/helper/url/url.go
+++ b/helper/url/url.go
--- a/helper/uuid/uuid.go
+++ b/helper/uuid/uuid.go
--- a/helper/uuid/uuid_test.go
+++ b/helper/uuid/uuid_test.go
@ -2,7 +2,7 @@ package uuid_test

 import (
 	"fmt"
-	"github.com/dtapps/go-library/helper/uuid"
+	"gopkg.in/dtapps/go-library.v2/uuid"
 	"testing"
 )