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")); - } } 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); } },