From 79950b26c0c32fa4af53839702f4f73c996fc96b Mon Sep 17 00:00:00 2001 From: smallchill Date: Mon, 27 May 2019 12:00:19 +0800 Subject: [PATCH] :tada: 2.0.2.RELEASE --- blade-auth/pom.xml | 2 +- blade-common/pom.xml | 2 +- blade-gateway/pom.xml | 2 +- blade-ops-api/blade-flow-api/pom.xml | 2 +- blade-ops-api/pom.xml | 4 ++-- blade-ops/blade-admin/pom.xml | 2 +- blade-ops/blade-develop/pom.xml | 2 +- blade-ops/blade-flow-design/pom.xml | 2 +- blade-ops/blade-flow/pom.xml | 2 +- blade-ops/blade-log/pom.xml | 2 +- blade-ops/blade-resource/pom.xml | 2 +- .../org/springblade/resource/controller/OssController.java | 3 +++ blade-ops/pom.xml | 4 ++-- 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-system/pom.xml | 2 +- blade-service/blade-user/pom.xml | 2 +- blade-service/pom.xml | 4 ++-- pom.xml | 6 +++--- script/docker/.env | 2 +- 24 files changed, 32 insertions(+), 29 deletions(-) diff --git a/blade-auth/pom.xml b/blade-auth/pom.xml index 10fc151b..06457f2b 100644 --- a/blade-auth/pom.xml +++ b/blade-auth/pom.xml @@ -8,7 +8,7 @@ BladeX org.springblade - 2.0.1.RELEASE + 2.0.2.RELEASE blade-auth diff --git a/blade-common/pom.xml b/blade-common/pom.xml index e741f85d..5e1550bd 100644 --- a/blade-common/pom.xml +++ b/blade-common/pom.xml @@ -5,7 +5,7 @@ BladeX org.springblade - 2.0.1.RELEASE + 2.0.2.RELEASE 4.0.0 diff --git a/blade-gateway/pom.xml b/blade-gateway/pom.xml index f407bbff..0581fb1c 100644 --- a/blade-gateway/pom.xml +++ b/blade-gateway/pom.xml @@ -5,7 +5,7 @@ BladeX org.springblade - 2.0.1.RELEASE + 2.0.2.RELEASE 4.0.0 diff --git a/blade-ops-api/blade-flow-api/pom.xml b/blade-ops-api/blade-flow-api/pom.xml index c20ab647..ce8b49a7 100644 --- a/blade-ops-api/blade-flow-api/pom.xml +++ b/blade-ops-api/blade-flow-api/pom.xml @@ -5,7 +5,7 @@ blade-ops-api org.springblade - 2.0.1.RELEASE + 2.0.2.RELEASE 4.0.0 diff --git a/blade-ops-api/pom.xml b/blade-ops-api/pom.xml index e604c99c..dfa838d6 100644 --- a/blade-ops-api/pom.xml +++ b/blade-ops-api/pom.xml @@ -5,13 +5,13 @@ BladeX org.springblade - 2.0.1.RELEASE + 2.0.2.RELEASE 4.0.0 blade-ops-api ${project.artifactId} - 2.0.1.RELEASE + 2.0.2.RELEASE pom BladeX 微服务API集合 diff --git a/blade-ops/blade-admin/pom.xml b/blade-ops/blade-admin/pom.xml index b1bf309e..76c946e6 100644 --- a/blade-ops/blade-admin/pom.xml +++ b/blade-ops/blade-admin/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.0.1.RELEASE + 2.0.2.RELEASE 4.0.0 diff --git a/blade-ops/blade-develop/pom.xml b/blade-ops/blade-develop/pom.xml index 8612a28d..0fc1434c 100644 --- a/blade-ops/blade-develop/pom.xml +++ b/blade-ops/blade-develop/pom.xml @@ -6,7 +6,7 @@ org.springblade blade-ops - 2.0.1.RELEASE + 2.0.2.RELEASE 4.0.0 diff --git a/blade-ops/blade-flow-design/pom.xml b/blade-ops/blade-flow-design/pom.xml index 2c562e71..47f042a3 100644 --- a/blade-ops/blade-flow-design/pom.xml +++ b/blade-ops/blade-flow-design/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.0.1.RELEASE + 2.0.2.RELEASE 4.0.0 diff --git a/blade-ops/blade-flow/pom.xml b/blade-ops/blade-flow/pom.xml index cd84abbe..d2635531 100644 --- a/blade-ops/blade-flow/pom.xml +++ b/blade-ops/blade-flow/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.0.1.RELEASE + 2.0.2.RELEASE 4.0.0 diff --git a/blade-ops/blade-log/pom.xml b/blade-ops/blade-log/pom.xml index ffe99c7e..37a18c64 100644 --- a/blade-ops/blade-log/pom.xml +++ b/blade-ops/blade-log/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.0.1.RELEASE + 2.0.2.RELEASE 4.0.0 diff --git a/blade-ops/blade-resource/pom.xml b/blade-ops/blade-resource/pom.xml index 941649ff..b52c1229 100644 --- a/blade-ops/blade-resource/pom.xml +++ b/blade-ops/blade-resource/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.0.1.RELEASE + 2.0.2.RELEASE 4.0.0 diff --git a/blade-ops/blade-resource/src/main/java/org/springblade/resource/controller/OssController.java b/blade-ops/blade-resource/src/main/java/org/springblade/resource/controller/OssController.java index 0074ebb7..b7de105b 100644 --- a/blade-ops/blade-resource/src/main/java/org/springblade/resource/controller/OssController.java +++ b/blade-ops/blade-resource/src/main/java/org/springblade/resource/controller/OssController.java @@ -25,8 +25,10 @@ import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.cache.utils.CacheUtil; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.annotation.PreAuth; import org.springblade.core.secure.utils.SecureUtil; import org.springblade.core.tool.api.R; +import org.springblade.core.tool.constant.RoleConstant; import org.springblade.core.tool.utils.Func; import org.springblade.resource.builder.OssBuilder; import org.springblade.resource.entity.Oss; @@ -48,6 +50,7 @@ import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE; @RestController @AllArgsConstructor @RequestMapping("/oss") +@PreAuth(RoleConstant.HAS_ROLE_ADMIN) @Api(value = "对象存储接口", tags = "接口") public class OssController extends BladeController { diff --git a/blade-ops/pom.xml b/blade-ops/pom.xml index faa7067e..397d89b7 100644 --- a/blade-ops/pom.xml +++ b/blade-ops/pom.xml @@ -5,13 +5,13 @@ BladeX org.springblade - 2.0.1.RELEASE + 2.0.2.RELEASE 4.0.0 blade-ops ${project.artifactId} - 2.0.1.RELEASE + 2.0.2.RELEASE pom diff --git a/blade-service-api/blade-desk-api/pom.xml b/blade-service-api/blade-desk-api/pom.xml index ede5de4d..e3f307f3 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.0.1.RELEASE + 2.0.2.RELEASE 4.0.0 diff --git a/blade-service-api/blade-dict-api/pom.xml b/blade-service-api/blade-dict-api/pom.xml index 7922a249..0eb9f6dc 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.0.1.RELEASE + 2.0.2.RELEASE 4.0.0 diff --git a/blade-service-api/blade-system-api/pom.xml b/blade-service-api/blade-system-api/pom.xml index 947d6fbc..d4488732 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.0.1.RELEASE + 2.0.2.RELEASE 4.0.0 diff --git a/blade-service-api/blade-user-api/pom.xml b/blade-service-api/blade-user-api/pom.xml index 2f2c524f..c6cc3b12 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.0.1.RELEASE + 2.0.2.RELEASE 4.0.0 diff --git a/blade-service-api/pom.xml b/blade-service-api/pom.xml index b75c3cfe..605dd55d 100644 --- a/blade-service-api/pom.xml +++ b/blade-service-api/pom.xml @@ -5,13 +5,13 @@ BladeX org.springblade - 2.0.1.RELEASE + 2.0.2.RELEASE 4.0.0 blade-service-api ${project.artifactId} - 2.0.1.RELEASE + 2.0.2.RELEASE pom BladeX 微服务API集合 diff --git a/blade-service/blade-desk/pom.xml b/blade-service/blade-desk/pom.xml index fd57e14d..07a4fae5 100644 --- a/blade-service/blade-desk/pom.xml +++ b/blade-service/blade-desk/pom.xml @@ -6,7 +6,7 @@ org.springblade blade-service - 2.0.1.RELEASE + 2.0.2.RELEASE 4.0.0 diff --git a/blade-service/blade-system/pom.xml b/blade-service/blade-system/pom.xml index 29810a5b..08f60c4a 100644 --- a/blade-service/blade-system/pom.xml +++ b/blade-service/blade-system/pom.xml @@ -5,7 +5,7 @@ blade-service org.springblade - 2.0.1.RELEASE + 2.0.2.RELEASE 4.0.0 diff --git a/blade-service/blade-user/pom.xml b/blade-service/blade-user/pom.xml index 1fdcf397..db037e70 100644 --- a/blade-service/blade-user/pom.xml +++ b/blade-service/blade-user/pom.xml @@ -5,7 +5,7 @@ blade-service org.springblade - 2.0.1.RELEASE + 2.0.2.RELEASE 4.0.0 diff --git a/blade-service/pom.xml b/blade-service/pom.xml index 5e366bb8..c8e93ea1 100644 --- a/blade-service/pom.xml +++ b/blade-service/pom.xml @@ -6,14 +6,14 @@ org.springblade BladeX - 2.0.1.RELEASE + 2.0.2.RELEASE 4.0.0 blade-service ${project.artifactId} - 2.0.1.RELEASE + 2.0.2.RELEASE pom BladeX 微服务集合 diff --git a/pom.xml b/pom.xml index ca3da65b..3ba6027e 100644 --- a/pom.xml +++ b/pom.xml @@ -5,12 +5,12 @@ org.springblade BladeX - 2.0.1.RELEASE + 2.0.2.RELEASE pom - 2.0.1.RELEASE - 2.0.1.RELEASE + 2.0.2.RELEASE + 2.0.2.RELEASE 1.8 3.8.1 diff --git a/script/docker/.env b/script/docker/.env index c9c89c47..9b5fc716 100644 --- a/script/docker/.env +++ b/script/docker/.env @@ -1,2 +1,2 @@ REGISTER=192.168.0.157/blade -TAG=2.0.1.RELEASE +TAG=2.0.2.RELEASE