Merge pull request Clouda-team#77 from imyelo/master

fix bug: fetch第三方数据时发送整个json对象的post请求
mermalrain · Jan 24, 2014 · 2f98871 · 2f98871
2 parents d09438d + 4a8a647
commit 2f98871
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/sumeru/src/controller.js b/sumeru/src/controller.js
@@ -239,7 +239,7 @@ var runnable = function(fw){
         redirect:function(queryPath,paramMap,isforce){
             var urlHash = queryPath;
             if(paramMap){
-                urlHash += "!" + fw.utils.mapToUriParam(paramMap);
+                urlHash += "?" + fw.utils.mapToUriParam(paramMap);
             }
             fw.router.redirect(urlHash,isforce);
         },

diff --git a/sumeru/src/external.js b/sumeru/src/external.js
@@ -708,15 +708,27 @@ var runnable = function(fw, findDiff, publishBaseDir, externalConfig, http, http
 	 */
 	function sendPostRequest(options, postData, cb, buffer){
 		//server
+		var defaultOptions;
 		if(fw.IS_SUMERU_SERVER){
-            postData = encodeURIComponent(JSON.stringify(postData));
-            var defaultOptions = {
-				method : 'POST',
-				headers: {
-			        'Content-Type': 'application/x-www-form-urlencoded',
-			        'Content-Length': postData.length
+			if (options && options.json === true) {
+        postData = JSON.stringify(postData);
+        defaultOptions = {
+					method : 'POST',
+					headers: {
+		        'Content-Type': 'application/json',
+		        'Content-Length': postData.length
 			    }
-			};
+				};
+			} else {
+        postData = encodeURIComponent(JSON.stringify(postData));
+        defaultOptions = {
+					method : 'POST',
+					headers: {
+		        'Content-Type': 'application/x-www-form-urlencoded',
+		        'Content-Length': postData.length
+			    }
+				};
+			}
 
 			var opts = Library.objUtils.extend(true, defaultOptions, options);