From 9bc2ae07b8006156e23331b5c38c9135b5e9fdb8 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, 9 Nov 2024 13:26:52 +0800 Subject: [PATCH] publish 1.0.12-icbc-sandbox --- pom.xml | 20 +++++++++---------- springboot-ademo/pom.xml | 2 +- springboot-annotation/pom.xml | 2 +- springboot-database/pom.xml | 2 +- springboot-encrypt/pom.xml | 2 +- springboot-login/pom.xml | 2 +- .../service/impl/DefaultLoginConfigurer.java | 5 +++++ springboot-message/pom.xml | 2 +- springboot-platform/pom.xml | 2 +- springboot-poi/pom.xml | 2 +- springboot-util/pom.xml | 2 +- .../java/com/tiesheng/util/pojos/ApiResp.java | 8 -------- springboot-web/pom.xml | 2 +- .../core/service/FileUploadService.java | 1 + .../core/service/TieshengWebConfigurer.java | 3 +-- 15 files changed, 27 insertions(+), 30 deletions(-) diff --git a/pom.xml b/pom.xml index 90db7d9..5ebcabb 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 1.0.12 + 1.0.12-icbc-sandbox pom springboot-parent 杭州铁晟科技有限公司基础依赖 @@ -57,55 +57,55 @@ com.tiesheng.springboot-parent springboot-database - 1.0.12 + 1.0.12-icbc-sandbox com.tiesheng.springboot-parent springboot-login - 1.0.12 + 1.0.12-icbc-sandbox com.tiesheng.springboot-parent springboot-web - 1.0.12 + 1.0.12-icbc-sandbox com.tiesheng.springboot-parent springboot-util - 1.0.12 + 1.0.12-icbc-sandbox com.tiesheng.springboot-parent springboot-platform - 1.0.12 + 1.0.12-icbc-sandbox com.tiesheng.springboot-parent springboot-message - 1.0.12 + 1.0.12-icbc-sandbox com.tiesheng.springboot-parent springboot-encrypt - 1.0.12 + 1.0.12-icbc-sandbox com.tiesheng.springboot-parent springboot-annotation - 1.0.12 + 1.0.12-icbc-sandbox com.tiesheng.springboot-parent springboot-poi - 1.0.12 + 1.0.12-icbc-sandbox diff --git a/springboot-ademo/pom.xml b/springboot-ademo/pom.xml index 0e96d8c..091d362 100644 --- a/springboot-ademo/pom.xml +++ b/springboot-ademo/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 1.0.12 + 1.0.12-icbc-sandbox springboot-ademo diff --git a/springboot-annotation/pom.xml b/springboot-annotation/pom.xml index 0e35ef4..676be66 100644 --- a/springboot-annotation/pom.xml +++ b/springboot-annotation/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 1.0.12 + 1.0.12-icbc-sandbox springboot-annotation diff --git a/springboot-database/pom.xml b/springboot-database/pom.xml index 85b6e2d..6723c00 100644 --- a/springboot-database/pom.xml +++ b/springboot-database/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 1.0.12 + 1.0.12-icbc-sandbox springboot-database diff --git a/springboot-encrypt/pom.xml b/springboot-encrypt/pom.xml index 773ebfe..ce7c9c9 100644 --- a/springboot-encrypt/pom.xml +++ b/springboot-encrypt/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 1.0.12 + 1.0.12-icbc-sandbox springboot-encrypt diff --git a/springboot-login/pom.xml b/springboot-login/pom.xml index 791aaf0..334c833 100644 --- a/springboot-login/pom.xml +++ b/springboot-login/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 1.0.12 + 1.0.12-icbc-sandbox springboot-login diff --git a/springboot-login/src/main/java/com/tiesheng/login/service/impl/DefaultLoginConfigurer.java b/springboot-login/src/main/java/com/tiesheng/login/service/impl/DefaultLoginConfigurer.java index 0bb8625..af82d61 100644 --- a/springboot-login/src/main/java/com/tiesheng/login/service/impl/DefaultLoginConfigurer.java +++ b/springboot-login/src/main/java/com/tiesheng/login/service/impl/DefaultLoginConfigurer.java @@ -24,4 +24,9 @@ public class DefaultLoginConfigurer implements TieshengLoginConfigurer { public void onLoginRedirect(TokenBean bean, String to, String extra, HttpServletResponse response) { } + + @Override + public void onSignError(HttpServletResponse response) { + + } } diff --git a/springboot-message/pom.xml b/springboot-message/pom.xml index 1b50fb3..e9271a8 100644 --- a/springboot-message/pom.xml +++ b/springboot-message/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 1.0.12 + 1.0.12-icbc-sandbox springboot-message diff --git a/springboot-platform/pom.xml b/springboot-platform/pom.xml index 55ce6e0..b7857ba 100644 --- a/springboot-platform/pom.xml +++ b/springboot-platform/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 1.0.12 + 1.0.12-icbc-sandbox springboot-platform diff --git a/springboot-poi/pom.xml b/springboot-poi/pom.xml index cc7837b..af9e1fd 100644 --- a/springboot-poi/pom.xml +++ b/springboot-poi/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 1.0.12 + 1.0.12-icbc-sandbox springboot-poi diff --git a/springboot-util/pom.xml b/springboot-util/pom.xml index f742241..fc0e262 100644 --- a/springboot-util/pom.xml +++ b/springboot-util/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 1.0.12 + 1.0.12-icbc-sandbox springboot-util diff --git a/springboot-util/src/main/java/com/tiesheng/util/pojos/ApiResp.java b/springboot-util/src/main/java/com/tiesheng/util/pojos/ApiResp.java index bf42220..1b5ec93 100644 --- a/springboot-util/src/main/java/com/tiesheng/util/pojos/ApiResp.java +++ b/springboot-util/src/main/java/com/tiesheng/util/pojos/ApiResp.java @@ -17,7 +17,6 @@ public class ApiResp { private int code; private String message; - private Throwable exception; private T data; private long recordsTotal = 0; private boolean encrypt = false; @@ -182,11 +181,4 @@ public class ApiResp { this.encrypt = encrypt; } - public Throwable getException() { - return exception; - } - - public void setException(Throwable exception) { - this.exception = exception; - } } diff --git a/springboot-web/pom.xml b/springboot-web/pom.xml index 835333b..27639bd 100644 --- a/springboot-web/pom.xml +++ b/springboot-web/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 1.0.12 + 1.0.12-icbc-sandbox springboot-web diff --git a/springboot-web/src/main/java/com/tiesheng/core/service/FileUploadService.java b/springboot-web/src/main/java/com/tiesheng/core/service/FileUploadService.java index dcd4400..bcff61c 100644 --- a/springboot-web/src/main/java/com/tiesheng/core/service/FileUploadService.java +++ b/springboot-web/src/main/java/com/tiesheng/core/service/FileUploadService.java @@ -114,6 +114,7 @@ public class FileUploadService { * @param fileMd5 */ public String chunkMerge(String fileMd5, String fileExt) { + tieshengWebConfigurer.uploadFileCheck(fileExt); // 1，获取文件块的目录 FileUploadPath folder = FileUploadPath.folder(fileMd5); diff --git a/springboot-web/src/main/java/com/tiesheng/core/service/TieshengWebConfigurer.java b/springboot-web/src/main/java/com/tiesheng/core/service/TieshengWebConfigurer.java index ae8f061..c490c90 100644 --- a/springboot-web/src/main/java/com/tiesheng/core/service/TieshengWebConfigurer.java +++ b/springboot-web/src/main/java/com/tiesheng/core/service/TieshengWebConfigurer.java @@ -35,8 +35,7 @@ public interface TieshengWebConfigurer { */ default ApiResp addExceptionHandler(Exception e) { ApiResp apiResp = ApiResp.respCust(ApiRespEnum.ServerError); - apiResp.setException(e); - LogFactory.get().info(apiResp.getException()); + LogFactory.get().info(e); return apiResp; }