!452 跨域问题 Merge pull request !452 from younger007/master

若依

2022-03-15 ed693e89c924b7cc7add2ae2931b0a3cbf8a9f1a

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

@@ -59,14 +59,16 @@
     * 修改代码生成业务

     */

    @PreAuthorize("@ss.hasPermi('tool:gen:query')")

    @GetMapping(value = "/{talbleId}")

    public AjaxResult getInfo(@PathVariable Long talbleId)

    @GetMapping(value = "/{tableId}")

    public AjaxResult getInfo(@PathVariable Long tableId)

    {

        GenTable table = genTableService.selectGenTableById(talbleId);

        List<GenTableColumn> list = genTableColumnService.selectGenTableColumnListByTableId(talbleId);

        GenTable table = genTableService.selectGenTableById(tableId);

        List<GenTable> tables = genTableService.selectGenTableAll();

        List<GenTableColumn> list = genTableColumnService.selectGenTableColumnListByTableId(tableId);

        Map<String, Object> map = new HashMap<String, Object>();

        map.put("info", table);

        map.put("rows", list);

        map.put("tables", tables);

        return AjaxResult.success(map);

    }



@@ -86,7 +88,7 @@
     * 查询数据表字段列表

     */

    @PreAuthorize("@ss.hasPermi('tool:gen:list')")

    @GetMapping(value = "/column/{talbleId}")

    @GetMapping(value = "/column/{tableId}")

    public TableDataInfo columnList(Long tableId)

    {

        TableDataInfo dataInfo = new TableDataInfo();

@@ -99,7 +101,7 @@
    /**

     * 导入表结构（保存）

     */

    @PreAuthorize("@ss.hasPermi('tool:gen:list')")

    @PreAuthorize("@ss.hasPermi('tool:gen:import')")

    @Log(title = "代码生成", businessType = BusinessType.IMPORT)

    @PostMapping("/importTable")

    public AjaxResult importTableSave(String tables)

@@ -148,15 +150,39 @@
    }



    /**

     * 生成代码

     * 生成代码（下载方式）

     */

    @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(@PathVariable("tableName") String tableName)

    {

        byte[] data = genTableService.generatorCode(tableName);

        genCode(response, data);

        genTableService.generatorCode(tableName);

        return AjaxResult.success();

    }



    /**

     * 同步数据库

     */

    @PreAuthorize("@ss.hasPermi('tool:gen:edit')")

    @Log(title = "代码生成", businessType = BusinessType.UPDATE)

    @GetMapping("/synchDb/{tableName}")

    public AjaxResult synchDb(@PathVariable("tableName") String tableName)

    {

        genTableService.synchDb(tableName);

        return AjaxResult.success();

    }



    /**

@@ -168,7 +194,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);

    }



@@ -178,9 +204,10 @@
    private void genCode(HttpServletResponse response, byte[] data) throws IOException

    {

        response.reset();

        response.addHeader("Access-Control-Expose-Headers", "Content-Disposition");

        response.setHeader("Content-Disposition", "attachment; filename=\"ruoyi.zip\"");

        response.addHeader("Content-Length", "" + data.length);

        response.setContentType("application/octet-stream; charset=UTF-8");

        IOUtils.write(data, response.getOutputStream());

    }

}

}