diff --git a/README.md b/README.md
index ba16447..aa5b568 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
-
+
-
-
+
+
@@ -22,7 +22,7 @@
* 极简封装了多租户底层,用更少的代码换来拓展性更强的SaaS多租户系统。
* 借鉴OAuth2,实现了多终端认证系统,可控制子系统的token权限互相隔离。
* 借鉴Security,封装了Secure模块,采用JWT做Token认证,可拓展集成Redis等细颗粒度控制方案。
-* 稳定生产了三年,经历了从 Camden -> Hoxton -> 2020 的技术架构,也经历了从fat jar -> docker -> k8s + jenkins的部署架构。
+* 稳定生产了三年,经历了从 Camden -> Hoxton -> 2021 的技术架构,也经历了从fat jar -> docker -> k8s + jenkins的部署架构。
* 项目分包明确,规范微服务的开发模式,使包与包之间的分工清晰。
## 架构图
diff --git a/blade-auth/pom.xml b/blade-auth/pom.xml
index cd348d3..cc05edb 100644
--- a/blade-auth/pom.xml
+++ b/blade-auth/pom.xml
@@ -8,7 +8,7 @@
SpringBlade
org.springblade
- 3.2.0
+ 3.3.0
blade-auth
diff --git a/blade-common/pom.xml b/blade-common/pom.xml
index 2ff4b64..88a61dc 100644
--- a/blade-common/pom.xml
+++ b/blade-common/pom.xml
@@ -5,7 +5,7 @@
SpringBlade
org.springblade
- 3.2.0
+ 3.3.0
4.0.0
diff --git a/blade-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java b/blade-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java
index d9bd33c..f2424ea 100644
--- a/blade-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java
+++ b/blade-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java
@@ -17,6 +17,7 @@ package org.springblade.common.launch;
import org.springblade.common.constant.LauncherConstant;
import org.springblade.core.launch.service.LauncherService;
+import org.springblade.core.launch.utils.PropsUtil;
import org.springframework.boot.builder.SpringApplicationBuilder;
import java.util.Properties;
@@ -31,10 +32,10 @@ public class LauncherServiceImpl implements LauncherService {
@Override
public void launcher(SpringApplicationBuilder builder, String appName, String profile) {
Properties props = System.getProperties();
- props.setProperty("spring.cloud.nacos.discovery.server-addr", LauncherConstant.nacosAddr(profile));
- props.setProperty("spring.cloud.nacos.config.server-addr", LauncherConstant.nacosAddr(profile));
- props.setProperty("spring.cloud.sentinel.transport.dashboard", LauncherConstant.sentinelAddr(profile));
- props.setProperty("spring.zipkin.base-url", LauncherConstant.zipkinAddr(profile));
+ PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.server-addr", LauncherConstant.nacosAddr(profile));
+ PropsUtil.setProperty(props, "spring.cloud.nacos.config.server-addr", LauncherConstant.nacosAddr(profile));
+ PropsUtil.setProperty(props, "spring.cloud.sentinel.transport.dashboard", LauncherConstant.sentinelAddr(profile));
+ PropsUtil.setProperty(props, "spring.zipkin.base-url", LauncherConstant.zipkinAddr(profile));
}
}
diff --git a/blade-common/src/main/java/org/springblade/common/tool/PropsUtil.java b/blade-common/src/main/java/org/springblade/common/tool/PropsUtil.java
new file mode 100644
index 0000000..9644e24
--- /dev/null
+++ b/blade-common/src/main/java/org/springblade/common/tool/PropsUtil.java
@@ -0,0 +1,42 @@
+/**
+ * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springblade.common.tool;
+
+import org.springframework.util.StringUtils;
+
+import java.util.Properties;
+
+/**
+ * 配置工具类
+ *
+ * @author Chill
+ */
+public class PropsUtil {
+
+ /**
+ * 设置配置值,已存在则跳过
+ *
+ * @param props property
+ * @param key key
+ * @param value value
+ */
+ public static void setProperty(Properties props, String key, String value) {
+ if (StringUtils.isEmpty(props.getProperty(key))) {
+ props.setProperty(key, value);
+ }
+ }
+
+}
diff --git a/blade-gateway/pom.xml b/blade-gateway/pom.xml
index 49f2049..36fe9a4 100644
--- a/blade-gateway/pom.xml
+++ b/blade-gateway/pom.xml
@@ -5,7 +5,7 @@
SpringBlade
org.springblade
- 3.2.0
+ 3.3.0
4.0.0
diff --git a/blade-ops/blade-admin/pom.xml b/blade-ops/blade-admin/pom.xml
index f1d835c..7a8ed1a 100644
--- a/blade-ops/blade-admin/pom.xml
+++ b/blade-ops/blade-admin/pom.xml
@@ -5,7 +5,7 @@
blade-ops
org.springblade
- 3.2.0
+ 3.3.0
4.0.0
diff --git a/blade-ops/blade-develop/pom.xml b/blade-ops/blade-develop/pom.xml
index 350af89..42f58c3 100644
--- a/blade-ops/blade-develop/pom.xml
+++ b/blade-ops/blade-develop/pom.xml
@@ -6,7 +6,7 @@
org.springblade
blade-ops
- 3.2.0
+ 3.3.0
4.0.0
diff --git a/blade-ops/blade-develop/src/main/resources/templates/controller.java.vm b/blade-ops/blade-develop/src/main/resources/templates/controller.java.vm
index 58762e2..ef6773e 100644
--- a/blade-ops/blade-develop/src/main/resources/templates/controller.java.vm
+++ b/blade-ops/blade-develop/src/main/resources/templates/controller.java.vm
@@ -17,8 +17,8 @@ package $!{package.Controller};
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import javax.validation.Valid;
@@ -35,14 +35,15 @@ import $!{package.Entity}.$!{entity};
#set($voPackage=$package.Entity.replace("entity","vo"))
import $!{voPackage}.$!{entity}VO;
#set($wrapperPackage=$package.Entity.replace("entity","wrapper"))
+#if($!{cfg.hasWrapper})
import $!{wrapperPackage}.$!{entity}Wrapper;
+#end
import $!{package.Service}.$!{table.serviceName};
#if($!{superControllerClassPackage})
import $!{superControllerClassPackage};
#end
#if(!$!{superEntityClass})
#end
-import java.util.List;
/**
* $!{table.comment} 控制器
@@ -52,7 +53,7 @@ import java.util.List;
*/
@RestController
@AllArgsConstructor
-@RequestMapping("#if($!{package.ModuleName})/$!{package.ModuleName}#end/$!{cfg.entityKey}")
+@RequestMapping("#if($!{package.ModuleName})$!{package.ModuleName}#end/$!{entityKey}")
@Api(value = "$!{table.comment}", tags = "$!{table.comment}接口")
#if($!{superControllerClass})
public class $!{table.controllerName} extends $!{superControllerClass} {
@@ -62,11 +63,12 @@ public class $!{table.controllerName} {
private $!{table.serviceName} $!{table.entityPath}Service;
+#if($!{cfg.hasWrapper})
/**
- * 详情
- */
+ * 详情
+ */
@GetMapping("/detail")
- @ApiOperationSupport(order = 1)
+ @ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入$!{table.entityPath}")
public R<$!{entity}VO> detail($!{entity} $!{table.entityPath}) {
$!{entity} detail = $!{table.entityPath}Service.getOne(Condition.getQueryWrapper($!{table.entityPath}));
@@ -74,21 +76,45 @@ public class $!{table.controllerName} {
}
/**
- * 分页 $!{table.comment}
- */
+ * 分页 $!{table.comment}
+ */
@GetMapping("/list")
- @ApiOperationSupport(order = 2)
+ @ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入$!{table.entityPath}")
public R> list($!{entity} $!{table.entityPath}, Query query) {
IPage<$!{entity}> pages = $!{table.entityPath}Service.page(Condition.getPage(query), Condition.getQueryWrapper($!{table.entityPath}));
return R.data($!{entity}Wrapper.build().pageVO(pages));
}
+#else
/**
- * 自定义分页 $!{table.comment}
- */
+ * 详情
+ */
+ @GetMapping("/detail")
+ @ApiOperationSupport(order = 1)
+ @ApiOperation(value = "详情", notes = "传入$!{table.entityPath}")
+ public R<$!{entity}> detail($!{entity} $!{table.entityPath}) {
+ $!{entity} detail = $!{table.entityPath}Service.getOne(Condition.getQueryWrapper($!{table.entityPath}));
+ return R.data(detail);
+ }
+
+ /**
+ * 分页 $!{table.comment}
+ */
+ @GetMapping("/list")
+ @ApiOperationSupport(order = 2)
+ @ApiOperation(value = "分页", notes = "传入$!{table.entityPath}")
+ public R> list($!{entity} $!{table.entityPath}, Query query) {
+ IPage<$!{entity}> pages = $!{table.entityPath}Service.page(Condition.getPage(query), Condition.getQueryWrapper($!{table.entityPath}));
+ return R.data(pages);
+ }
+#end
+
+ /**
+ * 自定义分页 $!{table.comment}
+ */
@GetMapping("/page")
- @ApiOperationSupport(order = 3)
+ @ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入$!{table.entityPath}")
public R> page($!{entity}VO $!{table.entityPath}, Query query) {
IPage<$!{entity}VO> pages = $!{table.entityPath}Service.select$!{entity}Page(Condition.getPage(query), $!{table.entityPath});
@@ -96,30 +122,30 @@ public class $!{table.controllerName} {
}
/**
- * 新增 $!{table.comment}
- */
+ * 新增 $!{table.comment}
+ */
@PostMapping("/save")
- @ApiOperationSupport(order = 4)
+ @ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入$!{table.entityPath}")
public R save(@Valid @RequestBody $!{entity} $!{table.entityPath}) {
return R.status($!{table.entityPath}Service.save($!{table.entityPath}));
}
/**
- * 修改 $!{table.comment}
- */
+ * 修改 $!{table.comment}
+ */
@PostMapping("/update")
- @ApiOperationSupport(order = 5)
+ @ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入$!{table.entityPath}")
public R update(@Valid @RequestBody $!{entity} $!{table.entityPath}) {
return R.status($!{table.entityPath}Service.updateById($!{table.entityPath}));
}
/**
- * 新增或修改 $!{table.comment}
- */
+ * 新增或修改 $!{table.comment}
+ */
@PostMapping("/submit")
- @ApiOperationSupport(order = 6)
+ @ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入$!{table.entityPath}")
public R submit(@Valid @RequestBody $!{entity} $!{table.entityPath}) {
return R.status($!{table.entityPath}Service.saveOrUpdate($!{table.entityPath}));
@@ -128,10 +154,10 @@ public class $!{table.controllerName} {
#if($!{superEntityClass})
/**
- * 删除 $!{table.comment}
- */
+ * 删除 $!{table.comment}
+ */
@PostMapping("/remove")
- @ApiOperationSupport(order = 7)
+ @ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
return R.status($!{table.entityPath}Service.deleteLogic(Func.toLongList(ids)));
@@ -140,10 +166,10 @@ public class $!{table.controllerName} {
#else
/**
- * 删除 $!{table.comment}
- */
+ * 删除 $!{table.comment}
+ */
@PostMapping("/remove")
- @ApiOperationSupport(order = 7)
+ @ApiOperationSupport(order = 8)
@ApiOperation(value = "删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
return R.status($!{table.entityPath}Service.removeByIds(Func.toLongList(ids)));
diff --git a/blade-ops/blade-report/pom.xml b/blade-ops/blade-report/pom.xml
index 99ed51d..be71692 100644
--- a/blade-ops/blade-report/pom.xml
+++ b/blade-ops/blade-report/pom.xml
@@ -5,7 +5,7 @@
org.springblade
blade-ops
- 3.2.0
+ 3.3.0
4.0.0
diff --git a/blade-ops/blade-resource/pom.xml b/blade-ops/blade-resource/pom.xml
index 6d2f36a..08a27d1 100644
--- a/blade-ops/blade-resource/pom.xml
+++ b/blade-ops/blade-resource/pom.xml
@@ -5,7 +5,7 @@
blade-ops
org.springblade
- 3.2.0
+ 3.3.0
4.0.0
diff --git a/blade-ops/blade-seata-order/pom.xml b/blade-ops/blade-seata-order/pom.xml
index 0a7e5e3..4a45735 100644
--- a/blade-ops/blade-seata-order/pom.xml
+++ b/blade-ops/blade-seata-order/pom.xml
@@ -5,7 +5,7 @@
blade-ops
org.springblade
- 3.2.0
+ 3.3.0
4.0.0
diff --git a/blade-ops/blade-seata-storage/pom.xml b/blade-ops/blade-seata-storage/pom.xml
index 97c0ef1..e9ff675 100644
--- a/blade-ops/blade-seata-storage/pom.xml
+++ b/blade-ops/blade-seata-storage/pom.xml
@@ -5,7 +5,7 @@
blade-ops
org.springblade
- 3.2.0
+ 3.3.0
4.0.0
diff --git a/blade-ops/blade-swagger/pom.xml b/blade-ops/blade-swagger/pom.xml
index 695223e..70c1c70 100644
--- a/blade-ops/blade-swagger/pom.xml
+++ b/blade-ops/blade-swagger/pom.xml
@@ -5,7 +5,7 @@
blade-ops
org.springblade
- 3.2.0
+ 3.3.0
4.0.0
diff --git a/blade-ops/pom.xml b/blade-ops/pom.xml
index 2c8ddc0..a87d113 100644
--- a/blade-ops/pom.xml
+++ b/blade-ops/pom.xml
@@ -5,13 +5,13 @@
SpringBlade
org.springblade
- 3.2.0
+ 3.3.0
4.0.0
blade-ops
${project.artifactId}
- 3.2.0
+ 3.3.0
pom
blade-admin
diff --git a/blade-service-api/blade-demo-api/pom.xml b/blade-service-api/blade-demo-api/pom.xml
index 2fca853..9794276 100644
--- a/blade-service-api/blade-demo-api/pom.xml
+++ b/blade-service-api/blade-demo-api/pom.xml
@@ -5,7 +5,7 @@
blade-service-api
org.springblade
- 3.2.0
+ 3.3.0
4.0.0
diff --git a/blade-service-api/blade-desk-api/pom.xml b/blade-service-api/blade-desk-api/pom.xml
index 9258727..b20ea5f 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
- 3.2.0
+ 3.3.0
4.0.0
diff --git a/blade-service-api/blade-dict-api/pom.xml b/blade-service-api/blade-dict-api/pom.xml
index bde6b39..1ddb6fe 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
- 3.2.0
+ 3.3.0
4.0.0
diff --git a/blade-service-api/blade-scope-api/pom.xml b/blade-service-api/blade-scope-api/pom.xml
index 43487bd..3ab8ebc 100644
--- a/blade-service-api/blade-scope-api/pom.xml
+++ b/blade-service-api/blade-scope-api/pom.xml
@@ -5,7 +5,7 @@
blade-service-api
org.springblade
- 3.2.0
+ 3.3.0
4.0.0
diff --git a/blade-service-api/blade-system-api/pom.xml b/blade-service-api/blade-system-api/pom.xml
index c788723..b52ef59 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
- 3.2.0
+ 3.3.0
4.0.0
diff --git a/blade-service-api/blade-user-api/pom.xml b/blade-service-api/blade-user-api/pom.xml
index b7a50bb..79672c9 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
- 3.2.0
+ 3.3.0
4.0.0
diff --git a/blade-service-api/pom.xml b/blade-service-api/pom.xml
index 617c26e..508a66a 100644
--- a/blade-service-api/pom.xml
+++ b/blade-service-api/pom.xml
@@ -5,13 +5,13 @@
SpringBlade
org.springblade
- 3.2.0
+ 3.3.0
4.0.0
blade-service-api
${project.artifactId}
- 3.2.0
+ 3.3.0
pom
SpringBlade 微服务API集合
diff --git a/blade-service/blade-demo/pom.xml b/blade-service/blade-demo/pom.xml
index 8c52f70..e05b386 100644
--- a/blade-service/blade-demo/pom.xml
+++ b/blade-service/blade-demo/pom.xml
@@ -5,7 +5,7 @@
blade-service
org.springblade
- 3.2.0
+ 3.3.0
4.0.0
diff --git a/blade-service/blade-desk/pom.xml b/blade-service/blade-desk/pom.xml
index f7304c9..28504c5 100644
--- a/blade-service/blade-desk/pom.xml
+++ b/blade-service/blade-desk/pom.xml
@@ -6,7 +6,7 @@
org.springblade
blade-service
- 3.2.0
+ 3.3.0
4.0.0
diff --git a/blade-service/blade-log/pom.xml b/blade-service/blade-log/pom.xml
index 67e8c3b..c5979ca 100644
--- a/blade-service/blade-log/pom.xml
+++ b/blade-service/blade-log/pom.xml
@@ -5,7 +5,7 @@
blade-service
org.springblade
- 3.2.0
+ 3.3.0
4.0.0
diff --git a/blade-service/blade-system/pom.xml b/blade-service/blade-system/pom.xml
index 201430b..d3974a6 100644
--- a/blade-service/blade-system/pom.xml
+++ b/blade-service/blade-system/pom.xml
@@ -5,7 +5,7 @@
blade-service
org.springblade
- 3.2.0
+ 3.3.0
4.0.0
diff --git a/blade-service/blade-user/pom.xml b/blade-service/blade-user/pom.xml
index 2841e8c..3e23114 100644
--- a/blade-service/blade-user/pom.xml
+++ b/blade-service/blade-user/pom.xml
@@ -5,7 +5,7 @@
blade-service
org.springblade
- 3.2.0
+ 3.3.0
4.0.0
diff --git a/blade-service/pom.xml b/blade-service/pom.xml
index d3d807f..6b99275 100644
--- a/blade-service/pom.xml
+++ b/blade-service/pom.xml
@@ -7,12 +7,12 @@
org.springblade
SpringBlade
- 3.2.0
+ 3.3.0
blade-service
${project.artifactId}
- 3.2.0
+ 3.3.0
pom
SpringBlade 微服务集合
diff --git a/doc/nacos/blade.yaml b/doc/nacos/blade.yaml
index e2d3864..299418c 100644
--- a/doc/nacos/blade.yaml
+++ b/doc/nacos/blade.yaml
@@ -69,7 +69,7 @@ knife4j:
swagger:
title: SpringBlade 接口文档系统
description: SpringBlade 接口文档系统
- version: 3.2.0
+ version: 3.3.0
license: Powered By SpringBlade
licenseUrl: https://bladex.vip
terms-of-service-url: https://bladex.vip
diff --git a/pom.xml b/pom.xml
index 994a15e..500a0da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,12 +5,12 @@
org.springblade
SpringBlade
- 3.2.0
+ 3.3.0
pom
- 3.2.0
- 3.2.0
+ 3.3.0
+ 3.3.0
1.8
3.8.1
@@ -21,13 +21,13 @@
1.6.2
2.2.6
1.2.5
- 2021.1
- 2.0.3
- 2.5.3
+ 2021.0.1.0
+ 2.0.4
+ 2.6.2
2.0.0.RELEASE
- 2.5.6
- 2020.0.4
+ 2.6.3
+ 2021.0.1
Cairo-SR8
diff --git a/script/docker/.env b/script/docker/.env
index 8cece65..b5dfd3d 100644
--- a/script/docker/.env
+++ b/script/docker/.env
@@ -1,2 +1,2 @@
REGISTER=192.168.0.157/blade
-TAG=3.2.0
+TAG=3.3.0
diff --git a/script/kuboard/kuboard_spring-blade.yaml b/script/kuboard/kuboard_spring-blade.yaml
index 6d5766e..c28731c 100644
--- a/script/kuboard/kuboard_spring-blade.yaml
+++ b/script/kuboard/kuboard_spring-blade.yaml
@@ -152,7 +152,7 @@ spec:
spec:
containers:
- name: blade-admin
- image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-admin:3.2.0'
+ image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-admin:3.3.0'
args:
- '--spring.profiles.active=${PROFILE}'
- '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
@@ -386,7 +386,7 @@ spec:
spec:
containers:
- name: blade-auth
- image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-auth:3.2.0'
+ image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-auth:3.3.0'
args:
- '--spring.profiles.active=${PROFILE}'
- '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
@@ -625,7 +625,7 @@ spec:
spec:
containers:
- name: blade-desk
- image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-desk:3.2.0'
+ image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-desk:3.3.0'
args:
- '--spring.profiles.active=${PROFILE}'
- '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
@@ -864,7 +864,7 @@ spec:
spec:
containers:
- name: blade-develop
- image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-develop:3.2.0'
+ image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-develop:3.3.0'
args:
- '--spring.profiles.active=${PROFILE}'
- '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
@@ -1096,7 +1096,7 @@ spec:
spec:
containers:
- name: blade-gateway
- image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-gateway:3.2.0'
+ image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-gateway:3.3.0'
args:
- '--spring.profiles.active=${PROFILE}'
- '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
@@ -1331,7 +1331,7 @@ spec:
spec:
containers:
- name: blade-log
- image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-log:3.2.0'
+ image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-log:3.3.0'
args:
- '--spring.profiles.active=${PROFILE}'
- '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
@@ -1565,7 +1565,7 @@ spec:
spec:
containers:
- name: blade-report
- image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-report:3.2.0'
+ image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-report:3.3.0'
args:
- '--spring.profiles.active=${PROFILE}'
- '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
@@ -1799,7 +1799,7 @@ spec:
spec:
containers:
- name: blade-resource
- image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-resource:3.2.0'
+ image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-resource:3.3.0'
args:
- '--spring.profiles.active=${PROFILE}'
- '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
@@ -2033,7 +2033,7 @@ spec:
spec:
containers:
- name: blade-system
- image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-system:3.2.0'
+ image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-system:3.3.0'
args:
- '--spring.profiles.active=${PROFILE}'
- '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
@@ -2267,7 +2267,7 @@ spec:
spec:
containers:
- name: blade-user
- image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-user:3.2.0'
+ image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-user:3.3.0'
args:
- '--spring.profiles.active=${PROFILE}'
- '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
@@ -2496,7 +2496,7 @@ spec:
spec:
containers:
- name: saber-web
- image: 'swr.cn-east-2.myhuaweicloud.com/blade/saber-web:3.2.0'
+ image: 'swr.cn-east-2.myhuaweicloud.com/blade/saber-web:3.3.0'
ports:
- name: web
containerPort: 80
@@ -2721,7 +2721,7 @@ spec:
spec:
containers:
- name: blade-swagger
- image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-swagger:3.2.0'
+ image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-swagger:3.3.0'
args:
- '--spring.profiles.active=${PROFILE}'
- '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
@@ -3749,7 +3749,7 @@ spec:
spec:
containers:
- name: mysql
- image: 'swr.cn-east-2.myhuaweicloud.com/blade/saber-db:v3.2.0'
+ image: 'swr.cn-east-2.myhuaweicloud.com/blade/saber-db:v3.3.0'
ports:
- name: mysql
containerPort: 3306