From ed6d251ff37ba1d8e5f0ecf0d62e361ed1287f8a Mon Sep 17 00:00:00 2001 From: limqhz Date: Sun, 10 May 2020 02:04:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=85=8D=E7=BD=AE=EF=BC=8CFa?= =?UTF-8?q?ce++=E5=AE=95=E6=9C=BA=E3=80=81=E5=8F=AF=E4=BB=A5=E7=BB=99?= =?UTF-8?q?=E5=87=BA=E5=8F=8B=E6=83=85=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/application-development.yml | 6 +- .../config/application-production.yml | 2 +- api/src/main/resources/logback.xml | 33 ++++++---- .../com/sv/service/common/FaceService.java | 61 ++++++++++++------- 4 files changed, 64 insertions(+), 38 deletions(-) diff --git a/api/src/main/resources/config/application-development.yml b/api/src/main/resources/config/application-development.yml index 4696f1d..eca6316 100644 --- a/api/src/main/resources/config/application-development.yml +++ b/api/src/main/resources/config/application-development.yml @@ -1,12 +1,12 @@ spring: datasource: -# url: jdbc:mysql://yingdiandian.mysql.rds.aliyuncs.com:3306/smart_venue?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2b8&useAffectedRows=true +# url: jdbc:mysql://yingdiandian.mysql.rds.aliyuncs.com:3306/smart_venue?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2b8&useAffectedRows=true&useSSL=false # username: yingdd # password: Yingdd2015 - url: jdbc:mysql://127.0.01:3306/smart_venue?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2b8&useAffectedRows=true + url: jdbc:mysql://127.0.01:3306/smart_venue?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2b8&useAffectedRows=true&useSSL=false username: root password: 123456 -# url: jdbc:mysql://120.27.209.4:3306/smart_venue?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2b8&useAffectedRows=true +# url: jdbc:mysql://120.27.209.4:3306/smart_venue?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2b8&useAffectedRows=true&useSSL=false # username: root # password: hyty1234 diff --git a/api/src/main/resources/config/application-production.yml b/api/src/main/resources/config/application-production.yml index d87e2a1..0f8f3b3 100644 --- a/api/src/main/resources/config/application-production.yml +++ b/api/src/main/resources/config/application-production.yml @@ -1,6 +1,6 @@ spring: datasource: - url: jdbc:mysql://127.0.0.1:3306/smart_venue?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2b8&useAffectedRows=true + url: jdbc:mysql://127.0.0.1:3306/smart_venue?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2b8&useAffectedRows=true&useSSL=false username: root password: hyty1234 redis: diff --git a/api/src/main/resources/logback.xml b/api/src/main/resources/logback.xml index e96e6cc..5f5c8b0 100644 --- a/api/src/main/resources/logback.xml +++ b/api/src/main/resources/logback.xml @@ -1,7 +1,7 @@ - + @@ -10,30 +10,37 @@ - - ${LOG_HOME}/api-spring.log + ${LOG_HOME}/common-default.log - ${LOG_HOME}/api-spring-%d{yyyy-MM-dd_HH}.%i.log + ${LOG_HOME}/common-default-%d{yyyy-MM-dd}.log - - 10MB - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n - - - + + ${LOG_HOME}/common-error.log + + ERROR + + + ${LOG_HOME}/common-error-%d{yyyy-MM-dd}.log + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + + - + + \ No newline at end of file diff --git a/service/src/main/java/com/sv/service/common/FaceService.java b/service/src/main/java/com/sv/service/common/FaceService.java index a84755f..4d6eaf2 100644 --- a/service/src/main/java/com/sv/service/common/FaceService.java +++ b/service/src/main/java/com/sv/service/common/FaceService.java @@ -12,6 +12,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.http.HttpEntity; import org.apache.http.NameValuePair; +import org.apache.http.client.config.RequestConfig; import org.apache.http.client.entity.UrlEncodedFormEntity; import org.apache.http.client.methods.*; import org.apache.http.entity.StringEntity; @@ -55,18 +56,24 @@ public class FaceService { /** * face++登录 */ - public boolean login() throws IOException { + public boolean login() { JsonObject param = new JsonObject(); param.addProperty("username", account); param.addProperty("password", pwd); - CloseableHttpResponse response = post(param, "auth/login"); - if (response.getStatusLine().getStatusCode() == 200) { - LoginResponse loginResponse = JsonMapper.nonNullMapper().fromJson(response.getEntity().getContent(), LoginResponse.class); - logger.info("登录成功" + ToStringBuilder.reflectionToString(loginResponse)); - return true; - } else { - logger.error("face++登陆失败！"); - throw new FaceServiceException("登录失败"); + CloseableHttpResponse response = null; + try { + response = post(param, "auth/login"); + if (response.getStatusLine().getStatusCode() == 200) { + LoginResponse loginResponse = JsonMapper.nonNullMapper().fromJson(response.getEntity().getContent(), LoginResponse.class); + logger.info("登录成功" + ToStringBuilder.reflectionToString(loginResponse)); + return true; + } else { + logger.error("face++登陆失败！"); + throw new FaceServiceException("无法连接人脸服务器"); + } + } catch (IOException e) { + logger.error("login无法连接人脸服务器"); + throw new FaceServiceException("无法连接人脸服务器"); } } @@ -77,7 +84,7 @@ public class FaceService { * @param member * @return */ - public Integer addSubject(Integer faceId, Member member) throws IOException { + public Integer addSubject(Integer faceId, Member member) throws UnsupportedEncodingException { JsonObject param = new JsonObject(); param.addProperty("gender", 1); String nickname = member.getNickname(); @@ -92,18 +99,23 @@ public class FaceService { JsonArray faceIds = new JsonArray(); faceIds.add(faceId); param.add("photo_ids", faceIds); - CloseableHttpResponse response = post(param, "subject"); - if (response.getStatusLine().getStatusCode() == 200) { - AddMemberResponse addMemberResponse = JsonMapper.nonNullMapper().fromJson(response.getEntity().getContent(), AddMemberResponse.class); - if (addMemberResponse.getCode() == 0) { - Integer subjectId = addMemberResponse.getData().getId(); - return subjectId; + try { + CloseableHttpResponse response = post(param, "subject"); + if (response.getStatusLine().getStatusCode() == 200) { + AddMemberResponse addMemberResponse = JsonMapper.nonNullMapper().fromJson(response.getEntity().getContent(), AddMemberResponse.class); + if (addMemberResponse.getCode() == 0) { + Integer subjectId = addMemberResponse.getData().getId(); + return subjectId; + } else { + throw new FaceServiceException(addMemberResponse.getDesc()); + } } else { - throw new FaceServiceException(addMemberResponse.getDesc()); + logger.error("添加用户失败 code:" + response.getStatusLine().getStatusCode()); + throw new FaceServiceException("添加用户失败"); } - } else { - logger.error("添加用户失败 code:" + response.getStatusLine().getStatusCode()); - throw new FaceServiceException("添加用户失败"); + } catch (IOException e) { + logger.error("addSubject无法连接人脸服务器"); + throw new FaceServiceException("无法连接人脸服务器"); } } @@ -122,6 +134,7 @@ public class FaceService { try { CloseableHttpResponse response = httpClient.execute(req); } catch (IOException e) { + logger.error("show发生异常",e); e.printStackTrace(); } } @@ -183,9 +196,15 @@ public class FaceService { HttpPost httpPost = new HttpPost("http://" + faceUrl + "/" + uri); httpPost.addHeader("Content-Type", "application/json"); httpPost.addHeader("user-agent", "Koala Admin"); - if (param != null) + RequestConfig requestConfig = RequestConfig.custom().setConnectionRequestTimeout(7000) + .setSocketTimeout(7000).setConnectTimeout(1000).build(); + httpPost.setConfig(requestConfig); + if (param != null){ httpPost.setEntity(new StringEntity(param.toString())); + } CloseableHttpResponse response = httpClient.execute(httpPost); + logger.info(uri+"返回编码"+response.getStatusLine().getStatusCode()); + logger.info(uri+"返回结果"+response.toString()); return response; }