From 113792a2cf17f81b88363f77d0718ae618893ece Mon Sep 17 00:00:00 2001 From: limqhz Date: Sat, 1 Feb 2020 16:45:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E4=BC=A0Face++=E4=B9=B1=E7=A0=81?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/application-development.yml | 3 +++ api/src/test/java/com/FaceServiceTest.java | 27 ++++++++++++++++--- .../com/sv/service/api/MemberService.java | 3 ++- .../com/sv/service/common/FaceService.java | 6 +++-- 4 files changed, 33 insertions(+), 6 deletions(-) diff --git a/api/src/main/resources/config/application-development.yml b/api/src/main/resources/config/application-development.yml index 1aadf02..4696f1d 100644 --- a/api/src/main/resources/config/application-development.yml +++ b/api/src/main/resources/config/application-development.yml @@ -6,6 +6,9 @@ spring: url: jdbc:mysql://127.0.01:3306/smart_venue?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2b8&useAffectedRows=true 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 +# username: root +# password: hyty1234 redis: host: 127.0.0.1 diff --git a/api/src/test/java/com/FaceServiceTest.java b/api/src/test/java/com/FaceServiceTest.java index 028cc68..1d2d786 100644 --- a/api/src/test/java/com/FaceServiceTest.java +++ b/api/src/test/java/com/FaceServiceTest.java @@ -1,6 +1,8 @@ package com; import com.sv.entity.Member; +import com.sv.entity.MemberFaceInfo; +import com.sv.mapper.MemberMapper; import com.sv.service.api.MemberService; import com.sv.service.common.FaceService; import org.junit.Test; @@ -16,6 +18,7 @@ import javax.annotation.Resource; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.IOException; +import java.util.Date; @RunWith(SpringJUnit4ClassRunner.class) @SpringBootTest(webEnvironment= SpringBootTest.WebEnvironment.NONE) @@ -27,6 +30,9 @@ public class FaceServiceTest { @Resource private MemberService memberService; + @Resource + private MemberMapper memberMapper; + @Test public void test(){ @@ -50,10 +56,25 @@ public class FaceServiceTest { @Test public void addMember() throws IOException { + String faceUrl = "faceUrl"; faceService.login(); - Member member = memberService.findById(15); - Integer subjectId = faceService.addSubject(3,member); - memberService.setMemberFaceInfo(subjectId,"xxx",member.getId(),1); + Member member = memberService.findById(521); + Integer memberId = member.getId(); + Integer subjectId = faceService.addSubject(130,member); + MemberFaceInfo memberFaceInfo = memberMapper.findMemberFaceInfo(memberId); + if (memberFaceInfo == null) { + memberFaceInfo = new MemberFaceInfo(); + memberFaceInfo.setMemberId(memberId); + memberFaceInfo.setPlatformId(1); + } + memberFaceInfo.setFaceId(subjectId); + memberFaceInfo.setFaceUrl(faceUrl); + memberFaceInfo.setModifiedTime(new Date()); + if (memberFaceInfo.getId() == null) { + memberMapper.insertMemberFaceInfo(memberFaceInfo); + } else { + memberMapper.updateMemberFaceInfo(memberFaceInfo); + } } } diff --git a/service/src/main/java/com/sv/service/api/MemberService.java b/service/src/main/java/com/sv/service/api/MemberService.java index 7543147..ca7ac8d 100644 --- a/service/src/main/java/com/sv/service/api/MemberService.java +++ b/service/src/main/java/com/sv/service/api/MemberService.java @@ -505,8 +505,9 @@ public class MemberService extends BaseServiceImpl { if (faceService.login()){ ByteArrayInputStream byteArrayInputStream = getByteArrayInputStream(file); Integer faceId = faceService.uploadFace(byteArrayInputStream); + logger.info(memberId + "& faceId ===" + faceId); subjectId = faceService.addSubject(faceId, member); - logger.info(faceId + "&&" + subjectId); + logger.info(memberId + "& subjectId ===" + subjectId); } if (memberFaceInfo != null) { //删除原有的subject 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 2ac95cb..a84755f 100644 --- a/service/src/main/java/com/sv/service/common/FaceService.java +++ b/service/src/main/java/com/sv/service/common/FaceService.java @@ -80,8 +80,10 @@ public class FaceService { public Integer addSubject(Integer faceId, Member member) throws IOException { JsonObject param = new JsonObject(); param.addProperty("gender", 1); - if (!StringUtils.isEmpty(member.getNickname())) { - param.addProperty("name", StringUtils.isEmpty(member.getNickname()) ? "" : member.getNickname()); + String nickname = member.getNickname(); + nickname = new String(nickname.getBytes("UTF-8"),"ISO-8859-1"); + if (!StringUtils.isEmpty(nickname)) { + param.addProperty("name", StringUtils.isEmpty(nickname) ? "" : nickname); } else { param.addProperty("name", StringUtils.isEmpty(member.getMobile()) ? "" : member.getMobile()); }