--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/client/FileClient.java

 package com.zrqx.resource.bg.client;
 
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 
-import com.zrqx.core.model.sysuser.log.Log;
 import com.zrqx.core.util.response.CallBack;
 
 import io.swagger.annotations.ApiOperation;
@@ -15,8 +14,8 @@ public interface FileClient {
 	
 
 	@ApiOperation(value = "获取文件地址")
-	@RequestMapping(value = "/file", method = RequestMethod.GET)
-	public CallBack<String> downLoad(String fileName);
+	@RequestMapping(value = "/file/getFilePath", method = RequestMethod.GET)
+	public CallBack<String> downLoad(@RequestParam(value = "fileName") String fileName) throws Exception;
 	
 	
 }
\ No newline at end of file

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/client/FileClientHystric.java

@@ -17,10 +17,10 @@ public class FileClientHystric implements FileClient{
 	private static final Logger logger = LoggerFactory.getLogger(FileClientHystric.class);
 
 	@Override
-	public CallBack<String> downLoad(String fileName) {
+	public CallBack<String> downLoad(String fileName) throws Exception {
 		// TODO Auto-generated method stub
 		logger.info("保存操作日志失败");
-		return null;
+		return CallBack.fail();
 	}
 
 	

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/controller/ebook/FgEbookController.java

@@ -13,6 +13,7 @@ import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
@@ -102,9 +103,9 @@ public class FgEbookController {
 		vo.setListArticle(resourceRelationService.queryRelationList(list));
 		return CallBack.success(vo);
 	}
-	@ResponseBody
-	@RequestMapping("viewerit.html")
-	public void viewerit(HttpServletRequest request, HttpServletResponse response,String oid) throws IOException {
+	/*@RequestMapping("viewerit.html")*/
+	@PostMapping("viewerit.html")
+	public void viewerit(HttpServletRequest request, HttpServletResponse response,String oid) throws Exception {
 		 response.addHeader("Access-Control-Allow-Origin", "*");
 		 response.addHeader("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE, OPTIONS");
          response.addHeader("Access-Control-Allow-Headers",

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

@@ -17,7 +17,7 @@ hystrix:
           thread: 
             timeoutInMilliseconds: 1440000
           semaphore:
-            maxConcurrentRequests: 200
+            maxConcurrentRequests: 20000
 logging:
     level:
       com.zrqx.resource.bg.mapper: DEBUG