档案打包

blade-service/blade-archive/src/main/java/org/springblade/archive/controller/ArchiveOfflineVersionInfoController.java

@@ -44,12 +44,12 @@ public class ArchiveOfflineVersionInfoController {
     @ApiOperation(value = "打包数据")
     @GetMapping("/packData")
     public R<String> packData(Long projectId) throws Exception {
-//        //先获取状态，同时只能有一个项目打包
-//        offlineVersionInfoService.getPackStatus();
-//        //异步调用自动打包上传，完成后修改数据库信息
-//        offlineVersionInfoService.packData(projectId);
-//        return R.data("最新数据后台自动打包中，打包完成后会更新打包日期");
-        return R.data("暂时停止使用离线档案，请联系管理员");
+        //先获取状态，同时只能有一个项目打包
+        offlineVersionInfoService.getPackStatus();
+        //异步调用自动打包上传，完成后修改数据库信息
+        offlineVersionInfoService.packData(projectId);
+        return R.data("最新数据后台自动打包中，打包完成后会更新打包日期");
+        //return R.data("暂时停止使用离线档案，请联系管理员");
     }
 
     /**

blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/ArchiveOfflineVersionInfoServiceImpl.java

@@ -67,9 +67,10 @@ public class ArchiveOfflineVersionInfoServiceImpl extends BaseServiceImpl<Archiv
 //        String localUrl = "/www/wwwroot/localClient/local_archives/alilib";
 //        String packUrl = "/www/wwwroot/localClient";
 //        String zipUrl = "/www/wwwroot/localClient.zip";
-        String localUrl = "/www/wwwroot/Users/hongchuangyanfa/Desktop/localArchive/localClient/local_archives/alilib";
-        String packUrl = "/www/wwwroot/Users/hongchuangyanfa/Desktop/localArchive";
-        String zipUrl = "/www/wwwroot/Users/hongchuangyanfa/Desktop/localArchive/"+projectId;
+        String fileUrl = FileUtils.getSysLocalFileUrl();
+        String localUrl = fileUrl+"localArchive/localClient/local_archives/alilib";
+        String packUrl = fileUrl+"localArchive";
+        String zipUrl = fileUrl+"localArchive/"+projectId;
         //清空url的文件夹
         CommonUtil.deleteDir(localUrl);
         //导入档案到sqlite

blade-service/blade-archive/src/main/java/org/springblade/archive/utils/FileUtils.java

@@ -130,6 +130,41 @@ public class FileUtils {
         }
     }
 
+    public static String getSysLocalFileUrl() {
+        String file_path = ParamCache.getValue(CommonConstant.SYS_LOCAL_URL);
+        String sys_isonline = ParamCache.getValue(CommonConstant.SYS_ISONLINE);
+
+        if (sys_isonline.equals("1")) { //正式环境
+            if (SystemUtils.isMacOs()) {
+                file_path = "/Users/hongchuangyanfa/Desktop/";
+            } else if (SystemUtils.isWindows()) {
+                file_path = "C://upload//";
+            }
+        } else if (sys_isonline.equals("2")) { //109测试环境
+            if (SystemUtils.isMacOs()) {
+                file_path = "/www/wwwroot/Users/hongchuangyanfa/Desktop/";
+            } else if (SystemUtils.isWindows()) {
+                file_path = "C://upload//";
+            }
+        } else if (sys_isonline.equals("20")) { //183
+            if (SystemUtils.isLinux()) {
+                file_path = "/home/www/wwwroot/Users/hongchuangyanfa/Desktop/";
+            } else if (SystemUtils.isMacOs()) {
+                file_path = "/Users/hongchuangyanfa/Desktop/";
+            } else if (SystemUtils.isWindows()) {
+                file_path = "C://upload//";
+            }
+        } else {  //本地环境
+            if (SystemUtils.isMacOs()) {
+                file_path = "/Users/hongchuangyanfa/Desktop/";
+            } else if (SystemUtils.isWindows()) {
+                file_path = "C://upload//";
+            }
+        }
+        return file_path;
+    }
+
+
     /**
      * 压缩图片
      */
@@ -773,15 +808,6 @@ public class FileUtils {
         return ossPath;
     }
 
-    public static String getSysLocalFileUrl() {
-        String file_path = ParamCache.getValue(CommonConstant.SYS_LOCAL_URL);
-        if (SystemUtils.isMacOs()) {
-            file_path = "/Users/hongchuangyanfa/Desktop/";
-        } else if (SystemUtils.isWindows()) {
-            file_path = "C://upload//";
-        }
-        return file_path;
-    }
 
     public static void main11(String[] args) {
        /* SpeechRecognizerDemo demo = new SpeechRecognizerDemo(appKey, id, secret, url);