From aa06f1adc56a4b5ea05b40075e96a6db9066a5e2 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Fri, 23 Nov 2018 13:26:03 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90datas?= =?UTF-8?q?=E5=8F=98=E9=87=8F=E5=85=A8=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ruoyi/generator/util/GenUtils.java | 2 +- ruoyi-generator/src/main/resources/vm/html/list.html.vm | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java index 05e7e77c..a6747836 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java @@ -145,7 +145,7 @@ public class GenUtils if (template.contains("ServiceImpl.java.vm")) { - return javaPath + "service" + "/" + "/impl/" + className + "ServiceImpl.java"; + return javaPath + "service" + "/impl/" + className + "ServiceImpl.java"; } if (template.contains("Controller.java.vm")) diff --git a/ruoyi-generator/src/main/resources/vm/html/list.html.vm b/ruoyi-generator/src/main/resources/vm/html/list.html.vm index 12b9f535..04b2a39e 100644 --- a/ruoyi-generator/src/main/resources/vm/html/list.html.vm +++ b/ruoyi-generator/src/main/resources/vm/html/list.html.vm @@ -70,6 +70,11 @@ var editFlag = [[${@permission.hasPermi('${moduleName}:${classname}:edit')}]]; var removeFlag = [[${@permission.hasPermi('${moduleName}:${classname}:remove')}]]; var prefix = ctx + "${moduleName}/${classname}"; +#foreach($column in $columns) +#if(${column.configInfo} && ${column.configInfo.type} == 'dict') + var datas = [[${@dict.getType('${column.configInfo.value}')}]]; +#end +#end $(function() { var options = { @@ -98,7 +103,6 @@ title : '${column.columnComment}', sortable: true, formatter: function(value, row, index) { - var datas = [[${@dict.getType('${column.configInfo.value}')}]]; return $.table.selectDictLabel(datas, value); } }, From 75f27dc53657b35bb0917ee0ee56347544a18d2f Mon Sep 17 00:00:00 2001 From: wangchl Date: Fri, 23 Nov 2018 17:16:48 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=A0=E5=87=BA=E5=86=97=E4=BD=99?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/framework/shiro/service/SysPasswordService.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysPasswordService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysPasswordService.java index 7a5c6ee3..f3bd37f8 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysPasswordService.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysPasswordService.java @@ -82,9 +82,4 @@ public class SysPasswordService return new Md5Hash(username + password + salt).toHex().toString(); } - public static void main(String[] args) - { - System.out.println(new SysPasswordService().encryptPassword("admin", "admin123", "111111")); - System.out.println(new SysPasswordService().encryptPassword("ry", "admin123", "222222")); - } }