diff --git a/README.md b/README.md index f33896b..afef311 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ parent:版本封装
base:功能封装 #### 引用 ->yexuejc.springboot.version=1.0.7 +>yexuejc.springboot.version=1.0.8 pom.xml ``` diff --git a/UPDATE.md b/UPDATE.md index a611b6a..46952bf 100644 --- a/UPDATE.md +++ b/UPDATE.md @@ -1,7 +1,26 @@ uselaw-base 更新内容 ------------------- -#### version :1.0.7 +#### version :1.0.8 +**time:** 2018-5-4 09:54:18
+**branch:** master
+**update:**
+1. 修复依赖 +2. 使用加密:配置密钥方式/配置密钥方式 二选一 +``` +#加密开关 +yexuejc.http.encrypt.encrypt=true +yexuejc.http.encrypt.decrypt=true +#配置密钥方式 +yexuejc.http.encrypt.private-key=私钥 +#配置证书方式 +yexuejc.http.encrypt.private-key-path=/lgfishing.keystore 路径 +yexuejc.http.encrypt.private-alias=别名 +yexuejc.http.encrypt.private-pwd=密码 +``` + +# +##### version :1.0.7 **time:** 2018-5-4 09:54:18
**branch:** master
**update:**
diff --git a/pom.xml b/pom.xml index 4a93ba8..5afca17 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.yexuejc.springboot yexuejc-springboot-parent - 1.0.7 + 1.0.8 pom ${project.artifactId} @@ -105,6 +105,7 @@ springfox-swagger-ui ${springfox-swagger2.version} + org.mybatis.spring.boot diff --git a/yexuejc-springboot-base/pom.xml b/yexuejc-springboot-base/pom.xml index 5513aac..8955976 100644 --- a/yexuejc-springboot-base/pom.xml +++ b/yexuejc-springboot-base/pom.xml @@ -9,7 +9,7 @@ com.yexuejc.springboot yexuejc-springboot-parent - 1.0.7 + 1.0.8 @@ -22,14 +22,15 @@ - - - - - com.github.yexuejc + com.yexuejc.base yexuejc-base + + + + + org.springframework.boot @@ -78,14 +79,6 @@ jedis true - - - commons-io - commons-io - 2.6 - true - - org.springframework.boot spring-boot-starter-test diff --git a/yexuejc-springboot-base/src/main/java/com/yexuejc/springboot/base/filter/ParamsRequestBodyAdvice.java b/yexuejc-springboot-base/src/main/java/com/yexuejc/springboot/base/filter/ParamsRequestBodyAdvice.java index 1c08dc7..3016140 100644 --- a/yexuejc-springboot-base/src/main/java/com/yexuejc/springboot/base/filter/ParamsRequestBodyAdvice.java +++ b/yexuejc-springboot-base/src/main/java/com/yexuejc/springboot/base/filter/ParamsRequestBodyAdvice.java @@ -30,7 +30,7 @@ import java.security.interfaces.RSAPrivateKey; * @author: maxf * @date: 2018/5/12 22:49 */ -@ControllerAdvice(basePackages = "com") +@ControllerAdvice @EnableConfigurationProperties(RsaProperties.class) public class ParamsRequestBodyAdvice implements RequestBodyAdvice { diff --git a/yexuejc-springboot-base/src/main/java/com/yexuejc/springboot/base/filter/ParamsResponseBodyAdvice.java b/yexuejc-springboot-base/src/main/java/com/yexuejc/springboot/base/filter/ParamsResponseBodyAdvice.java index 4746031..1326788 100644 --- a/yexuejc-springboot-base/src/main/java/com/yexuejc/springboot/base/filter/ParamsResponseBodyAdvice.java +++ b/yexuejc-springboot-base/src/main/java/com/yexuejc/springboot/base/filter/ParamsResponseBodyAdvice.java @@ -28,7 +28,7 @@ import java.util.Map; * @author: maxf * @date: 2018/5/12 22:50 */ -@ControllerAdvice(basePackages = "com") +@ControllerAdvice @EnableConfigurationProperties(RsaProperties.class) public class ParamsResponseBodyAdvice implements ResponseBodyAdvice { diff --git a/yexuejc-springboot-base/src/main/resources/META-INF/spring.factories b/yexuejc-springboot-base/src/main/resources/META-INF/spring.factories index 42fe140..0a80197 100644 --- a/yexuejc-springboot-base/src/main/resources/META-INF/spring.factories +++ b/yexuejc-springboot-base/src/main/resources/META-INF/spring.factories @@ -1,4 +1,7 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ com.yexuejc.springboot.base.autoconfigure.WebAutoConfiguration,\ com.yexuejc.springboot.base.autoconfigure.OssAutoConfiguration,\ -com.yexuejc.springboot.base.autoconfigure.MutiRedisAutoConfiguration +com.yexuejc.springboot.base.autoconfigure.MutiRedisAutoConfiguration,\ +com.yexuejc.springboot.base.filter.ParamsRequestBodyAdvice,\ +com.yexuejc.springboot.base.filter.ParamsResponseBodyAdvice + diff --git a/yexuejc-springboot-base/src/test/java/com/yexuejc/springboot/base/web/IndexCtrl.java b/yexuejc-springboot-base/src/test/java/com/yexuejc/springboot/base/web/IndexCtrl.java index 0e4dea5..eb34a45 100644 --- a/yexuejc-springboot-base/src/test/java/com/yexuejc/springboot/base/web/IndexCtrl.java +++ b/yexuejc-springboot-base/src/test/java/com/yexuejc/springboot/base/web/IndexCtrl.java @@ -4,7 +4,6 @@ import com.yexuejc.base.http.Resps; import com.yexuejc.base.pojo.PagerVO; import com.yexuejc.base.util.JsonUtil; import com.yexuejc.base.util.StrUtil; -import org.springframework.data.repository.query.Param; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -27,7 +26,7 @@ public class IndexCtrl { } @RequestMapping(value = {"/2"}) - public Resps a(String name, @Param("name") String pwd) { + public Resps a(String name, String pwd) { System.out.println("请求参数:name = [" + name + "], pwd = [" + pwd + "]"); return Resps.success("请求成功").setSucc("id>" + StrUtil.genUUID()); }