diff --git a/README.md b/README.md
index 694da6b..c8feef6 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
-
+
-
+
diff --git a/blade-auth/pom.xml b/blade-auth/pom.xml
index af2ea9e..c3467fe 100644
--- a/blade-auth/pom.xml
+++ b/blade-auth/pom.xml
@@ -8,7 +8,7 @@
SpringBlade
org.springblade
- 3.0.3
+ 3.1.0
blade-auth
diff --git a/blade-common/pom.xml b/blade-common/pom.xml
index 86029b8..a167f87 100644
--- a/blade-common/pom.xml
+++ b/blade-common/pom.xml
@@ -5,7 +5,7 @@
SpringBlade
org.springblade
- 3.0.3
+ 3.1.0
4.0.0
diff --git a/blade-gateway/pom.xml b/blade-gateway/pom.xml
index fa27ecd..b5ec77e 100644
--- a/blade-gateway/pom.xml
+++ b/blade-gateway/pom.xml
@@ -5,7 +5,7 @@
SpringBlade
org.springblade
- 3.0.3
+ 3.1.0
4.0.0
diff --git a/blade-ops/blade-admin/pom.xml b/blade-ops/blade-admin/pom.xml
index 1220b82..cce71b3 100644
--- a/blade-ops/blade-admin/pom.xml
+++ b/blade-ops/blade-admin/pom.xml
@@ -5,7 +5,7 @@
blade-ops
org.springblade
- 3.0.3
+ 3.1.0
4.0.0
diff --git a/blade-ops/blade-develop/pom.xml b/blade-ops/blade-develop/pom.xml
index 557495e..aecc99b 100644
--- a/blade-ops/blade-develop/pom.xml
+++ b/blade-ops/blade-develop/pom.xml
@@ -6,7 +6,7 @@
org.springblade
blade-ops
- 3.0.3
+ 3.1.0
4.0.0
diff --git a/blade-ops/blade-report/pom.xml b/blade-ops/blade-report/pom.xml
index 2159b7c..933269a 100644
--- a/blade-ops/blade-report/pom.xml
+++ b/blade-ops/blade-report/pom.xml
@@ -5,7 +5,7 @@
org.springblade
blade-ops
- 3.0.3
+ 3.1.0
4.0.0
diff --git a/blade-ops/blade-resource/pom.xml b/blade-ops/blade-resource/pom.xml
index a0ccf99..377a0bb 100644
--- a/blade-ops/blade-resource/pom.xml
+++ b/blade-ops/blade-resource/pom.xml
@@ -5,7 +5,7 @@
blade-ops
org.springblade
- 3.0.3
+ 3.1.0
4.0.0
diff --git a/blade-ops/blade-seata-order/pom.xml b/blade-ops/blade-seata-order/pom.xml
index 41391ff..0ce4b87 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.0.3
+ 3.1.0
4.0.0
diff --git a/blade-ops/blade-seata-storage/pom.xml b/blade-ops/blade-seata-storage/pom.xml
index 9086de3..d8cffc4 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.0.3
+ 3.1.0
4.0.0
diff --git a/blade-ops/blade-swagger/pom.xml b/blade-ops/blade-swagger/pom.xml
index bb12699..7435ff0 100644
--- a/blade-ops/blade-swagger/pom.xml
+++ b/blade-ops/blade-swagger/pom.xml
@@ -5,7 +5,7 @@
blade-ops
org.springblade
- 3.0.3
+ 3.1.0
4.0.0
diff --git a/blade-ops/pom.xml b/blade-ops/pom.xml
index 93083ca..06e2d85 100644
--- a/blade-ops/pom.xml
+++ b/blade-ops/pom.xml
@@ -5,13 +5,13 @@
SpringBlade
org.springblade
- 3.0.3
+ 3.1.0
4.0.0
blade-ops
${project.artifactId}
- 3.0.3
+ 3.1.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 8ab3607..b183541 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.0.3
+ 3.1.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 07b22d8..240136b 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.0.3
+ 3.1.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 995a0c4..2652398 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.0.3
+ 3.1.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 2220d3b..0fe4c24 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.0.3
+ 3.1.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 57f7f49..be91de0 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.0.3
+ 3.1.0
4.0.0
diff --git a/blade-service-api/pom.xml b/blade-service-api/pom.xml
index 0f8d307..0c47684 100644
--- a/blade-service-api/pom.xml
+++ b/blade-service-api/pom.xml
@@ -5,13 +5,13 @@
SpringBlade
org.springblade
- 3.0.3
+ 3.1.0
4.0.0
blade-service-api
${project.artifactId}
- 3.0.3
+ 3.1.0
pom
SpringBlade 微服务API集合
diff --git a/blade-service/blade-demo/pom.xml b/blade-service/blade-demo/pom.xml
index 8db4379..c9b6d2e 100644
--- a/blade-service/blade-demo/pom.xml
+++ b/blade-service/blade-demo/pom.xml
@@ -5,7 +5,7 @@
blade-service
org.springblade
- 3.0.3
+ 3.1.0
4.0.0
diff --git a/blade-service/blade-desk/pom.xml b/blade-service/blade-desk/pom.xml
index 28f64f0..3fd8813 100644
--- a/blade-service/blade-desk/pom.xml
+++ b/blade-service/blade-desk/pom.xml
@@ -6,7 +6,7 @@
org.springblade
blade-service
- 3.0.3
+ 3.1.0
4.0.0
diff --git a/blade-service/blade-log/pom.xml b/blade-service/blade-log/pom.xml
index 7595e13..22cc540 100644
--- a/blade-service/blade-log/pom.xml
+++ b/blade-service/blade-log/pom.xml
@@ -5,7 +5,7 @@
blade-service
org.springblade
- 3.0.3
+ 3.1.0
4.0.0
diff --git a/blade-service/blade-system/pom.xml b/blade-service/blade-system/pom.xml
index 86c6215..548fb4c 100644
--- a/blade-service/blade-system/pom.xml
+++ b/blade-service/blade-system/pom.xml
@@ -5,7 +5,7 @@
blade-service
org.springblade
- 3.0.3
+ 3.1.0
4.0.0
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DictServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DictServiceImpl.java
index 671b748..36dc4ba 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DictServiceImpl.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DictServiceImpl.java
@@ -18,8 +18,8 @@ package org.springblade.system.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.exceptions.ApiException;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.tool.node.ForestNodeMerger;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringPool;
@@ -72,7 +72,7 @@ public class DictServiceImpl extends ServiceImpl implements ID
LambdaQueryWrapper lqw = Wrappers.query().lambda().eq(Dict::getCode, dict.getCode()).eq(Dict::getDictKey, dict.getDictKey());
Integer cnt = baseMapper.selectCount((Func.isEmpty(dict.getId())) ? lqw : lqw.notIn(Dict::getId, dict.getId()));
if (cnt > 0) {
- throw new ApiException("当前字典键值已存在!");
+ throw new ServiceException("当前字典键值已存在!");
}
return saveOrUpdate(dict);
}
diff --git a/blade-service/blade-user/pom.xml b/blade-service/blade-user/pom.xml
index e117499..35f3b4b 100644
--- a/blade-service/blade-user/pom.xml
+++ b/blade-service/blade-user/pom.xml
@@ -5,7 +5,7 @@
blade-service
org.springblade
- 3.0.3
+ 3.1.0
4.0.0
diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
index 278cdc7..d89c45b 100644
--- a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
+++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
@@ -19,7 +19,6 @@ package org.springblade.system.user.service.impl;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.exceptions.ApiException;
import lombok.AllArgsConstructor;
import org.springblade.common.constant.CommonConstant;
import org.springblade.core.log.exception.ServiceException;
@@ -63,7 +62,7 @@ public class UserServiceImpl extends BaseServiceImpl implement
}
Integer cnt = baseMapper.selectCount(Wrappers.query().lambda().eq(User::getTenantId, user.getTenantId()).eq(User::getAccount, user.getAccount()));
if (cnt > 0) {
- throw new ApiException("当前用户已存在!");
+ throw new ServiceException("当前用户已存在!");
}
return saveOrUpdate(user);
}
@@ -191,11 +190,11 @@ public class UserServiceImpl extends BaseServiceImpl implement
R result = sysClient.getTenant(user.getTenantId());
Tenant tenant = result.getData();
if (!result.isSuccess() || tenant == null || tenant.getId() == null) {
- throw new ApiException("租户信息错误!");
+ throw new ServiceException("租户信息错误!");
}
UserOauth userOauth = userOauthService.getById(oauthId);
if (userOauth == null || userOauth.getId() == null) {
- throw new ApiException("第三方登陆信息错误!");
+ throw new ServiceException("第三方登陆信息错误!");
}
user.setRealName(user.getName());
user.setAvatar(userOauth.getAvatar());
diff --git a/blade-service/pom.xml b/blade-service/pom.xml
index e52b7f9..6b9b9a4 100644
--- a/blade-service/pom.xml
+++ b/blade-service/pom.xml
@@ -7,12 +7,12 @@
org.springblade
SpringBlade
- 3.0.3
+ 3.1.0
blade-service
${project.artifactId}
- 3.0.3
+ 3.1.0
pom
SpringBlade 微服务集合
diff --git a/doc/nacos/blade.yaml b/doc/nacos/blade.yaml
index 73cd02e..4264c7d 100644
--- a/doc/nacos/blade.yaml
+++ b/doc/nacos/blade.yaml
@@ -69,7 +69,7 @@ knife4j:
swagger:
title: SpringBlade 接口文档系统
description: SpringBlade 接口文档系统
- version: 3.0.3
+ version: 3.1.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 8fbf580..bc8433d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,12 +5,12 @@
org.springblade
SpringBlade
- 3.0.3
+ 3.1.0
pom
- 3.0.3
- 3.0.3
+ 3.1.0
+ 3.1.0
1.8
3.8.1
@@ -21,13 +21,13 @@
1.6.2
2.2.6
1.2.5
- 2.2.5.RELEASE
- 2.0.0
- 2.3.1
+ 2021.1
+ 2.0.2
+ 2.4.2
2.0.0.RELEASE
- 2.4.4
- 2020.0.2
+ 2.5.2
+ 2020.0.3
Cairo-SR8
diff --git a/script/docker/.env b/script/docker/.env
index 264f45d..2758b24 100644
--- a/script/docker/.env
+++ b/script/docker/.env
@@ -1,2 +1,2 @@
REGISTER=192.168.0.157/blade
-TAG=3.0.3
+TAG=3.1.0
diff --git a/script/docker/deploy.sh b/script/docker/deploy.sh
index 72fd95f..d8604b6 100644
--- a/script/docker/deploy.sh
+++ b/script/docker/deploy.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
#使用说明,用来提示输入参数
usage() {
diff --git a/script/docker/docker-compose.yml b/script/docker/docker-compose.yml
index d02360f..e757b61 100644
--- a/script/docker/docker-compose.yml
+++ b/script/docker/docker-compose.yml
@@ -1,7 +1,7 @@
version: '3'
services:
nacos:
- image: nacos/nacos-server:2.0.0
+ image: nacos/nacos-server:2.0.2
hostname: "nacos-standalone"
environment:
- MODE=standalone
diff --git a/script/kuboard/kuboard_spring-blade.yaml b/script/kuboard/kuboard_spring-blade.yaml
index 1a4a055..e00b563 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.0.3'
+ image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-admin:3.1.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.0.3'
+ image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-auth:3.1.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.0.3'
+ image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-desk:3.1.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.0.3'
+ image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-develop:3.1.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.0.3'
+ image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-gateway:3.1.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.0.3'
+ image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-log:3.1.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.0.3'
+ image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-report:3.1.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.0.3'
+ image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-resource:3.1.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.0.3'
+ image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-system:3.1.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.0.3'
+ image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-user:3.1.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.0.3'
+ image: 'swr.cn-east-2.myhuaweicloud.com/blade/saber-web:3.1.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.0.3'
+ image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-swagger:3.1.0'
args:
- '--spring.profiles.active=${PROFILE}'
- '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
@@ -3016,7 +3016,7 @@ spec:
defaultMode: 420
containers:
- name: nacos
- image: 'swr.cn-east-2.myhuaweicloud.com/blade/nacos-server:2.0.0'
+ image: 'swr.cn-east-2.myhuaweicloud.com/blade/nacos-server:2.0.2'
ports:
- name: client
containerPort: 8848
@@ -3749,7 +3749,7 @@ spec:
spec:
containers:
- name: mysql
- image: 'swr.cn-east-2.myhuaweicloud.com/blade/saber-db:v3.0.3'
+ image: 'swr.cn-east-2.myhuaweicloud.com/blade/saber-db:v3.1.0'
ports:
- name: mysql
containerPort: 3306