--no commit message

com.zrqx.works/src/main/java/com/zrqx/works/bg/client/sysuser/SysuserClient.java

@@ -26,7 +26,7 @@ public interface SysuserClient {
 	
 	
 	/** 查找用户,用户所属部门，用户角色*/
-	@PostMapping(SysUserRequestPath.BG + SysUserRequestPath.USER + SysUserRequestPath.BASICS)
+	@GetMapping(SysUserRequestPath.BG + SysUserRequestPath.USER + SysUserRequestPath.BASICS)
 	public CallBack<UserVO> getUserById(@RequestParam("userId") String userId);
 	
 }
\ No newline at end of file

com.zrqx.works/src/main/java/com/zrqx/works/bg/controller/apply/ApplyController.java

@@ -132,8 +132,8 @@ public class ApplyController {
 	public CallBack<PageMap<String, List<QueryApplyVo>>> page(Integer status, PageParam pageParam) {
 		pageParam.setOrderBy("applyTime desc");
 		Criteria cr = service.createCriteria();
-		String userId = redis.getUser().getUserId();
-		// String userId = "11";
+		//String userId = redis.getUser().getUserId();
+		 String userId = "11";
 		cr.andEqualTo("userId", userId);
 		if (status != null) {
 			cr.andEqualTo("status", status);

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

@@ -32,4 +32,15 @@ spring:
   http:
     multipart:
      maxFileSize: 20Mb
-     maxRequestSize: 20Mb
\ No newline at end of file
+     maxRequestSize: 20Mb
+ribbon:
+  ConnectTimeout: 60000
+  ReadTimeout: 60000
+hystrix:
+  command: 
+    default: 
+      execution: 
+        isolation:
+          strategy: SEMAPHORE
+          thread: 
+            timeoutInMilliseconds: 120000
\ No newline at end of file