diff --git a/README.md b/README.md index a31a2b3..30a4a59 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@

Build Status - Coverage Status - Downloads + Coverage Status + Downloads

## SpringBlade微服务开发平台 diff --git a/blade-core-boot/pom.xml b/blade-core-boot/pom.xml index 4efe168..1777a56 100644 --- a/blade-core-boot/pom.xml +++ b/blade-core-boot/pom.xml @@ -5,7 +5,7 @@ org.springblade blade-tool - 2.7.0 + 2.7.1 4.0.0 diff --git a/blade-core-boot/src/main/resources/bootstrap.yml b/blade-core-boot/src/main/resources/bootstrap.yml index be1e653..4804c3b 100644 --- a/blade-core-boot/src/main/resources/bootstrap.yml +++ b/blade-core-boot/src/main/resources/bootstrap.yml @@ -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 diff --git a/blade-core-cloud/pom.xml b/blade-core-cloud/pom.xml index 6c468ce..fc66d57 100644 --- a/blade-core-cloud/pom.xml +++ b/blade-core-cloud/pom.xml @@ -5,7 +5,7 @@ blade-tool org.springblade - 2.7.0 + 2.7.1 4.0.0 @@ -27,11 +27,6 @@ org.springframework.retry spring-retry - - org.springframework.cloud - spring-cloud-stream - 2.2.1.RELEASE - io.github.openfeign @@ -87,6 +82,12 @@ spring-cloud-starter-alibaba-sentinel ${alibaba.cloud.version} + + + com.alibaba + fastjson + 1.2.70 + diff --git a/blade-core-cloud/src/main/java/org/springblade/core/cloud/stream/ServiceErrorStreams.java b/blade-core-cloud/src/main/java/org/springblade/core/cloud/stream/ServiceErrorStreams.java deleted file mode 100644 index 5398109..0000000 --- a/blade-core-cloud/src/main/java/org/springblade/core/cloud/stream/ServiceErrorStreams.java +++ /dev/null @@ -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(); -} diff --git a/blade-core-develop/pom.xml b/blade-core-develop/pom.xml index 605f7db..e9e91f6 100644 --- a/blade-core-develop/pom.xml +++ b/blade-core-develop/pom.xml @@ -5,7 +5,7 @@ blade-tool org.springblade - 2.7.0 + 2.7.1 4.0.0 diff --git a/blade-core-develop/src/main/resources/templates/saber/crud.vue.vm b/blade-core-develop/src/main/resources/templates/saber/crud.vue.vm index 77c78a7..6a24667 100644 --- a/blade-core-develop/src/main/resources/templates/saber/crud.vue.vm +++ b/blade-core-develop/src/main/resources/templates/saber/crud.vue.vm @@ -48,7 +48,7 @@ selectionList: [], option: { height: 'auto', - calcHeight: 80, + calcHeight: 210, searchShow: true, searchMenuSpan: 6, tip: false, diff --git a/blade-core-launch/pom.xml b/blade-core-launch/pom.xml index cc99a40..79fcb40 100644 --- a/blade-core-launch/pom.xml +++ b/blade-core-launch/pom.xml @@ -5,7 +5,7 @@ blade-tool org.springblade - 2.7.0 + 2.7.1 4.0.0 diff --git a/blade-core-launch/src/main/java/org/springblade/core/launch/constant/AppConstant.java b/blade-core-launch/src/main/java/org/springblade/core/launch/constant/AppConstant.java index b7faea7..69e9ab7 100644 --- a/blade-core-launch/src/main/java/org/springblade/core/launch/constant/AppConstant.java +++ b/blade-core-launch/src/main/java/org/springblade/core/launch/constant/AppConstant.java @@ -25,7 +25,7 @@ public interface AppConstant { /** * 应用版本 */ - String APPLICATION_VERSION = "2.7.0"; + String APPLICATION_VERSION = "2.7.1"; /** * 基础包 diff --git a/blade-core-log/pom.xml b/blade-core-log/pom.xml index 93fd88c..71da98e 100644 --- a/blade-core-log/pom.xml +++ b/blade-core-log/pom.xml @@ -5,7 +5,7 @@ blade-tool org.springblade - 2.7.0 + 2.7.1 4.0.0 diff --git a/blade-core-log/src/main/java/org/springblade/core/log/utils/LogAbstractUtil.java b/blade-core-log/src/main/java/org/springblade/core/log/utils/LogAbstractUtil.java index 176f956..de6192b 100644 --- a/blade-core-log/src/main/java/org/springblade/core/log/utils/LogAbstractUtil.java +++ b/blade-core-log/src/main/java/org/springblade/core/log/utils/LogAbstractUtil.java @@ -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)); + } } /** diff --git a/blade-core-mybatis/pom.xml b/blade-core-mybatis/pom.xml index 1c7f7f0..d6e485a 100644 --- a/blade-core-mybatis/pom.xml +++ b/blade-core-mybatis/pom.xml @@ -5,7 +5,7 @@ blade-tool org.springblade - 2.7.0 + 2.7.1 4.0.0 diff --git a/blade-core-oss/pom.xml b/blade-core-oss/pom.xml index 7f39b9a..96a3195 100644 --- a/blade-core-oss/pom.xml +++ b/blade-core-oss/pom.xml @@ -5,7 +5,7 @@ blade-tool org.springblade - 2.7.0 + 2.7.1 4.0.0 diff --git a/blade-core-secure/pom.xml b/blade-core-secure/pom.xml index 69e2973..5f4073d 100644 --- a/blade-core-secure/pom.xml +++ b/blade-core-secure/pom.xml @@ -5,7 +5,7 @@ blade-tool org.springblade - 2.7.0 + 2.7.1 4.0.0 diff --git a/blade-core-swagger/pom.xml b/blade-core-swagger/pom.xml index 9884200..6b9a346 100644 --- a/blade-core-swagger/pom.xml +++ b/blade-core-swagger/pom.xml @@ -5,7 +5,7 @@ blade-tool org.springblade - 2.7.0 + 2.7.1 4.0.0 diff --git a/blade-core-swagger/src/main/java/org/springblade/core/swagger/SwaggerProperties.java b/blade-core-swagger/src/main/java/org/springblade/core/swagger/SwaggerProperties.java index 660ef89..0ea633d 100644 --- a/blade-core-swagger/src/main/java/org/springblade/core/swagger/SwaggerProperties.java +++ b/blade-core-swagger/src/main/java/org/springblade/core/swagger/SwaggerProperties.java @@ -55,7 +55,7 @@ public class SwaggerProperties { /** * 版本 **/ - private String version = "2.7.0"; + private String version = "2.7.1"; /** * 许可证 **/ diff --git a/blade-core-test/pom.xml b/blade-core-test/pom.xml index 1af4380..dbeb991 100644 --- a/blade-core-test/pom.xml +++ b/blade-core-test/pom.xml @@ -5,7 +5,7 @@ org.springblade blade-tool - 2.7.0 + 2.7.1 4.0.0 diff --git a/blade-core-tool/pom.xml b/blade-core-tool/pom.xml index 4fc7f23..8858fc3 100644 --- a/blade-core-tool/pom.xml +++ b/blade-core-tool/pom.xml @@ -6,7 +6,7 @@ org.springblade blade-tool - 2.7.0 + 2.7.1 4.0.0 diff --git a/blade-core-tool/src/main/java/org/springblade/core/tool/node/BaseNode.java b/blade-core-tool/src/main/java/org/springblade/core/tool/node/BaseNode.java index aebbfbc..67754d3 100644 --- a/blade-core-tool/src/main/java/org/springblade/core/tool/node/BaseNode.java +++ b/blade-core-tool/src/main/java/org/springblade/core/tool/node/BaseNode.java @@ -51,4 +51,22 @@ public class BaseNode implements INode { @JsonInclude(JsonInclude.Include.NON_EMPTY) protected List 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; + } + } + } diff --git a/blade-core-tool/src/main/java/org/springblade/core/tool/node/INode.java b/blade-core-tool/src/main/java/org/springblade/core/tool/node/INode.java index 92659bf..b9db178 100644 --- a/blade-core-tool/src/main/java/org/springblade/core/tool/node/INode.java +++ b/blade-core-tool/src/main/java/org/springblade/core/tool/node/INode.java @@ -46,4 +46,13 @@ public interface INode extends Serializable { */ List getChildren(); + /** + * 是否有子孙节点 + * + * @return Boolean + */ + default Boolean getHasChildren() { + return false; + } + } diff --git a/blade-core-transaction/pom.xml b/blade-core-transaction/pom.xml index 38027e1..9b82cb8 100644 --- a/blade-core-transaction/pom.xml +++ b/blade-core-transaction/pom.xml @@ -5,7 +5,7 @@ blade-tool org.springblade - 2.7.0 + 2.7.1 4.0.0 diff --git a/pom.xml b/pom.xml index efefeb7..afff777 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springblade blade-tool - 2.7.0 + 2.7.1 pom blade-tool @@ -36,23 +36,23 @@ - 2.7.0 + 2.7.1 1.8 3.8.0 2.9.2 1.5.21 - 2.0.2 - 3.3.1 + 2.0.3 + 3.3.2 1.6.0 3.4.2 - 2.2.2 + 2.2.3 1.1.0 2.2.1.RELEASE - 1.1.0 + 1.2.0 - 2.2.6.RELEASE - Hoxton.SR3 + 2.2.7.RELEASE + Hoxton.SR5 Cairo-SR8 UTF-8