blade
/
blade-tool
mirror of https://github.com/chillzhuang/blade-tool
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

🎉 2.7.1.RELEASE,增加行政区划管理,支持Seata1.2

This commit is contained in:
smallchill 2020-06-12 10:12:26 +08:00
parent 8c3f34d614
commit f6c1790061
22 changed files with 68 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -1,7 +1,7 @@
<p align="center">
<img src="https://img.shields.io/badge/license-LGPL%20v3-blue.svg" alt="Build Status">
<img src="https://img.shields.io/badge/Spring%20Cloud-Hoxton.SR3-blue.svg" alt="Coverage Status">
<img src="https://img.shields.io/badge/Spring%20Boot-2.2.6.RELEASE-blue.svg" alt="Downloads">
<img src="https://img.shields.io/badge/Spring%20Cloud-Hoxton.SR5-blue.svg" alt="Coverage Status">
<img src="https://img.shields.io/badge/Spring%20Boot-2.2.7.RELEASE-blue.svg" alt="Downloads">
</p>
## SpringBlade微服务开发平台

2
blade-core-boot/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.springblade</groupId>
<artifactId>blade-tool</artifactId>
<version>2.7.0</version>
<version>2.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blade-core-boot/src/main/resources/bootstrap.yml
View File

@ -97,7 +97,7 @@ mybatis-plus:
swagger:
title: SpringBlade 接口文档系统
description: SpringBlade 接口文档系统
version: 2.7.0
version: 2.7.1
license: Powered By SpringBlade
licenseUrl: https://bladex.vip
terms-of-service-url: https://bladex.vip

13
blade-core-cloud/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-tool</artifactId>
<groupId>org.springblade</groupId>
<version>2.7.0</version>
<version>2.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -27,11 +27,6 @@
<groupId>org.springframework.retry</groupId>
<artifactId>spring-retry</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream</artifactId>
<version>2.2.1.RELEASE</version>
</dependency>
<!--Feign-->
<dependency>
<groupId>io.github.openfeign</groupId>
@ -87,6 +82,12 @@
<artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
<version>${alibaba.cloud.version}</version>
</dependency>
<!-- Alibaba依赖 -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>1.2.70</version>
</dependency>
</dependencies>
</project>

32
blade-core-cloud/src/main/java/org/springblade/core/cloud/stream/ServiceErrorStreams.java
View File

@ -1,32 +0,0 @@
package org.springblade.core.cloud.stream;
import org.springframework.cloud.stream.annotation.Input;
import org.springframework.cloud.stream.annotation.Output;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.SubscribableChannel;
/**
* 服务异常 Streams
*
* @author L.cm
*/
public interface ServiceErrorStreams {
String INPUT = "service-error-in";
String OUTPUT = "service-error-out";
/**
* input
*
* @return SubscribableChannel
*/
@Input(INPUT)
SubscribableChannel subscribablebChannel();
/**
* output
*
* @return MessageChannel
*/
@Output(OUTPUT)
MessageChannel messageChannel();
}

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

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-tool</artifactId>
<groupId>org.springblade</groupId>
<version>2.7.0</version>
<version>2.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blade-core-develop/src/main/resources/templates/saber/crud.vue.vm
View File

@ -48,7 +48,7 @@
selectionList: [],
option: {
height: 'auto',
calcHeight: 80,
calcHeight: 210,
searchShow: true,
searchMenuSpan: 6,
tip: false,

2
blade-core-launch/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-tool</artifactId>
<groupId>org.springblade</groupId>
<version>2.7.0</version>
<version>2.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blade-core-launch/src/main/java/org/springblade/core/launch/constant/AppConstant.java
View File

@ -25,7 +25,7 @@ public interface AppConstant {
/**
* 应用版本
*/
String APPLICATION_VERSION = "2.7.0";
String APPLICATION_VERSION = "2.7.1";
/**
* 基础包

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

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-tool</artifactId>
<groupId>org.springblade</groupId>
<version>2.7.0</version>
<version>2.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

19
blade-core-log/src/main/java/org/springblade/core/log/utils/LogAbstractUtil.java
View File

@ -20,10 +20,7 @@ import org.springblade.core.launch.props.BladeProperties;
import org.springblade.core.launch.server.ServerInfo;
import org.springblade.core.log.model.LogAbstract;
import org.springblade.core.secure.utils.SecureUtil;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.StringPool;
import org.springblade.core.tool.utils.UrlUtil;
import org.springblade.core.tool.utils.WebUtil;
import org.springblade.core.tool.utils.*;
import javax.servlet.http.HttpServletRequest;
@ -41,12 +38,14 @@ public class LogAbstractUtil {
* @param logAbstract 日志基础类
*/
public static void addRequestInfoToLog(HttpServletRequest request, LogAbstract logAbstract) {
logAbstract.setRemoteIp(WebUtil.getIP(request));
logAbstract.setUserAgent(request.getHeader(WebUtil.USER_AGENT_HEADER));
logAbstract.setRequestUri(UrlUtil.getPath(request.getRequestURI()));
logAbstract.setMethod(request.getMethod());
logAbstract.setParams(WebUtil.getRequestParamString(request));
logAbstract.setCreateBy(SecureUtil.getUserAccount(request));
if (ObjectUtil.isNotEmpty(request)) {
logAbstract.setRemoteIp(WebUtil.getIP(request));
logAbstract.setUserAgent(request.getHeader(WebUtil.USER_AGENT_HEADER));
logAbstract.setRequestUri(UrlUtil.getPath(request.getRequestURI()));
logAbstract.setMethod(request.getMethod());
logAbstract.setParams(WebUtil.getRequestParamString(request));
logAbstract.setCreateBy(SecureUtil.getUserAccount(request));
}
}
/**

2
blade-core-mybatis/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-tool</artifactId>
<groupId>org.springblade</groupId>
<version>2.7.0</version>
<version>2.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blade-core-oss/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-tool</artifactId>
<groupId>org.springblade</groupId>
<version>2.7.0</version>
<version>2.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blade-core-secure/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-tool</artifactId>
<groupId>org.springblade</groupId>
<version>2.7.0</version>
<version>2.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

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

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-tool</artifactId>
<groupId>org.springblade</groupId>
<version>2.7.0</version>
<version>2.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blade-core-swagger/src/main/java/org/springblade/core/swagger/SwaggerProperties.java
View File

@ -55,7 +55,7 @@ public class SwaggerProperties {
/**
* 版本
**/
private String version = "2.7.0";
private String version = "2.7.1";
/**
* 许可证
**/

2
blade-core-test/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.springblade</groupId>
<artifactId>blade-tool</artifactId>
<version>2.7.0</version>
<version>2.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blade-core-tool/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>org.springblade</groupId>
<artifactId>blade-tool</artifactId>
<version>2.7.0</version>
<version>2.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

18
blade-core-tool/src/main/java/org/springblade/core/tool/node/BaseNode.java
View File

@ -51,4 +51,22 @@ public class BaseNode implements INode {
@JsonInclude(JsonInclude.Include.NON_EMPTY)
protected List<INode> children = new ArrayList<>();
/**
* 是否有子孙节点
*/
@JsonInclude(JsonInclude.Include.NON_EMPTY)
private Boolean hasChildren;
/**
* 是否有子孙节点
*/
@Override
public Boolean getHasChildren() {
if (children.size() > 0) {
return true;
} else {
return this.hasChildren;
}
}
}

9
blade-core-tool/src/main/java/org/springblade/core/tool/node/INode.java
View File

@ -46,4 +46,13 @@ public interface INode extends Serializable {
*/
List<INode> getChildren();
/**
* 是否有子孙节点
*
* @return Boolean
*/
default Boolean getHasChildren() {
return false;
}
}

2
blade-core-transaction/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-tool</artifactId>
<groupId>org.springblade</groupId>
<version>2.7.0</version>
<version>2.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

16
pom.xml
View File

@ -5,7 +5,7 @@
<groupId>org.springblade</groupId>
<artifactId>blade-tool</artifactId>
<version>2.7.0</version>
<version>2.7.1</version>
<packaging>pom</packaging>
<name>blade-tool</name>
<description>
@ -36,23 +36,23 @@
</scm>
<properties>
<blade.tool.version>2.7.0</blade.tool.version>
<blade.tool.version>2.7.1</blade.tool.version>
<java.version>1.8</java.version>
<maven.plugin.version>3.8.0</maven.plugin.version>
<swagger.version>2.9.2</swagger.version>
<swagger.models.version>1.5.21</swagger.models.version>
<knife4j.version>2.0.2</knife4j.version>
<mybatis.plus.version>3.3.1</mybatis.plus.version>
<knife4j.version>2.0.3</knife4j.version>
<mybatis.plus.version>3.3.2</mybatis.plus.version>
<protostuff.version>1.6.0</protostuff.version>
<disruptor.version>3.4.2</disruptor.version>
<spring.boot.admin.version>2.2.2</spring.boot.admin.version>
<spring.boot.admin.version>2.2.3</spring.boot.admin.version>
<mica.auto.version>1.1.0</mica.auto.version>
<alibaba.cloud.version>2.2.1.RELEASE</alibaba.cloud.version>
<alibaba.seata.version>1.1.0</alibaba.seata.version>
<alibaba.seata.version>1.2.0</alibaba.seata.version>
<spring.boot.version>2.2.6.RELEASE</spring.boot.version>
<spring.cloud.version>Hoxton.SR3</spring.cloud.version>
<spring.boot.version>2.2.7.RELEASE</spring.boot.version>
<spring.cloud.version>Hoxton.SR5</spring.cloud.version>
<spring.platform.version>Cairo-SR8</spring.platform.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>