Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

疯狂的狮子li

2020-08-02 c966d9bada8e189f0beb4867fce81ae73f3fcebd

 ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java

@@ -148,15 +148,27 @@
    }

    /**
     * 生成代码
     * 生成代码（下载方式）
     */
    @PreAuthorize("@ss.hasPermi('tool:gen:code')")
    @Log(title = "代码生成", businessType = BusinessType.GENCODE)
    @GetMapping("/download/{tableName}")
    public void download(HttpServletResponse response, @PathVariable("tableName") String tableName) throws IOException
    {
        byte[] data = genTableService.downloadCode(tableName);
        genCode(response, data);
    }

    /**
     * 生成代码（自定义路径）
     */
    @PreAuthorize("@ss.hasPermi('tool:gen:code')")
    @Log(title = "代码生成", businessType = BusinessType.GENCODE)
    @GetMapping("/genCode/{tableName}")
    public void genCode(HttpServletResponse response, @PathVariable("tableName") String tableName) throws IOException
    public AjaxResult genCode(HttpServletResponse response, @PathVariable("tableName") String tableName)
    {
        byte[] data = genTableService.generatorCode(tableName);
        genCode(response, data);
        genTableService.generatorCode(tableName);
        return AjaxResult.success();
    }

    /**
@@ -168,7 +180,7 @@
    public void batchGenCode(HttpServletResponse response, String tables) throws IOException
    {
        String[] tableNames = Convert.toStrArray(tables);
        byte[] data = genTableService.generatorCode(tableNames);
        byte[] data = genTableService.downloadCode(tableNames);
        genCode(response, data);
    }

@@ -185,4 +197,4 @@
        response.setContentType("application/octet-stream; charset=UTF-8");
        IOUtils.write(data, response.getOutputStream());
    }
}
}