diff --git a/src/main/java/com/fc/v2/common/domain/AjaxResult.java b/src/main/java/com/fc/v2/common/domain/AjaxResult.java
index a6c0f37..5a9551f 100644
--- a/src/main/java/com/fc/v2/common/domain/AjaxResult.java
+++ b/src/main/java/com/fc/v2/common/domain/AjaxResult.java
@@ -70,6 +70,21 @@ public class AjaxResult extends HashMap<String, Object>
         return json;
     }
     
+    /**
+     * 返回成功消息
+     * 
+     * @param msg 内容
+     * @return 成功消息
+     */
+    public static AjaxResult successNullData(String msg)
+    {
+        AjaxResult json = new AjaxResult();
+        json.put("msg", msg);
+        json.put("data", null);
+        json.put("code", 200);
+        return json;
+    }
+    
     /**
      * 返回成功消息
      * 
diff --git a/src/main/java/com/fc/v2/controller/admin/goview/GoviewProjectAPi.java b/src/main/java/com/fc/v2/controller/admin/goview/GoviewProjectAPi.java
index 173d78b..4384eae 100644
--- a/src/main/java/com/fc/v2/controller/admin/goview/GoviewProjectAPi.java
+++ b/src/main/java/com/fc/v2/controller/admin/goview/GoviewProjectAPi.java
@@ -219,37 +219,59 @@ public class GoviewProjectAPi extends BaseController{
 	@ResponseBody
     public AjaxResult magicHttp(@RequestBody MagicHttp magicHttp){
     	if(magicHttp!=null){
-    		logger.info("后台接收前端模拟提交数据:"+JSONUtil.toJsonStr(magicHttp));
-    		if(magicHttp.getRequestType().toUpperCase().equals("GET")){
-    			HttpRequest  httpRequest=HttpUtil.createGet(magicHttp.getUrl());
-    			if(magicHttp.getHead()!=null&&magicHttp.getHead().size()>0){
-    				httpRequest.addHeaders(magicHttp.getHead());
-    			}
-    			if(StrUtil.isNotBlank(magicHttp.getCookie())){
-    				httpRequest.cookie(magicHttp.getCookie());
-    			}
-    			httpRequest.timeout(magicHttp.getTimeout());
-    			String body= httpRequest.setFollowRedirects(true).execute().body();
-    			return AjaxResult.successData(200,body);
-    		}
-    		if(magicHttp.getRequestType().toUpperCase().equals("POST")){
+    		try {
+    			logger.info("后台接收前端模拟提交数据:"+JSONUtil.toJsonStr(magicHttp));
+        		if(magicHttp.getRequestType().toUpperCase().equals("GET")){
+        			HttpRequest  httpRequest=HttpUtil.createGet(magicHttp.getUrl());
+        			if(magicHttp.getHead()!=null&&magicHttp.getHead().size()>0){
+        				httpRequest.addHeaders(magicHttp.getHead());
+        			}
+        			if(StrUtil.isNotBlank(magicHttp.getCookie())){
+        				httpRequest.cookie(magicHttp.getCookie());
+        			}
+        			if(StrUtil.isNotBlank(magicHttp.getBody())){
+        				httpRequest.body(magicHttp.getBody());
+        			}
+        			if(magicHttp.getTimeout()!=null){
+        				httpRequest.timeout(magicHttp.getTimeout());
+        			}
+        			if(magicHttp.getTimeout()==null){
+        				httpRequest.timeout(30000);
+        			}
+        			
+        			String body= httpRequest.setFollowRedirects(true).execute().body();
+        			return AjaxResult.successData(200,body);
+        		}
+        		if(magicHttp.getRequestType().toUpperCase().equals("POST")){
 
-    			HttpRequest  httpRequest=HttpUtil.createPost(magicHttp.getUrl());
-    			if(magicHttp.getHead()!=null&&magicHttp.getHead().size()>0){
-    				httpRequest.addHeaders(magicHttp.getHead());
-    			}
-    			if(StrUtil.isNotBlank(magicHttp.getCookie())){
-    				httpRequest.cookie(magicHttp.getCookie());
-    			}
-    			httpRequest.timeout(magicHttp.getTimeout());
-    	    	if(magicHttp.getForm()!=null&&magicHttp.getForm().size()>0){
-    	    		httpRequest.form(magicHttp.getForm());
-    	    	}
-    	    	String body=httpRequest.setFollowRedirects(true).execute().body();
-    			return AjaxResult.successData(200,body);
-    		}
+        			HttpRequest  httpRequest=HttpUtil.createPost(magicHttp.getUrl());
+        			if(magicHttp.getHead()!=null&&magicHttp.getHead().size()>0){
+        				httpRequest.addHeaders(magicHttp.getHead());
+        			}
+        			if(StrUtil.isNotBlank(magicHttp.getCookie())){
+        				httpRequest.cookie(magicHttp.getCookie());
+        			}
+        			if(StrUtil.isNotBlank(magicHttp.getBody())){
+        				httpRequest.body(magicHttp.getBody());
+        			}
+        			if(magicHttp.getTimeout()!=null){
+        				httpRequest.timeout(magicHttp.getTimeout());
+        			}
+        			if(magicHttp.getTimeout()==null){
+        				httpRequest.timeout(30000);
+        			}
+        	    	if(magicHttp.getForm()!=null&&magicHttp.getForm().size()>0){
+        	    		httpRequest.form(magicHttp.getForm());
+        	    	}
+        	    	String body=httpRequest.setFollowRedirects(true).execute().body();
+        			return AjaxResult.successData(200,body);
+        		}
+			} catch (Exception e) {
+				return AjaxResult.successNullData("参数异常"+e.getMessage());
+			}
+    		
     	}
-    	return AjaxResult.error();
+    	return AjaxResult.successNullData("参数异常为null");
     }