From 704352ce675319f3ceb34c37205449d60365ef0f Mon Sep 17 00:00:00 2001 From: RuoYi Date: Fri, 1 Nov 2019 09:31:26 +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 | 20 +++---------------- .../templates/tool/gen/importTable.html | 20 +++---------------- 5 files changed, 10 insertions(+), 40 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 f3d9bc4e..01aabefc 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 36c33279..1503e155 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 33b11032..6e4f710d 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 f314c0ec..551ddee4 100644 --- a/ruoyi-generator/src/main/resources/templates/tool/gen/gen.html +++ b/ruoyi-generator/src/main/resources/templates/tool/gen/gen.html @@ -2,7 +2,6 @@ -
@@ -12,16 +11,10 @@
  • - 表名称： + 表名称：
  • - 表描述： + 表描述：
  • @@ -31,7 +24,7 @@
  •  搜索 -  重置 +  重置
@@ -59,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 8327a50a..294ca856 100644 --- a/ruoyi-generator/src/main/resources/templates/tool/gen/importTable.html +++ b/ruoyi-generator/src/main/resources/templates/tool/gen/importTable.html @@ -2,7 +2,6 @@ -
@@ -12,20 +11,14 @@
@@ -38,7 +31,6 @@
- \ No newline at end of file