Commit ff768e7f authored by 赵啸非's avatar 赵啸非

Revert "Revert "添加菜单资源配置""

This reverts commit 26ca1add.
parent 26ca1add
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -278,9 +278,6 @@ ...@@ -278,9 +278,6 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
......
...@@ -116,7 +116,7 @@ public interface UserService extends ICRUDCacheService<UserEntity,Long> { ...@@ -116,7 +116,7 @@ public interface UserService extends ICRUDCacheService<UserEntity,Long> {
boolean updateUserPwd(String loginName, String oldPwd, String newPwd) throws AppException; boolean updateUserPwd(String loginName, String oldPwd, String newPwd) throws AppException;
Rest<Void> refreshUser(); Rest<Void> refreshUser();
UserDao getUserDao(); UserDao getUserDao();
......
...@@ -243,7 +243,7 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE ...@@ -243,7 +243,7 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE
} }
MenuEntity sysModuleParent = menuMap.get(sysModule.getParentId()); MenuEntity sysModuleParent = menuMap.get(sysModule.getParentId());
if (sysModuleParent != null) { if (sysModuleParent != null) {
sysModuleParent.getChildren().add(sysModule); sysModuleParent.getChildList().add(sysModule);
} }
} }
return outlookBar; return outlookBar;
...@@ -378,6 +378,7 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE ...@@ -378,6 +378,7 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE
return Rest.ok(); return Rest.ok();
} }
@Override @Override
public UserDao getUserDao() { public UserDao getUserDao() {
return getDao(); return getDao();
...@@ -391,8 +392,4 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE ...@@ -391,8 +392,4 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE
Long[] userIds = roleUserService.find(roleUserQuery).stream().map(RoleUserEntity::getId).toArray(Long[]::new); Long[] userIds = roleUserService.find(roleUserQuery).stream().map(RoleUserEntity::getId).toArray(Long[]::new);
roleUserService.remove(userIds, context); roleUserService.remove(userIds, context);
} }
public static void main(String[] args) throws Exception {
System.out.println(SecurityUtil.md5DoubleEncoding("wangdongmei@123"));
}
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment