Merge remote-tracking branch 'origin/master'

attendance-performance-manager/src/main/java/com/mortals/xhx/module/hik/face/service/impl/HikFaceServiceImpl.java

@@ -286,9 +286,9 @@ public class HikFaceServiceImpl extends AbstractHikService implements IHikFaceSe
             Header header = resp.getFirstHeader("location");
             String newUrl = header.getValue();
             //本地测试
-            String replace = StrUtil.replace(newUrl, "https://10.12.177.245:6114", "http://8.136.255.30:8002");
-            HttpGet httpget = new HttpGet(replace);
-            //HttpGet httpget = new HttpGet(newUrl);
+           // String replace = StrUtil.replace(newUrl, "https://10.12.177.245:6114", "http://8.136.255.30:8002");
+           // HttpGet httpget = new HttpGet(replace);
+            HttpGet httpget = new HttpGet(newUrl);
             HttpClient httpClient = wrapClient(httpget.getURI().getScheme() + "://" + httpget.getURI().getHost());
             HttpResponse execute = httpClient.execute(httpget);
             HttpEntity entity = execute.getEntity();