From ac11a6bed87e8f3de95cb14f4460f20a68520f5d Mon Sep 17 00:00:00 2001 From: smallchill Date: Fri, 17 May 2019 12:18:47 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/springblade/system/service/impl/RoleServiceImpl.java | 2 ++ doc/nacos/blade.yaml | 4 ++++ script/docker/deploy.sh | 3 ++- 3 files changed, 8 insertions(+), 1 deletion(-) 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 a8b1c318..b2de1f8a 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 @@ -32,6 +32,7 @@ import org.springblade.system.service.IRoleMenuService; import org.springblade.system.service.IRoleService; import org.springblade.system.vo.RoleVO; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import javax.validation.constraints.NotEmpty; @@ -66,6 +67,7 @@ public class RoleServiceImpl extends ServiceImpl implements IR } @Override + @Transactional(rollbackFor = Exception.class) public boolean grant(@NotEmpty List roleIds, @NotEmpty List menuIds) { // 删除角色配置的菜单集合 roleMenuService.remove(Wrappers.update().lambda().in(RoleMenu::getRoleId, roleIds)); diff --git a/doc/nacos/blade.yaml b/doc/nacos/blade.yaml index 4ca970c8..a9183df8 100644 --- a/doc/nacos/blade.yaml +++ b/doc/nacos/blade.yaml @@ -68,6 +68,10 @@ management: #blade配置 blade: + xss: + url: + exclude-patterns: + - /weixin secure: url: exclude-patterns: diff --git a/script/docker/deploy.sh b/script/docker/deploy.sh index c2f37f47..9510d01f 100644 --- a/script/docker/deploy.sh +++ b/script/docker/deploy.sh @@ -14,6 +14,7 @@ port(){ firewall-cmd --add-port=3306/tcp --permanent firewall-cmd --add-port=3379/tcp --permanent firewall-cmd --add-port=7002/tcp --permanent + firewall-cmd --add-port=9999/tcp --permanent service firewalld restart } @@ -41,7 +42,7 @@ base(){ #启动程序模块 modules(){ - docker-compose up -d blade-gateway1 blade-gateway2 blade-auth1 blade-auth2 blade-user blade-desk blade-system blade-log + docker-compose up -d blade-gateway1 blade-gateway2 blade-auth1 blade-auth2 blade-user blade-desk blade-system blade-log blade-flow blade-flow-design } #启动监控模块