Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Develop #7

Merged
merged 49 commits into from
Oct 19, 2020
Merged

Develop #7

merged 49 commits into from
Oct 19, 2020

Commits on Aug 17, 2020

  1. art:证书类配置读取优化调整

    曾浩 committed Aug 17, 2020
    Configuration menu
    Copy the full SHA
    1812b23 View commit details
    Browse the repository at this point in the history

  2. new:电商收付通二级商户进件

    曾浩 committed Aug 17, 2020
    Configuration menu
    Copy the full SHA
    2b27ee9 View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2020

  1. Merge branch 'develop' into develop

    @binarywang
    binarywang authored Aug 18, 2020
    Configuration menu
    Copy the full SHA
    a3ec261 View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2020

  1. Merge remote-tracking branch 'wechat/develop' into develop 

    # Conflicts:
#	weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/ApplymentsRequest.java
#	weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/ApplymentsResult.java
#	weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/ApplymentsStatusResult.java
#	weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/EcommerceService.java
#	weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/EcommerceServiceImpl.java
    曾浩 committed Aug 24, 2020
    Configuration menu
    Copy the full SHA
    cee3753 View commit details
    Browse the repository at this point in the history

  2. art:微信服务商配置优化

    曾浩 committed Aug 24, 2020
    Configuration menu
    Copy the full SHA
    10e0ca5 View commit details
    Browse the repository at this point in the history

  3. new:jsapi合单支付

    曾浩 committed Aug 24, 2020
    Configuration menu
    Copy the full SHA
    5db9706 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2020

  1. new:合单支付

    曾浩 committed Aug 26, 2020
    Configuration menu
    Copy the full SHA
    e0d87eb View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2020

  1. Merge remote-tracking branch 'wechat/develop' into develop

    曾浩 committed Aug 30, 2020
    Configuration menu
    Copy the full SHA
    84b9b99 View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2020

  1. Merge remote-tracking branch 'wechat/develop' into develop

    曾浩 committed Sep 4, 2020
    Configuration menu
    Copy the full SHA
    541899a View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2020

  1. Merge remote-tracking branch 'wechat/develop' into develop

    曾浩 committed Sep 8, 2020
    Configuration menu
    Copy the full SHA
    9f60516 View commit details
    Browse the repository at this point in the history

  2. new:电商收付通普通支付

    曾浩 committed Sep 8, 2020
    Configuration menu
    Copy the full SHA
    97409a7 View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2020

  1. new:电商收付通支付回调处理

    曾浩 committed Sep 10, 2020
    Configuration menu
    Copy the full SHA
    f18c62b View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'wechat/develop' into develop 

    # Conflicts:
#	weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/EcommerceService.java
#	weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/EcommerceServiceImpl.java
    曾浩 committed Sep 10, 2020
    Configuration menu
    Copy the full SHA
    b8d9a15 View commit details
    Browse the repository at this point in the history

  3. new:电商收付通支付回调处理

    曾浩 committed Sep 10, 2020
    Configuration menu
    Copy the full SHA
    c8fc670 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'wechat/develop' into develop 

    # Conflicts:
