diff --git a/README.md b/README.md index acfd762..50e358b 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ ```xml - com.enongm.dianji + cn.felord payment-spring-boot-starter 1.0.0.RELEASE @@ -60,7 +60,9 @@ public class PayConfig { 微信支付V3开放接口引入： ```java @Autowired - WechatPayApi wechatPayV3Api; + WechatPayApi wechatPayV3Api; + @Autowired + WechatMarketingApi wchatMarketingApi; ``` ###### V3 例如V3 APP 支付 diff --git a/payment-spring-boot-autoconfigure/pom.xml b/payment-spring-boot-autoconfigure/pom.xml index d474ff0..7285dc7 100644 --- a/payment-spring-boot-autoconfigure/pom.xml +++ b/payment-spring-boot-autoconfigure/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.enongm.dianji + cn.felord payment-spring-boot-autoconfigure 1.0.0.RELEASE @@ -21,22 +21,10 @@ jar 4.0.0 - - - hndpx-release - Release Repository - http://dev.enongm.com/nexus3/repository/maven-releases/ - - - hndpx-snapshots - Snapshots Repository - http://dev.enongm.com/nexus3/repository/maven-snapshots/ - - - com.enongm.dianji + cn.felord payment-spring-boot 1.0.0.RELEASE pom diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/PayException.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/PayException.java similarity index 94% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/PayException.java rename to payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/PayException.java index 7925cc2..61f7ccc 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/PayException.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/PayException.java @@ -1,4 +1,4 @@ -package com.enongm.dianji.payment; +package cn.felord.payment; /** * @author Dax diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/alipay/AliPayConfiguration.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/alipay/AliPayConfiguration.java similarity index 97% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/alipay/AliPayConfiguration.java rename to payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/alipay/AliPayConfiguration.java index 73775de..9af03d0 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/alipay/AliPayConfiguration.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/alipay/AliPayConfiguration.java @@ -1,11 +1,11 @@ -package com.enongm.dianji.payment.alipay; +package cn.felord.payment.alipay; import com.alipay.api.AlipayApiException; import com.alipay.api.AlipayClient; import com.alipay.api.CertAlipayRequest; import com.alipay.api.DefaultAlipayClient; -import com.enongm.dianji.payment.PayException; +import cn.felord.payment.PayException; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/alipay/AliPayProperties.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/alipay/AliPayProperties.java similarity index 97% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/alipay/AliPayProperties.java rename to payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/alipay/AliPayProperties.java index f34d358..ba7ec46 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/alipay/AliPayProperties.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/alipay/AliPayProperties.java @@ -1,4 +1,4 @@ -package com.enongm.dianji.payment.alipay; +package cn.felord.payment.alipay; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/autoconfigure/EnableMobilePay.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/autoconfigure/EnableMobilePay.java similarity index 84% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/autoconfigure/EnableMobilePay.java rename to payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/autoconfigure/EnableMobilePay.java index 89df301..52c4ab5 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/autoconfigure/EnableMobilePay.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/autoconfigure/EnableMobilePay.java @@ -1,4 +1,4 @@ -package com.enongm.dianji.payment.autoconfigure; +package cn.felord.payment.autoconfigure; import org.springframework.context.annotation.Import; diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/autoconfigure/PayConfiguration.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/autoconfigure/PayConfiguration.java similarity index 60% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/autoconfigure/PayConfiguration.java rename to payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/autoconfigure/PayConfiguration.java index 0b3e27c..e717e04 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/autoconfigure/PayConfiguration.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/autoconfigure/PayConfiguration.java @@ -1,7 +1,7 @@ -package com.enongm.dianji.payment.autoconfigure; +package cn.felord.payment.autoconfigure; -import com.enongm.dianji.payment.alipay.AliPayConfiguration; -import com.enongm.dianji.payment.wechat.WechatPayConfiguration; +import cn.felord.payment.alipay.AliPayConfiguration; +import cn.felord.payment.wechat.WechatPayConfiguration; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/WechatPayConfiguration.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatPayConfiguration.java similarity index 94% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/WechatPayConfiguration.java rename to payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatPayConfiguration.java index d12f22d..801dd6f 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/WechatPayConfiguration.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatPayConfiguration.java @@ -1,8 +1,9 @@ -package com.enongm.dianji.payment.wechat; +package cn.felord.payment.wechat; -import com.enongm.dianji.payment.wechat.oauth2.OAuth2AuthorizationRequestRedirectProvider; -import com.enongm.dianji.payment.wechat.v3.*; +import cn.felord.payment.wechat.oauth2.OAuth2AuthorizationRequestRedirectProvider; +import cn.felord.payment.wechat.v3.*; +import cn.felord.payment.wechat.v3.*; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/WechatPayProperties.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatPayProperties.java similarity index 97% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/WechatPayProperties.java rename to payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatPayProperties.java index db76a4b..d56567f 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/WechatPayProperties.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatPayProperties.java @@ -1,4 +1,4 @@ -package com.enongm.dianji.payment.wechat; +package cn.felord.payment.wechat; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/WechatPayResponseErrorHandler.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatPayResponseErrorHandler.java similarity index 90% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/WechatPayResponseErrorHandler.java rename to payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatPayResponseErrorHandler.java index 63be7e4..479bcbf 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/WechatPayResponseErrorHandler.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatPayResponseErrorHandler.java @@ -1,4 +1,4 @@ -package com.enongm.dianji.payment.wechat; +package cn.felord.payment.wechat; import org.springframework.http.client.ClientHttpResponse; import org.springframework.web.client.DefaultResponseErrorHandler; diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/enumeration/BankCode.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/BankCode.java similarity index 98% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/enumeration/BankCode.java rename to payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/BankCode.java index d59bc07..7591fab 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/enumeration/BankCode.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/BankCode.java @@ -1,4 +1,4 @@ -package com.enongm.dianji.payment.wechat.enumeration; +package cn.felord.payment.wechat.enumeration; /** diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/enumeration/CouponBgColor.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/CouponBgColor.java similarity index 91% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/enumeration/CouponBgColor.java rename to payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/CouponBgColor.java index 338ec36..47daf03 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/enumeration/CouponBgColor.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/CouponBgColor.java @@ -1,4 +1,4 @@ -package com.enongm.dianji.payment.wechat.enumeration; +package cn.felord.payment.wechat.enumeration; /** * 优惠券背景色 diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/enumeration/CouponStatus.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/CouponStatus.java similarity index 81% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/enumeration/CouponStatus.java rename to payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/CouponStatus.java index a6a049f..bfb52a6 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/enumeration/CouponStatus.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/CouponStatus.java @@ -1,4 +1,4 @@ -package com.enongm.dianji.payment.wechat.enumeration; +package cn.felord.payment.wechat.enumeration; /** * The enum Coupon status. diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/enumeration/StockStatus.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/StockStatus.java similarity index 94% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/enumeration/StockStatus.java rename to payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/StockStatus.java index 8dc9c3e..97cd15f 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/enumeration/StockStatus.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/StockStatus.java @@ -1,4 +1,4 @@ -package com.enongm.dianji.payment.wechat.enumeration; +package cn.felord.payment.wechat.enumeration; /** * The enum Stock status. diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/enumeration/WeChatServer.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/WeChatServer.java similarity index 94% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/enumeration/WeChatServer.java rename to payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/WeChatServer.java index 1138600..7784f13 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/enumeration/WeChatServer.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/WeChatServer.java @@ -1,4 +1,4 @@ -package com.enongm.dianji.payment.wechat.enumeration; +package cn.felord.payment.wechat.enumeration; /** diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/enumeration/WechatPayV3Type.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/WechatPayV3Type.java similarity index 98% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/enumeration/WechatPayV3Type.java rename to payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/WechatPayV3Type.java index e0b19f0..884f71d 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/enumeration/WechatPayV3Type.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/WechatPayV3Type.java @@ -1,4 +1,4 @@ -package com.enongm.dianji.payment.wechat.enumeration; +package cn.felord.payment.wechat.enumeration; import org.springframework.http.HttpMethod; diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/oauth2/OAuth2AuthorizationRequestRedirectProvider.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/oauth2/OAuth2AuthorizationRequestRedirectProvider.java similarity index 97% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/oauth2/OAuth2AuthorizationRequestRedirectProvider.java rename to payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/oauth2/OAuth2AuthorizationRequestRedirectProvider.java index 32f1d28..be0ca1e 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/oauth2/OAuth2AuthorizationRequestRedirectProvider.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/oauth2/OAuth2AuthorizationRequestRedirectProvider.java @@ -1,7 +1,7 @@ -package com.enongm.dianji.payment.wechat.oauth2; +package cn.felord.payment.wechat.oauth2; -import com.enongm.dianji.payment.PayException; +import cn.felord.payment.PayException; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.PropertyNamingStrategy; diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/oauth2/OAuth2Exchange.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/oauth2/OAuth2Exchange.java similarity index 84% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/oauth2/OAuth2Exchange.java rename to payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/oauth2/OAuth2Exchange.java index 6eff506..a5f5e04 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/oauth2/OAuth2Exchange.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/oauth2/OAuth2Exchange.java @@ -1,4 +1,4 @@ -package com.enongm.dianji.payment.wechat.oauth2; +package cn.felord.payment.wechat.oauth2; import lombok.Data; diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/AbstractApi.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/AbstractApi.java similarity index 94% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/AbstractApi.java rename to payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/AbstractApi.java index 9d55044..063dbfd 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/AbstractApi.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/AbstractApi.java @@ -1,6 +1,6 @@ -package com.enongm.dianji.payment.wechat.v3; +package cn.felord.payment.wechat.v3; -import com.enongm.dianji.payment.PayException; +import cn.felord.payment.PayException; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/ExtensionFormHttpMessageConverter.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/ExtensionFormHttpMessageConverter.java similarity index 99% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/ExtensionFormHttpMessageConverter.java rename to payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/ExtensionFormHttpMessageConverter.java index 12d1437..f790f84 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/ExtensionFormHttpMessageConverter.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/ExtensionFormHttpMessageConverter.java @@ -1,4 +1,4 @@ -package com.enongm.dianji.payment.wechat.v3; +package cn.felord.payment.wechat.v3; import org.springframework.http.*; import org.springframework.http.converter.*; diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/KeyPairFactory.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/KeyPairFactory.java similarity index 95% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/KeyPairFactory.java rename to payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/KeyPairFactory.java index 8b5ca8c..496dcda 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/KeyPairFactory.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/KeyPairFactory.java @@ -1,7 +1,7 @@ -package com.enongm.dianji.payment.wechat.v3; +package cn.felord.payment.wechat.v3; -import com.enongm.dianji.payment.PayException; +import cn.felord.payment.PayException; import org.springframework.core.io.ClassPathResource; import java.security.KeyPair; diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/SignatureProvider.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/SignatureProvider.java similarity index 96% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/SignatureProvider.java rename to payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/SignatureProvider.java index 7184e9b..930d7b9 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/SignatureProvider.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/SignatureProvider.java @@ -1,10 +1,10 @@ -package com.enongm.dianji.payment.wechat.v3; +package cn.felord.payment.wechat.v3; -import com.enongm.dianji.payment.PayException; -import com.enongm.dianji.payment.wechat.enumeration.WeChatServer; -import com.enongm.dianji.payment.wechat.enumeration.WechatPayV3Type; -import com.enongm.dianji.payment.wechat.v3.model.ResponseSignVerifyParams; +import cn.felord.payment.wechat.enumeration.WeChatServer; +import cn.felord.payment.wechat.enumeration.WechatPayV3Type; +import cn.felord.payment.wechat.v3.model.ResponseSignVerifyParams; +import cn.felord.payment.PayException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/WechatMarketingApi.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatMarketingApi.java similarity index 95% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/WechatMarketingApi.java rename to payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatMarketingApi.java index 1b723d4..fd98f90 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/WechatMarketingApi.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatMarketingApi.java @@ -1,12 +1,12 @@ -package com.enongm.dianji.payment.wechat.v3; +package cn.felord.payment.wechat.v3; -import com.enongm.dianji.payment.wechat.WechatPayProperties; -import com.enongm.dianji.payment.wechat.enumeration.StockStatus; -import com.enongm.dianji.payment.wechat.enumeration.WeChatServer; -import com.enongm.dianji.payment.wechat.enumeration.WechatPayV3Type; -import com.enongm.dianji.payment.wechat.v3.model.StocksCreateParams; -import com.enongm.dianji.payment.wechat.v3.model.StocksQueryParams; -import com.enongm.dianji.payment.wechat.v3.model.StocksSendParams; +import cn.felord.payment.wechat.WechatPayProperties; +import cn.felord.payment.wechat.enumeration.StockStatus; +import cn.felord.payment.wechat.enumeration.WeChatServer; +import cn.felord.payment.wechat.enumeration.WechatPayV3Type; +import cn.felord.payment.wechat.v3.model.StocksCreateParams; +import cn.felord.payment.wechat.v3.model.StocksQueryParams; +import cn.felord.payment.wechat.v3.model.StocksSendParams; import com.fasterxml.jackson.databind.node.ObjectNode; import lombok.SneakyThrows; import org.bouncycastle.jcajce.provider.digest.SHA256; diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/WechatMetaBean.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatMetaBean.java similarity index 86% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/WechatMetaBean.java rename to payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatMetaBean.java index ab8f1c3..8aaccc1 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/WechatMetaBean.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatMetaBean.java @@ -1,7 +1,7 @@ -package com.enongm.dianji.payment.wechat.v3; +package cn.felord.payment.wechat.v3; -import com.enongm.dianji.payment.wechat.WechatPayProperties; +import cn.felord.payment.wechat.WechatPayProperties; import lombok.Data; import org.springframework.beans.factory.InitializingBean; import org.springframework.util.Assert; diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/WechatPayApi.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatPayApi.java similarity index 82% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/WechatPayApi.java rename to payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatPayApi.java index a8c5110..521096a 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/WechatPayApi.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatPayApi.java @@ -1,9 +1,9 @@ -package com.enongm.dianji.payment.wechat.v3; +package cn.felord.payment.wechat.v3; -import com.enongm.dianji.payment.wechat.WechatPayProperties; -import com.enongm.dianji.payment.wechat.enumeration.WeChatServer; -import com.enongm.dianji.payment.wechat.enumeration.WechatPayV3Type; -import com.enongm.dianji.payment.wechat.v3.model.AppPayParams; +import cn.felord.payment.wechat.enumeration.WeChatServer; +import cn.felord.payment.wechat.WechatPayProperties; +import cn.felord.payment.wechat.enumeration.WechatPayV3Type; +import cn.felord.payment.wechat.v3.model.AppPayParams; import com.fasterxml.jackson.databind.node.ObjectNode; import org.springframework.http.RequestEntity; import org.springframework.web.util.UriComponentsBuilder; diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/WechatPayCallback.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatPayCallback.java similarity index 87% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/WechatPayCallback.java rename to payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatPayCallback.java index 1be1233..b56dcb5 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/WechatPayCallback.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatPayCallback.java @@ -1,9 +1,9 @@ -package com.enongm.dianji.payment.wechat.v3; +package cn.felord.payment.wechat.v3; -import com.enongm.dianji.payment.PayException; -import com.enongm.dianji.payment.wechat.v3.model.CallbackParams; -import com.enongm.dianji.payment.wechat.v3.model.CouponConsumeData; -import com.enongm.dianji.payment.wechat.v3.model.ResponseSignVerifyParams; +import cn.felord.payment.wechat.v3.model.CouponConsumeData; +import cn.felord.payment.wechat.v3.model.ResponseSignVerifyParams; +import cn.felord.payment.PayException; +import cn.felord.payment.wechat.v3.model.CallbackParams; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.PropertyNamingStrategy; diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/WechatPayClient.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatPayClient.java similarity index 96% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/WechatPayClient.java rename to payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatPayClient.java index a471fcf..25d0fa5 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/WechatPayClient.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatPayClient.java @@ -1,10 +1,10 @@ -package com.enongm.dianji.payment.wechat.v3; +package cn.felord.payment.wechat.v3; -import com.enongm.dianji.payment.PayException; -import com.enongm.dianji.payment.wechat.WechatPayResponseErrorHandler; -import com.enongm.dianji.payment.wechat.enumeration.WechatPayV3Type; -import com.enongm.dianji.payment.wechat.v3.model.ResponseSignVerifyParams; +import cn.felord.payment.PayException; +import cn.felord.payment.wechat.WechatPayResponseErrorHandler; +import cn.felord.payment.wechat.enumeration.WechatPayV3Type; +import cn.felord.payment.wechat.v3.model.ResponseSignVerifyParams; import com.fasterxml.jackson.databind.node.ObjectNode; import lombok.SneakyThrows; import org.springframework.http.*; diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/WechatRequestEntity.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatRequestEntity.java similarity index 98% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/WechatRequestEntity.java rename to payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatRequestEntity.java index 2bc6c33..02d3cfb 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/WechatRequestEntity.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatRequestEntity.java @@ -1,4 +1,4 @@ -package com.enongm.dianji.payment.wechat.v3; +package cn.felord.payment.wechat.v3; import com.fasterxml.jackson.databind.node.ObjectNode; import lombok.Getter; diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/WechatResponseEntity.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatResponseEntity.java similarity index 98% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/WechatResponseEntity.java rename to payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatResponseEntity.java index 0b65ad4..27a445a 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/WechatResponseEntity.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatResponseEntity.java @@ -1,4 +1,4 @@ -package com.enongm.dianji.payment.wechat.v3; +package cn.felord.payment.wechat.v3; import lombok.Data; import lombok.extern.slf4j.Slf4j; diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/Amount.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/Amount.java similarity index 81% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/Amount.java rename to payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/Amount.java index 143f5df..543cb46 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/Amount.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/Amount.java @@ -1,4 +1,4 @@ -package com.enongm.dianji.payment.wechat.v3.model; +package cn.felord.payment.wechat.v3.model; import lombok.Data; diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/AppPayParams.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/AppPayParams.java similarity index 95% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/AppPayParams.java rename to payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/AppPayParams.java index 64bf386..b062db0 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/AppPayParams.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/AppPayParams.java @@ -1,4 +1,4 @@ -package com.enongm.dianji.payment.wechat.v3.model; +package cn.felord.payment.wechat.v3.model; import lombok.Data; diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/CallbackParams.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/CallbackParams.java similarity index 90% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/CallbackParams.java rename to payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/CallbackParams.java index 0fb18b9..b92e11b 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/CallbackParams.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/CallbackParams.java @@ -1,4 +1,4 @@ -package com.enongm.dianji.payment.wechat.v3.model; +package cn.felord.payment.wechat.v3.model; import lombok.Data; diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/ConsumeInformation.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/ConsumeInformation.java similarity index 84% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/ConsumeInformation.java rename to payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/ConsumeInformation.java index 935f3ce..4532753 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/ConsumeInformation.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/ConsumeInformation.java @@ -1,5 +1,5 @@ -package com.enongm.dianji.payment.wechat.v3.model; +package cn.felord.payment.wechat.v3.model; import lombok.Data; diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/CouponAvailableTime.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/CouponAvailableTime.java similarity index 79% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/CouponAvailableTime.java rename to payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/CouponAvailableTime.java index 5f0f9a8..45c399b 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/CouponAvailableTime.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/CouponAvailableTime.java @@ -1,5 +1,5 @@ -package com.enongm.dianji.payment.wechat.v3.model; +package cn.felord.payment.wechat.v3.model; import lombok.Data; diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/CouponConsumeData.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/CouponConsumeData.java similarity index 93% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/CouponConsumeData.java rename to payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/CouponConsumeData.java index 0b92ee0..aaf4f73 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/CouponConsumeData.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/CouponConsumeData.java @@ -1,5 +1,5 @@ -package com.enongm.dianji.payment.wechat.v3.model; +package cn.felord.payment.wechat.v3.model; import lombok.Data; diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/CouponUseRule.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/CouponUseRule.java similarity index 88% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/CouponUseRule.java rename to payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/CouponUseRule.java index fc58dc6..9e55015 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/CouponUseRule.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/CouponUseRule.java @@ -1,5 +1,5 @@ -package com.enongm.dianji.payment.wechat.v3.model; +package cn.felord.payment.wechat.v3.model; import lombok.Data; diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/Detail.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/Detail.java similarity index 86% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/Detail.java rename to payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/Detail.java index a39b43c..6be7552 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/Detail.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/Detail.java @@ -1,4 +1,4 @@ -package com.enongm.dianji.payment.wechat.v3.model; +package cn.felord.payment.wechat.v3.model; import lombok.Data; diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/DiscountTo.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/DiscountTo.java similarity index 78% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/DiscountTo.java rename to payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/DiscountTo.java index f48c7eb..290eeda 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/DiscountTo.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/DiscountTo.java @@ -1,5 +1,5 @@ -package com.enongm.dianji.payment.wechat.v3.model; +package cn.felord.payment.wechat.v3.model; import lombok.Data; diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/FixAvailableTime.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/FixAvailableTime.java similarity index 78% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/FixAvailableTime.java rename to payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/FixAvailableTime.java index 87db05b..f89f51f 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/FixAvailableTime.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/FixAvailableTime.java @@ -1,5 +1,5 @@ -package com.enongm.dianji.payment.wechat.v3.model; +package cn.felord.payment.wechat.v3.model; import lombok.Data; diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/FixedNormalCoupon.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/FixedNormalCoupon.java similarity index 87% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/FixedNormalCoupon.java rename to payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/FixedNormalCoupon.java index 9899a24..e33df32 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/FixedNormalCoupon.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/FixedNormalCoupon.java @@ -1,5 +1,5 @@ -package com.enongm.dianji.payment.wechat.v3.model; +package cn.felord.payment.wechat.v3.model; import lombok.Data; diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/Goods.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/Goods.java similarity index 89% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/Goods.java rename to payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/Goods.java index d4492b6..fa183dd 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/Goods.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/Goods.java @@ -1,4 +1,4 @@ -package com.enongm.dianji.payment.wechat.v3.model; +package cn.felord.payment.wechat.v3.model; import lombok.Data; diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/GoodsDetail.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/GoodsDetail.java similarity index 81% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/GoodsDetail.java rename to payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/GoodsDetail.java index 15162a4..71a033a 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/GoodsDetail.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/GoodsDetail.java @@ -1,5 +1,5 @@ -package com.enongm.dianji.payment.wechat.v3.model; +package cn.felord.payment.wechat.v3.model; import lombok.Data; diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/H5Info.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/H5Info.java similarity index 89% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/H5Info.java rename to payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/H5Info.java index fdfa3af..841684f 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/H5Info.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/H5Info.java @@ -1,4 +1,4 @@ -package com.enongm.dianji.payment.wechat.v3.model; +package cn.felord.payment.wechat.v3.model; import lombok.Data; diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/NormalCouponInformation.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/NormalCouponInformation.java similarity index 78% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/NormalCouponInformation.java rename to payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/NormalCouponInformation.java index 10af9da..1d136ad 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/NormalCouponInformation.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/NormalCouponInformation.java @@ -1,5 +1,5 @@ -package com.enongm.dianji.payment.wechat.v3.model; +package cn.felord.payment.wechat.v3.model; import lombok.Data; diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/PatternInfo.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/PatternInfo.java similarity index 79% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/PatternInfo.java rename to payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/PatternInfo.java index 7c4f274..886c0c7 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/PatternInfo.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/PatternInfo.java @@ -1,7 +1,7 @@ -package com.enongm.dianji.payment.wechat.v3.model; +package cn.felord.payment.wechat.v3.model; -import com.enongm.dianji.payment.wechat.enumeration.CouponBgColor; +import cn.felord.payment.wechat.enumeration.CouponBgColor; import lombok.Data; /** diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/Payer.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/Payer.java similarity index 85% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/Payer.java rename to payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/Payer.java index 16b0c28..b60676d 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/Payer.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/Payer.java @@ -1,4 +1,4 @@ -package com.enongm.dianji.payment.wechat.v3.model; +package cn.felord.payment.wechat.v3.model; import lombok.Data; diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/ResponseSignVerifyParams.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/ResponseSignVerifyParams.java similarity index 81% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/ResponseSignVerifyParams.java rename to payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/ResponseSignVerifyParams.java index 15ecdef..d45c8b3 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/ResponseSignVerifyParams.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/ResponseSignVerifyParams.java @@ -1,12 +1,13 @@ -package com.enongm.dianji.payment.wechat.v3.model; +package cn.felord.payment.wechat.v3.model; +import cn.felord.payment.wechat.v3.SignatureProvider; import lombok.Data; /** * 微信的响应签名校验参数 * * @author Dax - * @see com.enongm.dianji.payment.wechat.v3.SignatureProvider#responseSignVerify(ResponseSignVerifyParams) + * @see SignatureProvider#responseSignVerify(ResponseSignVerifyParams) * @since 16:32 */ @Data diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/SceneInfo.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/SceneInfo.java similarity index 88% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/SceneInfo.java rename to payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/SceneInfo.java index 89eca91..d6c482a 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/SceneInfo.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/SceneInfo.java @@ -1,4 +1,4 @@ -package com.enongm.dianji.payment.wechat.v3.model; +package cn.felord.payment.wechat.v3.model; import lombok.Data; diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/SettleInfo.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/SettleInfo.java similarity index 82% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/SettleInfo.java rename to payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/SettleInfo.java index 9c60f8a..7277c96 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/SettleInfo.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/SettleInfo.java @@ -1,4 +1,4 @@ -package com.enongm.dianji.payment.wechat.v3.model; +package cn.felord.payment.wechat.v3.model; import lombok.Data; diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/SingleitemDiscountOff.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/SingleitemDiscountOff.java similarity index 73% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/SingleitemDiscountOff.java rename to payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/SingleitemDiscountOff.java index 001d37a..957c2d0 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/SingleitemDiscountOff.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/SingleitemDiscountOff.java @@ -1,5 +1,5 @@ -package com.enongm.dianji.payment.wechat.v3.model; +package cn.felord.payment.wechat.v3.model; import lombok.Data; diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/StockUseRule.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/StockUseRule.java similarity index 93% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/StockUseRule.java rename to payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/StockUseRule.java index 0b2de77..65ecc63 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/StockUseRule.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/StockUseRule.java @@ -1,4 +1,4 @@ -package com.enongm.dianji.payment.wechat.v3.model; +package cn.felord.payment.wechat.v3.model; import lombok.Data; diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/StocksCreateParams.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/StocksCreateParams.java similarity index 95% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/StocksCreateParams.java rename to payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/StocksCreateParams.java index 0ed0015..71e3198 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/StocksCreateParams.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/StocksCreateParams.java @@ -1,4 +1,4 @@ -package com.enongm.dianji.payment.wechat.v3.model; +package cn.felord.payment.wechat.v3.model; import lombok.Data; diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/StocksQueryParams.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/StocksQueryParams.java similarity index 74% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/StocksQueryParams.java rename to payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/StocksQueryParams.java index 35f7bc5..3f1ade9 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/StocksQueryParams.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/StocksQueryParams.java @@ -1,6 +1,6 @@ -package com.enongm.dianji.payment.wechat.v3.model; +package cn.felord.payment.wechat.v3.model; -import com.enongm.dianji.payment.wechat.enumeration.StockStatus; +import cn.felord.payment.wechat.enumeration.StockStatus; import lombok.Data; import java.time.LocalDateTime; diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/StocksSendParams.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/StocksSendParams.java similarity index 93% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/StocksSendParams.java rename to payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/StocksSendParams.java index 281e8d4..54b264a 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/StocksSendParams.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/StocksSendParams.java @@ -1,4 +1,4 @@ -package com.enongm.dianji.payment.wechat.v3.model; +package cn.felord.payment.wechat.v3.model; import lombok.Data; diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/StoreInfo.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/StoreInfo.java similarity index 87% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/StoreInfo.java rename to payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/StoreInfo.java index d262639..6e1aa8e 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/model/StoreInfo.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/StoreInfo.java @@ -1,4 +1,4 @@ -package com.enongm.dianji.payment.wechat.v3.model; +package cn.felord.payment.wechat.v3.model; import lombok.Data; diff --git a/payment-spring-boot-starter/pom.xml b/payment-spring-boot-starter/pom.xml index 29453fc..14c21cf 100644 --- a/payment-spring-boot-starter/pom.xml +++ b/payment-spring-boot-starter/pom.xml @@ -3,28 +3,16 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.enongm.dianji + cn.felord payment-spring-boot-starter 1.0.0.RELEASE jar 4.0.0 - - - hndpx-release - Release Repository - http://dev.enongm.com/nexus3/repository/maven-releases/ - - - hndpx-snapshots - Snapshots Repository - http://dev.enongm.com/nexus3/repository/maven-snapshots/ - - - com.enongm.dianji + cn.felord payment-spring-boot 1.0.0.RELEASE pom @@ -47,7 +35,7 @@ spring-boot-starter - com.enongm.dianji + cn.felord payment-spring-boot-autoconfigure diff --git a/pom.xml b/pom.xml index 838249e..f8b45ab 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ - com.enongm.dianji + cn.felord payment-spring-boot 1.0.0.RELEASE pom @@ -30,18 +30,6 @@ 1.66 - - - hndpx-release - Release Repository - http://dev.enongm.com/nexus3/repository/maven-releases/ - - - hndpx-snapshots - Snapshots Repository - http://dev.enongm.com/nexus3/repository/maven-snapshots/ - - @@ -90,7 +78,7 @@ ${bcprov.version} - com.enongm.dianji + cn.felord payment-spring-boot-autoconfigure ${project.version}