From 2a8a8dffb21dec7a04711e588eff21799f2503ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 16 Apr 2025 11:30:18 +0800 Subject: [PATCH 1/5] =?UTF-8?q?feat:OSS=E5=88=87=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/service/impl/PushServiceImpl.java | 4 ++++ .../java/com/cool/store/config/OpenApiValidateFilter.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PushServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PushServiceImpl.java index 8c2d3d85c..9e28e3cdf 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PushServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PushServiceImpl.java @@ -181,6 +181,10 @@ public class PushServiceImpl implements PushService { try { Request request = buildRequest(requestBody, url, username, secret); + request.headers().names().forEach(x->{ + log.info(x+": {}",request.header(x)); + }); + try (Response response = okHttpClient.newCall(request).execute()) { // 2. 获取原始响应内容 String responseBody = response.body().string(); diff --git a/coolstore-partner-web/src/main/java/com/cool/store/config/OpenApiValidateFilter.java b/coolstore-partner-web/src/main/java/com/cool/store/config/OpenApiValidateFilter.java index c3336ed70..e2512857e 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/config/OpenApiValidateFilter.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/config/OpenApiValidateFilter.java @@ -66,7 +66,7 @@ public class OpenApiValidateFilter implements Filter { long currentTime = System.currentTimeMillis()/1000; long timeDiff = Math.abs(currentTime - timestamp); - if (timeDiff > 300) { + if (timeDiff > 600) { log.info("OpenApiValidateFilter==>{}","请求已过期，服务器时间:" + currentTime + " 请求时间:" + timestamp); throw new ServiceException(ErrorCodeEnum.SIGN_FAIL); } From 7f3882747654514987cd2e570f1f280d7276fa9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 16 Apr 2025 11:38:39 +0800 Subject: [PATCH 2/5] =?UTF-8?q?feat:OSS=E5=88=87=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cool/store/config/OpenApiValidateFilter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-web/src/main/java/com/cool/store/config/OpenApiValidateFilter.java b/coolstore-partner-web/src/main/java/com/cool/store/config/OpenApiValidateFilter.java index e2512857e..6414b2726 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/config/OpenApiValidateFilter.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/config/OpenApiValidateFilter.java @@ -48,7 +48,7 @@ public class OpenApiValidateFilter implements Filter { MDC.put(CommonConstants.REQUEST_ID, UUIDUtils.get32UUID()); HttpServletRequest request = (HttpServletRequest) servletRequest; String uri = request.getRequestURI(); - if(!uri.startsWith("/zxjp/open")){ + if(!uri.startsWith("/zxjp/open1")){ filterChain.doFilter(servletRequest, response); return; } From da134b75f114f8e2cd8ceac5451ea7db43a80075 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 16 Apr 2025 11:45:47 +0800 Subject: [PATCH 3/5] =?UTF-8?q?feat:OSS=E5=88=87=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/cool/store/mapper/ShopInfoMapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java index 631639a7c..ce1094d3c 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java @@ -93,7 +93,7 @@ public interface ShopInfoMapper extends Mapper { ShopInfoDO selectByStoreNum(@Param("storeNum") String storeNum); - ShopInfoDO selectByStoreCode(@Param("storeNum") String storeCode); + ShopInfoDO selectByStoreCode(@Param("storeCode") String storeCode); /** * @Auther: wangshuo * @Date: 2024/5/3 From a905e2be3b1a7414ebbb58f37351a4a61aee5625 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 16 Apr 2025 11:50:24 +0800 Subject: [PATCH 4/5] =?UTF-8?q?feat:OSS=E5=88=87=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/ShopInfoMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml index 79d47d54a..c34d7c813 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml @@ -177,7 +177,7 @@ select from xfsg_shop_info - where store_code = #{storeCode} + where shop_code = #{storeCode}