#	weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/CombineTransactionsNotifyResult.java
#	weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/NotifyResponse.java
#	weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/PartnerTransactionsNotifyResult.java
#	weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/SignatureHeader.java
#	weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/enums/TradeTypeEnum.java
    曾浩 committed Sep 10, 2020
    Configuration menu
    Copy the full SHA
    4f157b0 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2020

  1. 电商收付通支付调整

    曾浩 committed Sep 11, 2020
    Configuration menu
    Copy the full SHA
    34f0d99 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'wechat/develop' into develop

    曾浩 committed Sep 11, 2020
    Configuration menu
    Copy the full SHA
    c2552de View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2020

  1. Merge remote-tracking branch 'wechat/develop' into develop

    曾浩 committed Sep 14, 2020
    Configuration menu
    Copy the full SHA
    3fbeec4 View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2020

  1. Merge remote-tracking branch 'wechat/develop' into develop

    曾浩 committed Sep 15, 2020
    Configuration menu
    Copy the full SHA
    e56289f View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2020

  1. fix:电商收付通回调通知测试

    曾浩 committed Sep 17, 2020
    Configuration menu
    Copy the full SHA
    60c63a5 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'wechat/develop' into develop

    曾浩 committed Sep 17, 2020
    Configuration menu
    Copy the full SHA
    5b606fd View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2020

  1. Merge remote-tracking branch 'wechat/develop' into develop

    曾浩 committed Sep 20, 2020
    Configuration menu
    Copy the full SHA
    aa2fe98 View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2020

  1. new:电商收付通合单支付、普通支付查询

    曾浩 committed Sep 21, 2020
    Configuration menu
    Copy the full SHA
    9b20c74 View commit details
    Browse the repository at this point in the history

  2. new:电商收付通商户、平台提现

    曾浩 committed Sep 21, 2020
    Configuration menu
    Copy the full SHA
    00bc965 View commit details
    Browse the repository at this point in the history

  3. fix:命名统一调整

    曾浩 committed Sep 21, 2020
    Configuration menu
    Copy the full SHA
    2037900 View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2020

  1. Merge remote-tracking branch 'wechat/develop' into develop

    曾浩 committed Sep 22, 2020
    Configuration menu
    Copy the full SHA
    3b4bb74 View commit details
    Browse the repository at this point in the history

  2. new:分账查询、退款通知

    曾浩 committed Sep 22, 2020
    Configuration menu
    Copy the full SHA
    58ac339 View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2020

  1. new:修改结算账户、退款查询

    曾浩 committed Sep 23, 2020
    Configuration menu
    Copy the full SHA
    7df0e75 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'wechat/develop' into develop

    曾浩 committed Sep 23, 2020
    Configuration menu
    Copy the full SHA
    07edd5b View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2020

  1. Merge remote-tracking branch 'wechat/develop' into develop

    曾浩 committed Sep 25, 2020
    Configuration menu
    Copy the full SHA
    f0f21e1 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2020

  1. Merge remote-tracking branch 'wechat/develop' into develop

    曾浩 committed Sep 27, 2020
    Configuration menu
    Copy the full SHA
    a28a17a View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2020

  1. fix:字段错误

    曾浩 committed Sep 28, 2020
    Configuration menu
    Copy the full SHA
    d248c0e View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'wechat/develop' into develop

    曾浩 committed Sep 28, 2020
    Configuration menu
    Copy the full SHA
    9603199 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2020

  1. 🆕 #1789 微信支付电商收付通增加下载账单的接口

    @f00lish
    f00lish authored Sep 29, 2020
    Configuration menu
    Copy the full SHA
    429f170 View commit details
    Browse the repository at this point in the history

  2. 修改退款接口字段错误 (#1788) 

    * art:证书类配置读取优化调整

* new:电商收付通二级商户进件

* art:微信服务商配置优化

* new:jsapi合单支付

* new:合单支付

* new:电商收付通普通支付

* new:电商收付通支付回调处理

* new:电商收付通支付回调处理

* 电商收付通支付调整

* fix:电商收付通回调通知测试

* new:电商收付通合单支付、普通支付查询

* new:电商收付通商户、平台提现

* fix:命名统一调整

* new:分账查询、退款通知

* new:修改结算账户、退款查询

* fix:字段错误

Co-authored-by: 曾浩 <[email protected]>
Co-authored-by: Binary Wang <[email protected]>
    @binarywang
    binarywang and 曾浩 authored Sep 29, 2020
    Configuration menu
    Copy the full SHA
    cd0c63f View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2020

  1. 🆕 #1793 企业微信添加应用管理的设置工作台自定义展示模块 

    Co-authored-by: sysong <[email protected]>
    @youflint
    youflint and sysong authored Sep 30, 2020
    Configuration menu
    Copy the full SHA
    8428270 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2020

  1. 🎨 优化公众号Spring Boot Starter的redisTemplate注入等代码

    @Dream2Land @binarywang
    Dream2Land authored and binarywang committed Oct 2, 2020
    Configuration menu
    Copy the full SHA
    8929fc4 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2020

  1. 🎨 优化代码，提供toString方法，避免某些情况下出现的问题

    @binarywang
    binarywang committed Oct 5, 2020
    Configuration menu
    Copy the full SHA
    18f3f40 View commit details
    Browse the repository at this point in the history

  2. 🆕 #1675 企业微信增加更新、查询和删除日历的接口

    @binarywang
    binarywang committed Oct 5, 2020
    Configuration menu
    Copy the full SHA
    64402ab View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2020

  1. 🆕 #1686 微信公众号增加对话能力（原导购助手）部分接口，如添加顾问、获取顾问信息等

    @binarywang
    binarywang committed Oct 6, 2020
    Configuration menu
    Copy the full SHA
    6948044 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2020

  1. 🆕 #1686 微信公众号增加对话能力（原导购助手）部分接口，如修改顾问、删除顾问、获取顾问列表等

    @binarywang
    binarywang committed Oct 7, 2020
    Configuration menu
    Copy the full SHA
    9c91aeb View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2020

  1. 🎨 #1797 企业微信配置客户联系「联系我」方式接口返回增加二维码链接字段 

    新增联系我二维码链接，仅在scene为2时返回
    @Acvrock
    Acvrock authored Oct 12, 2020
    Configuration menu
    Copy the full SHA
    6cc5ebd View commit details
    Browse the repository at this point in the history

  2. 🎨 优化部分代码，重构OAuth2网页授权、网页登录等相关接口，方便接入open模块

    @binarywang
    binarywang committed Oct 12, 2020
    Configuration menu
    Copy the full SHA
    c7b1abc View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2020

  1. 🐛 修复字段错误 

    Co-authored-by: 曾浩 <[email protected]>
    @cloudX2019
    cloudX2019 and 曾浩 authored Oct 13, 2020
    Configuration menu
    Copy the full SHA
    5599c0d View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2020

  1. 🆕 #1725 微信支付分增加免确认模式（预授权方式）相关接口支持

    @spvycf
    spvycf authored Oct 15, 2020
    Configuration menu
    Copy the full SHA
    7c9e2e4 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2020

  1. 🆕 #1806 开放平台增加第三方平台代公众号实现复用公众号资料快速创建小程序的接口

    @binarywang
    binarywang committed Oct 17, 2020
    Configuration menu
    Copy the full SHA
    77e3c8e View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2020

  1. 🆕 微信开发平台模块增加OAuth2相关接口（网页授权、网页登录等）的实现

    @binarywang
    binarywang committed Oct 18, 2020
    Configuration menu
    Copy the full SHA
    07bc5a5 View commit details
    Browse the repository at this point in the history

  2. 🎨 优化部分代码，明确出错信息

    @binarywang
    binarywang committed Oct 18, 2020
    Configuration menu
    Copy the full SHA
    1510041 View commit details
    Browse the repository at this point in the history

  3. 🔖 发布 3.9.5.B 测试版本

    @binarywang
    binarywang committed Oct 18, 2020
    Configuration menu
    Copy the full SHA
    08bb399 View commit details
    Browse the repository at this point in the history