浏览代码

优化识别

suntianwu 3 年之前
父节点
当前提交
c98c5da61a

+ 5 - 0
src/main/java/com/iden/bms/service/FaceIdenService.java

@@ -57,6 +57,7 @@ public class FaceIdenService {
     @Resource
     @Resource
     private RedisUtil redisUtil;
     private RedisUtil redisUtil;
 
 
+
     @Value("${iden.root:#{null}}")
     @Value("${iden.root:#{null}}")
     private String idenRoot;
     private String idenRoot;
     @Value("${file.url:#{null}}")
     @Value("${file.url:#{null}}")
@@ -67,6 +68,10 @@ public class FaceIdenService {
 
 
     private static final Logger logger = LogManager.getLogger(FaceIdenService.class);
     private static final Logger logger = LogManager.getLogger(FaceIdenService.class);
 
 
+    public String getIdenRoot() {
+        return idenRoot;
+    }
+
     /**
     /**
      * 初始化人脸识别库
      * 初始化人脸识别库
      */
      */

+ 4 - 2
src/main/java/com/iden/common/facetool/pool/MyFaceMonitor.java

@@ -2,7 +2,8 @@ package com.iden.common.facetool.pool;
 
 
 import com.face.monitor.FaceMonitor;
 import com.face.monitor.FaceMonitor;
 
 
-import com.iden.common.util.CommonConfUtil;
+import com.iden.bms.service.FaceIdenService;
+import com.iden.common.util.SpringContextHolder;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.Logger;
 
 
@@ -15,7 +16,8 @@ public class MyFaceMonitor {
     public MyFaceMonitor() {
     public MyFaceMonitor() {
         synchronized (this) {
         synchronized (this) {
             if( this.faceMonitor == null) {
             if( this.faceMonitor == null) {
-                String idenRoot = CommonConfUtil.getConf("iden.root");
+                FaceIdenService faceIdenService = SpringContextHolder.getBean(FaceIdenService.class);
+                String idenRoot = faceIdenService.getIdenRoot();
                 //初始化引擎
                 //初始化引擎
                 logger.info("init one FaceMonitor--idenRoot==" + idenRoot);
                 logger.info("init one FaceMonitor--idenRoot==" + idenRoot);
                 this.faceMonitor = new FaceMonitor();
                 this.faceMonitor = new FaceMonitor();

+ 1 - 3
src/main/resources/common.properties

@@ -3,6 +3,4 @@ auth.jwt.id=standard_jwt
 # jwt ��Կ
 # jwt ��Կ
 auth.jwt.secret=hong1mu2zhi3ruan4jian5
 auth.jwt.secret=hong1mu2zhi3ruan4jian5
 # jwt ����ʱ��, (2Сʱ = 7200000ms; 24Сʱ = 86400000ms; 7�� = 604800000ms)
 # jwt ����ʱ��, (2Сʱ = 7200000ms; 24Сʱ = 86400000ms; 7�� = 604800000ms)
-auth.jwt.ttl.ms=86400000
-#服务部署根目录
-iden.root=/data/iden/
+auth.jwt.ttl.ms=86400000