github
/
RuoYi
mirror of https://gitee.com/y_project/RuoYi.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/y_project/RuoYi

pull/42/head
RuoYi 2018-11-23 22:43:53 +08:00
parent 4d2d5defb9 75f27dc536
commit 1c1078565a
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysPasswordService.java
View File

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

2
ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
View File

@ -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"))

6
ruoyi-generator/src/main/resources/vm/html/list.html.vm
View File

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