Merge remote-tracking branch 'origin/main'

modules/bmw/src/main/java/com/bonus/bmw/config/IpAndPathConfig.java

@@ -14,14 +14,28 @@ public class IpAndPathConfig {
      */
 //    @Value("${environment}")
 //    public static String environment;
-    public static String environment = "prod";
+    public static String environment = "test";
+
+    public static String LINUX_URL = "/data/real_name/";
+
+    public static String WINDOWS_URL = "D:/yn/real_name/";
+
+
+    public static String getUrl(){
+        String os = System.getProperty("os.name");
+        if(os.toLowerCase().startsWith("win")){
+            return WINDOWS_URL;
+        }else{
+            return LINUX_URL;
+        }
+    }
 
     /**
      * 持证
      */
     public static String certificateDevUrl = "http://127.0.0.1:21880/wcd/getWorkerCard";
 
-    public static String certificateTestUrl = "http://192.168.0.14:21880/wcd/getWorkerCard";
+    public static String certificateTestUrl = "http://192.168.0.7:21880/wcd/getWorkerCard";
 
     public static String certificateProdUrl = "http://112.29.103.165:21880/wcd/getWorkerCard";
 
@@ -30,7 +44,7 @@ public class IpAndPathConfig {
      * 人脸检测后端相关
      */
     public static String faceDevUrl = "http://127.0.0.1:1909/file/";
-    public static String faceTestUrl = "http://192.168.0.14:1909/file/";
+    public static String faceTestUrl = "http://192.168.0.7:1909/file/";
     public static String faceProdUrl = "http://112.29.103.165:1617/file/";
 
 
@@ -38,38 +52,20 @@ public class IpAndPathConfig {
      * 统一工作平台url地址
      */
     public static String unifiedPlatDevUrl = "http://127.0.0.1:27018/ynuw";
-    public static String unifiedPlatTestUrl = "http://192.168.0.14:27018/ynuw";
+    public static String unifiedPlatTestUrl = "http://192.168.0.7:27018/ynuw";
     public static String unifiedPlatProdUrl = "http://112.29.103.165:1617/ynuw";
 
     /**
      * 相关配置
      */
     public static String getFaceUrl(){
-        if(environment.contains("prod")){
+        return  getUrl();
-            return faceProdUrl;
-        }else if(environment.contains("test")){
-            return faceTestUrl;
-        }else{
-            return faceDevUrl;
-        }
     }
     public static String getUnifiedPlatUrl(){
-        if(environment.contains("prod")){
+        return  getUrl();
-            return unifiedPlatProdUrl;
-        }else if(environment.contains("test")){
-            return unifiedPlatTestUrl;
-        }else{
-            return unifiedPlatDevUrl;
-        }
     }
     public static String getCertificateUrl(){
-        if(environment.contains("prod")){
+        return  getUrl();
-            return certificateProdUrl;
-        }else if(environment.contains("test")){
-            return certificateTestUrl;
-        }else{
-            return certificateDevUrl;
-        }
     }
 
 }

modules/bmw/src/main/java/com/bonus/bmw/person/controller/PersonComprehensiveController.java

@@ -130,8 +130,9 @@ public class PersonComprehensiveController {
     public R faceDetection(@RequestBody PersonComprehensiveBean bean) {
         try {
             String url = IpAndPathConfig.getFaceUrl();
+            log.error("url:" + url);
             ArcFaceHelper arcFaceHelper = new ArcFaceHelper();
-            FaceResult faceResult = arcFaceHelper.getFaceFeatures(url + bean.getFacePhoto());
+            FaceResult faceResult = arcFaceHelper.getFaceFeatures(url + bean.getFacePhoto().replace("ynRealName/", ""));
             return R.ok(faceResult);
         }catch (Exception e){
             return R.fail("人脸检测失败：" + e.getMessage());

modules/bmw/src/main/java/com/bonus/bmw/salarystat/service/SalaryStatServiceImpl.java

@@ -274,7 +274,7 @@ public class SalaryStatServiceImpl implements SalaryStatService{
         ZipOutputStream zos = new ZipOutputStream(byteArrayOutputStream);
         try {
             for (TemporarySalaryFileBean bean : list) {
-                URL url = new URL(IpAndPathConfig.getFaceUrl() + bean.getFilePath());
+                URL url = new URL(IpAndPathConfig.getFaceUrl() + bean.getFilePath().replace("ynRealName/", ""));
 //                URL url = new URL("http://192.168.0.14:1909/file/" + bean.getFilePath());
                 try (InputStream in = url.openStream()) {
                     // 添加文件到zip中