--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/commons/interceptor/FeignHeaderInterceptor.java

+package com.zrqx.resource.commons.interceptor;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import feign.RequestInterceptor;
+import feign.RequestTemplate;
+/**
+ * Feign配置
+ * 使用FeignClient进行服务间调用，传递headers信息
+ * @author lw
+ * @date 2018年10月17日下午2:48:44
+ */
+@Component
+public class FeignHeaderInterceptor implements RequestInterceptor { 
+	
+	@Override 
+	public void apply(RequestTemplate requestTemplate) { 
+		ServletRequestAttributes attributes = (ServletRequestAttributes)RequestContextHolder.getRequestAttributes(); 
+		if (attributes != null) {
+			HttpServletRequest request = attributes.getRequest(); 
+			// 前台token
+			if(request.getHeader("Y-Token") != null){
+				requestTemplate.header("Y-Token", request.getHeader("Y-Token"));
+			}
+			// 后台token
+			if(request.getHeader("X-Token") != null){
+				requestTemplate.header("X-Token", request.getHeader("X-Token"));
+			}
+		}
+	}
+}

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/client/member/FgMemberCollectionClient.java

+package com.zrqx.resource.fg.client.member;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import com.zrqx.core.constant.resource.ResourceRequestPath;
+import com.zrqx.core.form.GoodsForm;
+import com.zrqx.core.util.response.CallBack;
+
+/**
+ * 收藏远程调用
+ * @author ycw
+ * @date 2019年5月20日下午4:21:43
+ */
+@FeignClient(value="member1",fallback=FgMemberCollectionClientHystric.class,path = ResourceRequestPath.FG + ResourceRequestPath.MEMBER_COLLECTION)
+public interface FgMemberCollectionClient {
+
+	/**
+	 * 查询资源是否被收藏
+	 * @return
+	 * @author ycw
+	 * @date: 2019年2月18日 上午11:57:53
+	 */
+	@PostMapping(value = ResourceRequestPath.CHECK_IS_COLLECT)
+	CallBack<Integer> checkIsCollect(@RequestBody GoodsForm form);
+}

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/client/member/FgMemberCollectionClientHystric.java

+package com.zrqx.resource.fg.client.member;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import com.zrqx.core.form.GoodsForm;
+import com.zrqx.core.util.response.CallBack;
+
+@Component
+public class FgMemberCollectionClientHystric implements
+		FgMemberCollectionClient {
+
+private static final Logger logger = LoggerFactory.getLogger(FgMemberCollectionClientHystric.class);
+
+	@Override
+	public CallBack<Integer> checkIsCollect(GoodsForm form){
+		logger.info("调用member服务查询是否收藏失败");
+		return CallBack.fail();
+	}
+}

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/service/articlelibrary/FgArticleLibrarySerivceImpl.java

@@ -44,6 +44,7 @@ import com.zrqx.core.vo.resource.fg.articlelibrary.FgArticleLibraryListVO;
 import com.zrqx.core.vo.resource.fg.articlelibrary.FgArticleLibraryOneVO;
 import com.zrqx.core.vo.resource.fg.recommend.FgTypeToResourceListVo;
 import com.zrqx.resource.commons.Redis;
+import com.zrqx.resource.fg.client.member.FgMemberCollectionClient;
 import com.zrqx.resource.fg.client.member.MemberClient;
 import com.zrqx.resource.fg.client.order.OrderClient;
 import com.zrqx.resource.fg.client.organ.OrganClient;
@@ -80,7 +81,8 @@ public class FgArticleLibrarySerivceImpl extends BaseServiceImpl<ArticleLibrary,
 	private OrganClient organClient;
 	@Autowired
 	private MemberClient fgMemberConllectionManage;
-
+	@Autowired
+	private FgMemberCollectionClient fgMemberCollectionClient;
 	@Override
 	public BaseMapper<ArticleLibrary> getMapper() {
 		return mapper;
@@ -176,8 +178,15 @@ public class FgArticleLibrarySerivceImpl extends BaseServiceImpl<ArticleLibrary,
 			// 是否收藏
 			GoodsForm form = new GoodsForm();
 			form.setId(oid);
-			form.setType(GoodsTypeEnum.ARTICLE.getCode());
-			vo.setIsCollection(fgMemberConllectionManage.checkIsCollect(form).getData());
+			form.setType("2");
+			form.setPro_type(2);
+			CallBack<Integer> result = fgMemberCollectionClient.checkIsCollect(form);
+			if(result.hasEntity()){
+				vo.setIsCollection(result.getData());
+			}else{
+				logger.info("跨服务查询收藏失败");
+				vo.setIsCollection(0);
+			}
 		}
 		//是否已上架、未定价
 		if(!LibraryStatusEnum.STATUS_1.getCode().equals(vo.getStatus()) || 

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/service/ebook/FgEbookServiceImpl.java

@@ -33,6 +33,7 @@ import com.zrqx.core.util.response.CallBack;
 import com.zrqx.core.vo.resource.fg.ebook.FgEbookListVO;
 import com.zrqx.core.vo.resource.fg.ebook.FgEbookVO;
 import com.zrqx.resource.commons.Redis;
+import com.zrqx.resource.fg.client.member.FgMemberCollectionClient;
 import com.zrqx.resource.fg.client.member.MemberClient;
 import com.zrqx.resource.fg.client.order.OrderClient;
 import com.zrqx.resource.fg.client.organ.OrganClient;
@@ -71,6 +72,8 @@ public class FgEbookServiceImpl extends BaseServiceImpl<Ebook, String> implement
 	
 	@Autowired
 	private MemberClient fgMemberConllectionManage;
+	@Autowired
+	private FgMemberCollectionClient fgMemberCollectionClient;
 	
 	@Override
 	public BaseMapper<Ebook> getMapper() {
@@ -145,8 +148,15 @@ public class FgEbookServiceImpl extends BaseServiceImpl<Ebook, String> implement
 			// 是否收藏
 			GoodsForm form = new GoodsForm();
 			form.setId(oid);
-			form.setType(GoodsTypeEnum.EBOOK.getCode());
-			vo.setIsCollection(fgMemberConllectionManage.checkIsCollect(form).getData());
+			form.setType("1");
+			form.setPro_type(2);
+			CallBack<Integer> result = fgMemberCollectionClient.checkIsCollect(form);
+			if(result.hasEntity()){
+				vo.setIsCollection(result.getData());
+			}else{
+				logger.info("跨服务查询收藏失败");
+				vo.setIsCollection(0);
+			}
 		}
 		//是否已上架、未定价
 		if(!EbookStatusEnum._4.getCode().equals(vo.getBookStatus()) || vo.getPrice() == null ){

com.zrqx.resource/src/main/resources/application.yml

@@ -8,6 +8,16 @@ security:
 feign: 
   hystrix: 
     enabled: true 
+hystrix:
+  command: 
+    default: 
+      execution: 
+        isolation:
+          strategy: SEMAPHORE
+          thread: 
+            timeoutInMilliseconds: 1440000
+          semaphore:
+            maxConcurrentRequests: 200
 logging:
     level:
       com.zrqx.resource.bg.mapper: DEBUG

com.zrqx.resource/target/classes/application.yml

@@ -8,6 +8,16 @@ security:
 feign: 
   hystrix: 
     enabled: true 
+hystrix:
+  command: 
+    default: 
+      execution: 
+        isolation:
+          strategy: SEMAPHORE
+          thread: 
+            timeoutInMilliseconds: 1440000
+          semaphore:
+            maxConcurrentRequests: 200
 logging:
     level:
       com.zrqx.resource.bg.mapper: DEBUG