修正注释，删除无用代码

fantouchxie · fantouchxie · commit a7d76515f499 · 2018-04-23T23:08:03.000+08:00
diff --git a/src/main/java/com/qcloud/image/demo/Demo.java b/src/main/java/com/qcloud/image/demo/Demo.java
@@ -499,7 +499,6 @@ private static void faceAddFace(ImageClient imageClient, String bucketName) {
     private static void faceDelPerson(ImageClient imageClient, String bucketName, String personId) {
         String ret;
         System.out.println("====================================================");
-        String delPersonId = "personY";
         FaceDelPersonRequest delPersonReq = new FaceDelPersonRequest(bucketName, personId);
 
         ret = imageClient.faceDelPerson(delPersonReq);
diff --git a/src/main/java/com/qcloud/image/http/DefaultImageHttpClient.java b/src/main/java/com/qcloud/image/http/DefaultImageHttpClient.java
@@ -30,22 +30,12 @@
  */
 public class DefaultImageHttpClient extends AbstractImageHttpClient {
 
-    //private static final Logger LOG = LoggerFactory.getLogger(DefaultImageHttpClient.class);
-
     private OkHttpClient mOkHttpClient = new OkHttpClient();
 
     public DefaultImageHttpClient(ClientConfig config) {
         super(config);
     }
 
-    // 获得异常发生时的返回信息
-/*    private String getExceptionMsg(HttpRequest httpRequest, String exceptionStr) {
-        String errMsg = new StringBuilder("HttpRequest:").append(httpRequest.toString())
-                .append("\nException:").append(exceptionStr).toString();
-        LOG.error(errMsg);
-        return errMsg;
-    }*/
-
     @Override
     protected String sendGetRequest(HttpRequest httpRequest) throws AbstractImageException {
         mOkHttpClient.setProxy(config.getProxy());
@@ -86,55 +76,10 @@ protected String sendGetRequest(HttpRequest httpRequest) throws AbstractImageExc
             throw new UnknownException(e.getMessage());
         }
         return string;
-
-/*
-        String url = httpRequest.getUrl();
-        HttpGet httpGet = null;
-        String responseStr = "";
-        int retry = 0;
-        int maxRetryCount = this.config.getMaxFailedRetry();
-        while (retry < maxRetryCount) {
-            try {
-                URIBuilder urlBuilder = new URIBuilder(url);
-                for (String paramKey : httpRequest.getParams().keySet()) {
-                    urlBuilder.addParameter(paramKey, String.valueOf(httpRequest.getParams().get(paramKey)));
-                }
-                httpGet = new HttpGet(urlBuilder.build());
-            } catch (URISyntaxException e) {
-                String errMsg = "Invalid url:" + url;
-                LOG.error(errMsg);
-                throw new ParamException(errMsg);
-            }
-
-            httpGet.setConfig(onGetConfig());
-            setHeaders(httpGet, httpRequest.getHeaders());
-
-            try {
-                HttpResponse httpResponse = httpClient.execute(httpGet);
-                responseStr = EntityUtils.toString(httpResponse.getEntity(), "UTF-8");
-                new JSONObject(responseStr);
-                return responseStr;
-            } catch (ParseException | IOException e) {
-                ++retry;
-                if (retry == maxRetryCount) {
-                    String errMsg = getExceptionMsg(httpRequest, e.toString());
-                    throw new ServerException(errMsg);
-                }
-            } catch (JSONException e) {
-                String errMsg = getExceptionMsg(httpRequest, e.toString());
-                throw new ServerException(errMsg);
-            } finally {
-                httpGet.releaseConnection();
-            }
-        }
-        return responseStr;
-*/
-
     }
 
     @Override
     public void shutdown() {
-        //mOkHttpClient.
     }
 
     @Override
@@ -237,71 +182,13 @@ protected String sendPostRequest(HttpRequest httpRequest) throws AbstractImageEx
         } else {
             throw new ParamException("Unknown ContentType, httpRequest.getContentType():" + httpRequest.getContentType());
         }
-        
-/*
-        String url = httpRequest.getUrl();
-        String responseStr = "";
-        int retry = 0;
-        int maxRetryCount = this.config.getMaxFailedRetry();
-        while (retry < maxRetryCount) {
-            HttpPost httpPost = new HttpPost(url);
-            httpPost.setConfig(onGetConfig());
-
-            Map<String, Object> params = httpRequest.getParams();
-            setHeaders(httpPost, httpRequest.getHeaders());
-            if (httpRequest.getContentType() == HttpContentType.APPLICATION_JSON) {
-                setJsonEntity(httpPost, params);
-            } else if (httpRequest.getContentType() == HttpContentType.MULTIPART_FORM_DATA) {
-                try {
-                    HashMap<String, String> keyList = httpRequest.getKeyList();
-                    HashMap<String, File> imageList = httpRequest.getImageList();
-                    String imageKey = httpRequest.getImageKey();
-                    File image = httpRequest.getImage();
-                    setMultiPartEntity(httpPost, params, imageList, image, keyList, imageKey);
-                } catch (Exception e) {
-                    throw new UnknownException(e.toString());
-                }
-            }
-
-            try {
-                HttpResponse httpResponse = httpClient.execute(httpPost);
-                responseStr = EntityUtils.toString(httpResponse.getEntity(), "UTF-8");
-                new JSONObject(responseStr);
-                return responseStr;
-            } catch (ParseException | IOException e) {
-                ++retry;
-                if (retry == maxRetryCount) {
-                    String errMsg = getExceptionMsg(httpRequest, e.toString());
-                    throw new ServerException(errMsg);
-                }
-            } catch (JSONException e) {
-                String errMsg = getExceptionMsg(httpRequest, e.toString());
-                throw new ServerException(errMsg);
-            } finally {
-                httpPost.releaseConnection();
-            }
-        }
-        return responseStr;
-*/
     }
 
