浏览代码

添加 buildJsonPara 优化输出 json 参数

James 3 年之前
父节点
当前提交
c45a69cb9f
共有 1 个文件被更改,包括 24 次插入8 次删除
  1. 24 8
      src/main/java/com/jfinal/core/ActionReporter.java

+ 24 - 8
src/main/java/com/jfinal/core/ActionReporter.java

@@ -24,6 +24,7 @@ import java.util.Map;
 import java.util.Map.Entry;
 import javax.servlet.http.HttpServletRequest;
 import com.jfinal.aop.Interceptor;
+import com.jfinal.core.paragetter.JsonRequest;
 
 /**
  * ActionReporter
@@ -103,7 +104,29 @@ public class ActionReporter {
 		
 		// print all parameters
 		HttpServletRequest request = controller.getRequest();
-		Map<String, String[]> paraMap = request.getParameterMap();
+		if (request instanceof JsonRequest) {
+			buildJsonPara(controller, sb);
+		} else {
+			buildPara(controller, sb);
+		}
+		
+		sb.append("--------------------------------------------------------------------------------\n");
+		
+		try {
+			writer.write(sb.toString());
+		} catch (IOException ex) {
+			throw new RuntimeException(ex);
+		}
+	}
+	
+	private void buildJsonPara(Controller controller, StringBuilder sb) {
+		sb.append("Parameter   : ");
+		sb.append(controller.getRawData());
+		sb.append('\n');
+	}
+	
+	private void buildPara(Controller controller, StringBuilder sb) {
+		Map<String, String[]> paraMap = controller.getRequest().getParameterMap();
 		if (paraMap != null && paraMap.size() > 0) {
 			sb.append("Parameter   : ");
 			for (Entry<String, String[]> e : paraMap.entrySet()) {
@@ -134,13 +157,6 @@ public class ActionReporter {
 			}
 			sb.append("\n");
 		}
-		sb.append("--------------------------------------------------------------------------------\n");
-		
-		try {
-			writer.write(sb.toString());
-		} catch (IOException ex) {
-			throw new RuntimeException(ex);
-		}
 	}
 	
 	private static class SystemOutWriter extends Writer {