自动刷新token封装修改泛型

@@ -19,9 +19,11 @@ export class HttpBizUtil {
    * @param headers 请求header参数
    * @param headers 请求header参数
    * @returns 返回值
    * @returns 返回值
    */
    */
-  static get<T = string>(url: string, headers?: HashMap<string, string>): Promise<ResponseDTO<T>> {
-    return new Promise<ResponseDTO<T>>((success, debug) => {
-      WDHttp.get<ResponseDTO<T>>(url, headers).then((resDTO: ResponseDTO<T>) => {
+  static get<T = ResponseDTO<string>>(url: string, headers?: HashMap<string, string>): Promise<T> {
+    return new Promise<T>((success, debug) => {
+      WDHttp.get<T>(url, headers).then((originalRes: T) => {
+        try {
+          let resDTO = originalRes as ResponseDTO
           Logger.debug(TAG, 'get: ' + resDTO.code)
           Logger.debug(TAG, 'get: ' + resDTO.code)
           Logger.debug(TAG, 'get: ' + resDTO.message)
           Logger.debug(TAG, 'get: ' + resDTO.message)
           // 403：临时token；406：强制下线、封禁、清空登录信息还要跳转登录页面
           // 403：临时token；406：强制下线、封禁、清空登录信息还要跳转登录页面
@@ -33,16 +35,20 @@ export class HttpBizUtil {
               }
               }
               Logger.debug(TAG, 'get again send: ' + token)
               Logger.debug(TAG, 'get again send: ' + token)
               // refreshToken为空场景不处理，直接请求接口。
               // refreshToken为空场景不处理，直接请求接口。
-            WDHttp.get<ResponseDTO<T>>(url, headers).then((resDTO: ResponseDTO<T>) => {
-              Logger.debug(TAG, 'get again: ' + resDTO.message)
-              success(resDTO)
+              WDHttp.get<T>(url, headers).then((againResDTO: T) => {
+                Logger.debug(TAG, 'get again: ' + againResDTO)
+                success(againResDTO)
               }).catch((res: object) => {
               }).catch((res: object) => {
                 debug(res)
                 debug(res)
               })
               })
             });
             });
           } else {
           } else {
-          success(resDTO)
+            success(originalRes)
           }
           }
+        } catch (e) {
+          debug(originalRes)
+        }
+
       }).catch((res: object) => {
       }).catch((res: object) => {
         debug(res)
         debug(res)
       })
       })
@@ -56,9 +62,11 @@ export class HttpBizUtil {
    * @param headers 请求header参数
    * @param headers 请求header参数
    * @returns 返回值
    * @returns 返回值
    */
    */
-  static post<T = string>(url: string, data?: object, headers?: HashMap<string, string>): Promise<ResponseDTO<T>> {
-    return new Promise<ResponseDTO<T>>((success, debug) => {
-      WDHttp.post<ResponseDTO<T>>(url, data, headers).then((resDTO: ResponseDTO<T>) => {
+  static post<T = ResponseDTO<string>>(url: string, data?: object, headers?: HashMap<string, string>): Promise<T> {
+    return new Promise<T>((success, debug) => {
+      WDHttp.post<T>(url, data, headers).then((originalRes: T) => {
+        try {
+          let resDTO = originalRes as ResponseDTO
           Logger.debug(TAG, 'post: ' + resDTO.code)
           Logger.debug(TAG, 'post: ' + resDTO.code)
           Logger.debug(TAG, 'post: ' + resDTO.message)
           Logger.debug(TAG, 'post: ' + resDTO.message)
           // 403：临时token；406：强制下线、封禁、清空登录信息还要跳转登录页面
           // 403：临时token；406：强制下线、封禁、清空登录信息还要跳转登录页面
@@ -69,14 +77,17 @@ export class HttpBizUtil {
                 headers.replace('cookie', 'RMRB-X-TOKEN=' + token)
                 headers.replace('cookie', 'RMRB-X-TOKEN=' + token)
               }
               }
               // refreshToken为空场景不处理，直接请求接口。
               // refreshToken为空场景不处理，直接请求接口。
-            WDHttp.post<ResponseDTO<T>>(url, headers).then((resDTO: ResponseDTO<T>) => {
-              success(resDTO)
+              WDHttp.post<T>(url, headers).then((againResDTO: T) => {
+                success(againResDTO)
               }).catch((res: object) => {
               }).catch((res: object) => {
                 debug(res)
                 debug(res)
               })
               })
             });
             });
           } else {
           } else {
-          success(resDTO)
+            success(originalRes)
+          }
+        } catch (e) {
+          success(originalRes)
         }
         }
       }).catch((res: object) => {
       }).catch((res: object) => {
         debug(res)
         debug(res)

@@ -372,7 +372,7 @@ class MinePageDatasModel{
     let url = HttpUrlUtils.getMineUserLevelDataUrl()
     let url = HttpUrlUtils.getMineUserLevelDataUrl()
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
     // return WDHttp.get<ResponseDTO<MineUserLevelItem>>(url, headers)
     // return WDHttp.get<ResponseDTO<MineUserLevelItem>>(url, headers)
-    return HttpBizUtil.get<MineUserLevelItem>(url, headers)
+    return HttpBizUtil.get<ResponseDTO<MineUserLevelItem>>(url, headers)
   };
   };
 
 
   async getMineUserLevelDataLocal(context: Context): Promise<MineUserLevelItem> {
   async getMineUserLevelDataLocal(context: Context): Promise<MineUserLevelItem> {
@@ -411,7 +411,7 @@ class MinePageDatasModel{
     let url = HttpUrlUtils.getMineUserDetailDataUrl()
     let url = HttpUrlUtils.getMineUserDetailDataUrl()
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
     // return WDHttp.get<ResponseDTO<MineUserDetailItem>>(url, headers)
     // return WDHttp.get<ResponseDTO<MineUserDetailItem>>(url, headers)
-    return HttpBizUtil.get<MineUserDetailItem>(url, headers)
+    return HttpBizUtil.get<ResponseDTO<MineUserDetailItem>>(url, headers)
   };
   };
 
 
   async getMineUserDetailDataLocal(context: Context): Promise<MineUserDetailItem> {
   async getMineUserDetailDataLocal(context: Context): Promise<MineUserDetailItem> {

@@ -224,7 +224,7 @@ export class LoginModel {
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
 
 
     return new Promise<string>((success, fail) => {
     return new Promise<string>((success, fail) => {
-      HttpBizUtil.post<string>(HttpUrlUtils.getLogoutUrl(), bean, headers).then((data: ResponseDTO<string>)=>{
+      HttpBizUtil.post<ResponseDTO<string>>(HttpUrlUtils.getLogoutUrl(), bean, headers).then((data: ResponseDTO<string>)=>{
         if (!data) {
         if (!data) {
           fail("数据为空")
           fail("数据为空")
           return
           return