From 78355d18adb2c3c4f7a6ef62c1c4db8f9c37856e Mon Sep 17 00:00:00 2001 From: smallchill Date: Fri, 29 Mar 2019 19:21:52 +0800 Subject: [PATCH] :tada: 2.1.1.RELEASE --- blade-auth/pom.xml | 2 +- blade-common/pom.xml | 2 +- blade-gateway/pom.xml | 2 +- blade-ops/blade-admin/pom.xml | 2 +- blade-ops/blade-develop/pom.xml | 2 +- blade-ops/pom.xml | 2 +- blade-service-api/blade-desk-api/pom.xml | 2 +- blade-service-api/blade-dict-api/pom.xml | 2 +- blade-service-api/blade-system-api/pom.xml | 2 +- blade-service-api/blade-user-api/pom.xml | 2 +- blade-service-api/pom.xml | 4 ++-- blade-service/blade-desk/pom.xml | 2 +- blade-service/blade-log/pom.xml | 2 +- blade-service/blade-system/pom.xml | 2 +- .../springblade/system/service/impl/MenuServiceImpl.java | 3 --- blade-service/blade-user/pom.xml | 2 +- blade-service/pom.xml | 4 ++-- pom.xml | 6 +++--- 18 files changed, 21 insertions(+), 24 deletions(-) diff --git a/blade-auth/pom.xml b/blade-auth/pom.xml index 7b341663..901417de 100644 --- a/blade-auth/pom.xml +++ b/blade-auth/pom.xml @@ -8,7 +8,7 @@ SpringBlade org.springblade - 2.1.0 + 2.1.1 blade-auth diff --git a/blade-common/pom.xml b/blade-common/pom.xml index c0e47544..cea1cfb9 100644 --- a/blade-common/pom.xml +++ b/blade-common/pom.xml @@ -5,7 +5,7 @@ SpringBlade org.springblade - 2.1.0 + 2.1.1 4.0.0 diff --git a/blade-gateway/pom.xml b/blade-gateway/pom.xml index 190e1974..ca33508a 100644 --- a/blade-gateway/pom.xml +++ b/blade-gateway/pom.xml @@ -5,7 +5,7 @@ SpringBlade org.springblade - 2.1.0 + 2.1.1 4.0.0 diff --git a/blade-ops/blade-admin/pom.xml b/blade-ops/blade-admin/pom.xml index 53667473..813c12f6 100644 --- a/blade-ops/blade-admin/pom.xml +++ b/blade-ops/blade-admin/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.1.0 + 2.1.1 4.0.0 diff --git a/blade-ops/blade-develop/pom.xml b/blade-ops/blade-develop/pom.xml index 9e4bfd9a..b13c50a5 100644 --- a/blade-ops/blade-develop/pom.xml +++ b/blade-ops/blade-develop/pom.xml @@ -6,7 +6,7 @@ org.springblade blade-ops - 2.1.0 + 2.1.1 4.0.0 diff --git a/blade-ops/pom.xml b/blade-ops/pom.xml index 4d523a35..eb504085 100644 --- a/blade-ops/pom.xml +++ b/blade-ops/pom.xml @@ -5,7 +5,7 @@ SpringBlade org.springblade - 2.1.0 + 2.1.1 4.0.0 diff --git a/blade-service-api/blade-desk-api/pom.xml b/blade-service-api/blade-desk-api/pom.xml index d5fa13cf..c9e13f66 100644 --- a/blade-service-api/blade-desk-api/pom.xml +++ b/blade-service-api/blade-desk-api/pom.xml @@ -5,7 +5,7 @@ blade-service-api org.springblade - 2.1.0 + 2.1.1 4.0.0 diff --git a/blade-service-api/blade-dict-api/pom.xml b/blade-service-api/blade-dict-api/pom.xml index 1bd0f2e8..41bd8c20 100644 --- a/blade-service-api/blade-dict-api/pom.xml +++ b/blade-service-api/blade-dict-api/pom.xml @@ -5,7 +5,7 @@ blade-service-api org.springblade - 2.1.0 + 2.1.1 4.0.0 diff --git a/blade-service-api/blade-system-api/pom.xml b/blade-service-api/blade-system-api/pom.xml index add7ad5d..dad706de 100644 --- a/blade-service-api/blade-system-api/pom.xml +++ b/blade-service-api/blade-system-api/pom.xml @@ -5,7 +5,7 @@ blade-service-api org.springblade - 2.1.0 + 2.1.1 4.0.0 diff --git a/blade-service-api/blade-user-api/pom.xml b/blade-service-api/blade-user-api/pom.xml index 3510cf7e..7f351e96 100644 --- a/blade-service-api/blade-user-api/pom.xml +++ b/blade-service-api/blade-user-api/pom.xml @@ -5,7 +5,7 @@ blade-service-api org.springblade - 2.1.0 + 2.1.1 4.0.0 diff --git a/blade-service-api/pom.xml b/blade-service-api/pom.xml index ad6db605..51356c40 100644 --- a/blade-service-api/pom.xml +++ b/blade-service-api/pom.xml @@ -5,13 +5,13 @@ SpringBlade org.springblade - 2.1.0 + 2.1.1 4.0.0 blade-service-api ${project.artifactId} - 2.1.0 + 2.1.1 pom SpringBlade 微服务API集合 diff --git a/blade-service/blade-desk/pom.xml b/blade-service/blade-desk/pom.xml index c3e6ae5c..c4f37a1c 100644 --- a/blade-service/blade-desk/pom.xml +++ b/blade-service/blade-desk/pom.xml @@ -6,7 +6,7 @@ org.springblade blade-service - 2.1.0 + 2.1.1 4.0.0 diff --git a/blade-service/blade-log/pom.xml b/blade-service/blade-log/pom.xml index 29203ef5..1a455961 100644 --- a/blade-service/blade-log/pom.xml +++ b/blade-service/blade-log/pom.xml @@ -5,7 +5,7 @@ blade-service org.springblade - 2.1.0 + 2.1.1 4.0.0 diff --git a/blade-service/blade-system/pom.xml b/blade-service/blade-system/pom.xml index 81b925d7..384fa055 100644 --- a/blade-service/blade-system/pom.xml +++ b/blade-service/blade-system/pom.xml @@ -5,7 +5,7 @@ blade-service org.springblade - 2.1.0 + 2.1.1 4.0.0 diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java index c7c4cd95..2f711beb 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java @@ -98,9 +98,6 @@ public class MenuServiceImpl extends ServiceImpl implements IM @Override public List authRoutes(BladeUser user) { - if (Func.isEmpty(user)) { - return null; - } List routes = baseMapper.authRoutes(Func.toIntList(user.getRoleId())); List list = new ArrayList<>(); routes.forEach(route -> list.add(Kv.init().set(route.getPath(), Kv.init().set("authority", Func.toStrArray(route.getAlias()))))); diff --git a/blade-service/blade-user/pom.xml b/blade-service/blade-user/pom.xml index 9d5cfdaf..b01520f0 100644 --- a/blade-service/blade-user/pom.xml +++ b/blade-service/blade-user/pom.xml @@ -5,7 +5,7 @@ blade-service org.springblade - 2.1.0 + 2.1.1 4.0.0 diff --git a/blade-service/pom.xml b/blade-service/pom.xml index 83f1b04d..276f0947 100644 --- a/blade-service/pom.xml +++ b/blade-service/pom.xml @@ -7,12 +7,12 @@ org.springblade SpringBlade - 2.1.0 + 2.1.1 blade-service ${project.artifactId} - 2.1.0 + 2.1.1 pom SpringBlade 微服务集合 diff --git a/pom.xml b/pom.xml index 16789620..f800a030 100644 --- a/pom.xml +++ b/pom.xml @@ -5,12 +5,12 @@ org.springblade SpringBlade - 2.1.0 + 2.1.1 pom - 2.1.0 - 2.1.0 + 2.1.1 + 2.1.1 1.8 2.9.2 -- GitLab