venue/smart_venue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化配置，Face++宕机、可以给出友情提示

Browse Source
This commit is contained in:
limqhz
2020-05-10 02:04:58 +08:00
parent c69c799f4a
commit ed6d251ff3
4 changed files with 64 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/src/main/resources/config/application-development.yml
View File

@@ -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

2
api/src/main/resources/config/application-production.yml
View File

@@ -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:

33
api/src/main/resources/logback.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF8"?>
<configuration>
<jmxConfigurator />
<property name="LOG_HOME" value="/home/log/svapi"/>
<property name="LOG_HOME" value="/home/log/api_logs"/>
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
@@ -10,30 +10,37 @@
</encoder>
</appender>
<appender name="springLogFile"
<appender name="COMMON-DEFAULT"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${LOG_HOME}/api-spring.log</file>
<file>${LOG_HOME}/common-default.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${LOG_HOME}/api-spring-%d{yyyy-MM-dd_HH}.%i.log
<fileNamePattern>${LOG_HOME}/common-default-%d{yyyy-MM-dd}.log
</fileNamePattern>
<timeBasedFileNamingAndTriggeringPolicy
class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>10MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
</rollingPolicy>
<encoder>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
</encoder>
</appender>
<logger name= "org.springframework" level="info" additivity="false">
<appender-ref ref="springLogFile" />
</logger>
<appender name="COMMON-ERROR"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${LOG_HOME}/common-error.log</file>
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>ERROR</level>
</filter>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${LOG_HOME}/common-error-%d{yyyy-MM-dd}.log
</fileNamePattern>
</rollingPolicy>
<encoder>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
</encoder>
</appender>
<!-- root -->
<root level="info">
<appender-ref ref="STDOUT" />
<appender-ref ref="springLogFile" />
<appender-ref ref="COMMON-DEFAULT" />
<appender-ref ref="COMMON-ERROR" />
</root>
</configuration>

61
service/src/main/java/com/sv/service/common/FaceService.java
View File

@@ -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;
}