From 1992671f1f86c2ebe4f20105ea74ad4b6dd42a4c Mon Sep 17 00:00:00 2001 From: smallchill Date: Mon, 21 Jan 2019 17:48:03 +0800 Subject: [PATCH] :tada: 1.0.0-RC5 --- blade-core-boot/pom.xml | 2 +- .../core/boot/ctrl/BladeController.java | 21 -------------- .../core/boot/logger/RequestLogAspect.java | 2 +- .../src/main/resources/bootstrap.yml | 4 +-- blade-core-launch/pom.xml | 2 +- blade-core-log/pom.xml | 8 ++++- blade-core-mybatis/pom.xml | 2 +- blade-core-secure/pom.xml | 2 +- blade-core-swagger/pom.xml | 2 +- blade-core-tool/pom.xml | 2 +- .../java/org/springblade/core/tool/api/R.java | 4 +-- .../tool/config/MessageConfiguration.java | 4 +-- pom.xml | 29 ++++++++++++------- 13 files changed, 38 insertions(+), 46 deletions(-) diff --git a/blade-core-boot/pom.xml b/blade-core-boot/pom.xml index 8f14280..1be1bd9 100644 --- a/blade-core-boot/pom.xml +++ b/blade-core-boot/pom.xml @@ -5,7 +5,7 @@ org.springblade blade-tool - 1.0.0-RC4 + 1.0.0-RC5 4.0.0 diff --git a/blade-core-boot/src/main/java/org/springblade/core/boot/ctrl/BladeController.java b/blade-core-boot/src/main/java/org/springblade/core/boot/ctrl/BladeController.java index 0b5b122..0d8949b 100644 --- a/blade-core-boot/src/main/java/org/springblade/core/boot/ctrl/BladeController.java +++ b/blade-core-boot/src/main/java/org/springblade/core/boot/ctrl/BladeController.java @@ -21,14 +21,9 @@ import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.SecureUtil; import org.springblade.core.tool.api.R; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.propertyeditors.CustomDateEditor; -import org.springframework.web.bind.ServletRequestDataBinder; -import org.springframework.web.bind.annotation.InitBinder; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; -import java.text.SimpleDateFormat; -import java.util.Date; import java.util.List; /** @@ -38,22 +33,6 @@ import java.util.List; */ public class BladeController { - /** - * ============================ BINDER ================================================= - */ - - /** - * initBinder - * - * @param binder binder - */ - @InitBinder - protected void initBinder(ServletRequestDataBinder binder) { - SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - dateFormat.setLenient(false); - binder.registerCustomEditor(Date.class, new CustomDateEditor(dateFormat, false)); - } - /** * ============================ REQUEST ================================================= */ diff --git a/blade-core-boot/src/main/java/org/springblade/core/boot/logger/RequestLogAspect.java b/blade-core-boot/src/main/java/org/springblade/core/boot/logger/RequestLogAspect.java index 8d5614c..9cc1254 100644 --- a/blade-core-boot/src/main/java/org/springblade/core/boot/logger/RequestLogAspect.java +++ b/blade-core-boot/src/main/java/org/springblade/core/boot/logger/RequestLogAspect.java @@ -46,7 +46,7 @@ public class RequestLogAspect { * @throws Throwable 异常 */ @Around( - "execution(!static org.springblade.core.tool.api.R<*> *(..)) && " + + "execution(!static org.springblade.core.tool.api.R *(..)) && " + "(@within(org.springframework.stereotype.Controller) || " + "@within(org.springframework.web.bind.annotation.RestController))" ) diff --git a/blade-core-boot/src/main/resources/bootstrap.yml b/blade-core-boot/src/main/resources/bootstrap.yml index b851cb9..0248146 100644 --- a/blade-core-boot/src/main/resources/bootstrap.yml +++ b/blade-core-boot/src/main/resources/bootstrap.yml @@ -73,11 +73,11 @@ mybatis-plus: map-underscore-to-camel-case: true cache-enabled: false -#swagger公共信息 +#swagger配置信息 swagger: title: SpringBlade 接口文档系统 description: SpringBlade 接口文档系统 - version: 1.0.0 + version: 2.0.0 license: Powered By SpringBlade licenseUrl: https://springblade.org terms-of-service-url: https://springblade.org diff --git a/blade-core-launch/pom.xml b/blade-core-launch/pom.xml index 9c3469d..016ad08 100644 --- a/blade-core-launch/pom.xml +++ b/blade-core-launch/pom.xml @@ -5,7 +5,7 @@ blade-tool org.springblade - 1.0.0-RC4 + 1.0.0-RC5 4.0.0 diff --git a/blade-core-log/pom.xml b/blade-core-log/pom.xml index 10e9fb7..8f687b1 100644 --- a/blade-core-log/pom.xml +++ b/blade-core-log/pom.xml @@ -5,7 +5,7 @@ blade-tool org.springblade - 1.0.0-RC4 + 1.0.0-RC5 4.0.0 @@ -37,6 +37,12 @@ org.springframework.cloud spring-cloud-starter-openfeign + + + commons-logging + commons-logging + + diff --git a/blade-core-mybatis/pom.xml b/blade-core-mybatis/pom.xml index def1c01..09677f8 100644 --- a/blade-core-mybatis/pom.xml +++ b/blade-core-mybatis/pom.xml @@ -5,7 +5,7 @@ blade-tool org.springblade - 1.0.0-RC4 + 1.0.0-RC5 4.0.0 diff --git a/blade-core-secure/pom.xml b/blade-core-secure/pom.xml index 6989e33..6ec435f 100644 --- a/blade-core-secure/pom.xml +++ b/blade-core-secure/pom.xml @@ -5,7 +5,7 @@ blade-tool org.springblade - 1.0.0-RC4 + 1.0.0-RC5 4.0.0 diff --git a/blade-core-swagger/pom.xml b/blade-core-swagger/pom.xml index 583111a..426b9d1 100644 --- a/blade-core-swagger/pom.xml +++ b/blade-core-swagger/pom.xml @@ -5,7 +5,7 @@ blade-tool org.springblade - 1.0.0-RC4 + 1.0.0-RC5 4.0.0 diff --git a/blade-core-tool/pom.xml b/blade-core-tool/pom.xml index 028e64d..076c67d 100644 --- a/blade-core-tool/pom.xml +++ b/blade-core-tool/pom.xml @@ -6,7 +6,7 @@ org.springblade blade-tool - 1.0.0-RC4 + 1.0.0-RC5 4.0.0 diff --git a/blade-core-tool/src/main/java/org/springblade/core/tool/api/R.java b/blade-core-tool/src/main/java/org/springblade/core/tool/api/R.java index 06b4474..0f7ddf4 100644 --- a/blade-core-tool/src/main/java/org/springblade/core/tool/api/R.java +++ b/blade-core-tool/src/main/java/org/springblade/core/tool/api/R.java @@ -35,7 +35,7 @@ import java.util.Optional; @Setter @ToString @ApiModel(description = "返回信息") -@NoArgsConstructor(access = AccessLevel.PRIVATE) +@NoArgsConstructor public class R implements Serializable { private static final long serialVersionUID = 1L; @@ -217,7 +217,7 @@ public class R implements Serializable { * @param flag 成功状态 * @return R */ - public static R status(boolean flag) { + public static R status(boolean flag) { return flag ? success(BladeConstant.DEFAULT_SUCCESS_MESSAGE) : fail(BladeConstant.DEFAULT_FAILURE_MESSAGE); } diff --git a/blade-core-tool/src/main/java/org/springblade/core/tool/config/MessageConfiguration.java b/blade-core-tool/src/main/java/org/springblade/core/tool/config/MessageConfiguration.java index 54cd1b9..18d187d 100644 --- a/blade-core-tool/src/main/java/org/springblade/core/tool/config/MessageConfiguration.java +++ b/blade-core-tool/src/main/java/org/springblade/core/tool/config/MessageConfiguration.java @@ -20,6 +20,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import lombok.AllArgsConstructor; import org.springblade.core.tool.jackson.MappingApiJackson2HttpMessageConverter; import org.springblade.core.tool.support.xss.XssFilter; +import org.springblade.core.tool.utils.Charsets; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -30,7 +31,6 @@ import org.springframework.http.converter.json.AbstractJackson2HttpMessageConver import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import javax.servlet.DispatcherType; -import java.nio.charset.StandardCharsets; import java.util.List; /** @@ -51,7 +51,7 @@ public class MessageConfiguration implements WebMvcConfigurer { @Override public void configureMessageConverters(List> converters) { converters.removeIf(x -> x instanceof StringHttpMessageConverter || x instanceof AbstractJackson2HttpMessageConverter); - converters.add(new StringHttpMessageConverter(StandardCharsets.UTF_8)); + converters.add(new StringHttpMessageConverter(Charsets.UTF_8)); converters.add(new ByteArrayHttpMessageConverter()); converters.add(new ResourceHttpMessageConverter()); converters.add(new ResourceRegionHttpMessageConverter()); diff --git a/pom.xml b/pom.xml index 552649c..4ea40c1 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springblade blade-tool - 1.0.0-RC4 + 1.0.0-RC5 pom blade-tool @@ -36,22 +36,23 @@ - 1.0.0-RC4 + 1.0.0-RC5 1.8 3.8.0 2.9.2 1.5.21 1.8.8 - 3.0.6 + 3.0.7.1 4.0.1 1.6.0 3.4.2 2.0.2 + 0.0.1 2.0.7.RELEASE Finchley.SR2 - Cairo-SR5 + Cairo-RELEASE UTF-8 UTF-8 @@ -120,6 +121,12 @@ org.springframework.cloud spring-cloud-starter-netflix-hystrix + + + commons-logging + commons-logging + +