Skip to content

Commit ae8c54d

Browse files
committed
【fix】修复ICL1331,service相关回调代码中发生编码错误不再进入失败回调 review by luoxiao
1 parent 2c70112 commit ae8c54d

File tree

1 file changed

+25
-19
lines changed

1 file changed

+25
-19
lines changed

src/common/iServer/CommonServiceBase.js

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ export class CommonServiceBase {
3737

3838
this.proxy = null;
3939

40-
4140
this.index = null;
4241

4342
this.length = null;
@@ -274,7 +273,7 @@ export class CommonServiceBase {
274273
timeout: options.async ? 0 : null,
275274
proxy: options.proxy
276275
})
277-
.then(function(response) {
276+
.then(function (response) {
278277
if (response.text) {
279278
return response.text();
280279
}
@@ -283,34 +282,41 @@ export class CommonServiceBase {
283282
}
284283
return response;
285284
})
286-
.then(function(text) {
287-
var result = text;
285+
.then(function (text) {
286+
let requestResult = text;
288287
if (typeof text === 'string') {
289-
result = new JSONFormat().read(text);
288+
requestResult = new JSONFormat().read(text);
290289
}
291-
if (!result || result.error || (result.code >= 300 && result.code !== 304)) {
292-
if (result && result.error) {
293-
result = {
294-
error: result.error
290+
if (
291+
!requestResult ||
292+
requestResult.error ||
293+
(requestResult.code >= 300 && requestResult.code !== 304)
294+
) {
295+
if (requestResult && requestResult.error) {
296+
requestResult = {
297+
error: requestResult.error
295298
};
296299
} else {
297-
result = {
298-
error: result
300+
requestResult = {
301+
error: requestResult
299302
};
300303
}
301304
}
302-
if (result.error) {
305+
return requestResult;
306+
})
307+
.catch(function (e) {
308+
var failure = options.scope ? FunctionExt.bind(options.failure, options.scope) : options.failure;
309+
failure(e);
310+
})
311+
.then((requestResult) => {
312+
if (requestResult.error) {
303313
var failure = options.scope ? FunctionExt.bind(options.failure, options.scope) : options.failure;
304-
failure(result);
314+
failure(requestResult);
305315
} else {
306-
result.succeed = result.succeed == undefined ? true : result.succeed;
316+
requestResult.succeed = requestResult.succeed == undefined ? true : requestResult.succeed;
307317
var success = options.scope ? FunctionExt.bind(options.success, options.scope) : options.success;
308-
success(result);
318+
success(requestResult);
309319
}
310-
})
311-
.catch(function(e) {
312-
var failure = options.scope ? FunctionExt.bind(options.failure, options.scope) : options.failure;
313-
failure(e);
314320
});
315321
}
316322
}

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy