From ec2375272950fabc60ea90bd39e8d7adae203971 Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Tue, 26 Apr 2022 18:59:21 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=907.2.2=E3=80=91=E5=88=A0=E9=99=A4kernel?= =?UTF-8?q?-d-pay?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel-d-pay/README.md | 151 ------------------ kernel-d-pay/pay-api/pom.xml | 15 -- .../roses/kernel/pay/api/PayApi.java | 76 --------- .../pay/api/constants/PayConstants.java | 55 ------- .../pay/api/exception/PayException.java | 43 ----- .../pay/api/pojo/TradeRefundResponse.java | 130 --------------- kernel-d-pay/pay-sdk-alipay/pom.xml | 33 ---- .../pay/alipay/config/AlipayConfig.java | 135 ---------------- .../pay/alipay/constants/AlipayConstants.java | 37 ----- .../pay/alipay/service/AlipayService.java | 76 --------- .../service/impl/AlipayServiceImpl.java | 91 ----------- kernel-d-pay/pay-spring-boot-starter/pom.xml | 26 --- .../pay/starter/GunsPayAutoConfiguration.java | 53 ------ .../main/resources/META-INF/spring.factories | 3 - kernel-d-pay/pom.xml | 37 ----- pom.xml | 3 - 16 files changed, 964 deletions(-) delete mode 100644 kernel-d-pay/README.md delete mode 100644 kernel-d-pay/pay-api/pom.xml delete mode 100644 kernel-d-pay/pay-api/src/main/java/cn/stylefeng/roses/kernel/pay/api/PayApi.java delete mode 100644 kernel-d-pay/pay-api/src/main/java/cn/stylefeng/roses/kernel/pay/api/constants/PayConstants.java delete mode 100644 kernel-d-pay/pay-api/src/main/java/cn/stylefeng/roses/kernel/pay/api/exception/PayException.java delete mode 100644 kernel-d-pay/pay-api/src/main/java/cn/stylefeng/roses/kernel/pay/api/pojo/TradeRefundResponse.java delete mode 100644 kernel-d-pay/pay-sdk-alipay/pom.xml delete mode 100644 kernel-d-pay/pay-sdk-alipay/src/main/java/cn/stylefeng/roses/kernel/pay/alipay/config/AlipayConfig.java delete mode 100644 kernel-d-pay/pay-sdk-alipay/src/main/java/cn/stylefeng/roses/kernel/pay/alipay/constants/AlipayConstants.java delete mode 100644 kernel-d-pay/pay-sdk-alipay/src/main/java/cn/stylefeng/roses/kernel/pay/alipay/service/AlipayService.java delete mode 100644 kernel-d-pay/pay-sdk-alipay/src/main/java/cn/stylefeng/roses/kernel/pay/alipay/service/impl/AlipayServiceImpl.java delete mode 100644 kernel-d-pay/pay-spring-boot-starter/pom.xml delete mode 100644 kernel-d-pay/pay-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/pay/starter/GunsPayAutoConfiguration.java delete mode 100644 kernel-d-pay/pay-spring-boot-starter/src/main/resources/META-INF/spring.factories delete mode 100644 kernel-d-pay/pom.xml diff --git a/kernel-d-pay/README.md b/kernel-d-pay/README.md deleted file mode 100644 index e9fed2f77..000000000 --- a/kernel-d-pay/README.md +++ /dev/null @@ -1,151 +0,0 @@ -# 支付模块 - -## 接入支付宝支付 - -### application.yml添加支付宝支付appid等信息 - -```yml -alipay: - appId: 2021000117660206 - gatewayHost: openapi.alipaydev.com - notifyUrl: http://101.132.1.2:8001/pay/notify_url - merchantPrivateKey: MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC+g1/v3Z968 - alipayPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB -``` - -注：openapi.alipaydev.com 是沙盒环境 ，正式环境需要更换网关 - -gatewayHost：必须是外网穿透host，否则阿里无法回调成功 - -### 使用Demo - -```java -package com.alipay.controller; - -import cn.hutool.core.lang.UUID; -import cn.stylefeng.roses.kernel.pay.api.PayApi; -import cn.stylefeng.roses.kernel.pay.api.pojo.TradeRefundResponse; -import com.alipay.easysdk.factory.Factory; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import java.util.HashMap; -import java.util.Map; - -/** - * 支付模块测试 - * - * @author huziyang - * @date 2021/05/29 21:38 - */ -@RestController -@RequestMapping("/test") -@Slf4j -public class AlipayTest { - - - @Resource - private PayApi payApi; - - /** - * PC支付 - * - * @return 支付页面 - * @author huziyang - * @date 2021/04/20 20:43 - */ - @GetMapping("/page") - public String page(){ - return payApi.page("xx全屋定制", "eb58cd5c-7613-41ce-93ef-fcf0ad4284f9","12.5",null); - } - - /** - * 手机支付 - * - * @return 支付页面 - * @author huziyang - * @date 2021/04/20 20:43 - */ - @GetMapping("/wap") - public String wap(){ - return payApi.wap("xx全屋定制", "eb58cd5c-7613-41ce-93ef-fcf0ad4284f8","12.5",null,null); - } - - /** - * 退款 - * - * @return 退款实体 - * @author huziyang - * @date 2021/04/20 20:43 - */ - @PostMapping("/refund") - public TradeRefundResponse refund() { - return payApi.refund("eb58cd5c-7613-41ce-93ef-fcf0ad4284f8", "12.5"); - } - - - /** - * 支付宝回调 - * - * @param request - * @throws Exception - * @author huziyang - * @date 2021/04/20 20:43 - */ - @PostMapping("/notify_url") - public void notify(HttpServletRequest request) throws Exception { - if (request.getParameter("trade_status").equals("TRADE_SUCCESS")) { - Map params = new HashMap<>(); - Map requestParams = request.getParameterMap(); - for (String name : requestParams.keySet()) { - params.put(name, request.getParameter(name)); - } - if (Factory.Payment.Common().verifyNotify(params)) { - log.info("支付宝异步回调成功"); - log.info("订单名称: " + params.get("subject")); - log.info("交易状态: " + params.get("trade_status")); - log.info("支付宝交易凭证号: " + params.get("trade_no")); - log.info("商家订单号: " + params.get("out_trade_no")); - log.info("交易金额: " + params.get("total_amount")); - log.info("支付宝唯一id: " + params.get("buyer_id")); - log.info("付款时间: " + params.get("gmt_payment")); - log.info("付款金额: " + params.get("buyer_pay_amount")); - } - } - } -} -``` - -### pom中引用支付依赖 - -```xml - - cn.stylefeng.roses - pay-spring-boot-starter - ${roses.version} - -``` - -至此支付宝支付就接入成功啦！ - - - -如果需要配置应用公钥证书文件路径等信息，参照如下yml（具体配置参数可以查看支付宝支付官方文档） - -```yml -alipay: - appId: - gatewayHost: - notifyUrl: - merchantPrivateKey: - alipayPublicKey: - encryptKey: - merchantCertPath: - alipayCertPath: - alipayRootCertPath: -``` - diff --git a/kernel-d-pay/pay-api/pom.xml b/kernel-d-pay/pay-api/pom.xml deleted file mode 100644 index 95ec5dcea..000000000 --- a/kernel-d-pay/pay-api/pom.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - 4.0.0 - - - cn.stylefeng.roses - kernel-d-pay - 7.2.2 - - - pay-api - - \ No newline at end of file diff --git a/kernel-d-pay/pay-api/src/main/java/cn/stylefeng/roses/kernel/pay/api/PayApi.java b/kernel-d-pay/pay-api/src/main/java/cn/stylefeng/roses/kernel/pay/api/PayApi.java deleted file mode 100644 index 489b39131..000000000 --- a/kernel-d-pay/pay-api/src/main/java/cn/stylefeng/roses/kernel/pay/api/PayApi.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Copyright [2020-2030] [https://www.stylefeng.cn] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点： - * - * 1.请不要删除和修改根目录下的LICENSE文件。 - * 2.请不要删除和修改Guns源码头部的版权声明。 - * 3.请保留源码和相关描述文件的项目出处，作者声明等。 - * 4.分发源码时候，请注明软件出处 https://gitee.com/stylefeng/guns - * 5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns - * 6.若您的项目无法满足以上几点，可申请商业授权 - */ -package cn.stylefeng.roses.kernel.pay.api; - - -import cn.stylefeng.roses.kernel.pay.api.pojo.TradeRefundResponse; - -/** - * 支付的api - * - * @author huziyang - * @date 2021/04/20 20:43 - */ -public interface PayApi { - - /** - * PC网页支付 - * - * @param orderName 订单名称 - * @param outTradeNo 商家订单编号 - * @param total 金额 - * @param returnUrl 付款完成后跳转页面 - * @return 支付页面 - * @author huziyang - * @date 2021/04/20 20:43 - */ - String page(String orderName, String outTradeNo, String total, String returnUrl); - - /** - * 手机支付 - * - * @param orderName 订单名称 - * @param outTradeNo 商家订单编号 - * @param total 金额 - * @param quitUrl 中途退出时返回的页面 - * @param returnUrl 付款完成后跳转页面 - * @return 支付页面 - * @author huziyang - * @date 2021/04/20 20:43 - */ - String wap(String orderName, String outTradeNo, String total, String quitUrl, String returnUrl); - - /** - * 退款 - * - * @param outTradeNo 商家订单编号 - * @param refundAmount 退款金额 - * @return 退款结果 - * @author huziyang - * @date 2021/04/20 20:43 - */ - TradeRefundResponse refund(String outTradeNo, String refundAmount); - -} diff --git a/kernel-d-pay/pay-api/src/main/java/cn/stylefeng/roses/kernel/pay/api/constants/PayConstants.java b/kernel-d-pay/pay-api/src/main/java/cn/stylefeng/roses/kernel/pay/api/constants/PayConstants.java deleted file mode 100644 index da72e7168..000000000 --- a/kernel-d-pay/pay-api/src/main/java/cn/stylefeng/roses/kernel/pay/api/constants/PayConstants.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright [2020-2030] [https://www.stylefeng.cn] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点： - * - * 1.请不要删除和修改根目录下的LICENSE文件。 - * 2.请不要删除和修改Guns源码头部的版权声明。 - * 3.请保留源码和相关描述文件的项目出处，作者声明等。 - * 4.分发源码时候，请注明软件出处 https://gitee.com/stylefeng/guns - * 5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns - * 6.若您的项目无法满足以上几点，可申请商业授权 - */ -package cn.stylefeng.roses.kernel.pay.api.constants; - -/** - * 支付模块的常量 - * - * @author huziyang - * @date 2021/04/20 20:43 - */ -public interface PayConstants { - - /** - * mongodb模块的名称 - */ - String PAY_MODULE_NAME = "kernel-d-pay"; - - /** - * 异常枚举的步进值 - */ - String PAY_EXCEPTION_STEP_CODE = "80"; - - /** - * 退款成功的返回码 - */ - String REFUND_SUCCESS_CODE = "10000"; - - /** - * 退款失败的返回码 - */ - String REFUND_ERROR_CODE = "40000"; - -} diff --git a/kernel-d-pay/pay-api/src/main/java/cn/stylefeng/roses/kernel/pay/api/exception/PayException.java b/kernel-d-pay/pay-api/src/main/java/cn/stylefeng/roses/kernel/pay/api/exception/PayException.java deleted file mode 100644 index 594fad767..000000000 --- a/kernel-d-pay/pay-api/src/main/java/cn/stylefeng/roses/kernel/pay/api/exception/PayException.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright [2020-2030] [https://www.stylefeng.cn] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点： - * - * 1.请不要删除和修改根目录下的LICENSE文件。 - * 2.请不要删除和修改Guns源码头部的版权声明。 - * 3.请保留源码和相关描述文件的项目出处，作者声明等。 - * 4.分发源码时候，请注明软件出处 https://gitee.com/stylefeng/guns - * 5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns - * 6.若您的项目无法满足以上几点，可申请商业授权 - */ -package cn.stylefeng.roses.kernel.pay.api.exception; - -import cn.stylefeng.roses.kernel.pay.api.constants.PayConstants; -import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; -import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException; - -/** - * 支付模块的异常 - * - * @author huziyang - * @date 2021/04/20 20:43 - */ -public class PayException extends ServiceException { - - public PayException(AbstractExceptionEnum exception) { - super(PayConstants.PAY_MODULE_NAME, exception); - } - -} diff --git a/kernel-d-pay/pay-api/src/main/java/cn/stylefeng/roses/kernel/pay/api/pojo/TradeRefundResponse.java b/kernel-d-pay/pay-api/src/main/java/cn/stylefeng/roses/kernel/pay/api/pojo/TradeRefundResponse.java deleted file mode 100644 index 58a933740..000000000 --- a/kernel-d-pay/pay-api/src/main/java/cn/stylefeng/roses/kernel/pay/api/pojo/TradeRefundResponse.java +++ /dev/null @@ -1,130 +0,0 @@ -/* - * Copyright [2020-2030] [https://www.stylefeng.cn] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点： - * - * 1.请不要删除和修改根目录下的LICENSE文件。 - * 2.请不要删除和修改Guns源码头部的版权声明。 - * 3.请保留源码和相关描述文件的项目出处，作者声明等。 - * 4.分发源码时候，请注明软件出处 https://gitee.com/stylefeng/guns - * 5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns - * 6.若您的项目无法满足以上几点，可申请商业授权 - */ -package cn.stylefeng.roses.kernel.pay.api.pojo; - -import cn.stylefeng.roses.kernel.pay.api.constants.PayConstants; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * 退款响应 - * - * @author huziyang - * @date 2021/04/20 20:43 - */ -@Data -@NoArgsConstructor -@AllArgsConstructor -@Builder -public class TradeRefundResponse { - - /** - * 退款状态码 - */ - private String code; - - /** - * 状态描述 - */ - private String msg; - - /** - * 商家订单号 - */ - private String outTradeNo; - - /** - * 退款金额 - */ - private String refundFee; - - /** - * 各厂商系统中的交易流水号 - */ - private String tradeNo; - - /** - * 退款实际的发生时间 - */ - private String gmtRefundPay; - - /** - * 买家账号 - */ - private String buyerLogonId; - - /** - * 买家在各厂商系统中的用户id - */ - private String buyerUserId; - - /** - * 各厂商响应值 - */ - private Object data; - - /** - * 初始化一个新创建的 TradeRefundResponse对象 - * - * @param code 状态码 - * @param msg 描述 - * @param data 对象值 - * @author huziyang - * @date 2021/04/20 20:43 - */ - public TradeRefundResponse(String code, String msg, Object data) { - this.code = code; - this.msg = msg; - this.data = data; - } - - /** - * 返回错误信息 - * - * @param msg 描述 - * @param data 对象值 - * @return TradeRefundResponse对象 - * @author huziyang - * @date 2021/04/20 20:43 - */ - public static TradeRefundResponse error(String msg, Object data) { - return new TradeRefundResponse(PayConstants.REFUND_ERROR_CODE, msg, data); - } - - /** - * 返回错误信息 - * - * @param msg 描述 - * @return TradeRefundResponse对象 - * @author huziyang - * @date 2021/04/20 20:43 - */ - public static TradeRefundResponse error(String msg) { - return error(msg, null); - } - -} diff --git a/kernel-d-pay/pay-sdk-alipay/pom.xml b/kernel-d-pay/pay-sdk-alipay/pom.xml deleted file mode 100644 index 1763f322e..000000000 --- a/kernel-d-pay/pay-sdk-alipay/pom.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - 4.0.0 - - - cn.stylefeng.roses - kernel-d-pay - 7.2.2 - - - pay-sdk-alipay - - - - - - cn.stylefeng.roses - pay-api - ${roses.version} - - - - - com.alipay.sdk - alipay-easysdk - ${alipay.version} - - - - - \ No newline at end of file diff --git a/kernel-d-pay/pay-sdk-alipay/src/main/java/cn/stylefeng/roses/kernel/pay/alipay/config/AlipayConfig.java b/kernel-d-pay/pay-sdk-alipay/src/main/java/cn/stylefeng/roses/kernel/pay/alipay/config/AlipayConfig.java deleted file mode 100644 index bf21f4fe2..000000000 --- a/kernel-d-pay/pay-sdk-alipay/src/main/java/cn/stylefeng/roses/kernel/pay/alipay/config/AlipayConfig.java +++ /dev/null @@ -1,135 +0,0 @@ -/* - * Copyright [2020-2030] [https://www.stylefeng.cn] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点： - * - * 1.请不要删除和修改根目录下的LICENSE文件。 - * 2.请不要删除和修改Guns源码头部的版权声明。 - * 3.请保留源码和相关描述文件的项目出处，作者声明等。 - * 4.分发源码时候，请注明软件出处 https://gitee.com/stylefeng/guns - * 5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns - * 6.若您的项目无法满足以上几点，可申请商业授权 - */ -package cn.stylefeng.roses.kernel.pay.alipay.config; - -import com.alipay.easysdk.factory.Factory; -import com.alipay.easysdk.kernel.Config; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.ApplicationArguments; -import org.springframework.boot.ApplicationRunner; -import org.springframework.stereotype.Component; - -/** - * 阿里支付配置类 - * - * @author huziyang - * @date 2021/04/20 20:43 - */ -@Component -public class AlipayConfig implements ApplicationRunner { - - /** - * 应用id - */ - @Value("${alipay.appId}") - private String appId; - - /** - * 私钥 - */ - @Value("${alipay.merchantPrivateKey}") - private String merchantPrivateKey; - - /** - * 公钥 - */ - @Value("${alipay.alipayPublicKey}") - private String alipayPublicKey; - - /** - * 网关 - */ - @Value("${alipay.gatewayHost}") - private String gatewayHost; - - /** - * 支付成功后的接口回调地址 （可选） - */ - @Value("${alipay.notifyUrl:#{null}}") - private String notifyUrl; - - /** - * AES密钥 （可选） - */ - @Value("${alipay.encryptKey:#{null}}") - private String encryptKey; - - /** - * 应用公钥证书文件路径 - */ - @Value("${alipay.merchantCertPath:#{null}}") - private String merchantCertPath; - - /** - * 支付宝公钥证书文件路径 - */ - @Value("${alipay.alipayCertPath:#{null}}") - private String alipayCertPath; - - /** - * 支付宝根证书文件路径 - */ - @Value("${alipay.alipayRootCertPath:#{null}}") - private String alipayRootCertPath; - - /** - * 初始化 - * - * @author huziyang - * @date 2021/04/20 20:43 - */ - @Override - public void run(ApplicationArguments args) throws Exception { - Factory.setOptions(getOptions()); - } - - /** - * 获取支付配置对象 - * - * @return 支付配置对象 - * @author huziyang - * @date 2021/04/20 20:43 - */ - private Config getOptions() { - Config config = new Config(); - config.protocol = "https"; - config.gatewayHost = this.gatewayHost; - config.signType = "RSA2"; - config.appId = this.appId; - config.merchantPrivateKey = this.merchantPrivateKey; - // 证书文件路径支持设置为文件系统中的路径或CLASS_PATH中的路径，优先从文件系统中加载，加载失败后会继续尝试从CLASS_PATH中加载 - config.merchantCertPath = this.merchantCertPath; - config.alipayCertPath = this.alipayCertPath; - config.alipayRootCertPath = this.alipayRootCertPath; - // 如果采用非证书模式，则无需赋值上面的三个证书路径，改为赋值如下的支付宝公钥字符串即可 - config.alipayPublicKey = this.alipayPublicKey; - // 可设置异步通知接收服务地址（可选） - config.notifyUrl = notifyUrl; - // 可设置AES密钥，调用AES加解密相关接口时需要（可选） - config.encryptKey = this.encryptKey; - return config; - } - -} diff --git a/kernel-d-pay/pay-sdk-alipay/src/main/java/cn/stylefeng/roses/kernel/pay/alipay/constants/AlipayConstants.java b/kernel-d-pay/pay-sdk-alipay/src/main/java/cn/stylefeng/roses/kernel/pay/alipay/constants/AlipayConstants.java deleted file mode 100644 index 5d84e071b..000000000 --- a/kernel-d-pay/pay-sdk-alipay/src/main/java/cn/stylefeng/roses/kernel/pay/alipay/constants/AlipayConstants.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright [2020-2030] [https://www.stylefeng.cn] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点： - * - * 1.请不要删除和修改根目录下的LICENSE文件。 - * 2.请不要删除和修改Guns源码头部的版权声明。 - * 3.请保留源码和相关描述文件的项目出处，作者声明等。 - * 4.分发源码时候，请注明软件出处 https://gitee.com/stylefeng/guns - * 5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns - * 6.若您的项目无法满足以上几点，可申请商业授权 - */ -package cn.stylefeng.roses.kernel.pay.alipay.constants; - -/** - * 阿里支付常量 - * - * @author huziyang - * @date 2021/04/20 20:43 - */ -public interface AlipayConstants { - - String ALIPAY_REFUND_SUCCESS_CODE = "10000"; - -} diff --git a/kernel-d-pay/pay-sdk-alipay/src/main/java/cn/stylefeng/roses/kernel/pay/alipay/service/AlipayService.java b/kernel-d-pay/pay-sdk-alipay/src/main/java/cn/stylefeng/roses/kernel/pay/alipay/service/AlipayService.java deleted file mode 100644 index 4824c1790..000000000 --- a/kernel-d-pay/pay-sdk-alipay/src/main/java/cn/stylefeng/roses/kernel/pay/alipay/service/AlipayService.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Copyright [2020-2030] [https://www.stylefeng.cn] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点： - * - * 1.请不要删除和修改根目录下的LICENSE文件。 - * 2.请不要删除和修改Guns源码头部的版权声明。 - * 3.请保留源码和相关描述文件的项目出处，作者声明等。 - * 4.分发源码时候，请注明软件出处 https://gitee.com/stylefeng/guns - * 5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns - * 6.若您的项目无法满足以上几点，可申请商业授权 - */ -package cn.stylefeng.roses.kernel.pay.alipay.service; - - -import cn.stylefeng.roses.kernel.pay.api.pojo.TradeRefundResponse; - -/** - * 阿里支付的接口 - * - * @author huziyang - * @date 2021/04/20 20:43 - */ -public interface AlipayService { - - /** - * PC网页支付 - * - * @param orderName 订单名称 - * @param outTradeNo 商家订单编号 - * @param total 金额 - * @param returnUrl 付款完成后跳转页面 - * @return 支付页面 - * @author huziyang - * @date 2021/04/20 20:43 - */ - String page(String orderName, String outTradeNo, String total, String returnUrl); - - /** - * 手机支付 - * - * @param orderName 订单名称 - * @param outTradeNo 商家订单编号 - * @param total 金额 - * @param quitUrl 中途退出时返回的页面 - * @param returnUrl 付款完成后跳转页面 - * @return 支付页面 - * @author huziyang - * @date 2021/04/20 20:43 - */ - String wap(String orderName, String outTradeNo, String total, String quitUrl, String returnUrl); - - /** - * 退款 - * - * @param outTradeNo 商家订单编号 - * @param refundAmount 退款金额 - * @return 退款结果 - * @author huziyang - * @date 2021/04/20 20:43 - */ - TradeRefundResponse refund(String outTradeNo, String refundAmount); - -} diff --git a/kernel-d-pay/pay-sdk-alipay/src/main/java/cn/stylefeng/roses/kernel/pay/alipay/service/impl/AlipayServiceImpl.java b/kernel-d-pay/pay-sdk-alipay/src/main/java/cn/stylefeng/roses/kernel/pay/alipay/service/impl/AlipayServiceImpl.java deleted file mode 100644 index 6196212f6..000000000 --- a/kernel-d-pay/pay-sdk-alipay/src/main/java/cn/stylefeng/roses/kernel/pay/alipay/service/impl/AlipayServiceImpl.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Copyright [2020-2030] [https://www.stylefeng.cn] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点： - * - * 1.请不要删除和修改根目录下的LICENSE文件。 - * 2.请不要删除和修改Guns源码头部的版权声明。 - * 3.请保留源码和相关描述文件的项目出处，作者声明等。 - * 4.分发源码时候，请注明软件出处 https://gitee.com/stylefeng/guns - * 5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns - * 6.若您的项目无法满足以上几点，可申请商业授权 - */ -package cn.stylefeng.roses.kernel.pay.alipay.service.impl; - -import cn.stylefeng.roses.kernel.pay.alipay.constants.AlipayConstants; -import cn.stylefeng.roses.kernel.pay.alipay.service.AlipayService; -import cn.stylefeng.roses.kernel.pay.api.PayApi; -import cn.stylefeng.roses.kernel.pay.api.constants.PayConstants; -import cn.stylefeng.roses.kernel.pay.api.pojo.TradeRefundResponse; -import com.alipay.easysdk.factory.Factory; -import com.alipay.easysdk.payment.common.models.AlipayTradeRefundResponse; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -/** - * 阿里支付接口实现 - * - * @author huziyang - * @date 2021/04/20 20:43 - */ -@Service -@Slf4j -public class AlipayServiceImpl implements AlipayService, PayApi { - - @Override - public String page(String orderName, String outTradeNo, String total, String returnUrl) { - try { - return Factory.Payment.Page().pay(orderName, outTradeNo, total, returnUrl).body; - } catch (Exception e) { - log.error(e.getMessage()); - return e.getMessage(); - } - } - - @Override - public String wap(String orderName, String outTradeNo, String total, String quitUrl, String returnUrl) { - try { - return Factory.Payment.Wap().pay(orderName, outTradeNo, total, quitUrl, returnUrl).body; - } catch (Exception e) { - log.error(e.getMessage()); - return e.getMessage(); - } - } - - @Override - public TradeRefundResponse refund(String outTradeNo, String refundAmount) { - try { - AlipayTradeRefundResponse response = Factory.Payment.Common().refund(outTradeNo, refundAmount); - if (AlipayConstants.ALIPAY_REFUND_SUCCESS_CODE.equals(response.getCode())) { - return TradeRefundResponse.builder() - .code(PayConstants.REFUND_SUCCESS_CODE) - .msg(response.getMsg()) - .outTradeNo(response.getOutTradeNo()) - .refundFee(response.getRefundFee()) - .tradeNo(response.getTradeNo()) - .gmtRefundPay(response.getGmtRefundPay()) - .buyerLogonId(response.buyerLogonId) - .buyerUserId(response.buyerUserId) - .data(response) - .build(); - } - return TradeRefundResponse.error(response.msg, response); - } catch (Exception e) { - log.error(e.getMessage()); - return TradeRefundResponse.error(e.getMessage()); - } - } - -} diff --git a/kernel-d-pay/pay-spring-boot-starter/pom.xml b/kernel-d-pay/pay-spring-boot-starter/pom.xml deleted file mode 100644 index 056d47452..000000000 --- a/kernel-d-pay/pay-spring-boot-starter/pom.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - 4.0.0 - - - cn.stylefeng.roses - kernel-d-pay - 7.2.2 - - - pay-spring-boot-starter - - - - - - cn.stylefeng.roses - pay-sdk-alipay - ${roses.version} - - - - - \ No newline at end of file diff --git a/kernel-d-pay/pay-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/pay/starter/GunsPayAutoConfiguration.java b/kernel-d-pay/pay-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/pay/starter/GunsPayAutoConfiguration.java deleted file mode 100644 index bdd972865..000000000 --- a/kernel-d-pay/pay-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/pay/starter/GunsPayAutoConfiguration.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright [2020-2030] [https://www.stylefeng.cn] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点： - * - * 1.请不要删除和修改根目录下的LICENSE文件。 - * 2.请不要删除和修改Guns源码头部的版权声明。 - * 3.请保留源码和相关描述文件的项目出处，作者声明等。 - * 4.分发源码时候，请注明软件出处 https://gitee.com/stylefeng/guns - * 5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns - * 6.若您的项目无法满足以上几点，可申请商业授权 - */ -package cn.stylefeng.roses.kernel.pay.starter; - -import cn.stylefeng.roses.kernel.pay.alipay.service.impl.AlipayServiceImpl; -import cn.stylefeng.roses.kernel.pay.api.PayApi; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -/** - * 支付模块自动配置 - * - * @author huziyang - * @date 2021/05/29 21:38 - */ -@Configuration -public class GunsPayAutoConfiguration { - - /** - * 支付 阿里支付实现 - * - * @author huziyang - * @date 2021/05/29 21:38 - */ - @Bean - public PayApi payApi() { - return new AlipayServiceImpl(); - } - -} - diff --git a/kernel-d-pay/pay-spring-boot-starter/src/main/resources/META-INF/spring.factories b/kernel-d-pay/pay-spring-boot-starter/src/main/resources/META-INF/spring.factories deleted file mode 100644 index f8b084b65..000000000 --- a/kernel-d-pay/pay-spring-boot-starter/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,3 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - cn.stylefeng.roses.kernel.pay.starter.GunsPayAutoConfiguration,\ - cn.stylefeng.roses.kernel.pay.alipay.config.AlipayConfig \ No newline at end of file diff --git a/kernel-d-pay/pom.xml b/kernel-d-pay/pom.xml deleted file mode 100644 index 81e19ec32..000000000 --- a/kernel-d-pay/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - 4.0.0 - - - roses-kernel - cn.stylefeng.roses - 7.2.2 - - - kernel-d-pay - pom - - pay-api - pay-sdk-alipay - pay-spring-boot-starter - - - - 8 - 8 - 2.2.0 - - - - - - - cn.stylefeng.roses - kernel-a-rule - ${roses.version} - - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index 948d33726..05cee5c64 100644 --- a/pom.xml +++ b/pom.xml @@ -100,9 +100,6 @@ kernel-d-mongodb - - kernel-d-pay - kernel-s-system