From 5bd544386715ab47c285397597f9282315467420 Mon Sep 17 00:00:00 2001 From: chentianming Date: Tue, 6 Sep 2022 16:50:37 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4oki=E7=9B=B4=E6=8E=A5?= =?UTF-8?q?=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 40 ++---------------- README_EN.md | 37 +--------------- qun.png => group.png | Bin pom.xml | 16 +++---- .../spring/boot/core/RetrofitFactoryBean.java | 2 +- 5 files changed, 10 insertions(+), 85 deletions(-) rename qun.png => group.png (100%) diff --git a/README.md b/README.md index 29c2392..6ca8f09 100644 --- a/README.md +++ b/README.md @@ -49,45 +49,11 @@ gitee项目地址:[https://gitee.com/lianjiatech/retrofit-spring-boot-starter] com.github.lianjiatech retrofit-spring-boot-starter - 2.3.6 + 2.3.7 ``` -**本项目依赖Retrofit-2.9.0,okhttp-3.14.9,okio-1.17.5版本,如果启动失败,可尝试手动引入完整依赖**: - - -```xml - - com.github.lianjiatech - retrofit-spring-boot-starter - 2.3.6 - - - com.squareup.okhttp3 - logging-interceptor - 3.14.9 - - - com.squareup.okhttp3 - okhttp - 3.14.9 - - - com.squareup.okio - okio - 1.17.5 - - - com.squareup.retrofit2 - retrofit - 2.9.0 - - - com.squareup.retrofit2 - converter-jackson - 2.9.0 - -``` +**如果启动失败,大概率是依赖冲突,烦请引入或者排除相关依赖**。 ### 定义HTTP接口 @@ -144,7 +110,7 @@ public class TestService { 组件支持了多个可配置的属性,用来应对不同的业务场景,具体可支持的配置属性及默认值如下: -**注意:应用只需要配置要更改的配置项!** +**注意:应用只需要配置要更改的配置项**! ```yaml retrofit: diff --git a/README_EN.md b/README_EN.md index dcb25a1..1a97ab1 100644 --- a/README_EN.md +++ b/README_EN.md @@ -37,42 +37,7 @@ com.github.lianjiatech retrofit-spring-boot-starter - 2.3.6 - -``` - -**This project depends on Retrofit-2.9.0, okhttp-3.14.9, and okio-1.17.5 versions. If the startup fails, you can try to manually introduce complete dependencies**: - -```xml - - com.github.lianjiatech - retrofit-spring-boot-starter - 2.3.6 - - - com.squareup.okhttp3 - logging-interceptor - 3.14.9 - - - com.squareup.okhttp3 - okhttp - 3.14.9 - - - com.squareup.okio - okio - 1.17.5 - - - com.squareup.retrofit2 - retrofit - 2.9.0 - - - com.squareup.retrofit2 - converter-jackson - 2.9.0 + 2.3.7 ``` diff --git a/qun.png b/group.png similarity index 100% rename from qun.png rename to group.png diff --git a/pom.xml b/pom.xml index d77cdd1..1391fb0 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.github.lianjiatech retrofit-spring-boot-starter - 2.3.6 + 2.3.7 retrofit-spring-boot-starter retrofit-spring-boot-starter @@ -42,8 +42,7 @@ 1.3.2 1.7.25 2.0.9.RELEASE - 3.14.9 - 1.17.5 + 3.14.9 1.6.3 2.12.6.1 1.18.24 @@ -130,17 +129,17 @@ com.squareup.okhttp3 logging-interceptor - ${okhttp3.version} + ${okhttp.version} com.squareup.okhttp3 okhttp - ${okhttp3.version} + ${okhttp.version} com.squareup.okhttp3 mockwebserver - ${okhttp3.version} + ${okhttp.version} test @@ -155,11 +154,6 @@ ${retrofit.version} test - - com.squareup.okio - okio - ${okio.version} - com.alibaba.csp sentinel-core diff --git a/src/main/java/com/github/lianjiatech/retrofit/spring/boot/core/RetrofitFactoryBean.java b/src/main/java/com/github/lianjiatech/retrofit/spring/boot/core/RetrofitFactoryBean.java index 685439d..b08ba14 100644 --- a/src/main/java/com/github/lianjiatech/retrofit/spring/boot/core/RetrofitFactoryBean.java +++ b/src/main/java/com/github/lianjiatech/retrofit/spring/boot/core/RetrofitFactoryBean.java @@ -58,7 +58,7 @@ public RetrofitFactoryBean(Class retrofitInterface) { } @Override - public T getObject() throws Exception { + public T getObject() { T source = createRetrofit().create(retrofitInterface); if (!isEnableDegrade(retrofitInterface)) { return source;