diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 01e4abe..27941aa 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,13 +1,21 @@ +# 相当于脚本用途的一个声明 name: Maven Central Repo Deployment +# 触发脚本的事件 这里为发布release之后触发 on: release: types: [released] +# 定义一个发行任务 jobs: publish: +# 任务运行的环境 runs-on: ubuntu-latest +# 任务的步骤 steps: - - name: Checkout +# 1. 声明 checkout 仓库代码到工作区 + - name: Checkout Git Repo uses: actions/checkout@v2 +# 2. 安装Java 环境 这里会用到的参数就是 Git Action secrets中配置的, +# 取值要在key前面加 secrets. - name: Set up Maven Central Repo uses: actions/setup-java@v1 with: @@ -16,7 +24,9 @@ jobs: server-username: ${{ secrets.OSSRH_USER }} server-password: ${{ secrets.OSSRH_PASSWORD }} gpg-passphrase: ${{ secrets.GPG_PASSWORD }} +# 3. 发布到Maven中央仓库 - name: Publish to Maven Central Repo +# 这里用到了其他人写的action脚本,详细可以去看他的文档。 uses: samuelmeuli/action-maven-publish@v1 with: gpg_private_key: ${{ secrets.GPG_SECRET }} diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/WechatPayV3Type.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/WechatPayV3Type.java index 2b1500f..3bcbca3 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/WechatPayV3Type.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/WechatPayV3Type.java @@ -431,7 +431,7 @@ public enum WechatPayV3Type { * * @since 1.0.4.RELEASES */ - MARKETING_BUSI_FAVOR_UPDATE(HttpMethod.POST, "%s/v3/marketing/busifavor/stocks/{stock_id}"), + MARKETING_BUSI_FAVOR_UPDATE(HttpMethod.PATCH, "%s/v3/marketing/busifavor/stocks/{stock_id}"), /** * 申请退券API. * diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/AbstractApi.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/AbstractApi.java index 546c453..50615ec 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/AbstractApi.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/AbstractApi.java @@ -202,6 +202,21 @@ public abstract class AbstractApi { .build(); } + /** + * 构建Post请求对象. + * + * @param uri the uri + * @param params the params + * @return the request entity + */ + protected RequestEntity Patch(URI uri, Object params) { + try { + return RequestEntity.patch(uri).header("Pay-TenantId", tenantId) + .body(mapper.writeValueAsString(params)); + } catch (JsonProcessingException e) { + throw new PayException("wechat app pay json failed"); + } + } /** * 对账单内容下载,非流文件。 * diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatMarketingBusiFavorApi.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatMarketingBusiFavorApi.java index 9fd4018..b29e50f 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatMarketingBusiFavorApi.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatMarketingBusiFavorApi.java @@ -384,7 +384,7 @@ public class WechatMarketingBusiFavorApi extends AbstractApi { .expand(updateParams.getStockId()) .toUri(); updateParams.setStockId(null); - return Post(uri, updateParams); + return Patch(uri, updateParams); }) .consumer(wechatResponseEntity::convert) .request();