-    /*
-    private void setJsonEntity(HttpPost httpPost, Map<String, Object> params) {
-        ContentType utf8TextPlain = ContentType.create("text/plain", Consts.UTF_8);
-        JSONObject root = new JSONObject(params);
-        StringEntity stringEntity = new StringEntity(root.toString(), utf8TextPlain);
-        httpPost.setEntity(stringEntity);
-    }
-    */
-
-    private void setMultiPartEntity(MultipartBuilder multipartBuilder,/*HttpPost httpPost,*/ Map<String, Object> params, Map<String, File> images, File imageData, Map<String, String> keyList, String imageKey)
+    private void setMultiPartEntity(MultipartBuilder multipartBuilder, Map<String, Object> params, Map<String, File> images, Map<String, byte[]> contentList,File imageData, Map<String, String> keyList, String imageKey)
             throws FileNotFoundException {
-        //ContentType utf8TextPlain = ContentType.create("text/plain", Consts.UTF_8);
-        //MultipartEntityBuilder entityBuilder = MultipartEntityBuilder.create();
 
         multipartBuilder.type(MultipartBuilder.FORM);
         for (String paramKey : params.keySet()) {
-            //entityBuilder.addTextBody(paramKey, String.valueOf(params.get(paramKey)), utf8TextPlain);
             multipartBuilder.addFormDataPart(paramKey, String.valueOf(params.get(paramKey)));
         }
 
@@ -315,15 +202,13 @@ private void setMultiPartEntity(MultipartBuilder multipartBuilder,/*HttpPost htt
                 if (!imageFile.exists()) {
                     throw new FileNotFoundException("File Not Exists: " + imageFile.getAbsolutePath());
                 }
-                //entityBuilder.addBinaryBody(paramName, imageFile);
                 multipartBuilder.addPart(
                         Headers.of("Content-Disposition", String.format("form-data; name=\"%s\"", paramName)),
                         RequestBody.create(MediaType.parse("image/jpg"), imageFile)
                 );
             }
         } else if (imageData != null) {
             if (imageData.exists()) {
-                //entityBuilder.addBinaryBody(imageKey, imageData);
                 multipartBuilder.addPart(
                         Headers.of("Content-Disposition", String.format("form-data; name=\"%s\"", imageKey)),
                         RequestBody.create(MediaType.parse("image/jpg"), imageData)
@@ -343,27 +228,5 @@ private void setMultiPartEntity(MultipartBuilder multipartBuilder,/*HttpPost htt
             }
         }
         
-        //HttpEntity entity = entityBuilder.build();
-        //httpPost.setEntity(entity);
-    }
-
-    /**
-     * 设置Http头部，同时添加上公共的类型，长连接，Image SDK标识
-     * @param message HTTP消息
-     * @param headers 用户额外添加的HTTP头部
-     */
-/*    
-    private void setHeaders(HttpMessage message, Map<String, String> headers) {
-        message.setHeader(RequestHeaderKey.ACCEPT, RequestHeaderValue.Accept.ALL);
-        message.setHeader(RequestHeaderKey.CONNECTION, RequestHeaderValue.Connection.KEEP_ALIVE);
-        message.setHeader(RequestHeaderKey.USER_AGENT, this.config.getUserAgent());
-
-        if (headers != null) {
-            for (String headerKey : headers.keySet()) {
-                message.setHeader(headerKey, headers.get(headerKey));
-            }
-        }
     }
-*/
-
 }
diff --git a/src/main/java/com/qcloud/image/op/DetectionOp.java b/src/main/java/com/qcloud/image/op/DetectionOp.java
@@ -676,8 +676,8 @@ public String faceGetGroupIds(FaceGetGroupIdsRequest request) throws AbstractIma
     /**
      * Person新增组信息, 文档见 https://cloud.tencent.com/document/product/641/12417
      * @param useNewDomain 是否使用新域名，<br>
-     * true: http://recognition.image.myqcloud.com/face/multidentify <br>
-     * false: http://service.image.myqcloud.com/face/multidentify <br>
+     * true: http://recognition.image.myqcloud.com/face/addgroupids <br>
+     * false: http://service.image.myqcloud.com/face/addgroupids <br>
      * 如果开发者使用的是原域名（service.image.myqcloud.com）且已产生调用，则无需更换域名。
      * @return JSON格式的字符串, 格式为{"code":$code, "message":"$mess"}, code为0表示成功, 其他为失败,
      * message为success或者失败原因
@@ -712,8 +712,8 @@ public String faceAddGroupIds(FaceAddGroupIdsRequest request, boolean useNewDoma
     /**
      * Person删除组信息, 文档见 https://cloud.tencent.com/document/product/641/12417
      * @param useNewDomain 是否使用新域名，<br>
-     * true: http://recognition.image.myqcloud.com/face/multidentify <br>
-     * false: http://service.image.myqcloud.com/face/multidentify <br>
+     * true: http://recognition.image.myqcloud.com/face/delgroupids <br>
+     * false: http://service.image.myqcloud.com/face/delgroupids <br>
      * 如果开发者使用的是原域名（service.image.myqcloud.com）且已产生调用，则无需更换域名。
      * @return JSON格式的字符串, 格式为{"code":$code, "message":"$mess"}, code为0表示成功, 其他为失败,
      * message为success或者失败原因
@@ -1154,8 +1154,8 @@ public String faceLiveDetectFour(FaceLiveDetectFourRequest request) throws Abstr
     /**
      * 人脸静态活体检测
      * @param useNewDomain 是否使用新域名，<br>
-     * true: http://recognition.image.myqcloud.com/face/multidentify <br>
-     * false: http://service.image.myqcloud.com/face/multidentify <br>
+     * true: http://recognition.image.myqcloud.com/face/livedetectpicture <br>
+     * false: http://service.image.myqcloud.com/face/livedetectpicture <br>
      * 如果开发者使用的是原域名（service.image.myqcloud.com）且已产生调用，则无需更换域名。
      * @return JSON格式的字符串, 格式为{"code":$code, "message":"$mess"}, code为0表示成功, 其他为失败,
      * message为success或者失败原因
