diff --git a/blade-ops/blade-flow-design/Dockerfile b/blade-ops/blade-flow-design/Dockerfile index 78ec6669..1d8b2cd8 100644 --- a/blade-ops/blade-flow-design/Dockerfile +++ b/blade-ops/blade-flow-design/Dockerfile @@ -2,11 +2,11 @@ FROM anapsix/alpine-java:8_server-jre_unlimited MAINTAINER smallchill@163.com -RUN mkdir -p /blade/admin +RUN mkdir -p /blade/flowdesign -WORKDIR /blade/admin +WORKDIR /blade/flowdesign -EXPOSE 7002 +EXPOSE 9999 ADD ./target/blade-flow-design.jar ./app.jar diff --git a/blade-ops/blade-flow/Dockerfile b/blade-ops/blade-flow/Dockerfile index 22b16990..eebaf715 100644 --- a/blade-ops/blade-flow/Dockerfile +++ b/blade-ops/blade-flow/Dockerfile @@ -2,11 +2,11 @@ FROM anapsix/alpine-java:8_server-jre_unlimited MAINTAINER smallchill@163.com -RUN mkdir -p /blade/admin +RUN mkdir -p /blade/flow -WORKDIR /blade/admin +WORKDIR /blade/flow -EXPOSE 7002 +EXPOSE 8008 ADD ./target/blade-flow.jar ./app.jar diff --git a/blade-ops/blade-flow/pom.xml b/blade-ops/blade-flow/pom.xml index cc5b028c..463704f9 100644 --- a/blade-ops/blade-flow/pom.xml +++ b/blade-ops/blade-flow/pom.xml @@ -67,6 +67,26 @@ + + com.spotify + docker-maven-plugin + ${docker.plugin.version} + + ${docker.registry.url}/blade/${project.artifactId}:${project.version} + ${project.basedir} + ${docker.registry.host} + + + / + ${project.build.directory} + ${project.build.finalName}.jar + + + ${docker.registry.url} + ${docker.registry.url} + true + + org.apache.maven.plugins maven-antrun-plugin diff --git a/blade-ops/blade-log/pom.xml b/blade-ops/blade-log/pom.xml index 575cc4c4..2a783b98 100644 --- a/blade-ops/blade-log/pom.xml +++ b/blade-ops/blade-log/pom.xml @@ -35,6 +35,26 @@ + + com.spotify + docker-maven-plugin + ${docker.plugin.version} + + ${docker.registry.url}/blade/${project.artifactId}:${project.version} + ${project.basedir} + ${docker.registry.host} + + + / + ${project.build.directory} + ${project.build.finalName}.jar + + + ${docker.registry.url} + ${docker.registry.url} + true + + org.apache.maven.plugins maven-antrun-plugin 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 967a4b9d..a8b1c318 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 @@ -59,7 +59,7 @@ public class RoleServiceImpl extends ServiceImpl implements IR public List tree(String tenantCode) { String userRole = SecureUtil.getUserRole(); String excludeRole = null; - if (!CollectionUtil.contains(Func.toStrArray(userRole), RoleConstant.ADMINISTRATOR)) { + if (!CollectionUtil.contains(Func.toStrArray(userRole), RoleConstant.ADMINISTRATOR) && !CollectionUtil.contains(Func.toStrArray(userRole), RoleConstant.ADMINISTRATOR)) { excludeRole = RoleConstant.ADMINISTRATOR; } return ForestNodeMerger.merge(baseMapper.tree(tenantCode, excludeRole)); diff --git a/script/docker/docker-compose.yml b/script/docker/docker-compose.yml index df5f66cc..d5c15ba5 100644 --- a/script/docker/docker-compose.yml +++ b/script/docker/docker-compose.yml @@ -131,6 +131,22 @@ services: networks: - blade_net + blade-flow: + image: "${REGISTER}/blade/blade-flow:${TAG}" + privileged: true + restart: always + networks: + - blade_net + + blade-flow-design: + image: "${REGISTER}/blade/blade-flow-design:${TAG}" + privileged: true + restart: always + ports: + - 9999:9999 + networks: + - blade_net + networks: blade_net: driver: bridge