blade/BladeX
1
0
Fork 0
mirror of https://github.com/chillzhuang/SpringBlade.git synced 2024-11-23 19:09:25 +08:00
Code Issues Projects Releases Wiki Activity

🎉 3.1.0.RELEASE 底层架构升级适配

Browse Source
This commit is contained in:
smallchill 2021-06-29 11:17:33 +08:00
parent 090f46d8c8
commit d15f2236c1
32 changed files with 59 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -1,9 +1,9 @@
<p align="center">
<img src="https://img.shields.io/badge/Release-V3.0.3-green.svg" alt="Downloads">
<img src="https://img.shields.io/badge/Release-V3.1.0-green.svg" alt="Downloads">
<img src="https://img.shields.io/badge/JDK-1.8+-green.svg" alt="Build Status">
<img src="https://img.shields.io/badge/license-Apache%202-blue.svg" alt="Build Status">
<img src="https://img.shields.io/badge/Spring%20Cloud-2020-blue.svg" alt="Coverage Status">
<img src="https://img.shields.io/badge/Spring%20Boot-2.4.4-blue.svg" alt="Downloads">
<img src="https://img.shields.io/badge/Spring%20Boot-2.5.2-blue.svg" alt="Downloads">
<a target="_blank" href="https://bladex.vip">
<img src="https://img.shields.io/badge/Author-Small%20Chill-ff69b4.svg" alt="Downloads">
</a>

2
blade-auth/pom.xml
View File

@ -8,7 +8,7 @@
<parent>
<artifactId>SpringBlade</artifactId>
<groupId>org.springblade</groupId>
<version>3.0.3</version>
<version>3.1.0</version>
</parent>
<artifactId>blade-auth</artifactId>

2
blade-common/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>SpringBlade</artifactId>
<groupId>org.springblade</groupId>
<version>3.0.3</version>
<version>3.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blade-gateway/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>SpringBlade</artifactId>
<groupId>org.springblade</groupId>
<version>3.0.3</version>
<version>3.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blade-ops/blade-admin/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-ops</artifactId>
<groupId>org.springblade</groupId>
<version>3.0.3</version>
<version>3.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blade-ops/blade-develop/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>org.springblade</groupId>
<artifactId>blade-ops</artifactId>
<version>3.0.3</version>
<version>3.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blade-ops/blade-report/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.springblade</groupId>
<artifactId>blade-ops</artifactId>
<version>3.0.3</version>
<version>3.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blade-ops/blade-resource/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-ops</artifactId>
<groupId>org.springblade</groupId>
<version>3.0.3</version>
<version>3.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blade-ops/blade-seata-order/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-ops</artifactId>
<groupId>org.springblade</groupId>
<version>3.0.3</version>
<version>3.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blade-ops/blade-seata-storage/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-ops</artifactId>
<groupId>org.springblade</groupId>
<version>3.0.3</version>
<version>3.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blade-ops/blade-swagger/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-ops</artifactId>
<groupId>org.springblade</groupId>
<version>3.0.3</version>
<version>3.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

4
blade-ops/pom.xml
View File

@ -5,13 +5,13 @@
<parent>
<artifactId>SpringBlade</artifactId>
<groupId>org.springblade</groupId>
<version>3.0.3</version>
<version>3.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>blade-ops</artifactId>
<name>${project.artifactId}</name>
<version>3.0.3</version>
<version>3.1.0</version>
<packaging>pom</packaging>
<modules>
<module>blade-admin</module>

2
blade-service-api/blade-demo-api/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-service-api</artifactId>
<groupId>org.springblade</groupId>
<version>3.0.3</version>
<version>3.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blade-service-api/blade-desk-api/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-service-api</artifactId>
<groupId>org.springblade</groupId>
<version>3.0.3</version>
<version>3.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blade-service-api/blade-dict-api/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-service-api</artifactId>
<groupId>org.springblade</groupId>
<version>3.0.3</version>
<version>3.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blade-service-api/blade-system-api/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-service-api</artifactId>
<groupId>org.springblade</groupId>
<version>3.0.3</version>
<version>3.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blade-service-api/blade-user-api/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-service-api</artifactId>
<groupId>org.springblade</groupId>
<version>3.0.3</version>
<version>3.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

