remove 移除 feign 相关代码与依赖

疯狂的狮子li

2021-11-03 8a93371baa43bf4d3027c9c1d8eea83d9ba2188c

remove 移除 feign 相关代码与依赖

 pom.xml

@@ -29,8 +29,6 @@
        <mybatis-plus.version>3.4.3.4</mybatis-plus.version>
        <p6spy.version>3.9.1</p6spy.version>
        <hutool.version>5.7.15</hutool.version>
        <feign.version>3.0.3</feign.version>
        <feign-okhttp.version>11.6</feign-okhttp.version>
        <okhttp.version>4.9.1</okhttp.version>
        <spring-boot-admin.version>2.5.2</spring-boot-admin.version>
        <redisson.version>3.16.3</redisson.version>
@@ -168,25 +166,6 @@
                <version>${hutool.version}</version>
            </dependency>

            <!-- @deprecated ç”±äºŽä½¿ç”¨äººæ•°è¾ƒå°‘ å†³å®šä¸Ž 3.4.0 ç‰ˆæœ¬ç§»é™¤ -->
            <dependency>
                <groupId>org.springframework.cloud</groupId>
                <artifactId>spring-cloud-starter-openfeign</artifactId>
                <version>${feign.version}</version>
                <exclusions>
                    <exclusion>
                        <artifactId>feign-core</artifactId>
                        <groupId>io.github.openfeign</groupId>
                    </exclusion>
                </exclusions>
            </dependency>
            <!-- @deprecated ç”±äºŽä½¿ç”¨äººæ•°è¾ƒå°‘ å†³å®šä¸Ž 3.4.0 ç‰ˆæœ¬ç§»é™¤ -->
            <dependency>
                <groupId>io.github.openfeign</groupId>
                <artifactId>feign-okhttp</artifactId>
                <version>${feign-okhttp.version}</version>
            </dependency>

            <dependency>
                <groupId>com.squareup.okhttp3</groupId>
                <artifactId>okhttp</artifactId>
@@ -243,12 +222,6 @@
                        <groupId>com.google.guava</groupId>
                    </exclusion>
                </exclusions>
            </dependency>

            <dependency>
                <groupId>com.yomahub</groupId>
                <artifactId>tlog-feign</artifactId>
                <version>${tlog.version}</version>
            </dependency>

            <dependency>

 ruoyi-admin/src/main/resources/application.yml

@@ -242,22 +242,6 @@
  # ABORT_POLICY ä¸­æ­¢
  rejectedExecutionHandler: CALLER_RUNS_POLICY

# feign ç›¸å…³é…ç½®
feign:
  # ä¸æ”¯æŒå¤šåŒ…, å¦‚有需要可在注解配置 æˆ– æå‡æ‰«åŒ…等级
  # ä¾‹å¦‚ com.**.**.feign
  package: com.ruoyi.**.feign
  # å¼€å¯åŽ‹ç¼©
  compression:
    request:
      enabled: true
    response:
      enabled: true
  okhttp:
    enabled: true
  circuitbreaker:
    enabled: true

--- # redisson ç¼“存配置
redisson:
  cacheGroup:

 ruoyi-common/pom.xml

@@ -117,18 +117,6 @@
            <artifactId>lombok</artifactId>
        </dependency>

        <!-- @deprecated ç”±äºŽä½¿ç”¨äººæ•°è¾ƒå°‘ å†³å®šä¸Ž 3.4.0 ç‰ˆæœ¬ç§»é™¤ -->
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-openfeign</artifactId>
        </dependency>

        <!-- @deprecated ç”±äºŽä½¿ç”¨äººæ•°è¾ƒå°‘ å†³å®šä¸Ž 3.4.0 ç‰ˆæœ¬ç§»é™¤ -->
        <dependency>
            <groupId>io.github.openfeign</groupId>
            <artifactId>feign-okhttp</artifactId>
        </dependency>

        <dependency>
            <groupId>de.codecentric</groupId>
            <artifactId>spring-boot-admin-starter-client</artifactId>
@@ -175,10 +163,6 @@
            <artifactId>tlog-webroot</artifactId>
        </dependency>

        <dependency>
            <groupId>com.yomahub</groupId>
            <artifactId>tlog-feign</artifactId>
        </dependency>
    </dependencies>

</project>

 ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java

