diff --git a/blade-ops/blade-report/Dockerfile b/blade-ops/blade-report/Dockerfile index d41eba6b..2239e3e3 100644 --- a/blade-ops/blade-report/Dockerfile +++ b/blade-ops/blade-report/Dockerfile @@ -10,6 +10,6 @@ EXPOSE 8108 ADD ./target/blade-report.jar ./app.jar -ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"] +ENTRYPOINT ["java -Xms1024m -Xmx1024m", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"] CMD ["--spring.profiles.active=dev"] diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RoleServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RoleServiceImpl.java index f5fdcb8d..ad60a01d 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RoleServiceImpl.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RoleServiceImpl.java @@ -84,6 +84,8 @@ public class RoleServiceImpl extends ServiceImpl implements IR @Override @Transactional(rollbackFor = Exception.class) public boolean grant(@NotEmpty List roleIds, List menuIds, List dataScopeIds, List apiScopeIds,List appMenuIds) { + + // 这里的菜单存在问题 return grantRoleMenu(roleIds, menuIds) && grantDataScope(roleIds, dataScopeIds) && grantApiScope(roleIds, apiScopeIds) && grantRoleAppMenu(roleIds, appMenuIds); }