From 0205fe0695e5590d0e4b7aff0b44c99a8f61397a Mon Sep 17 00:00:00 2001 From: mxd <838425805@qq.com> Date: Sat, 22 May 2021 21:36:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B91.2.0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/ssssssss/magicapi/modules/ResponseModule.java | 3 ++- .../main/java/org/ssssssss/magicapi/modules/SQLModule.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/magic-api/src/main/java/org/ssssssss/magicapi/modules/ResponseModule.java b/magic-api/src/main/java/org/ssssssss/magicapi/modules/ResponseModule.java index 09e3b8b1..e5f4e6bd 100644 --- a/magic-api/src/main/java/org/ssssssss/magicapi/modules/ResponseModule.java +++ b/magic-api/src/main/java/org/ssssssss/magicapi/modules/ResponseModule.java @@ -7,6 +7,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.context.request.RequestAttributes; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; +import org.ssssssss.magicapi.context.RequestContext; import org.ssssssss.magicapi.provider.ResultProvider; import org.ssssssss.script.annotation.Comment; import org.ssssssss.script.functions.ObjectConvertExtension; @@ -50,7 +51,7 @@ public class ResponseModule { */ @Comment("返回自定义分页结果") public Object page(@Comment("总条数") long total, @Comment("当前结果集") List> values) { - return resultProvider.buildPageResult(total, values); + return resultProvider.buildPageResult(RequestContext.getRequestEntity(),null, total, values); } /** diff --git a/magic-api/src/main/java/org/ssssssss/magicapi/modules/SQLModule.java b/magic-api/src/main/java/org/ssssssss/magicapi/modules/SQLModule.java index c9f127cd..beb7866f 100644 --- a/magic-api/src/main/java/org/ssssssss/magicapi/modules/SQLModule.java +++ b/magic-api/src/main/java/org/ssssssss/magicapi/modules/SQLModule.java @@ -281,7 +281,7 @@ public class SQLModule extends HashMap implements MagicModule @UnableCall public int update(BoundSql boundSql) { - sqlInterceptors.forEach(sqlInterceptor -> sqlInterceptor.preHandle(boundSql)); + sqlInterceptors.forEach(sqlInterceptor -> sqlInterceptor.preHandle(boundSql, RequestContext.getRequestEntity())); int value = dataSourceNode.getJdbcTemplate().update(boundSql.getSql(), boundSql.getParameters()); if (this.cacheName != null) { this.sqlCache.delete(this.cacheName); @@ -308,7 +308,7 @@ public class SQLModule extends HashMap implements MagicModule } void insert(BoundSql boundSql, MagicKeyHolder keyHolder) { - sqlInterceptors.forEach(sqlInterceptor -> sqlInterceptor.preHandle(boundSql)); + sqlInterceptors.forEach(sqlInterceptor -> sqlInterceptor.preHandle(boundSql, RequestContext.getRequestEntity())); dataSourceNode.getJdbcTemplate().update(con -> { PreparedStatement ps = keyHolder.createPrepareStatement(con, boundSql.getSql()); new ArgumentPreparedStatementSetter(boundSql.getParameters()).setValues(ps);