manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修正初始化脚本用户密码初始化加密2次的问题。

Browse Source
This commit is contained in:
thinkgem
2018-05-30 22:57:21 +08:00
parent 4b76a942cd
commit 131e0332e0
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.java
View File

@@ -257,7 +257,6 @@ public class InitCoreData extends BaseInitDataTests {
if("save".equals(action)){ if("save".equals(action)){
User entity = (User)params[1]; User entity = (User)params[1];
entity.setIsNewRecord(true); entity.setIsNewRecord(true);
entity.setPassword(UserService.encryptPassword(entity.getPassword()));
userService.save(entity); userService.save(entity);
return null; return null;
} }

10
modules/core/src/test/java/com/jeesite/test/DaoMapperTest.java
View File

@@ -149,7 +149,14 @@ public class DaoMapperTest extends BaseSpringContextTests {
System.out.println(new Config("1").getSqlMap().getWhere() System.out.println(new Config("1").getSqlMap().getWhere()
.andBracket("name", QueryType.EQ, "abc", 1).or("name", QueryType.EQ, "def", 2) .andBracket("name", QueryType.EQ, "abc", 1).or("name", QueryType.EQ, "def", 2)
.or("name", QueryType.EQ, "ghi", 3).endBracket().toSql()); .or("name", QueryType.EQ, "ghi", 3).endBracket().toSql());
System.out.println(new Config().getSqlMap().getWhere()
.andBracket("name", QueryType.EQ, "val", 1)
.and("name", QueryType.NE, "val", 2).endBracket()
.orBracket("name", QueryType.NE, "val", 3)
.and("name", QueryType.NE, "val", 4).endBracket()
.orBracket("name", QueryType.NE, "val", 5)
.and("name", QueryType.EQ, "val", 6).endBracket().toSql());
System.out.println("============ 带括号空值测试 ============"); System.out.println("============ 带括号空值测试 ============");
System.out.println(new Config("1").getSqlMap().getWhere() System.out.println(new Config("1").getSqlMap().getWhere()
.andBracket("name", QueryType.EQ, "", 1).or("name", QueryType.EQ, "def", 2) .andBracket("name", QueryType.EQ, "", 1).or("name", QueryType.EQ, "def", 2)
@@ -173,6 +180,7 @@ public class DaoMapperTest extends BaseSpringContextTests {
company.getArea().setCreateDate_gte(new Date()); company.getArea().setCreateDate_gte(new Date());
company.getArea().setCreateDate_lte(new Date()); company.getArea().setCreateDate_lte(new Date());
System.out.println(company.getSqlMap().getWhere().toSql()); System.out.println(company.getSqlMap().getWhere().toSql());
} }
} }