From 8980e4859c6ccfd19d85738af4e3f47eee503cae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=AF=E8=88=AA?= Date: Tue, 11 Jun 2024 17:51:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=87=A0=E4=B8=AAbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/qihang/jd/openApi/ApiCommon.java | 7 +++---- .../src/main/java/com/qihang/pdd/openapi/ApiCommon.java | 8 ++++---- .../com/qihang/tao/controller/GoodsApiController.java | 2 +- .../com/qihang/tao/controller/OrderApiController.java | 4 ++-- .../com/qihang/tao/controller/RefundApiController.java | 4 ++-- .../src/main/java/com/qihang/tao/openApi/ApiCommon.java | 4 ++-- 6 files changed, 14 insertions(+), 15 deletions(-) diff --git a/open-api/jd-api/src/main/java/com/qihang/jd/openApi/ApiCommon.java b/open-api/jd-api/src/main/java/com/qihang/jd/openApi/ApiCommon.java index 407cdca9..11db49cc 100644 --- a/open-api/jd-api/src/main/java/com/qihang/jd/openApi/ApiCommon.java +++ b/open-api/jd-api/src/main/java/com/qihang/jd/openApi/ApiCommon.java @@ -57,10 +57,9 @@ public class ApiCommon { params.setAppKey(platform.getAppKey()); params.setAppSecret(platform.getAppSecret()); params.setAccessToken(shop.getAccessToken()); -// params.setTokenRequestUrl(platform.getRedirectUri()); -// params.setApiRequestUrl(platform.getServerUrl()); -// params.setServerUrl(platform.getServerUrl()); - params.setSellerId(shop.getSellerShopId().toString()); + params.setRedirectUrl(platform.getRedirectUrl()); + params.setServerUrl(platform.getServerUrl()); + params.setSellerShopId(shop.getSellerShopId()); if (!StringUtils.hasText(shop.getAccessToken())) { return ResultVo.error(HttpStatus.UNAUTHORIZED1, "Token已过期，请重新授权", params); diff --git a/open-api/pdd-api/src/main/java/com/qihang/pdd/openapi/ApiCommon.java b/open-api/pdd-api/src/main/java/com/qihang/pdd/openapi/ApiCommon.java index 83a1e776..de4b08c1 100644 --- a/open-api/pdd-api/src/main/java/com/qihang/pdd/openapi/ApiCommon.java +++ b/open-api/pdd-api/src/main/java/com/qihang/pdd/openapi/ApiCommon.java @@ -57,10 +57,10 @@ public class ApiCommon { params.setAppKey(platform.getAppKey()); params.setAppSecret(platform.getAppSecret()); params.setAccessToken(shop.getAccessToken()); -// params.setTokenRequestUrl(platform.getRedirectUri()); -// params.setApiRequestUrl(platform.getServerUrl()); -// params.setServerUrl(platform.getServerUrl()); - params.setSellerId(shop.getSellerShopId().toString()); + params.setRedirectUrl(platform.getRedirectUrl()); + + params.setServerUrl(platform.getServerUrl()); + params.setSellerShopId(shop.getSellerShopId()); if (!StringUtils.hasText(shop.getAccessToken())) { return ResultVo.error(HttpStatus.UNAUTHORIZED1, "Token已过期，请重新授权", params); diff --git a/open-api/tao-api/src/main/java/com/qihang/tao/controller/GoodsApiController.java b/open-api/tao-api/src/main/java/com/qihang/tao/controller/GoodsApiController.java index e3cec249..535ba119 100644 --- a/open-api/tao-api/src/main/java/com/qihang/tao/controller/GoodsApiController.java +++ b/open-api/tao-api/src/main/java/com/qihang/tao/controller/GoodsApiController.java @@ -66,7 +66,7 @@ public class GoodsApiController extends BaseController { } ShopApiParams shopApiParams = checkResult.getData(); String sessionKey = shopApiParams.getAccessToken(); - String url = shopApiParams.getApiRequestUrl(); + String url = shopApiParams.getServerUrl(); String appKey = shopApiParams.getAppKey(); String appSecret = shopApiParams.getAppSecret(); diff --git a/open-api/tao-api/src/main/java/com/qihang/tao/controller/OrderApiController.java b/open-api/tao-api/src/main/java/com/qihang/tao/controller/OrderApiController.java index 3145b1cf..f91176e0 100644 --- a/open-api/tao-api/src/main/java/com/qihang/tao/controller/OrderApiController.java +++ b/open-api/tao-api/src/main/java/com/qihang/tao/controller/OrderApiController.java @@ -64,7 +64,7 @@ public class OrderApiController { return AjaxResult.error(checkResult.getCode(), checkResult.getMsg(),checkResult.getData()); } String sessionKey = checkResult.getData().getAccessToken(); - String url = checkResult.getData().getApiRequestUrl(); + String url = checkResult.getData().getServerUrl(); String appKey = checkResult.getData().getAppKey(); String appSecret = checkResult.getData().getAppSecret(); @@ -186,7 +186,7 @@ public class OrderApiController { return AjaxResult.error(checkResult.getCode(), checkResult.getMsg(), checkResult.getData()); } String sessionKey = checkResult.getData().getAccessToken(); - String url = checkResult.getData().getApiRequestUrl(); + String url = checkResult.getData().getServerUrl(); String appKey = checkResult.getData().getAppKey(); String appSecret = checkResult.getData().getAppSecret(); diff --git a/open-api/tao-api/src/main/java/com/qihang/tao/controller/RefundApiController.java b/open-api/tao-api/src/main/java/com/qihang/tao/controller/RefundApiController.java index eb61d88f..0458c360 100644 --- a/open-api/tao-api/src/main/java/com/qihang/tao/controller/RefundApiController.java +++ b/open-api/tao-api/src/main/java/com/qihang/tao/controller/RefundApiController.java @@ -66,7 +66,7 @@ public class RefundApiController { } String sessionKey = checkResult.getData().getAccessToken(); - String url = checkResult.getData().getApiRequestUrl(); + String url = checkResult.getData().getServerUrl(); String appKey = checkResult.getData().getAppKey(); String appSecret = checkResult.getData().getAppSecret(); @@ -184,7 +184,7 @@ public class RefundApiController { } String sessionKey = checkResult.getData().getAccessToken(); - String url = checkResult.getData().getApiRequestUrl(); + String url = checkResult.getData().getServerUrl(); String appKey = checkResult.getData().getAppKey(); String appSecret = checkResult.getData().getAppSecret(); diff --git a/open-api/tao-api/src/main/java/com/qihang/tao/openApi/ApiCommon.java b/open-api/tao-api/src/main/java/com/qihang/tao/openApi/ApiCommon.java index 951cb4cf..3a593539 100644 --- a/open-api/tao-api/src/main/java/com/qihang/tao/openApi/ApiCommon.java +++ b/open-api/tao-api/src/main/java/com/qihang/tao/openApi/ApiCommon.java @@ -58,8 +58,8 @@ public class ApiCommon { params.setAppKey(platform.getAppKey()); params.setAppSecret(platform.getAppSecret()); params.setAccessToken(shop.getAccessToken()); - params.setTokenRequestUrl(platform.getRedirectUrl()); -// params.setApiRequestUrl(platform.getServerUrl()); + params.setRedirectUrl(platform.getRedirectUrl()); + params.setServerUrl(platform.getServerUrl()); if (!StringUtils.hasText(shop.getAccessToken())) {