From e9e8ae6abe7f174d824c662bafced353b9230f9a Mon Sep 17 00:00:00 2001
From: "20932067@zju.edu.cn" <Clay>
Date: Sun, 28 Feb 2021 22:00:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=B8=8B=E8=BD=BD=E6=94=B9?=
 =?UTF-8?q?=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hchyun-ui/src/api/tool/gen.js                      |  7 +++++++
 hchyun-ui/src/views/tool/gen/index.vue             |  6 +++++-
 .../com/hchyun/common/utils/file/FileUtils.java    |  1 +
 .../java/com/hchyun/generator/config/Config.java   |  7 +++++++
 .../hchyun/generator/controller/GenController.java | 14 +++++++++++---
 5 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/hchyun-ui/src/api/tool/gen.js b/hchyun-ui/src/api/tool/gen.js
index 4506927..0c2220b 100644
--- a/hchyun-ui/src/api/tool/gen.js
+++ b/hchyun-ui/src/api/tool/gen.js
@@ -74,3 +74,10 @@ export function synchDb(tableName) {
     method: 'get'
   })
 }
+//下载接口
+export function downloadCode(tableNames){
+  return request({
+    url:'/tool/gen/batchGenCode?tables=' + tableNames,
+    method:'get'
+  })
+}
diff --git a/hchyun-ui/src/views/tool/gen/index.vue b/hchyun-ui/src/views/tool/gen/index.vue
index 1edb9ab..69279e5 100644
--- a/hchyun-ui/src/views/tool/gen/index.vue
+++ b/hchyun-ui/src/views/tool/gen/index.vue
@@ -178,7 +178,7 @@
 </template>
 
 <script>
-import { listTable, previewTable, delTable, genCode, synchDb } from "@/api/tool/gen";
+import { listTable, previewTable, delTable, genCode, synchDb, downloadCode } from "@/api/tool/gen";
 import importTable from "./importTable";
 import { downLoadZip } from "@/utils/zipdownload";
 import hljs from "highlight.js/lib/highlight";
@@ -269,6 +269,10 @@ export default {
           this.msgSuccess("成功生成到自定义路径：" + row.genPath);
         });
       } else {
+        // downloadCode(tableNames).then(res =>{
+        //   this.download(res.msg);
+        // })
+        // // todo
         downLoadZip("/tool/gen/batchGenCode?tables=" + tableNames, "hchyun");
       }
     },
diff --git a/hchyun/hchyun-common/src/main/java/com/hchyun/common/utils/file/FileUtils.java b/hchyun/hchyun-common/src/main/java/com/hchyun/common/utils/file/FileUtils.java
index 162638b..44ca1cc 100644
--- a/hchyun/hchyun-common/src/main/java/com/hchyun/common/utils/file/FileUtils.java
+++ b/hchyun/hchyun-common/src/main/java/com/hchyun/common/utils/file/FileUtils.java
@@ -38,6 +38,7 @@ public class FileUtils extends org.apache.commons.io.FileUtils {
                 os.write(b, 0, length);
             }
         } catch (IOException e) {
+            System.out.println(e);
             throw e;
         } finally {
             if (os != null) {
diff --git a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/config/Config.java b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/config/Config.java
index 16d7862..8565605 100644
--- a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/config/Config.java
+++ b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/config/Config.java
@@ -21,6 +21,13 @@ public class Config {
     private static String profile;
 
 
+
+
+    public void setProfile(String profile){
+        Config.profile = profile;
+    }
+
+
     public static String getProfile() {
         return profile;
     }
diff --git a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/controller/GenController.java b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/controller/GenController.java
index a73423a..9c3b1a1 100644
--- a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/controller/GenController.java
+++ b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/controller/GenController.java
@@ -9,6 +9,7 @@ import java.util.zip.ZipOutputStream;
 import javax.servlet.http.HttpServletResponse;
 
 import com.hchyun.generator.aop.Log;
+import com.hchyun.generator.config.Config;
 import com.hchyun.generator.enums.GenBusinessType;
 import com.hchyun.generator.utils.GenBaseController;
 import com.hchyun.generator.utils.GenReturnConstants;
@@ -207,22 +208,29 @@ public class GenController extends GenBaseController {
         String[] tableNames = Convert.toStrArray(tables);
         byte[] data = genTableService.downloadCode(tableNames);
         genCode(response, data);
-        compress(data);
+//        if (compress(data)){
+//            return AjaxResult.success("hchyun.zip");
+//        }else {
+//            return AjaxResult.error();
+//        }
     }
 
     /**
      * 将bytes流写入到本地
      * @param bytes
      */
-    public static void compress(byte[] bytes) {
+    public boolean compress(byte[] bytes) {
         try {
-            FileOutputStream fileOutputStream = new FileOutputStream("F:\\Work\\表白\\huhyun.zip");
+            String dir = Config.getProfile()+"/hchyun.zip";
+            FileOutputStream fileOutputStream = new FileOutputStream(dir);
             fileOutputStream.write(bytes);
             fileOutputStream.flush();
             fileOutputStream.close();
         } catch (IOException e) {
             e.printStackTrace();
+            return false;
         }
+        return true;
     }
 
     /**