From f30640f67bfa2bef9561dbf23580e4cfcb124778 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Mon, 9 Jul 2018 20:38:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=B9=E9=87=8F=E7=94=9F?= =?UTF-8?q?=E6=88=90=E4=BB=A3=E7=A0=81=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/project/tool/gen/controller/GenController.java | 5 ++--- src/main/resources/templates/tool/gen/gen.html | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java b/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java index 0f902d7b..d9f2090d 100644 --- a/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java +++ b/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java @@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import com.alibaba.fastjson.JSON; +import com.ruoyi.common.support.Convert; import com.ruoyi.framework.aspectj.lang.annotation.Log; import com.ruoyi.framework.aspectj.lang.constant.BusinessType; import com.ruoyi.framework.web.controller.BaseController; @@ -77,8 +77,7 @@ public class GenController extends BaseController @ResponseBody public void batchGenCode(HttpServletResponse response, String tables) throws IOException { - String[] tableNames = new String[] {}; - tableNames = JSON.parseArray(tables).toArray(tableNames); + String[] tableNames = Convert.toStrArray(tables); byte[] data = genService.generatorCode(tableNames); response.reset(); response.setHeader("Content-Disposition", "attachment; filename=\"ruoyi.zip\""); diff --git a/src/main/resources/templates/tool/gen/gen.html b/src/main/resources/templates/tool/gen/gen.html index 20980bb3..1594f1f2 100644 --- a/src/main/resources/templates/tool/gen/gen.html +++ b/src/main/resources/templates/tool/gen/gen.html @@ -92,7 +92,7 @@ return; } $.modal.confirm("确认要生成选中的" + rows.length + "条数据吗?", function() { - location.href = prefix + "/batchGenCode?tables=" + JSON.stringify(rows); + location.href = prefix + "/batchGenCode?tables=" + rows; layer.msg('执行成功,正在生成代码请稍后…', { icon: 1 }); }); }