Merge branch '转web' into 'master'

add

See merge request !11

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

@@ -15,6 +15,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpVersion;
@@ -149,7 +150,11 @@ public class HttpClient {
             e.printStackTrace();
         } finally {
             long end = new Date().getTime();
-            logger.info("call-res cost:" + (end - begin) + " url:" + url + " param:" + jsonStr + " res:" + resInfo);
+            if(StringUtils.isBlank(resInfo)) {
+                logger.info("请求url={},req={},resp={},time={}" ,url, map , "企微返回为空" , (end - begin));
+            }else {
+                logger.info("请求url={},req={},resp={},time={}" ,url, map , resInfo , (end - begin));
+            }
         }
         return weixinMap;
     }
@@ -183,7 +188,11 @@ public class HttpClient {
             return new HashMap<String, Object>();
         } finally {
             long end = new Date().getTime();
-            logger.info("call-res cost:" + (end - begin) + " url:" + url + " param:" + map + " res:" + entityStr);
+            if(StringUtils.isBlank(entityStr)) {
+                logger.info("file请求url={},req={},resp={},time={}" ,url, map , "企微返回为空" , (end - begin));
+            }else {
+                logger.info("file请求url={},req={},resp={},time={}" ,url, map , entityStr , (end - begin));
+            }
         }
         return obj;
     }

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

@@ -6,6 +6,7 @@ import java.util.List;
 import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.io.IOUtils;
 import org.apache.http.entity.ContentType;
 import org.apache.http.entity.mime.content.ByteArrayBody;
 import org.apache.http.entity.mime.content.ContentBody;
@@ -26,70 +27,57 @@ 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);
+    public Object selfPost(String url, String json, String ip) {
+        logger.info("自建post,url={},json={},ip={}", 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-body")
-    public Object selfPostJson(HttpServletRequest request, String url, @RequestBody Map<String, Object> jsonBody, String ip) {
+    public Object selfPostJson(String url, @RequestBody Map<String, Object> jsonBody, String ip) {
         String json = null ;
         if(null != jsonBody) {
             json = JSONObject.toJSONString(jsonBody) ;
         }
-        logger.info("自建post json,url={},json={},{}", url, json,ip);
+        logger.info("自建post-json,url={},json={},,ip={}", 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,  String ip) throws IOException {
         InputStream inputStream = request.getInputStream();
-        InputStreamReader inputStreamReader = new InputStreamReader(inputStream, "utf-8");
-        BufferedReader bufferedReader = new BufferedReader(inputStreamReader) ;
-        StringBuilder buffer = new StringBuilder();
+        Map<String, Object> map = null ;
         try {
-            String str = null;
-            while ((str = bufferedReader.readLine()) != null) {
-                buffer.append(str);
-            }
+            String json = IOUtils.toString(inputStream,"UTF-8") ;
+            logger.info("自建post-json,url={},json={},ip={}", url, json,ip);
+            map = HttpClient.getWinxinResByJson(url, json, getIp(ip) , ip);
         }finally {
-            bufferedReader.close();
-            inputStreamReader.close();
-            inputStream.close();
+            IOUtils.closeQuietly(inputStream);
         }
-        String json = buffer.toString();
-        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;
     }
 
     @RequestMapping("self-get")
     public Object selfGet(HttpServletRequest request,String url, String ip) {
-        logger.info("自建get,url={},{},{}", url,ip);
+        logger.info("自建get,url={},ip={}", 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);
+    public Object selfUpload(String url, String fileUrl, String fileName, String ip) {
+        logger.info("自建upload,url={},fileUrl={},ip={}", 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("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={},ip={}", url,ip);
         MultipartHttpServletRequest multiRequest = (MultipartHttpServletRequest) request;
         List<MultipartFile> list = multiRequest.getMultiFileMap().get("media");
         MultipartFile mf = list.get(0);
@@ -97,7 +85,6 @@ 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("end={}", JSONObject.toJSON(map));
         return map;
     }
     

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

@@ -21,33 +21,29 @@ public class QywxSelfApiServiceImpl implements QywxSelfApiService {
     public Map<String,Object> selfPost(String url, String json, String 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;
     }
     @Override
     public Map<String,Object> selfGet(String url, String ip) {
-        logger.info("自建get,url={},{}", url,ip);
+        logger.info("自建get,url={},ip={}", url,ip);
         Map<String, Object> map = HttpClient.getHttpByGet(url, getIp(ip) , ip);
-        logger.info("end={}", JSONObject.toJSON(map));
         return map;
     }
     @Override
     public Map<String,Object> selfUpload(String url, String fileUrl, String fileName, String ip) {
-        logger.info("自建upload,url={},fileUrl={},{}", url,fileUrl,ip);
+        logger.info("自建upload,url={},fileUrl={},ip={}", 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("end={}", JSONObject.toJSON(map));
         return map;
     }
     @Override
     public Map<String,Object> selfImage(String url, String fileName, String ip , byte[] data) {
-        logger.info("自建upload-data,url={},{}", url,ip);
+        logger.info("自建upload-data,url={},ip={}", url,ip);
         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("end={}", JSONObject.toJSON(map));
         return map;
     }