From 9984c8e7a0d1d017bc65041c6de3a2a1f8d24b5a Mon Sep 17 00:00:00 2001 From: sxile <3440626@qq.com> Date: Tue, 12 Nov 2019 15:35:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=87=E4=BB=B6=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E5=A4=9A=E7=BA=A7=E7=9B=AE=E5=BD=95=E8=AF=86=E5=88=AB?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../export/bootstrap-table-export.js | 2 +- .../common/utils/file/FileUploadUtils.java | 2 +- .../generator/controller/GenController.java | 6 ++--- .../resources/templates/tool/gen/gen.html | 25 +++++-------------- .../templates/tool/gen/importTable.html | 24 ++++-------------- 5 files changed, 15 insertions(+), 44 deletions(-) diff --git a/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/export/bootstrap-table-export.js b/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/export/bootstrap-table-export.js index f897fbc..967c87a 100644 --- a/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/export/bootstrap-table-export.js +++ b/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/export/bootstrap-table-export.js @@ -29,7 +29,7 @@ $.extend($.fn.bootstrapTable.locales, { formatExport: function () { - return 'Export data'; + return '导出'; } }); $.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales); diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java index 55bc3ee..138ef85 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java @@ -146,7 +146,7 @@ public class FileUploadUtils private static final String getPathFileName(String uploadDir, String fileName) throws IOException { - int dirLastIndex = uploadDir.lastIndexOf("/") + 1; + int dirLastIndex = Global.getProfile().length() + 1; String currentDir = StringUtils.substring(uploadDir, dirLastIndex); String pathFileName = Constants.RESOURCE_PREFIX + "/" + currentDir + "/" + fileName; return pathFileName; diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java index 33b1103..6e4f710 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java @@ -46,9 +46,8 @@ public class GenController extends BaseController @RequiresPermissions("tool:gen:view") @GetMapping() - public String gen(ModelMap mmap) + public String gen() { - mmap.put("genTables", genTableService.selectGenTableList(new GenTable())); return prefix + "/gen"; } @@ -98,9 +97,8 @@ public class GenController extends BaseController */ @RequiresPermissions("tool:gen:list") @GetMapping("/importTable") - public String importTable(ModelMap mmap) + public String importTable() { - mmap.put("dbTables", genTableService.selectDbTableList(new GenTable())); return prefix + "/importTable"; } diff --git a/ruoyi-generator/src/main/resources/templates/tool/gen/gen.html b/ruoyi-generator/src/main/resources/templates/tool/gen/gen.html index 6e01a50..2591d68 100644 --- a/ruoyi-generator/src/main/resources/templates/tool/gen/gen.html +++ b/ruoyi-generator/src/main/resources/templates/tool/gen/gen.html @@ -1,7 +1,7 @@ - +
@@ -11,17 +11,11 @@
  • - 表名称： -
    • + 表名称： +
  • - 表描述： -
    • + 表描述： +
  • @@ -30,7 +24,7 @@
  •  搜索 -  重置 +  重置
@@ -58,7 +52,6 @@
- \ No newline at end of file diff --git a/ruoyi-generator/src/main/resources/templates/tool/gen/importTable.html b/ruoyi-generator/src/main/resources/templates/tool/gen/importTable.html index 021adfb..a5e9e4d 100644 --- a/ruoyi-generator/src/main/resources/templates/tool/gen/importTable.html +++ b/ruoyi-generator/src/main/resources/templates/tool/gen/importTable.html @@ -1,7 +1,7 @@ - +
@@ -11,21 +11,14 @@
  • - 表名称： - + 表名称：
  • - 表描述： -
    • + 表描述： +
  •  搜索 -  重置 +  重置
@@ -38,7 +31,6 @@
- \ No newline at end of file