Merge branch '转web' into 'master'

add

See merge request !5

src/main/java/com/gic/qywx/self/QywxController.java

@@ -7,6 +7,7 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.alibaba.fastjson.JSONObject;
 import org.apache.http.entity.ContentType;
 import org.apache.http.entity.mime.content.ByteArrayBody;
 import org.apache.http.entity.mime.content.ContentBody;
@@ -28,15 +29,17 @@ public class QywxController {
 
     @RequestMapping("self-post")
     public Object selfPost(HttpServletRequest request,String url, String json, String ip) {
-        logger.info("自建post,url={},json={},{},{}", url, json,ip);
+        logger.info("自建post,url={},json={},{}", url, json,ip);
         Map<String, Object> map = HttpClient.getWinxinResByJson(url, json, getIp(ip) , ip);
+        logger.info("end={}", JSONObject.toJSON(map));
         return map;
     }
 
     @RequestMapping("self-post-json")
     public Object selfPostJson(HttpServletRequest request,String url, @RequestBody String json, String ip) {
-        logger.info("自建post json,url={},json={},{},{}", url, json,ip);
+        logger.info("自建post json,url={},json={},{}", url, json,ip);
         Map<String, Object> map = HttpClient.getWinxinResByJson(url, json, getIp(ip) , ip);
+        logger.info("end={}", JSONObject.toJSON(map));
         return map;
     }
 
@@ -44,23 +47,24 @@ public class QywxController {
     public Object selfGet(HttpServletRequest request,String url, String ip) {
         logger.info("自建get,url={},{},{}", url,ip);
         Map<String, Object> map = HttpClient.getHttpByGet(url, getIp(ip) , ip);
+        logger.info("end={}", JSONObject.toJSON(map));
         return map;
     }
 
     @RequestMapping("self-upload")
     public Object selfUpload(HttpServletRequest request,String url, String fileUrl, String fileName, String ip) {
-        logger.info("自建upload,url={},fileUrl={},{},{}", url,fileUrl,ip);
+        logger.info("自建upload,url={},fileUrl={},{}", url,fileUrl,ip);
         byte[] data = CommonUtil.getFileByte(fileUrl);
         Map<String, ContentBody> paramsMap = new HashMap<String, ContentBody>();
         paramsMap.put("media", new ByteArrayBody(data, ContentType.DEFAULT_BINARY, fileName));
         Map<String, Object> map = HttpClient.getWinxinResByFile(url, paramsMap, getIp(ip) , ip);
-        logger.info("自建upload end={}");
+        logger.info("end={}", JSONObject.toJSON(map));
         return map;
     }
 
     @RequestMapping("self-upload-data")
     public Object selfImage(HttpServletRequest request,String url, String fileName,  String ip) throws IOException {
-        logger.info("自建upload-data,url={},{},{}", url,ip);
+        logger.info("自建upload-data,url={},{}", url,ip);
         MultipartHttpServletRequest multiRequest = (MultipartHttpServletRequest) request;
         List<MultipartFile> list = multiRequest.getMultiFileMap().get("media");
         MultipartFile mf = list.get(0);
@@ -68,7 +72,7 @@ public class QywxController {
         Map<String, ContentBody> paramsMap = new HashMap<String, ContentBody>();
         paramsMap.put("media", new ByteArrayBody(data, ContentType.DEFAULT_BINARY, fileName));
         Map<String, Object> map = HttpClient.getWinxinResByFile(url, paramsMap, getIp(ip) , ip);
-        logger.info("自建upload-data end={}");
+        logger.info("end={}", JSONObject.toJSON(map));
         return map;
     }