caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

适配修改的api

Browse Source
This commit is contained in:
paulGao 2022-02-14 18:32:28 +08:00
parent 9aa253b56f
commit f8d2ab5e17
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
buyer-api/src/main/resources/application.yml
View File

@ -129,6 +129,7 @@ ignored:
- /weixin/**
- /source/**
- /buyer/payment/cashier/**
- /buyer/payment/cashierRefund/**
- /buyer/other/pageData/**
- /buyer/other/article/**
- /buyer/goods/**

10
framework/src/main/java/cn/lili/modules/connect/util/ConnectUtil.java
View File

@ -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/";
/**
* 回调地址获取

8
framework/src/main/java/cn/lili/modules/payment/kit/Payment.java
View File

@ -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();
}
}