4
blade-service-api/pom.xml
View File

@ -5,13 +5,13 @@
<parent>
<artifactId>SpringBlade</artifactId>
<groupId>org.springblade</groupId>
<version>3.0.3</version>
<version>3.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>blade-service-api</artifactId>
<name>${project.artifactId}</name>
<version>3.0.3</version>
<version>3.1.0</version>
<packaging>pom</packaging>
<description>SpringBlade 微服务API集合</description>

2
blade-service/blade-demo/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-service</artifactId>
<groupId>org.springblade</groupId>
<version>3.0.3</version>
<version>3.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blade-service/blade-desk/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>org.springblade</groupId>
<artifactId>blade-service</artifactId>
<version>3.0.3</version>
<version>3.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blade-service/blade-log/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-service</artifactId>
<groupId>org.springblade</groupId>
<version>3.0.3</version>
<version>3.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blade-service/blade-system/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-service</artifactId>
<groupId>org.springblade</groupId>
<version>3.0.3</version>
<version>3.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

4
blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DictServiceImpl.java
View File

@ -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<DictMapper, Dict> implements ID
LambdaQueryWrapper<Dict> lqw = Wrappers.<Dict>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);
}

2
blade-service/blade-user/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-service</artifactId>
<groupId>org.springblade</groupId>
<version>3.0.3</version>
<version>3.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

7
blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
View File

@ -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<UserMapper, User> implement
}
Integer cnt = baseMapper.selectCount(Wrappers.<User>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<UserMapper, User> implement
R<Tenant> 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());

4
blade-service/pom.xml
View File

@ -7,12 +7,12 @@
<parent>
<groupId>org.springblade</groupId>
<artifactId>SpringBlade</artifactId>
<version>3.0.3</version>
<version>3.1.0</version>
</parent>
<artifactId>blade-service</artifactId>
<name>${project.artifactId}</name>
<version>3.0.3</version>
<version>3.1.0</version>
<packaging>pom</packaging>
<description>SpringBlade 微服务集合</description>

2
doc/nacos/blade.yaml
View File

@ -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

16
pom.xml
View File

@ -5,12 +5,12 @@
<groupId>org.springblade</groupId>
<artifactId>SpringBlade</artifactId>
<version>3.0.3</version>
<version>3.1.0</version>
<packaging>pom</packaging>
<properties>
<blade.tool.version>3.0.3</blade.tool.version>
<blade.project.version>3.0.3</blade.project.version>
<blade.tool.version>3.1.0</blade.tool.version>
<blade.project.version>3.1.0</blade.project.version>
<java.version>1.8</java.version>
<maven.plugin.version>3.8.1</maven.plugin.version>
@ -21,13 +21,13 @@
<captcha.version>1.6.2</captcha.version>
<easyexcel.version>2.2.6</easyexcel.version>
<mica.auto.version>1.2.5</mica.auto.version>
<alibaba.cloud.version>2.2.5.RELEASE</alibaba.cloud.version>
<alibaba.nacos.version>2.0.0</alibaba.nacos.version>
<spring.boot.admin.version>2.3.1</spring.boot.admin.version>
<alibaba.cloud.version>2021.1</alibaba.cloud.version>
<alibaba.nacos.version>2.0.2</alibaba.nacos.version>
<spring.boot.admin.version>2.4.2</spring.boot.admin.version>
<spring.plugin.version>2.0.0.RELEASE</spring.plugin.version>
<spring.boot.version>2.4.4</spring.boot.version>
<spring.cloud.version>2020.0.2</spring.cloud.version>
<spring.boot.version>2.5.2</spring.boot.version>
<spring.cloud.version>2020.0.3</spring.cloud.version>
<spring.platform.version>Cairo-SR8</spring.platform.version>
<!-- 推荐使用Harbor -->

2
script/docker/.env
View File

@ -1,2 +1,2 @@
REGISTER=192.168.0.157/blade
TAG=3.0.3
TAG=3.1.0

1
script/docker/deploy.sh
View File

@ -1,3 +1,4 @@
#!/bin/bash
#使用说明，用来提示输入参数
usage() {

2
script/docker/docker-compose.yml
View File

@ -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

28
script/kuboard/kuboard_spring-blade.yaml
View File

@ -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