Skip to content

Commit 3396519

Browse files
committed
feat: 恢复变量命名
1 parent e0ef41a commit 3396519

File tree

4 files changed

+15
-15
lines changed

4 files changed

+15
-15
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ go get github.com/fastwego/dingding
1515

1616
// 钉钉 AccessToken 管理器
1717
atm := &dingding.DefaultAccessTokenManager{
18-
ID: DingConfig["AppKey"],
18+
Id: DingConfig["AppKey"],
1919
Name: "access_token",
2020
GetRefreshRequestFunc: func() *http.Request {
2121
params := url.Values{}
2222
params.Add("appkey", DingConfig["AppKey"])
2323
params.Add("appsecret", DingConfig["AppSecret"])
24-
req, _ := http.NewRequest(http.MethodGet, dingding.ServerURL+"/gettoken?"+params.Encode(), nil)
24+
req, _ := http.NewRequest(http.MethodGet, dingding.ServerUrl+"/gettoken?"+params.Encode(), nil)
2525

2626
return req
2727
},

access_token.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ type getRefreshRequestFunc func() *http.Request
3737

3838
// DefaultAccessTokenManager 默认结构体
3939
type DefaultAccessTokenManager struct {
40-
ID string
40+
Id string
4141
Name string
4242
GetRefreshRequestFunc getRefreshRequestFunc
4343
Cache cachego.Cache
@@ -66,7 +66,7 @@ func (m *DefaultAccessTokenManager) GetAccessToken() (accessToken string, err er
6666
req := m.GetRefreshRequestFunc()
6767
// 添加 serverUrl
6868
if !strings.HasPrefix(req.URL.String(), "http") {
69-
parse, _ := url.Parse(ServerURL)
69+
parse, _ := url.Parse(ServerUrl)
7070
req.URL.Host = parse.Host
7171
req.URL.Scheme = parse.Scheme
7272
}
@@ -123,7 +123,7 @@ func (m *DefaultAccessTokenManager) GetAccessToken() (accessToken string, err er
123123

124124
// getCacheKey
125125
func (m *DefaultAccessTokenManager) getCacheKey() (key string) {
126-
return "access_token:" + m.ID
126+
return "access_token:" + m.Id
127127
}
128128

129129
// GetName 获取 access_token 参数名称

client.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ import (
2525
)
2626

2727
const (
28-
contentTypeApplicationJSON = "application/json"
28+
contentTypeApplicationJson = "application/json"
2929
)
3030

31-
// ServerURL DingDing api服务地址
32-
var ServerURL = "https://oapi.dingtalk.com"
31+
// ServerUrl DingDing api接口地址
32+
var ServerUrl = "https://oapi.dingtalk.com"
3333

3434
// UserAgent 发送请求是,使用的用户标识
3535
var UserAgent = "fastwego/dingding"
@@ -40,29 +40,29 @@ var errorSystemBusy = errors.New("system busy")
4040
func NewClient(AccessTokenManager AccessTokenManager) (client *Client) {
4141
return &Client{
4242
AccessTokenManager: AccessTokenManager,
43-
HTTPClient: http.DefaultClient,
43+
HttpClient: http.DefaultClient,
4444
}
4545
}
4646

4747
// Client 用于向接口发送请求
4848
type Client struct {
4949
AccessTokenManager AccessTokenManager
50-
HTTPClient *http.Client
50+
HttpClient *http.Client
5151
}
5252

5353
// Do 执行 请求
5454
func (client *Client) Do(req *http.Request) (resp []byte, err error) {
5555

5656
// 添加 serverUrl
5757
if !strings.HasPrefix(req.URL.String(), "http") {
58-
parse, _ := url.Parse(ServerURL)
58+
parse, _ := url.Parse(ServerUrl)
5959
req.URL.Host = parse.Host
6060
req.URL.Scheme = parse.Scheme
6161
}
6262

6363
// 默认 Header Content-Type
6464
if req.Method == http.MethodPost && req.Header.Get("Content-Type") == "" {
65-
req.Header.Set("Content-Type", contentTypeApplicationJSON)
65+
req.Header.Set("Content-Type", contentTypeApplicationJson)
6666
}
6767

6868
// 添加 access_token
@@ -81,7 +81,7 @@ func (client *Client) Do(req *http.Request) (resp []byte, err error) {
8181
Logger.Printf("%s %s %v", req.Method, req.URL.String(), req.Header)
8282
}
8383

84-
response, err := client.HTTPClient.Do(req)
84+
response, err := client.HttpClient.Do(req)
8585
if err != nil {
8686
return
8787
}
@@ -97,7 +97,7 @@ func (client *Client) Do(req *http.Request) (resp []byte, err error) {
9797
Logger.Printf("%v : retry %s %s Headers %v", errorSystemBusy, req.Method, req.URL.String(), req.Header)
9898
}
9999

100-
response, err = client.HTTPClient.Do(req)
100+
response, err = client.HttpClient.Do(req)
101101
if err != nil {
102102
return
103103
}

util/signature.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ func Signature(data, secret string) string {
1414
h := hmac.New(sha256.New, []byte(secret))
1515
h.Write([]byte(fmt.Sprintf("%v\n%s", time.Now().UnixNano()/1e6, data)))
1616
return url.QueryEscape(base64.StdEncoding.EncodeToString(h.Sum(nil)))
17-
}
17+
}

0 commit comments

Comments
 (0)