Merge remote-tracking branch 'origin/master'

fetch/build.gradle

@@ -63,7 +63,7 @@ repositories {
     mavenCentral()
 }
 group 'com.qmai.android.fetch'
-version '1.2.61-SNAPSHOT'
+version '1.2.62-SNAPSHOT'
 
 gradlePublish {
 

fetch/src/main/java/com/qimai/android/fetch/callAdapter/KotlinCoroutinesCallAdapterFactory.kt

@@ -144,7 +144,7 @@ class KotlinCoroutinesCallAdapterFactory(
                     //业务逻辑错误
                     if (t is BizException) {
                         serverError?.apply {
-                            this.serverError(
+                            this.serverError(request.url().toString(),
                                 "${t.message}",
                                 gson.toJson(requestStartMessage),
                                 t.responseMsg
@@ -154,7 +154,7 @@ class KotlinCoroutinesCallAdapterFactory(
                     } else if (t is GsonParseErrorException) {
                         //gson解析异常
                         gsonParseError?.apply {
-                            this.parseError(
+                            this.parseError(request.url().toString(),
                                 "${t.message}",
                                 gson.toJson(requestStartMessage),
                                 t.responseMsg
@@ -162,7 +162,7 @@ class KotlinCoroutinesCallAdapterFactory(
                         }
                     } else if (t is ServerResponseException) {
                         serverError?.apply {
-                            this.serverError(
+                            this.serverError(request.url().toString(),
                                 "${t.message}",
                                 gson.toJson(requestStartMessage),
                                 t.responseMsg

fetch/src/main/java/com/qimai/android/fetch/interceptors/GsonParseError.kt

@@ -4,5 +4,5 @@ package com.qimai.android.fetch.interceptors
  * json解析异常
  */
 interface GsonParseError {
-    fun parseError(msg: String? = null,requestMsg:String?=null,responseMsg:String?=null)
+    fun parseError(url:String,msg: String? = null,requestMsg:String?=null,responseMsg:String?=null)
 }
\ No newline at end of file

fetch/src/main/java/com/qimai/android/fetch/interceptors/ServerError.kt

@@ -4,6 +4,6 @@ package com.qimai.android.fetch.interceptors
  * 服务器返回的false
  */
 interface ServerError {
-    fun serverError(msg: String? = null,requestMsg:String?=null,responseMsg:String?=null)
+    fun serverError(url:String?,msg: String? = null,requestMsg:String?=null,responseMsg:String?=null)
 
 }
\ No newline at end of file