diff --git a/pom.xml b/pom.xml index 2c40637..16e6a02 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 2.0.4 + 2.0.5 pom springboot-parent 杭州铁晟科技有限公司基础依赖 @@ -58,49 +58,49 @@ com.tiesheng.springboot-parent springboot-database - 2.0.4 + 2.0.5 com.tiesheng.springboot-parent springboot-login - 2.0.4 + 2.0.5 com.tiesheng.springboot-parent springboot-web - 2.0.4 + 2.0.5 com.tiesheng.springboot-parent springboot-util - 2.0.4 + 2.0.5 com.tiesheng.springboot-parent springboot-platform - 2.0.4 + 2.0.5 com.tiesheng.springboot-parent springboot-message - 2.0.4 + 2.0.5 com.tiesheng.springboot-parent springboot-role - 2.0.4 + 2.0.5 com.tiesheng.springboot-parent springboot-annotation - 2.0.4 + 2.0.5 diff --git a/springboot-ademo/pom.xml b/springboot-ademo/pom.xml index 5b24aa8..7547735 100644 --- a/springboot-ademo/pom.xml +++ b/springboot-ademo/pom.xml @@ -6,11 +6,11 @@ com.tiesheng.springboot-parent springboot-parent - 2.0.4 + 2.0.5 springboot-ademo - 2.0.4 + 2.0.5 8 diff --git a/springboot-ademo/src/main/java/com/tiesheng/demo/controller/TestController.java b/springboot-ademo/src/main/java/com/tiesheng/demo/controller/TestController.java index 9cdd156..590ec22 100644 --- a/springboot-ademo/src/main/java/com/tiesheng/demo/controller/TestController.java +++ b/springboot-ademo/src/main/java/com/tiesheng/demo/controller/TestController.java @@ -84,12 +84,8 @@ public class TestController { String jsonString = JSON.toJSONString(jsonTest); LogFactory.get().info(jsonString); - -// String data = "0moeVHD0879FOJzCORIxc3SDFIsgzDBCmrZSCORLXPxMUtruvUifSME7xanfM3cJd6qgYRN7yIhL7Jc29PTy9DIhBMzEV3VYcN4r+WYw7VDHMIVJ9nprKqekHgujJtdHiUNKdYYm7yDhlb8cZE4Gam5/xTV20BZk92EV08/4S9A5txZCj2ETJ9/51WEeoC2V1Z3tVFdbOx2ktbygeOce3BUD5/q9UGRf59xshDe6Yow="; - String data = "C9g1Kr5UttpMdFWOvAvVTyUMjpNuCJglVv5mkF0ZexkjUPE9XJAFtJegV5x3bAJnN/8Coe18s/eQ+PhwN1cRMCChiOjbjOD4raqlTVjwCDzV/d7BD2b1nVI3J38tDBE26GDQ158MY3d7Q554wTahy8uvNoo+tFyVpMVw0B6GPW2IEF8KYU3u62eur+x2FhoSuPkPAyNpcwAK8hrC3m684lBc8+l3+zs7re0wSd0ypf7hD5QbEE+NbkBMJAOv78CXmhgTQ6zXerKmPEIw+gvviODoHbcsqUODLnCVyny0xTNzAHeNciYZgKarNu5aherI"; - String decrypt = encryptConfig.decrypt(data); - LogFactory.get().info(decrypt); - + String s = OkHttpUtil.get("http://toolbox.tieshengkeji.com/test/login/23232/3232"); + LogFactory.get().info(s); // ArrayList strings = CollUtil.newArrayList("11111", "22222"); // coreLogService.addProcess("fdfd", strings, new ProcessImportConsumer() { diff --git a/springboot-annotation/pom.xml b/springboot-annotation/pom.xml index 55bc146..ea57cc1 100644 --- a/springboot-annotation/pom.xml +++ b/springboot-annotation/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 2.0.4 + 2.0.5 springboot-annotation diff --git a/springboot-database/pom.xml b/springboot-database/pom.xml index a14790b..879182a 100644 --- a/springboot-database/pom.xml +++ b/springboot-database/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 2.0.4 + 2.0.5 springboot-database diff --git a/springboot-login/pom.xml b/springboot-login/pom.xml index 5d0064b..8aa3fbb 100644 --- a/springboot-login/pom.xml +++ b/springboot-login/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 2.0.4 + 2.0.5 springboot-login diff --git a/springboot-message/pom.xml b/springboot-message/pom.xml index 2ed3955..dce14ed 100644 --- a/springboot-message/pom.xml +++ b/springboot-message/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 2.0.4 + 2.0.5 springboot-message diff --git a/springboot-platform/pom.xml b/springboot-platform/pom.xml index 82d53aa..ef7ada5 100644 --- a/springboot-platform/pom.xml +++ b/springboot-platform/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 2.0.4 + 2.0.5 springboot-platform diff --git a/springboot-platform/src/main/java/com/tiesheng/platform/config/ding/PlatformDingConfig.java b/springboot-platform/src/main/java/com/tiesheng/platform/config/ding/PlatformDingConfig.java index 6c86f1d..0f26586 100644 --- a/springboot-platform/src/main/java/com/tiesheng/platform/config/ding/PlatformDingConfig.java +++ b/springboot-platform/src/main/java/com/tiesheng/platform/config/ding/PlatformDingConfig.java @@ -246,7 +246,7 @@ public class PlatformDingConfig { JSONObject object = new JSONObject(); object.put("dept_id", deptId); object.put("cursor", cursor); - object.put("size", 100); + object.put("size", 200); return doRequest(service, "https://oapi.dingtalk.com/topapi/v2/user/list", object, new TypeReference>() { diff --git a/springboot-role/pom.xml b/springboot-role/pom.xml index 011fd1b..f3c68b8 100644 --- a/springboot-role/pom.xml +++ b/springboot-role/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 2.0.4 + 2.0.5 springboot-role diff --git a/springboot-util/pom.xml b/springboot-util/pom.xml index 1f1c28b..32b09a3 100644 --- a/springboot-util/pom.xml +++ b/springboot-util/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 2.0.4 + 2.0.5 springboot-util diff --git a/springboot-web/pom.xml b/springboot-web/pom.xml index e7430ca..5fb4dfa 100644 --- a/springboot-web/pom.xml +++ b/springboot-web/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 2.0.4 + 2.0.5 springboot-web diff --git a/springboot-web/src/main/java/com/tiesheng/web/service/LogApiOkHttpInterceptor.java b/springboot-web/src/main/java/com/tiesheng/web/service/OkHttpLogInterceptor.java similarity index 93% rename from springboot-web/src/main/java/com/tiesheng/web/service/LogApiOkHttpInterceptor.java rename to springboot-web/src/main/java/com/tiesheng/web/service/OkHttpLogInterceptor.java index 85fd4af..f785ed1 100644 --- a/springboot-web/src/main/java/com/tiesheng/web/service/LogApiOkHttpInterceptor.java +++ b/springboot-web/src/main/java/com/tiesheng/web/service/OkHttpLogInterceptor.java @@ -14,7 +14,7 @@ import javax.annotation.Resource; import javax.validation.constraints.NotNull; @Component -public class LogApiOkHttpInterceptor implements Interceptor { +public class OkHttpLogInterceptor implements Interceptor { @Resource CoreLogApiMapper coreLogApiMapper; @@ -52,6 +52,9 @@ public class LogApiOkHttpInterceptor implements Interceptor { response = new Response.Builder() .request(request) + .protocol(Protocol.HTTP_1_1) + .code(logApi.getResult()) + .message(e.getMessage()) .body(OkHttpUtil.ofJsonResponse(logApi.getRespBody())) .build(); }