Browse Source

修改了文件对比Bug

李英俊ya 1 month ago
parent
commit
ed0611fa66

+ 2 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRepoController.java

@@ -106,8 +106,8 @@ public class SysRepoController extends BaseController
     public AjaxResult compare(@RequestBody SysRepo sysRepo)
     public AjaxResult compare(@RequestBody SysRepo sysRepo)
     {
     {
         SysRepo sysRepo_old = sysRepoService.selectSysRepoByRepoId(sysRepo.getRepoId());
         SysRepo sysRepo_old = sysRepoService.selectSysRepoByRepoId(sysRepo.getRepoId());
-        if(FileUtils.getFileExtension(sysRepo_old.getUrl()).equals(".docx") ||
-                FileUtils.getFileExtension(sysRepo_old.getUrl()).equals(".doc" )){
+        if(FileUtils.getFileExtension(sysRepo_old.getUrl()).equals("docx") ||
+                FileUtils.getFileExtension(sysRepo_old.getUrl()).equals("doc" )){
             return AjaxResult.success(OfficeCompareUtils.compare(FileUtils.getUploadPath(sysRepo_old.getUrl()),FileUtils.getUploadPath(sysRepo.getUrl()),"spire"));
             return AjaxResult.success(OfficeCompareUtils.compare(FileUtils.getUploadPath(sysRepo_old.getUrl()),FileUtils.getUploadPath(sysRepo.getUrl()),"spire"));
         }
         }
         return AjaxResult.error("对比失败");
         return AjaxResult.error("对比失败");

+ 3 - 2
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java

@@ -342,8 +342,9 @@ public class FileUtils
         }
         }
         String[] parts = url.split("/");
         String[] parts = url.split("/");
         if (parts.length > 3) {
         if (parts.length > 3) {
-            Integer index = parts[0].length() + parts[1].length() + 2;
-            return RuoYiConfig.getUploadPath() + url.substring(index);
+            Integer index = parts[1].length() + parts[2].length() + 2;
+            String  urlWithoutPrefix = RuoYiConfig.getUploadPath() + url.substring(index);
+            return urlWithoutPrefix;
         } else {
         } else {
             return null;
             return null;
         }
         }