ÎļþÒÑɾ³ý

 ruoyi-demo/src/main/java/com/ruoyi/demo/controller/FeignTestController.java

ÎļþÒÑɾ³ý

 ruoyi-demo/src/main/java/com/ruoyi/demo/feign/FeignTestService.java

ÎļþÒÑɾ³ý

 ruoyi-demo/src/main/java/com/ruoyi/demo/feign/constant/FeignTestConstant.java

ÎļþÒÑɾ³ý

 ruoyi-demo/src/main/java/com/ruoyi/demo/feign/fallback/FeignTestFallback.java

ÎļþÒÑɾ³ý

 ruoyi-demo/src/main/java/com/ruoyi/demo/feign/fallback/package-info.java

ÎļþÒÑɾ³ý

 ruoyi-demo/src/main/java/com/ruoyi/demo/feign/package-info.java

ÎļþÒÑɾ³ý

 ruoyi-framework/src/main/java/com/ruoyi/framework/config/FeignConfig.java

ÎļþÒÑɾ³ý

 ruoyi-framework/src/main/java/com/ruoyi/framework/config/I18nConfig.java

@@ -1,7 +1,6 @@
package com.ruoyi.framework.config;

import cn.hutool.core.util.StrUtil;
import org.jetbrains.annotations.NotNull;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.LocaleResolver;
@@ -28,7 +27,6 @@
     */
    static class I18nLocaleResolver implements LocaleResolver {

        @NotNull
        @Override
        public Locale resolveLocale(HttpServletRequest httpServletRequest) {
            String language = httpServletRequest.getHeader("content-language");
@@ -41,7 +39,7 @@
        }

        @Override
        public void setLocale(@NotNull HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Locale locale) {
        public void setLocale(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Locale locale) {

        }
    }

 ruoyi-framework/src/main/java/com/ruoyi/framework/config/TLogConfig.java

@@ -1,7 +1,6 @@
package com.ruoyi.framework.config;

import com.yomahub.tlog.core.aop.AspectLogAop;
import com.yomahub.tlog.feign.filter.TLogFeignFilter;
import com.yomahub.tlog.spring.TLogPropertyInit;
import com.yomahub.tlog.spring.TLogSpringAware;
import com.yomahub.tlog.springboot.property.TLogProperty;
@@ -39,11 +38,6 @@
    @Bean
    public AspectLogAop aspectLogAop() {
        return new AspectLogAop();
    }

    @Bean
    public TLogFeignFilter tLogFeignFilter() {
        return new TLogFeignFilter();
    }

}

 ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java

@@ -1,6 +1,7 @@
package com.ruoyi.generator.controller;

import cn.hutool.core.convert.Convert;
import cn.hutool.core.io.IoUtil;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -13,7 +14,6 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.apache.commons.io.IOUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
@@ -201,6 +201,6 @@
        response.setHeader("Content-Disposition", "attachment; filename=\"ruoyi.zip\"");
        response.addHeader("Content-Length", "" + data.length);
        response.setContentType("application/octet-stream; charset=UTF-8");
        IOUtils.write(data, response.getOutputStream());
        IoUtil.write(response.getOutputStream(), false, data);
    }
}
}

 ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java

@@ -2,6 +2,7 @@

import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.io.IoUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.constant.GenConstants;
@@ -21,7 +22,7 @@
import com.ruoyi.generator.util.VelocityInitializer;
import com.ruoyi.generator.util.VelocityUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.IOUtils;
import org.apache.poi.util.IOUtils;
import org.apache.velocity.Template;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.Velocity;
@@ -33,6 +34,7 @@
import java.io.File;
import java.io.IOException;
import java.io.StringWriter;
import java.nio.charset.StandardCharsets;
import java.util.*;
import java.util.stream.Collectors;
import java.util.zip.ZipEntry;
@@ -341,8 +343,8 @@
            try {
                // æ·»åŠ åˆ°zip
                zip.putNextEntry(new ZipEntry(VelocityUtils.getFileName(template, table)));
                IOUtils.write(sw.toString(), zip, Constants.UTF8);
                IOUtils.closeQuietly(sw);
                IoUtil.write(zip, StandardCharsets.UTF_8, false, sw.toString());
                IoUtil.close(sw);
                zip.flush();
                zip.closeEntry();
            } catch (IOException e) {