From db92cedf0db641b0c35c78c472038c8b799a8860 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Wed, 10 Jun 2026 10:30:06 +0800 Subject: [PATCH] =?UTF-8?q?fix(face):=20=E4=BF=AE=E5=A4=8D=E4=BA=BA?= =?UTF-8?q?=E8=84=B8=E8=AF=86=E5=88=AB=E7=8E=AF=E5=A2=83=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../edu/command/study/StudentSignAddExe.java | 9 +++++++- .../com/zcloud/edu/config/FileUrlConfig.java | 4 ++-- .../edu/domain/model/study/StudentSignE.java | 22 ++++++++++--------- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/web-app/src/main/java/com/zcloud/edu/command/study/StudentSignAddExe.java b/web-app/src/main/java/com/zcloud/edu/command/study/StudentSignAddExe.java index af06f8c..f1f90fa 100644 --- a/web-app/src/main/java/com/zcloud/edu/command/study/StudentSignAddExe.java +++ b/web-app/src/main/java/com/zcloud/edu/command/study/StudentSignAddExe.java @@ -17,6 +17,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.ObjectUtils; @@ -58,7 +59,13 @@ public class StudentSignAddExe { faceUrl = Base64Util.getBase64String(studentSignE.getFiles()[0]); log.info("StudentSignAddExe-execute,调用阿里进行人脸识别开始"); long startAliTime = System.currentTimeMillis(); - studentSignE.compareFace(student.getUserAvatarUrl(), faceUrl, fileUrlConfig.getPrefixUrl()); + Boolean environment = false; + log.info("StudentSignAddExe-execute,fileUrlConfig.getPrefixUrl():{}",fileUrlConfig.getPrefixUrl()); + if(!"https://jpfz.qhdsafety.com/gbsFileTest/".equals(fileUrlConfig.getPrefixUrl())){ + environment = true; + } + + studentSignE.compareFace(student.getUserAvatarUrl(), faceUrl, fileUrlConfig.getPrefixUrl(),environment); log.info("StudentSignAddExe-execute,调用阿里进行人脸识别结束,耗时:{}",System.currentTimeMillis() - startAliTime); } catch (Exception e) { throw new RuntimeException(e); diff --git a/web-client/src/main/java/com/zcloud/edu/config/FileUrlConfig.java b/web-client/src/main/java/com/zcloud/edu/config/FileUrlConfig.java index 7890e7b..0b709c0 100644 --- a/web-client/src/main/java/com/zcloud/edu/config/FileUrlConfig.java +++ b/web-client/src/main/java/com/zcloud/edu/config/FileUrlConfig.java @@ -16,7 +16,7 @@ public class FileUrlConfig { } public String getPrefixUrl() { // 正式环境 - return "http://192.168.192.201:8991/file/uploadFiles2/"; -// return prefixUrl; +// return "http://192.168.192.201:8991/file/uploadFiles2/"; + return prefixUrl; } } diff --git a/web-domain/src/main/java/com/zcloud/edu/domain/model/study/StudentSignE.java b/web-domain/src/main/java/com/zcloud/edu/domain/model/study/StudentSignE.java index ccb0af3..b5ce91b 100644 --- a/web-domain/src/main/java/com/zcloud/edu/domain/model/study/StudentSignE.java +++ b/web-domain/src/main/java/com/zcloud/edu/domain/model/study/StudentSignE.java @@ -3,14 +3,12 @@ package com.zcloud.edu.domain.model.study; import com.alibaba.cola.exception.BizException; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.google.gson.JsonObject; import com.jjb.saas.framework.domain.model.BaseE; import com.zcloud.gbscommon.utils.Base64Util; import com.zcloud.gbscommon.utils.FaceUtil; import com.zcloud.gbscommon.utils.HttpRequestUtil; import com.zcloud.gbscommon.utils.Tools; import lombok.Data; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.multipart.MultipartFile; import java.time.LocalDateTime; @@ -70,21 +68,25 @@ public class StudentSignE extends BaseE { //修改人id private Long updateId; - public void compareFace(String templateFaceUrl, String faceUrl, String prefixUrl) throws Exception { + public void compareFace(String templateFaceUrl, String faceUrl, String prefixUrl, Boolean environment) throws Exception { try { String templateFace = Base64Util.urlToBase64(prefixUrl + templateFaceUrl); Map map = new HashMap(); map.put("pic1", templateFace); map.put("pic2", faceUrl); String jsonParam = JSON.toJSONString(map); - // 正式环境 - String compareResult = HttpRequestUtil.doPost("http://192.168.192.201:8971/gbs-face/face/compareFace", jsonParam); - JSONObject jsonObject = JSONObject.parseObject(compareResult); - jsonObject.getJSONObject("info").getString("confidence"); - String compareResultStr = jsonObject.getJSONObject("info").getString("confidence"); + String compareResultStr; + if (environment) { + // 正式环境 + String compareResult = HttpRequestUtil.doPost("http://192.168.192.201:8971/gbs-face/face/compareFace", jsonParam); + JSONObject jsonObject = JSONObject.parseObject(compareResult); + jsonObject.getJSONObject("info").getString("confidence"); + compareResultStr = jsonObject.getJSONObject("info").getString("confidence"); + } else { + // 测试环境 + compareResultStr = FaceUtil.compareFace(templateFace, faceUrl); + } - // 测试环境 -// String compareResultStr = FaceUtil.compareFace(templateFace, faceUrl); if (Double.valueOf(compareResultStr) < 75) { throw new BizException("人脸不匹配"); }