xuqinmin12/HarmonyOSBaseLibs
0
0
派生 0
代码 工单 合并请求 版本发布 百科 动态

微调

浏览代码
这个提交包含在：
徐勤民 2024-10-18 20:30:27 +08:00
父节点 87ef142944
当前提交 2081e3d6fa
共有 1 个文件被更改，包括 44 次插入 和 35 次删除
显示统计 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

79
src/main/ets/http/HttpHelper.ts
查看文件

@ -41,8 +41,8 @@ export class HttpHelper {
constructor() { constructor() {
this.httpHandlerList = new HashMap<string, http.HttpRequest>(); this.httpHandlerList = new HashMap<string, http.HttpRequest>();
LocalStorageHelper.storage.setOrCreate(LocalStorageKeys.HttpHandlerList,this.httpHandlerList) LocalStorageHelper.storage.setOrCreate(LocalStorageKeys.HttpHandlerList, this.httpHandlerList)
LocalStorageHelper.storage.setOrCreate(LocalStorageKeys.HttpHandlerListLength,this.httpHandlerList.length) LocalStorageHelper.storage.setOrCreate(LocalStorageKeys.HttpHandlerListLength, this.httpHandlerList.length)
this.concurrentList.clear() this.concurrentList.clear()
} }
@ -73,18 +73,19 @@ export class HttpHelper {
return new Promise<T>((resolve, reject) => { return new Promise<T>((resolve, reject) => {
if (this.concurrentList.getIndexOf(apiNo ?? params.url) === -1 && this.httpHandlerList.hasKey(apiNo ?? params.url)) { if (this.concurrentList.getIndexOf(apiNo ?? params.url) === -1 &&
this.httpHandlerList.hasKey(apiNo ?? params.url)) {
this.httpHandlerList.get(apiNo ?? params.url).destroy() this.httpHandlerList.get(apiNo ?? params.url).destroy()
this.httpHandlerList.remove(apiNo ?? params.url) this.httpHandlerList.remove(apiNo ?? params.url)
LocalStorageHelper.storage.setOrCreate(LocalStorageKeys.HttpHandlerList,this.httpHandlerList) LocalStorageHelper.storage.setOrCreate(LocalStorageKeys.HttpHandlerList, this.httpHandlerList)
LocalStorageHelper.storage.setOrCreate(LocalStorageKeys.HttpHandlerListLength,this.httpHandlerList.length) LocalStorageHelper.storage.setOrCreate(LocalStorageKeys.HttpHandlerListLength, this.httpHandlerList.length)
} }
let httpRequest = http.createHttp(); let httpRequest = http.createHttp();
if (this.concurrentList.getIndexOf(apiNo ?? params.url) === -1) { if (this.concurrentList.getIndexOf(apiNo ?? params.url) === -1) {
this.httpHandlerList.set(apiNo ?? params.url, httpRequest) this.httpHandlerList.set(apiNo ?? params.url, httpRequest)
LocalStorageHelper.storage.setOrCreate(LocalStorageKeys.HttpHandlerList,this.httpHandlerList) LocalStorageHelper.storage.setOrCreate(LocalStorageKeys.HttpHandlerList, this.httpHandlerList)
LocalStorageHelper.storage.setOrCreate(LocalStorageKeys.HttpHandlerListLength,this.httpHandlerList.length) LocalStorageHelper.storage.setOrCreate(LocalStorageKeys.HttpHandlerListLength, this.httpHandlerList.length)
} }
const header = { const header = {
@ -104,7 +105,7 @@ export class HttpHelper {
extraData: params.data extraData: params.data
}) })
.then((data: http.HttpResponse) => { .then((data: http.HttpResponse) => {
console.info('=====>' + 'Result:' + data.result as string); console.info(`=====>Result:${data.result as string}(${apiNo})`);
// console.info('=====>' + 'code:' + data.responseCode); // console.info('=====>' + 'code:' + data.responseCode);
// console.info('=====>' + 'type:' + JSON.stringify(data.resultType)); // console.info('=====>' + 'type:' + JSON.stringify(data.resultType));
// console.info('=====>' + 'header:' + JSON.stringify(data.header)); // console.info('=====>' + 'header:' + JSON.stringify(data.header));
@ -114,8 +115,8 @@ export class HttpHelper {
if (this.httpHandlerList.hasKey(apiNo ?? params.url)) { if (this.httpHandlerList.hasKey(apiNo ?? params.url)) {
this.httpHandlerList.remove(apiNo ?? params.url) this.httpHandlerList.remove(apiNo ?? params.url)
LocalStorageHelper.storage.setOrCreate(LocalStorageKeys.HttpHandlerList,this.httpHandlerList) LocalStorageHelper.storage.setOrCreate(LocalStorageKeys.HttpHandlerList, this.httpHandlerList)
LocalStorageHelper.storage.setOrCreate(LocalStorageKeys.HttpHandlerListLength,this.httpHandlerList.length) LocalStorageHelper.storage.setOrCreate(LocalStorageKeys.HttpHandlerListLength, this.httpHandlerList.length)
} }
if (data.responseCode === 200) { if (data.responseCode === 200) {
resolve((typeof data.result === 'string' ? JSON.parse(data.result) : data.result) as T) resolve((typeof data.result === 'string' ? JSON.parse(data.result) : data.result) as T)
@ -126,15 +127,17 @@ export class HttpHelper {
reject(err) reject(err)
} }
}).catch((err: Error) => { }).catch((err: Error) => {
console.info('=====>' + 'Error:' + JSON.stringify({ err: err, url: params.url, }));
if (this.httpHandlerList.hasKey(apiNo ?? params.url)) { if (this.httpHandlerList.hasKey(apiNo ?? params.url)) {
this.httpHandlerList.remove(apiNo ?? params.url) this.httpHandlerList.remove(apiNo ?? params.url)
LocalStorageHelper.storage.setOrCreate(LocalStorageKeys.HttpHandlerList,this.httpHandlerList) LocalStorageHelper.storage.setOrCreate(LocalStorageKeys.HttpHandlerList, this.httpHandlerList)
LocalStorageHelper.storage.setOrCreate(LocalStorageKeys.HttpHandlerListLength,this.httpHandlerList.length) LocalStorageHelper.storage.setOrCreate(LocalStorageKeys.HttpHandlerListLength, this.httpHandlerList.length)
} }
if (err.message === 'Failed writing received data to disk/application') { if (err.message === 'Failed writing received data to disk/application') {
reject('cancel') reject('cancel')
} else } else {
reject(err) reject(err)
}
}); });
}); });
@ -151,18 +154,19 @@ export class HttpHelper {
return new Promise<T>((resolve, reject) => { return new Promise<T>((resolve, reject) => {
if (this.concurrentList.getIndexOf(apiNo ?? params.url) === -1 && this.httpHandlerList.hasKey(apiNo ?? params.url)) { if (this.concurrentList.getIndexOf(apiNo ?? params.url) === -1 &&
this.httpHandlerList.hasKey(apiNo ?? params.url)) {
this.httpHandlerList.get(apiNo ?? params.url).destroy() this.httpHandlerList.get(apiNo ?? params.url).destroy()
this.httpHandlerList.remove(apiNo ?? params.url) this.httpHandlerList.remove(apiNo ?? params.url)
LocalStorageHelper.storage.setOrCreate(LocalStorageKeys.HttpHandlerList,this.httpHandlerList) LocalStorageHelper.storage.setOrCreate(LocalStorageKeys.HttpHandlerList, this.httpHandlerList)
LocalStorageHelper.storage.setOrCreate(LocalStorageKeys.HttpHandlerListLength,this.httpHandlerList.length) LocalStorageHelper.storage.setOrCreate(LocalStorageKeys.HttpHandlerListLength, this.httpHandlerList.length)
} }
let httpRequest = http.createHttp(); let httpRequest = http.createHttp();
if (this.concurrentList.getIndexOf(apiNo ?? params.url) === -1) { if (this.concurrentList.getIndexOf(apiNo ?? params.url) === -1) {
this.httpHandlerList.set(apiNo ?? params.url, httpRequest) this.httpHandlerList.set(apiNo ?? params.url, httpRequest)
LocalStorageHelper.storage.setOrCreate(LocalStorageKeys.HttpHandlerList,this.httpHandlerList) LocalStorageHelper.storage.setOrCreate(LocalStorageKeys.HttpHandlerList, this.httpHandlerList)
LocalStorageHelper.storage.setOrCreate(LocalStorageKeys.HttpHandlerListLength,this.httpHandlerList.length) LocalStorageHelper.storage.setOrCreate(LocalStorageKeys.HttpHandlerListLength, this.httpHandlerList.length)
} }
const header = { const header = {
@ -184,7 +188,7 @@ export class HttpHelper {
extraData: encodeURI(data) extraData: encodeURI(data)
}) })
.then((data: http.HttpResponse) => { .then((data: http.HttpResponse) => {
console.info('=====>' + 'Result:' + data.result as string); console.info(`=====>Result:${data.result as string}(${apiNo})`);
// console.info('=====>' + 'code:' + data.responseCode); // console.info('=====>' + 'code:' + data.responseCode);
// console.info('=====>' + 'type:' + JSON.stringify(data.resultType)); // console.info('=====>' + 'type:' + JSON.stringify(data.resultType));
// console.info('=====>' + 'header:' + JSON.stringify(data.header)); // console.info('=====>' + 'header:' + JSON.stringify(data.header));
@ -194,8 +198,8 @@ export class HttpHelper {
if (this.httpHandlerList.hasKey(apiNo ?? params.url)) { if (this.httpHandlerList.hasKey(apiNo ?? params.url)) {
this.httpHandlerList.remove(apiNo ?? params.url) this.httpHandlerList.remove(apiNo ?? params.url)
LocalStorageHelper.storage.setOrCreate(LocalStorageKeys.HttpHandlerList,this.httpHandlerList) LocalStorageHelper.storage.setOrCreate(LocalStorageKeys.HttpHandlerList, this.httpHandlerList)
LocalStorageHelper.storage.setOrCreate(LocalStorageKeys.HttpHandlerListLength,this.httpHandlerList.length) LocalStorageHelper.storage.setOrCreate(LocalStorageKeys.HttpHandlerListLength, this.httpHandlerList.length)
} }
if (data.responseCode === 200) { if (data.responseCode === 200) {
resolve((typeof data.result === 'string' ? JSON.parse(data.result) : data.result) as T) resolve((typeof data.result === 'string' ? JSON.parse(data.result) : data.result) as T)
@ -206,15 +210,17 @@ export class HttpHelper {
reject(err) reject(err)
} }
}).catch((err: Error) => { }).catch((err: Error) => {
console.info('=====>' + 'Error:' + JSON.stringify({ err: err, url: params.url, }));
if (this.httpHandlerList.hasKey(apiNo ?? params.url)) { if (this.httpHandlerList.hasKey(apiNo ?? params.url)) {
this.httpHandlerList.remove(apiNo ?? params.url) this.httpHandlerList.remove(apiNo ?? params.url)
LocalStorageHelper.storage.setOrCreate(LocalStorageKeys.HttpHandlerList,this.httpHandlerList) LocalStorageHelper.storage.setOrCreate(LocalStorageKeys.HttpHandlerList, this.httpHandlerList)
LocalStorageHelper.storage.setOrCreate(LocalStorageKeys.HttpHandlerListLength,this.httpHandlerList.length) LocalStorageHelper.storage.setOrCreate(LocalStorageKeys.HttpHandlerListLength, this.httpHandlerList.length)
} }
if (err.message === 'Failed writing received data to disk/application') { if (err.message === 'Failed writing received data to disk/application') {
reject('cancel') reject('cancel')
} else } else {
reject(err) reject(err)
}
}); });
}); });
@ -233,18 +239,19 @@ export class HttpHelper {
return new Promise<T>((resolve, reject) => { return new Promise<T>((resolve, reject) => {
if (this.concurrentList.getIndexOf(apiNo ?? params.url) === -1 && this.httpHandlerList.hasKey(apiNo ?? params.url)) { if (this.concurrentList.getIndexOf(apiNo ?? params.url) === -1 &&
this.httpHandlerList.hasKey(apiNo ?? params.url)) {
this.httpHandlerList.get(apiNo ?? params.url).destroy() this.httpHandlerList.get(apiNo ?? params.url).destroy()
this.httpHandlerList.remove(apiNo ?? params.url) this.httpHandlerList.remove(apiNo ?? params.url)
LocalStorageHelper.storage.setOrCreate(LocalStorageKeys.HttpHandlerList,this.httpHandlerList) LocalStorageHelper.storage.setOrCreate(LocalStorageKeys.HttpHandlerList, this.httpHandlerList)
LocalStorageHelper.storage.setOrCreate(LocalStorageKeys.HttpHandlerListLength,this.httpHandlerList.length) LocalStorageHelper.storage.setOrCreate(LocalStorageKeys.HttpHandlerListLength, this.httpHandlerList.length)
} }
let httpRequest = http.createHttp(); let httpRequest = http.createHttp();
if (this.concurrentList.getIndexOf(apiNo ?? params.url) === -1) { if (this.concurrentList.getIndexOf(apiNo ?? params.url) === -1) {
this.httpHandlerList.set(apiNo ?? params.url, httpRequest) this.httpHandlerList.set(apiNo ?? params.url, httpRequest)
LocalStorageHelper.storage.setOrCreate(LocalStorageKeys.HttpHandlerList,this.httpHandlerList) LocalStorageHelper.storage.setOrCreate(LocalStorageKeys.HttpHandlerList, this.httpHandlerList)
LocalStorageHelper.storage.setOrCreate(LocalStorageKeys.HttpHandlerListLength,this.httpHandlerList.length) LocalStorageHelper.storage.setOrCreate(LocalStorageKeys.HttpHandlerListLength, this.httpHandlerList.length)
} }
const header = { const header = {
@ -261,7 +268,7 @@ export class HttpHelper {
// extraData: params.data // extraData: params.data
}) })
.then((data: http.HttpResponse) => { .then((data: http.HttpResponse) => {
// console.info('=====>' + 'Result:' + data.result as string); console.info(`=====>Result:${data.result as string}(${apiNo})`);
// console.info('=====>' + 'code:' + data.responseCode); // console.info('=====>' + 'code:' + data.responseCode);
// console.info('=====>' + 'type:' + JSON.stringify(data.resultType)); // console.info('=====>' + 'type:' + JSON.stringify(data.resultType));
// console.info('=====>' + 'header:' + JSON.stringify(data.header)); // console.info('=====>' + 'header:' + JSON.stringify(data.header));
@ -271,8 +278,8 @@ export class HttpHelper {
if (this.httpHandlerList.hasKey(apiNo ?? params.url)) { if (this.httpHandlerList.hasKey(apiNo ?? params.url)) {
this.httpHandlerList.remove(apiNo ?? params.url) this.httpHandlerList.remove(apiNo ?? params.url)
LocalStorageHelper.storage.setOrCreate(LocalStorageKeys.HttpHandlerList,this.httpHandlerList) LocalStorageHelper.storage.setOrCreate(LocalStorageKeys.HttpHandlerList, this.httpHandlerList)
LocalStorageHelper.storage.setOrCreate(LocalStorageKeys.HttpHandlerListLength,this.httpHandlerList.length) LocalStorageHelper.storage.setOrCreate(LocalStorageKeys.HttpHandlerListLength, this.httpHandlerList.length)
} }
if (data.responseCode === 200) { if (data.responseCode === 200) {
resolve((typeof data.result === 'string' ? JSON.parse(data.result) : data.result) as T) resolve((typeof data.result === 'string' ? JSON.parse(data.result) : data.result) as T)
@ -283,15 +290,17 @@ export class HttpHelper {
reject(err) reject(err)
} }
}).catch((err: Error) => { }).catch((err: Error) => {
console.info('=====>' + 'Error:' + JSON.stringify({ err: err, url: params.url, }));
if (this.httpHandlerList.hasKey(apiNo ?? params.url)) { if (this.httpHandlerList.hasKey(apiNo ?? params.url)) {
this.httpHandlerList.remove(apiNo ?? params.url) this.httpHandlerList.remove(apiNo ?? params.url)
LocalStorageHelper.storage.setOrCreate(LocalStorageKeys.HttpHandlerList,this.httpHandlerList) LocalStorageHelper.storage.setOrCreate(LocalStorageKeys.HttpHandlerList, this.httpHandlerList)
LocalStorageHelper.storage.setOrCreate(LocalStorageKeys.HttpHandlerListLength,this.httpHandlerList.length) LocalStorageHelper.storage.setOrCreate(LocalStorageKeys.HttpHandlerListLength, this.httpHandlerList.length)
} }
if (err.message === 'Failed writing received data to disk/application') { if (err.message === 'Failed writing received data to disk/application') {
reject('cancel') reject('cancel')
} else } else {
reject(err) reject(err)
}
}); });
}); });