diff --git a/yq-admin/src/main/java/yq/web/controller/nologin/NoLogin.java b/yq-admin/src/main/java/yq/web/controller/nologin/NoLogin.java index aa3b0d0..9f39028 100644 --- a/yq-admin/src/main/java/yq/web/controller/nologin/NoLogin.java +++ b/yq-admin/src/main/java/yq/web/controller/nologin/NoLogin.java @@ -66,13 +66,13 @@ public class NoLogin { */ @PostMapping("/compareFaces") - public AjaxResult compareFaces(MultipartFile multipartFile) throws IOException { + public AjaxResult compareFaces(MultipartFile file) throws IOException { - if(multipartFile !=null){ + if(file !=null){ List list = mineFaceService.selectMineFaceByList(); if(!list.isEmpty()){ for (MineFace mineFace : list) { - float v = FaceEnginUtil.uploadContrast(multipartFile, mineFace.getFaceByte()); + float v = FaceEnginUtil.uploadContrast(file, mineFace.getFaceByte()); if(v>0.7){ mineFace.setFaceByte(null); return AjaxResult.success(mineFace); diff --git a/yq-admin/src/main/resources/application-druid.yml b/yq-admin/src/main/resources/application-druid.yml index 3a2de76..d04b155 100644 --- a/yq-admin/src/main/resources/application-druid.yml +++ b/yq-admin/src/main/resources/application-druid.yml @@ -6,7 +6,7 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://localhost:3306/mine?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://localhost:3307/mine?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root password: 123456 # 从库数据源 diff --git a/yq-admin/src/main/resources/application.yml b/yq-admin/src/main/resources/application.yml index abfe029..dbd15fc 100644 --- a/yq-admin/src/main/resources/application.yml +++ b/yq-admin/src/main/resources/application.yml @@ -87,7 +87,7 @@ spring: # 数据库索引 database: 0 # 密码 - password: + password: 123456 # 连接超时时间 timeout: 10s lettuce: @@ -143,7 +143,7 @@ xss: arcsoft: appId: 7MtFQZ9S9Ue2UC7koYxJbeL5iEHhqGtp3d5SJbJ4ou92 sdkKey: 4VM5rVL8eKmmELhRi8ZoopH33GzsgPoptA94zSXyHvzz - faceEngine: E:\arcsoft_lib\LINUX64 + faceEngine: E:\\arcsoft_lib\\LINUX64 thread-pool-size: 10 diff --git a/yq-common/src/main/java/yq/common/utils/FaceEnginUtil.java b/yq-common/src/main/java/yq/common/utils/FaceEnginUtil.java index 47a0862..03ab3d4 100644 --- a/yq-common/src/main/java/yq/common/utils/FaceEnginUtil.java +++ b/yq-common/src/main/java/yq/common/utils/FaceEnginUtil.java @@ -11,6 +11,7 @@ import com.arcsoft.face.toolkit.ImageFactory; import com.arcsoft.face.toolkit.ImageInfo; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Configuration; import org.springframework.web.multipart.MultipartFile; import yq.common.exception.ServiceException; import yq.common.utils.file.ImageUtils; @@ -31,16 +32,17 @@ import static com.arcsoft.face.toolkit.ImageFactory.getRGBData; * @author: jeecg-boot */ @Slf4j +@Configuration public class FaceEnginUtil { @Value(value = "${arcsoft.appId}") - private static String appId; + private static String appId = "7MtFQZ9S9Ue2UC7koYxJbeL5iEHhqGtp3d5SJbJ4ou92"; @Value(value = "${arcsoft.sdkKey}") - private static String sdkKey; + private static String sdkKey = "4VM5rVL8eKmmELhRi8ZoopH33GzsgPoptA94zSXyHvzz"; @Value(value = "${arcsoft.faceEngine}") - private static String faceEngineUrl; + private static String faceEngineUrl = "E:\\\\arcsoft_lib\\\\LINUX64"; public static FaceEngine init() { diff --git a/yq-system/src/main/resources/mapper/system/MineFaceMapper.xml b/yq-system/src/main/resources/mapper/system/MineFaceMapper.xml index 80f55d1..cae604c 100644 --- a/yq-system/src/main/resources/mapper/system/MineFaceMapper.xml +++ b/yq-system/src/main/resources/mapper/system/MineFaceMapper.xml @@ -16,6 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -39,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where mf.id = #{id} - SELECT mf.id, mf.face_name, @@ -94,7 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" remark = #{remark}, create_time = #{createTime}, group_id = #{groupId}, - + face_byte = #{faceByte}, where id = #{id}