From f8d2ab5e17f3c4bfe1888e6413e0b4638e6ef4d3 Mon Sep 17 00:00:00 2001
From: paulGao <paulgao0831@gmail.com>
Date: Mon, 14 Feb 2022 18:32:28 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D=E4=BF=AE=E6=94=B9=E7=9A=84ap?=
 =?UTF-8?q?i?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer-api/src/main/resources/application.yml           |  1 +
 .../java/cn/lili/modules/connect/util/ConnectUtil.java | 10 +++++-----
 .../main/java/cn/lili/modules/payment/kit/Payment.java |  8 ++++----
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/buyer-api/src/main/resources/application.yml b/buyer-api/src/main/resources/application.yml
index bf86659d..4192a8ab 100644
--- a/buyer-api/src/main/resources/application.yml
+++ b/buyer-api/src/main/resources/application.yml
@@ -129,6 +129,7 @@ ignored:
     - /weixin/**
     - /source/**
     - /buyer/payment/cashier/**
+    - /buyer/payment/cashierRefund/**
     - /buyer/other/pageData/**
     - /buyer/other/article/**
     - /buyer/goods/**
diff --git a/framework/src/main/java/cn/lili/modules/connect/util/ConnectUtil.java b/framework/src/main/java/cn/lili/modules/connect/util/ConnectUtil.java
index 6a627b4b..272ad84e 100644
--- a/framework/src/main/java/cn/lili/modules/connect/util/ConnectUtil.java
+++ b/framework/src/main/java/cn/lili/modules/connect/util/ConnectUtil.java
@@ -3,22 +3,22 @@ package cn.lili.modules.connect.util;
 import cn.hutool.json.JSONUtil;
 import cn.lili.cache.Cache;
 import cn.lili.cache.CachePrefix;
+import cn.lili.common.enums.ClientTypeEnum;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.common.security.token.Token;
-import cn.lili.common.vo.ResultMessage;
 import cn.lili.common.properties.ApiProperties;
 import cn.lili.common.properties.DomainProperties;
-import cn.lili.common.enums.ClientTypeEnum;
+import cn.lili.common.security.token.Token;
+import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.connect.config.AuthConfig;
 import cn.lili.modules.connect.config.ConnectAuthEnum;
 import cn.lili.modules.connect.entity.dto.AuthCallback;
 import cn.lili.modules.connect.entity.dto.AuthResponse;
 import cn.lili.modules.connect.entity.dto.ConnectAuthUser;
 import cn.lili.modules.connect.exception.AuthException;
-import cn.lili.modules.connect.request.BaseAuthQQRequest;
 import cn.lili.modules.connect.request.AuthRequest;
+import cn.lili.modules.connect.request.BaseAuthQQRequest;
 import cn.lili.modules.connect.request.BaseAuthWeChatPCRequest;
 import cn.lili.modules.connect.request.BaseAuthWeChatRequest;
 import cn.lili.modules.connect.service.ConnectService;
@@ -62,7 +62,7 @@ public class ConnectUtil {
     private DomainProperties domainProperties;
 
 
-    static String prefix = "/buyer/connect/callback/";
+    static String prefix = "/buyer/passport/connect/connect/callback/";
 
     /**
      * 回调地址获取
diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/Payment.java b/framework/src/main/java/cn/lili/modules/payment/kit/Payment.java
index 9ad4b921..4046dc1a 100644
--- a/framework/src/main/java/cn/lili/modules/payment/kit/Payment.java
+++ b/framework/src/main/java/cn/lili/modules/payment/kit/Payment.java
@@ -4,8 +4,8 @@ import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.payment.entity.RefundLog;
-import cn.lili.modules.payment.kit.dto.PayParam;
 import cn.lili.modules.payment.entity.enums.PaymentMethodEnum;
+import cn.lili.modules.payment.kit.dto.PayParam;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -129,7 +129,7 @@ public interface Payment {
      * @return 回调地址
      */
     default String callbackUrl(String api, PaymentMethodEnum paymentMethodEnum) {
-        return api + "/buyer/cashier/callback/" + paymentMethodEnum.name();
+        return api + "/buyer/payment/cashier/callback/" + paymentMethodEnum.name();
     }
     /**
      * 支付异步通知地址
@@ -139,7 +139,7 @@ public interface Payment {
      * @return 异步通知地址
      */
     default String notifyUrl(String api, PaymentMethodEnum paymentMethodEnum) {
-        return api + "/buyer/cashier/notify/" + paymentMethodEnum.name();
+        return api + "/buyer/payment/cashier/notify/" + paymentMethodEnum.name();
     }
 
     /**
@@ -150,7 +150,7 @@ public interface Payment {
      * @return 异步通知地址
      */
     default String refundNotifyUrl(String api, PaymentMethodEnum paymentMethodEnum) {
-        return api + "/buyer/cashier/refund/notify/" + paymentMethodEnum.name();
+        return api + "/buyer/payment/cashierRefund/notify/" + paymentMethodEnum.name();
     }
 
 }