fix：

1、修复feign-okhttp

app/src/main/java/com/yiring/app/config/FeignOkHttpConfig.java

-/* (C) 2022 YiRing, Inc. */
-package com.yiring.app.config;
-
-import feign.Feign;
-import java.util.concurrent.TimeUnit;
-import okhttp3.ConnectionPool;
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.cloud.openfeign.FeignAutoConfiguration;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * feignOkhttp
- *
- * @author LJ-2204
- * @date 2022/4/27
- */
-
-@Configuration
-@ConditionalOnClass(Feign.class)
-@AutoConfigureBefore(FeignAutoConfiguration.class)
-public class FeignOkHttpConfig {
-
-    @Bean
-    public okhttp3.OkHttpClient okHttpClient() {
-        return new okhttp3.OkHttpClient.Builder()
-            .readTimeout(60, TimeUnit.SECONDS)
-            .connectTimeout(60, TimeUnit.SECONDS)
-            .writeTimeout(120, TimeUnit.SECONDS)
-            .connectionPool(new ConnectionPool())
-            .build();
-    }
-}

app/src/main/java/com/yiring/app/rabbit/config/ZyConfigProperties.java

@@ -67,7 +67,7 @@ public class ZyConfigProperties {
         String api;
         String tenant;
 
-        @Resource
+        @Resource(name = "ZyConfigProxyClient")
         ZyConfigProxyClient client;
 
         @Resource
@@ -75,7 +75,7 @@ public class ZyConfigProperties {
 
         @Data
         @FieldDefaults(level = AccessLevel.PRIVATE)
-        @Component
+        @Component("ZyConfigProxyClient")
         @ConfigurationProperties(prefix = "zy-config.proxy.client")
         public static class ZyConfigProxyClient {
 

basic-common/minio/src/main/java/com/yiring/common/config/MinioConfig.java

@@ -29,7 +29,7 @@ public class MinioConfig {
     String bucket;
     String domain;
 
-    @Bean
+    @Bean("MinioClient")
     public MinioClient getClient() {
         return MinioClient.builder().endpoint(endpoint).credentials(accessKey, secretKey).build();
     }

basic-common/minio/src/main/java/com/yiring/common/core/Minio.java

@@ -28,7 +28,7 @@ public class Minio {
     @Resource
     public MinioConfig config;
 
-    @Resource
+    @Resource(name = "MinioClient")
     public MinioClient client;
 
     /**