自定义messageConverter

This commit is contained in:
felord.cn
2020-12-01 22:36:32 +08:00
parent 0e1efd4e94
commit 30d04ec4da
57 changed files with 101 additions and 133 deletions

View File

@@ -17,7 +17,7 @@
```xml
<dependency>
<groupId>com.enongm.dianji</groupId>
<groupId>cn.felord</groupId>
<artifactId>payment-spring-boot-starter</artifactId>
<version>1.0.0.RELEASE</version>
</dependency>
@@ -60,7 +60,9 @@ public class PayConfig {
微信支付V3开放接口引入
```java
@Autowired
WechatPayApi wechatPayV3Api;
WechatPayApi wechatPayV3Api;
@Autowired
WechatMarketingApi wchatMarketingApi;
```
###### V3
例如V3 APP 支付

View File

@@ -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">
<groupId>com.enongm.dianji</groupId>
<groupId>cn.felord</groupId>
<artifactId>payment-spring-boot-autoconfigure</artifactId>
<version>1.0.0.RELEASE</version>
<build>
@@ -21,22 +21,10 @@
<packaging>jar</packaging>
<modelVersion>4.0.0</modelVersion>
<distributionManagement>
<repository>
<id>hndpx-release</id>
<name>Release Repository</name>
<url>http://dev.enongm.com/nexus3/repository/maven-releases/</url>
</repository>
<snapshotRepository>
<id>hndpx-snapshots</id>
<name>Snapshots Repository</name>
<url>http://dev.enongm.com/nexus3/repository/maven-snapshots/</url>
</snapshotRepository>
</distributionManagement>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.enongm.dianji</groupId>
<groupId>cn.felord</groupId>
<artifactId>payment-spring-boot</artifactId>
<version>1.0.0.RELEASE</version>
<type>pom</type>

View File

@@ -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;

View File

@@ -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;

View File

@@ -1,4 +1,4 @@
package com.enongm.dianji.payment.autoconfigure;
package cn.felord.payment.autoconfigure;
import org.springframework.context.annotation.Import;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -1,4 +1,4 @@
package com.enongm.dianji.payment.wechat.enumeration;
package cn.felord.payment.wechat.enumeration;
/**
* 优惠券背景色

View File

@@ -1,4 +1,4 @@
package com.enongm.dianji.payment.wechat.enumeration;
package cn.felord.payment.wechat.enumeration;
/**
* The enum Coupon status.

View File

@@ -1,4 +1,4 @@
package com.enongm.dianji.payment.wechat.enumeration;
package cn.felord.payment.wechat.enumeration;
/**
* The enum Stock status.

View File

@@ -1,4 +1,4 @@
package com.enongm.dianji.payment.wechat.enumeration;
package cn.felord.payment.wechat.enumeration;
import org.springframework.http.HttpMethod;

View File

@@ -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;

View File

@@ -1,4 +1,4 @@
package com.enongm.dianji.payment.wechat.oauth2;
package cn.felord.payment.wechat.oauth2;
import lombok.Data;

View File

@@ -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;

View File

@@ -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.*;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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.*;

View File

@@ -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;

View File

@@ -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;

View File

@@ -1,4 +1,4 @@
package com.enongm.dianji.payment.wechat.v3.model;
package cn.felord.payment.wechat.v3.model;
import lombok.Data;

View File

@@ -1,4 +1,4 @@
package com.enongm.dianji.payment.wechat.v3.model;
package cn.felord.payment.wechat.v3.model;
import lombok.Data;

View File

@@ -1,4 +1,4 @@
package com.enongm.dianji.payment.wechat.v3.model;
package cn.felord.payment.wechat.v3.model;
import lombok.Data;

View File

@@ -1,5 +1,5 @@
package com.enongm.dianji.payment.wechat.v3.model;
package cn.felord.payment.wechat.v3.model;
import lombok.Data;

View File

@@ -1,4 +1,4 @@
package com.enongm.dianji.payment.wechat.v3.model;
package cn.felord.payment.wechat.v3.model;
import lombok.Data;

View File

@@ -1,5 +1,5 @@
package com.enongm.dianji.payment.wechat.v3.model;
package cn.felord.payment.wechat.v3.model;
import lombok.Data;

View File

@@ -1,4 +1,4 @@
package com.enongm.dianji.payment.wechat.v3.model;
package cn.felord.payment.wechat.v3.model;
import lombok.Data;

View File

@@ -1,5 +1,5 @@
package com.enongm.dianji.payment.wechat.v3.model;
package cn.felord.payment.wechat.v3.model;
import lombok.Data;

View File

@@ -1,4 +1,4 @@
package com.enongm.dianji.payment.wechat.v3.model;
package cn.felord.payment.wechat.v3.model;
import lombok.Data;

View File

@@ -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;
/**

View File

@@ -1,4 +1,4 @@
package com.enongm.dianji.payment.wechat.v3.model;
package cn.felord.payment.wechat.v3.model;
import lombok.Data;

View File

@@ -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

View File

@@ -1,4 +1,4 @@
package com.enongm.dianji.payment.wechat.v3.model;
package cn.felord.payment.wechat.v3.model;
import lombok.Data;

View File

@@ -1,4 +1,4 @@
package com.enongm.dianji.payment.wechat.v3.model;
package cn.felord.payment.wechat.v3.model;
import lombok.Data;

View File

@@ -1,4 +1,4 @@
package com.enongm.dianji.payment.wechat.v3.model;
package cn.felord.payment.wechat.v3.model;
import lombok.Data;

View File

@@ -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;

View File

@@ -1,4 +1,4 @@
package com.enongm.dianji.payment.wechat.v3.model;
package cn.felord.payment.wechat.v3.model;
import lombok.Data;

View File

@@ -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">
<groupId>com.enongm.dianji</groupId>
<groupId>cn.felord</groupId>
<artifactId>payment-spring-boot-starter</artifactId>
<version>1.0.0.RELEASE</version>
<packaging>jar</packaging>
<modelVersion>4.0.0</modelVersion>
<distributionManagement>
<repository>
<id>hndpx-release</id>
<name>Release Repository</name>
<url>http://dev.enongm.com/nexus3/repository/maven-releases/</url>
</repository>
<snapshotRepository>
<id>hndpx-snapshots</id>
<name>Snapshots Repository</name>
<url>http://dev.enongm.com/nexus3/repository/maven-snapshots/</url>
</snapshotRepository>
</distributionManagement>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.enongm.dianji</groupId>
<groupId>cn.felord</groupId>
<artifactId>payment-spring-boot</artifactId>
<version>1.0.0.RELEASE</version>
<type>pom</type>
@@ -47,7 +35,7 @@
<artifactId>spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>com.enongm.dianji</groupId>
<groupId>cn.felord</groupId>
<artifactId>payment-spring-boot-autoconfigure</artifactId>
</dependency>
<dependency>

16
pom.xml
View File

@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
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">
<groupId>com.enongm.dianji</groupId>
<groupId>cn.felord</groupId>
<artifactId>payment-spring-boot</artifactId>
<version>1.0.0.RELEASE</version>
<packaging>pom</packaging>
@@ -30,18 +30,6 @@
<bcprov.version>1.66</bcprov.version>
</properties>
<distributionManagement>
<repository>
<id>hndpx-release</id>
<name>Release Repository</name>
<url>http://dev.enongm.com/nexus3/repository/maven-releases/</url>
</repository>
<snapshotRepository>
<id>hndpx-snapshots</id>
<name>Snapshots Repository</name>
<url>http://dev.enongm.com/nexus3/repository/maven-snapshots/</url>
</snapshotRepository>
</distributionManagement>
<dependencyManagement>
<dependencies>
<dependency>
@@ -90,7 +78,7 @@
<version>${bcprov.version}</version>
</dependency>
<dependency>
<groupId>com.enongm.dianji</groupId>
<groupId>cn.felord</groupId>
<artifactId>payment-spring-boot-autoconfigure</artifactId>
<version>${project.version}</version>
</dependency>