diff --git a/easy-spring-cloud-feign/src/main/java/cn/org/easysite/spring/cloud/feign/configuration/FeignConfiguration.java b/easy-spring-cloud-feign/src/main/java/cn/org/easysite/spring/cloud/feign/configuration/FeignConfiguration.java index 241bfec..64a9ded 100644 --- a/easy-spring-cloud-feign/src/main/java/cn/org/easysite/spring/cloud/feign/configuration/FeignConfiguration.java +++ b/easy-spring-cloud-feign/src/main/java/cn/org/easysite/spring/cloud/feign/configuration/FeignConfiguration.java @@ -1,11 +1,7 @@ package cn.org.easysite.spring.cloud.feign.configuration; -import cn.org.easysite.spring.cloud.feign.interceptor.FeignResponseInterceptor; - import org.springframework.context.annotation.Configuration; -import feign.codec.Decoder; - /** * @author : yinlin * @version : 1.0 @@ -18,8 +14,8 @@ import feign.codec.Decoder; @Configuration public class FeignConfiguration { //@Bean - public Decoder getFeignResponseInterceptor() { - return new FeignResponseInterceptor(); - } + //public Decoder getFeignResponseInterceptor() { + // return new FeignResponseInterceptor(); + //} } diff --git a/easy-spring-cloud-feign/src/main/java/cn/org/easysite/spring/cloud/feign/interceptor/FeignResponseInterceptor.java b/easy-spring-cloud-feign/src/main/java/cn/org/easysite/spring/cloud/feign/interceptor/FeignResponseInterceptor.java index 811c9a3..697476c 100755 --- a/easy-spring-cloud-feign/src/main/java/cn/org/easysite/spring/cloud/feign/interceptor/FeignResponseInterceptor.java +++ b/easy-spring-cloud-feign/src/main/java/cn/org/easysite/spring/cloud/feign/interceptor/FeignResponseInterceptor.java @@ -1,48 +1,48 @@ -package cn.org.easysite.spring.cloud.feign.interceptor; - -import com.alibaba.fastjson.JSON; - -import org.springframework.beans.factory.ObjectFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.http.HttpMessageConverters; -import org.springframework.cloud.openfeign.support.ResponseEntityDecoder; -import org.springframework.cloud.openfeign.support.SpringDecoder; -import org.springframework.http.HttpStatus; - -import java.io.IOException; -import java.lang.reflect.Type; - -import cn.org.easysite.framework.exception.BaseException; -import feign.FeignException; -import feign.Response; -import feign.Util; -import feign.codec.Decoder; - - -/** - * Created by panda @version 1.0 - */ -public class FeignResponseInterceptor extends Decoder.Default implements Decoder { - - @Autowired - private ObjectFactory messageConverters; - - @Override - public Object decode(Response response, Type type) throws IOException, FeignException { - if (response.status() == HttpStatus.NOT_FOUND.value()) { - return Util.emptyValueOf(type); - } - if (response.body() == null) { - return null; - } - if (byte[].class.equals(type)) { - return Util.toByteArray(response.body().asInputStream()); - } - String json = Util.toString(response.body().asReader()); - cn.org.easysite.spring.boot.model.Response res = JSON.parseObject(json, cn.org.easysite.spring.boot.model.Response.class); - if (!res.isSuccess()) { - throw new BaseException(1015, res.getMsg()); - } - return new ResponseEntityDecoder(new SpringDecoder(this.messageConverters)).decode(response, type); - } -} +//package cn.org.easysite.spring.cloud.feign.interceptor; +// +//import com.alibaba.fastjson.JSON; +// +//import org.springframework.beans.factory.ObjectFactory; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.boot.autoconfigure.http.HttpMessageConverters; +//import org.springframework.cloud.openfeign.support.ResponseEntityDecoder; +//import org.springframework.cloud.openfeign.support.SpringDecoder; +//import org.springframework.http.HttpStatus; +// +//import java.io.IOException; +//import java.lang.reflect.Type; +// +//import cn.org.easysite.framework.exception.BaseException; +//import feign.FeignException; +//import feign.Response; +//import feign.Util; +//import feign.codec.Decoder; +// +// +///** +// * Created by panda @version 1.0 +// */ +//public class FeignResponseInterceptor extends Decoder.Default implements Decoder { +// +// @Autowired +// private ObjectFactory messageConverters; +// +// @Override +// public Object decode(Response response, Type type) throws IOException, FeignException { +// if (response.status() == HttpStatus.NOT_FOUND.value()) { +// return Util.emptyValueOf(type); +// } +// if (response.body() == null) { +// return null; +// } +// if (byte[].class.equals(type)) { +// return Util.toByteArray(response.body().asInputStream()); +// } +// String json = Util.toString(response.body().asReader()); +// cn.org.easysite.spring.boot.model.Response res = JSON.parseObject(json, cn.org.easysite.spring.boot.model.Response.class); +// if (!res.isSuccess()) { +// throw new BaseException(1015, res.getMsg()); +// } +// return new ResponseEntityDecoder(new SpringDecoder(this.messageConverters)).decode(response, type); +// } +//}