Skip to content

Commit 902db77

Browse files
author
HadiChan
committed
0.4.5
1 parent 81e46ce commit 902db77

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

lib/api.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -133,13 +133,13 @@ function ddvRestFulApi (path, requests, response) {
133133
}.bind(this))
134134
.then(function (body) {
135135
if (this.isAuth === true) {
136-
return ddvRestFulApiNextRun(this.auth, body, this.requests, this.response, this.request, this.onAccessKey, 0, (api.onAccessKeyTrySum || 3), isNative)
136+
return ddvRestFulApiNextRun(this.auth, body, this.requests, this.response, this.request, this.onAccessKey, 0, (api.onAccessKeyTrySum || 3), isNative, api)
137137
} else {
138138
return this.request(auth.getUri(), body, auth.method, auth.headers, api)
139-
.then(function (res) {
140-
auth = body = void 0
141-
return isNative === true ? res : parseDataByBody(res)
142-
})
139+
.then(function (res) {
140+
auth = body = void 0
141+
return isNative === true ? res : parseDataByBody(res)
142+
})
143143
}
144144
}.bind(this))
145145
.then(function (res) {
@@ -183,7 +183,7 @@ function ddvRestFulApi (path, requests, response) {
183183
})
184184
}
185185
// 运行这个请求
186-
function ddvRestFulApiNextRun (auth, body, requests, response, requestRun, onAccessKey, tryNum, trySum, isNative) {
186+
function ddvRestFulApiNextRun (auth, body, requests, response, requestRun, onAccessKey, tryNum, trySum, isNative, api) {
187187
// options.isServerNode = (requests && response && true) || false
188188
// ====设定请求对象====
189189
tryNum = tryNum || 0
@@ -196,7 +196,7 @@ function ddvRestFulApiNextRun (auth, body, requests, response, requestRun, onAcc
196196
delete auth.headers['Authorization']
197197
}
198198
auth.headers['Authorization'] = auth.getAuthString()
199-
return requestRun(auth.getUri(), body, auth.method, auth.headers)
199+
return requestRun(auth.getUri(), body, auth.method, auth.headers, api)
200200
.then(function (res) {
201201
auth = body = void 0
202202
return isNative === true ? res : parseDataByBody(res)
@@ -205,7 +205,7 @@ function ddvRestFulApiNextRun (auth, body, requests, response, requestRun, onAcc
205205
var r
206206
if (parseInt(e.statusCode) === 403 && tryNum < trySum) {
207207
// 重新运行一次
208-
r = ddvRestFulApiNextRun(auth, body, requests, response, requestRun, onAccessKey, (tryNum + 1), trySum, isNative)
208+
r = ddvRestFulApiNextRun(auth, body, requests, response, requestRun, onAccessKey, (tryNum + 1), trySum, isNative, api)
209209
} else {
210210
// 还是原路抛出错误
211211
r = isNative === true ? e : parseDataByBody(e, true)

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ddv-restful-api",
3-
"version": "0.4.4",
3+
"version": "0.4.5",
44
"description": "ddv-restful-api",
55
"main": "./index.js",
66
"scripts": {

0 commit comments

Comments
 (0)