From d0cd9aed0b72d14b42ebd0365afc69190ecbdd0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=BE=E6=96=87=E8=B1=AA?= <980287353@qq.com> Date: Sat, 14 Sep 2024 22:35:56 +0800 Subject: [PATCH 1/4] =?UTF-8?q?perf=EF=BC=9A=E9=92=89=E9=92=89=E5=8D=95?= =?UTF-8?q?=E6=AC=A1=E5=90=8C=E6=AD=A5=E8=B0=83=E6=95=B4=E4=B8=BA200?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/tiesheng/platform/config/ding/PlatformDingConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f5d37b6..55ae714 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 @@ -233,7 +233,7 @@ public class PlatformDingConfig { } return doRequest(service, "https://oapi.dingtalk.com/topapi/v2/user/list", - JSONUtil.createObj().putOpt("dept_id", deptId).putOpt("cursor", cursor).putOpt("size", 100), + JSONUtil.createObj().putOpt("dept_id", deptId).putOpt("cursor", cursor).putOpt("size", 200), new TypeReference>() { }).getResult(); } From 278429157aa5c60a27ca5b02850b8a847978b101 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=BE=E6=96=87=E8=B1=AA?= <980287353@qq.com> Date: Sat, 14 Sep 2024 22:38:07 +0800 Subject: [PATCH 2/4] =?UTF-8?q?perf=EF=BC=9A=E9=92=89=E9=92=89=E5=8D=95?= =?UTF-8?q?=E6=AC=A1=E5=90=8C=E6=AD=A5=E8=B0=83=E6=95=B4=E4=B8=BA200?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/tiesheng/platform/config/ding/PlatformDingConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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>() { From a816acaddb893c4d702fdce420d412f99d15fb04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=BE=E6=96=87=E8=B1=AA?= <980287353@qq.com> Date: Sat, 14 Sep 2024 22:57:03 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E7=BD=91?= =?UTF-8?q?=E7=BB=9C=E8=AF=B7=E6=B1=82=E5=BC=82=E5=B8=B8=E6=97=B6=EF=BC=8C?= =?UTF-8?q?api=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95=E4=B8=8D=E5=AE=8C?= =?UTF-8?q?=E6=95=B4=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/tiesheng/demo/controller/TestController.java | 3 +++ ...ogApiOkHttpInterceptor.java => OkHttpLogInterceptor.java} | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) rename springboot-web/src/main/java/com/tiesheng/web/service/{LogApiOkHttpInterceptor.java => OkHttpLogInterceptor.java} (93%) 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 06f8b25..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,6 +84,9 @@ public class TestController { String jsonString = JSON.toJSONString(jsonTest); LogFactory.get().info(jsonString); + 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() { // @Override 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(); } From e602f4c658f41b3a667b5d2ca9739d4792c8418d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=BE=E6=96=87=E8=B1=AA?= <980287353@qq.com> Date: Sat, 14 Sep 2024 22:57:37 +0800 Subject: [PATCH 4/4] publish 2.0.5 --- pom.xml | 18 +++++++++--------- springboot-ademo/pom.xml | 4 ++-- springboot-annotation/pom.xml | 2 +- springboot-database/pom.xml | 2 +- springboot-login/pom.xml | 2 +- springboot-message/pom.xml | 2 +- springboot-platform/pom.xml | 2 +- springboot-role/pom.xml | 2 +- springboot-util/pom.xml | 2 +- springboot-web/pom.xml | 2 +- 10 files changed, 19 insertions(+), 19 deletions(-) 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-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-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