diff --git a/modules/bmw/src/main/java/com/bonus/bmw/config/IpAndPathConfig.java b/modules/bmw/src/main/java/com/bonus/bmw/config/IpAndPathConfig.java index 300952d..57015c0 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/config/IpAndPathConfig.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/config/IpAndPathConfig.java @@ -24,9 +24,9 @@ public class IpAndPathConfig { public static String getUrl(){ String os = System.getProperty("os.name"); if(os.toLowerCase().startsWith("win")){ - return LINUX_URL; + return WINDOWS_URL; }else{ - return WINDOWS_URL; + return LINUX_URL; } } diff --git a/modules/bmw/src/main/java/com/bonus/bmw/person/controller/PersonComprehensiveController.java b/modules/bmw/src/main/java/com/bonus/bmw/person/controller/PersonComprehensiveController.java index f2cbc3d..c5a2217 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/person/controller/PersonComprehensiveController.java +++ b/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()); diff --git a/modules/bmw/src/main/java/com/bonus/bmw/salarystat/service/SalaryStatServiceImpl.java b/modules/bmw/src/main/java/com/bonus/bmw/salarystat/service/SalaryStatServiceImpl.java index e3e27b2..6e4d848 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/salarystat/service/SalaryStatServiceImpl.java +++ b/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中