From 8a93371baa43bf4d3027c9c1d8eea83d9ba2188c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 03 十一月 2021 15:02:29 +0800
Subject: [PATCH] remove 移除 feign 相关代码与依赖

---
 ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java |    8 +-
 /dev/null                                                                          |   95 -------------------------------
 ruoyi-framework/src/main/java/com/ruoyi/framework/config/TLogConfig.java           |    6 --
 pom.xml                                                                            |   27 ---------
 ruoyi-admin/src/main/resources/application.yml                                     |   16 -----
 ruoyi-framework/src/main/java/com/ruoyi/framework/config/I18nConfig.java           |    4 -
 ruoyi-common/pom.xml                                                               |   16 -----
 ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java    |    6 +-
 8 files changed, 9 insertions(+), 169 deletions(-)

diff --git a/pom.xml b/pom.xml
index c18418c..5a2c8b1 100644
--- a/pom.xml
+++ b/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>
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 7acd7ef..cd53e4a 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -242,22 +242,6 @@
   # ABORT_POLICY 涓
   rejectedExecutionHandler: CALLER_RUNS_POLICY
 
-# feign 鐩稿叧閰嶇疆
-feign:
-  # 涓嶆敮鎸佸鍖�, 濡傛湁闇�瑕佸彲鍦ㄦ敞瑙i厤缃� 鎴� 鎻愬崌鎵寘绛夌骇
-  # 渚嬪 com.**.**.feign
-  package: com.ruoyi.**.feign
-  # 寮�鍚帇缂�
-  compression:
-    request:
-      enabled: true
-    response:
-      enabled: true
-  okhttp:
-    enabled: true
-  circuitbreaker:
-    enabled: true
-
 --- # redisson 缂撳瓨閰嶇疆
 redisson:
   cacheGroup:
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index 12f14a0..9b5af98 100644
--- a/ruoyi-common/pom.xml
+++ b/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>
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java b/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java
deleted file mode 100644
index 7de92e2..0000000
--- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.ruoyi.common.exception.file;
-
-import lombok.*;
-import org.apache.commons.fileupload.FileUploadException;
-
-import java.util.Arrays;
-
-/**
- * 鏂囦欢涓婁紶 璇紓甯哥被
- *
- * @author ruoyi
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@NoArgsConstructor
-public class InvalidExtensionException extends FileUploadException {
-    private static final long serialVersionUID = 1L;
-
-    private String[] allowedExtension;
-    private String extension;
-    private String filename;
-
-    public InvalidExtensionException(String[] allowedExtension, String extension, String filename) {
-        super("filename : [" + filename + "], extension : [" + extension + "], allowed extension : [" + Arrays.toString(allowedExtension) + "]");
-        this.allowedExtension = allowedExtension;
-        this.extension = extension;
-        this.filename = filename;
-    }
-
-    public static class InvalidImageExtensionException extends InvalidExtensionException {
-        private static final long serialVersionUID = 1L;
-
-        public InvalidImageExtensionException(String[] allowedExtension, String extension, String filename) {
-            super(allowedExtension, extension, filename);
-        }
-    }
-
-    public static class InvalidFlashExtensionException extends InvalidExtensionException {
-        private static final long serialVersionUID = 1L;
-
-        public InvalidFlashExtensionException(String[] allowedExtension, String extension, String filename) {
-            super(allowedExtension, extension, filename);
-        }
-    }
-
-    public static class InvalidMediaExtensionException extends InvalidExtensionException {
-        private static final long serialVersionUID = 1L;
-
-        public InvalidMediaExtensionException(String[] allowedExtension, String extension, String filename) {
-            super(allowedExtension, extension, filename);
-        }
-    }
-
-    public static class InvalidVideoExtensionException extends InvalidExtensionException {
-        private static final long serialVersionUID = 1L;
-
-        public InvalidVideoExtensionException(String[] allowedExtension, String extension, String filename) {
-            super(allowedExtension, extension, filename);
-        }
-    }
-}
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/FeignTestController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/FeignTestController.java
deleted file mode 100644
index 2f833e3..0000000
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/FeignTestController.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.ruoyi.demo.controller;
-
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.demo.feign.FeignTestService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * feign娴嬭瘯controller
- *
- * @author Lion Li
- * @deprecated 鐢变簬浣跨敤浜烘暟杈冨皯 鍐冲畾涓� 3.4.0 鐗堟湰绉婚櫎
- */
-@Api(value = "feign娴嬭瘯", tags = {"feign娴嬭瘯"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/feign/test")
-public class FeignTestController {
-
-    private final FeignTestService feignTestService;
-
-    /**
-     * 鎼滅储鏁版嵁
-     */
-    @ApiOperation("娴嬭瘯浣跨敤feign璇锋眰鏁版嵁")
-    @GetMapping("/search/{wd}")
-    public AjaxResult search(@PathVariable String wd) {
-        String search = feignTestService.search(wd);
-        return AjaxResult.success("鎿嶄綔鎴愬姛",search);
-    }
-}
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/feign/FeignTestService.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/feign/FeignTestService.java
deleted file mode 100644
index 50eb4eb..0000000
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/feign/FeignTestService.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.ruoyi.demo.feign;
-
-import com.ruoyi.demo.feign.constant.FeignTestConstant;
-import com.ruoyi.demo.feign.fallback.FeignTestFallback;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-/**
- * feign娴嬭瘯service
- * 瑙勮寖鎺ュ彛 Service 鏃犳劅璋冪敤
- * 甯搁噺绠$悊璇锋眰璺緞 鏇村姞瑙勮寖
- * 鑷畾涔夊閿欏鐞� 瀹夊叏鍙潬 (闇�鑷閰嶇疆鐔旀柇鍣�)
- * 澧炲姞 feign 鐨勭洰鐨勪负浣� http 璇锋眰鎺ュ彛鍖�
- *
- * @author Lion Li
- * @deprecated 鐢变簬浣跨敤浜烘暟杈冨皯 鍐冲畾涓� 3.4.0 鐗堟湰绉婚櫎
- */
-@FeignClient(
-	name = FeignTestConstant.BAIDU_NAME,
-	url = FeignTestConstant.BAIDU_URL,
-	fallback = FeignTestFallback.class)
-public interface FeignTestService {
-
-    @GetMapping("/s")
-    String search(@RequestParam("wd") String wd);
-}
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/feign/constant/FeignTestConstant.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/feign/constant/FeignTestConstant.java
deleted file mode 100644
index 28dfa8a..0000000
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/feign/constant/FeignTestConstant.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.ruoyi.demo.feign.constant;
-
-/**
- * @deprecated 鐢变簬浣跨敤浜烘暟杈冨皯 鍐冲畾涓� 3.4.0 鐗堟湰绉婚櫎
- */
-@Deprecated
-public class FeignTestConstant {
-
-	public static final String BAIDU_NAME = "baidu";
-
-	public static final String BAIDU_URL = "http://www.baidu.com";
-
-}
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/feign/fallback/FeignTestFallback.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/feign/fallback/FeignTestFallback.java
deleted file mode 100644
index 8e81ad7..0000000
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/feign/fallback/FeignTestFallback.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.ruoyi.demo.feign.fallback;
-
-
-import com.ruoyi.demo.feign.FeignTestService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-/**
- * feign娴嬭瘯fallback
- * 鑷畾涔夊皝瑁呯粨鏋勪綋鐔旀柇
- * 闇�閲嶅啓瑙g爜鍣� 鏍规嵁鑷畾涔夊疄浣� 鑷瑙f瀽鐔旀柇
- *
- * 鐔旀柇鍣ㄩ渶瑕佽嚜琛屾坊鍔犻厤缃�
- *
- * @see {com.ruoyi.framework.config.FeignConfig#errorDecoder()}
- * @author Lion Li
- * @deprecated 鐢变簬浣跨敤浜烘暟杈冨皯 鍐冲畾涓� 3.4.0 鐗堟湰绉婚櫎
- */
-@Slf4j
-@Component
-public class FeignTestFallback implements FeignTestService {
-
-    @Override
-    public String search(String wd) {
-        log.error("fallback");
-        return "鎶ラ敊鍟�";
-    }
-}
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/feign/fallback/package-info.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/feign/fallback/package-info.java
deleted file mode 100644
index 47983a0..0000000
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/feign/fallback/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-package com.ruoyi.demo.feign.fallback;
\ No newline at end of file
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/feign/package-info.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/feign/package-info.java
deleted file mode 100644
index 91e4b4a..0000000
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/feign/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-package com.ruoyi.demo.feign;
\ No newline at end of file
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FeignConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FeignConfig.java
deleted file mode 100644
index 8b432ad..0000000
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FeignConfig.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package com.ruoyi.framework.config;
-
-import feign.*;
-import okhttp3.ConnectionPool;
-import okhttp3.OkHttpClient;
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.cloud.openfeign.FeignAutoConfiguration;
-import org.springframework.cloud.openfeign.support.SpringMvcContract;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import java.util.concurrent.TimeUnit;
-
-/**
- * openfeign閰嶇疆绫�
- *
- * @author Lion Li
- * @deprecated 鐢变簬浣跨敤浜烘暟杈冨皯 鍐冲畾涓� 3.4.0 鐗堟湰绉婚櫎
- */
-@Deprecated
-@EnableFeignClients("${feign.package}")
-@Configuration
-@ConditionalOnClass(Feign.class)
-@AutoConfigureBefore(FeignAutoConfiguration.class)
-public class FeignConfig {
-
-    @Bean
-    public OkHttpClient okHttpClient(){
-        return new OkHttpClient.Builder()
-                .readTimeout(60, TimeUnit.SECONDS)
-                .connectTimeout(60, TimeUnit.SECONDS)
-                .writeTimeout(120, TimeUnit.SECONDS)
-                .connectionPool(new ConnectionPool())
-                .build();
-    }
-
-    @Bean
-    public Contract feignContract() {
-        return new SpringMvcContract();
-    }
-
-    @Bean
-    public Logger.Level feignLoggerLevel() {
-        return Logger.Level.BASIC;
-    }
-
-    @Bean
-    public Request.Options feignRequestOptions() {
-        return new Request.Options(10, TimeUnit.SECONDS, 60,TimeUnit.SECONDS,true);
-    }
-
-    @Bean
-    public Retryer feignRetry() {
-        return new Retryer.Default();
-    }
-
-//	/**
-//	 * 鑷畾涔夊紓甯歌В鐮佸櫒
-//	 * 鐢ㄤ簬鑷畾涔夎繑鍥炰綋寮傚父鐔旀柇
-//	 */
-//	@Bean
-//	public ErrorDecoder errorDecoder() {
-//		return new CustomErrorDecoder();
-//	}
-//
-//
-//	/**
-//	 * 鑷畾涔夎繑鍥炰綋瑙g爜鍣�
-//	 */
-//	@Slf4j
-//	public static class CustomErrorDecoder implements ErrorDecoder {
-//
-//		@Override
-//		public Exception decode(String methodKey, Response response) {
-//			Exception exception = null;
-//			try {
-//				// 鑾峰彇鍘熷鐨勮繑鍥炲唴瀹�
-//				String json = JsonUtils.toJsonString(response.body().asReader(StandardCharsets.UTF_8));
-//				exception = new RuntimeException(json);
-//				// 灏嗚繑鍥炲唴瀹瑰弽搴忓垪鍖栦负Result锛岃繖閲屽簲鏍规嵁鑷韩椤圭洰浣滀慨鏀�
-//				AjaxResult result = JsonUtils.parseObject(json, AjaxResult.class);
-//				// 涓氬姟寮傚父鎶涘嚭绠�鍗曠殑 RuntimeException锛屼繚鐣欏師鏉ラ敊璇俊鎭�
-//				if (result.getCode() != 200) {
-//					exception = new RuntimeException(result.getMsg());
-//				}
-//			} catch (IOException e) {
-//				log.error(e.getMessage(), e);
-//			}
-//			return exception;
-//		}
-//	}
-
-}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/I18nConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/I18nConfig.java
index 48b341b..20b52a8 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/I18nConfig.java
+++ b/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) {
 
 		}
 	}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/TLogConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/TLogConfig.java
index 68bc425..c1665d9 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/TLogConfig.java
+++ b/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();
     }
 
 }
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
index 649d1dc..b90addf 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
+++ b/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);
     }
-}
\ No newline at end of file
+}
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
index 62fe67a..b53393f 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
+++ b/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 {
                 // 娣诲姞鍒皕ip
                 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) {

--
Gitblit v1.9.3