移除oki直接依赖

liuxiany · Sep 6, 2022 · 5bd5443 · 5bd5443
1 parent 1b4b349
commit 5bd5443
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 85 deletions.
diff --git a/README.md b/README.md
@@ -49,45 +49,11 @@ gitee项目地址：[https://gitee.com/lianjiatech/retrofit-spring-boot-starter]
 <dependency>
     <groupId>com.github.lianjiatech</groupId>
    <artifactId>retrofit-spring-boot-starter</artifactId>
-   <version>2.3.6</version>
+   <version>2.3.7</version>
 </dependency>
 ```
 
-**本项目依赖Retrofit-2.9.0，okhttp-3.14.9，okio-1.17.5版本，如果启动失败，可尝试手动引入完整依赖**：
-
-
-```xml
-<dependency>
-    <groupId>com.github.lianjiatech</groupId>
-   <artifactId>retrofit-spring-boot-starter</artifactId>
-   <version>2.3.6</version>
-</dependency>
- <dependency>
-    <groupId>com.squareup.okhttp3</groupId>
-    <artifactId>logging-interceptor</artifactId>
-    <version>3.14.9</version>
-</dependency>
-<dependency>
-    <groupId>com.squareup.okhttp3</groupId>
-    <artifactId>okhttp</artifactId>
-    <version>3.14.9</version>
-</dependency>
-<dependency>
-    <groupId>com.squareup.okio</groupId>
-    <artifactId>okio</artifactId>
-    <version>1.17.5</version>
-</dependency>
-<dependency>
-    <groupId>com.squareup.retrofit2</groupId>
-    <artifactId>retrofit</artifactId>
-    <version>2.9.0</version>
-</dependency>
-<dependency>
-    <groupId>com.squareup.retrofit2</groupId>
-    <artifactId>converter-jackson</artifactId>
-    <version>2.9.0</version>
-</dependency>
-```
+**如果启动失败，大概率是依赖冲突，烦请引入或者排除相关依赖**。
 
 ### 定义HTTP接口
 
@@ -144,7 +110,7 @@ public class TestService {
 
 组件支持了多个可配置的属性，用来应对不同的业务场景，具体可支持的配置属性及默认值如下：
 
-**注意：应用只需要配置要更改的配置项！**
+**注意：应用只需要配置要更改的配置项**!
 
 ```yaml
 retrofit:

diff --git a/README_EN.md b/README_EN.md
@@ -37,42 +37,7 @@
 <dependency>
     <groupId>com.github.lianjiatech</groupId>
    <artifactId>retrofit-spring-boot-starter</artifactId>
-   <version>2.3.6</version>
-</dependency>
-```
-
-**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
-<dependency>
-    <groupId>com.github.lianjiatech</groupId>
-   <artifactId>retrofit-spring-boot-starter</artifactId>
-   <version>2.3.6</version>
-</dependency>
- <dependency>
-    <groupId>com.squareup.okhttp3</groupId>
-    <artifactId>logging-interceptor</artifactId>
-    <version>3.14.9</version>
-</dependency>
-<dependency>
-    <groupId>com.squareup.okhttp3</groupId>
-    <artifactId>okhttp</artifactId>
-    <version>3.14.9</version>
-</dependency>
-<dependency>
-    <groupId>com.squareup.okio</groupId>
-    <artifactId>okio</artifactId>
-    <version>1.17.5</version>
-</dependency>
-<dependency>
-    <groupId>com.squareup.retrofit2</groupId>
-    <artifactId>retrofit</artifactId>
-    <version>2.9.0</version>
-</dependency>
-<dependency>
-    <groupId>com.squareup.retrofit2</groupId>
-    <artifactId>converter-jackson</artifactId>
-    <version>2.9.0</version>
+   <version>2.3.7</version>
 </dependency>
 ```
 

diff --git a/qun.png → group.png b/qun.png → group.png
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.github.lianjiatech</groupId>
     <artifactId>retrofit-spring-boot-starter</artifactId>
-    <version>2.3.6</version>
+    <version>2.3.7</version>
 
     <name>retrofit-spring-boot-starter</name>
     <description>retrofit-spring-boot-starter</description>
@@ -42,8 +42,7 @@
         <javax.annotation-api.version>1.3.2</javax.annotation-api.version>
         <slf4j-api.version>1.7.25</slf4j-api.version>
         <spring-boot.version>2.0.9.RELEASE</spring-boot.version>
-        <okhttp3.version>3.14.9</okhttp3.version>
-        <okio.version>1.17.5</okio.version>
+        <okhttp.version>3.14.9</okhttp.version>
         <sentinel.version>1.6.3</sentinel.version>
         <jackson.version>2.12.6.1</jackson.version>
         <lombok.version>1.18.24</lombok.version>
@@ -130,17 +129,17 @@
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>logging-interceptor</artifactId>
-            <version>${okhttp3.version}</version>
+            <version>${okhttp.version}</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
-            <version>${okhttp3.version}</version>
+            <version>${okhttp.version}</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>mockwebserver</artifactId>
-            <version>${okhttp3.version}</version>
+            <version>${okhttp.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -155,11 +154,6 @@
             <version>${retrofit.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.squareup.okio</groupId>
-            <artifactId>okio</artifactId>
-            <version>${okio.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.alibaba.csp</groupId>
             <artifactId>sentinel-core</artifactId>

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
@@ -58,7 +58,7 @@ public RetrofitFactoryBean(Class<T> retrofitInterface) {
     }
 
     @Override
-    public T getObject() throws Exception {
+    public T getObject() {
         T source = createRetrofit().create(retrofitInterface);
         if (!isEnableDegrade(retrofitInterface)) {
             return source;