Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
f7dab92
#389 微信支付查询退款返回结果中增加退款成功时间字段
binarywang Dec 2, 2017
a076851
开放平台增加 MessageRouter
007gzs Dec 4, 2017
9516193
Merge branch 'develop' of https://github.com/Wechat-Group/weixin-java…
007gzs Dec 4, 2017
e659ca0
Update WxMpMessageRouter.java
007gzs Dec 4, 2017
be16513
#394开放平台增加 MessageRouter
binarywang Dec 4, 2017
7b64b6b
发布2.9.1.BETA测试版本
binarywang Dec 4, 2017
0714cbe
#395 修复获取小程序二维码data format error的问题
binarywang Dec 7, 2017
cae504b
修复小l字符问题
binarywang Dec 16, 2017
ce281be
优化模版消息代码,添加默认构造方法
binarywang Dec 16, 2017
3a55561
#401 开放平台获取授权方的帐号基本信息返回对象增加MiniProgramInfo字段
binarywang Dec 16, 2017
d8250cb
#399 微信支付退款查询接口调整“代金券类型”字段位置
binarywang Dec 16, 2017
7118255
针对最近官网提出的用户unionID获取策略调整的公告,增加相应注释
binarywang Dec 16, 2017
ff3cdb1
#358 针对微信网页授权为snsapi_userinfo时,WxMpUser类中增加privilege字段
binarywang Dec 16, 2017
2e85dfd
remove useless javadoc
binarywang Dec 16, 2017
cbf18e8
#321 微信支付下载对账单接口增加对GZIP格式的支持
binarywang Dec 16, 2017
b152882
SimpleDateFormat线程不安全,使用FastDateFormat替代
binarywang Dec 16, 2017
d804d15
重构不规范的类名
binarywang Dec 16, 2017
b1aafae
规范部分代码
binarywang Dec 16, 2017
4a0f14d
发布2.9.2.BETA测试版本
binarywang Dec 18, 2017
42d5396
#401 开放平台获取授权方的帐号基本信息返回对象增加MiniProgramInfo字段
binarywang Dec 19, 2017
a361487
企业付款相关接口抽取为一个独立的接口实现类
binarywang Dec 19, 2017
230fc9f
清理代码
binarywang Dec 19, 2017
34a974b
#392 微信支付增加企业付款到银行卡的相关接口
binarywang Dec 20, 2017
0240fff
#392 微信支付增加企业付款到银行卡的相关接口
binarywang Dec 21, 2017
94ae938
#392 微信支付增加企业付款到银行卡的相关接口
binarywang Dec 21, 2017
0a21fe2
#412 规范代码,修复变量名使用错误的问题
binarywang Dec 23, 2017
e9e9a62
#416 修改删除群发接口的消息ID参数类型为Long
binarywang Dec 29, 2017
0d66bc7
发布2.9.3.BETA测试版本
binarywang Dec 29, 2017
519d5a5
去掉多余的等号字符
binarywang Jan 2, 2018
5dcd06b
#420 开放平台模块增加小程序相关接口
007gzs Jan 4, 2018
15a33a7
重构RSA加密方法
binarywang Jan 4, 2018
e18665f
Merge branch 'master' into develop
binarywang Jan 8, 2018
d0f436b
修复获取小程序二维码时参数名称错误和数据格式错误的问题
aliangsoft Jan 11, 2018
edaaa48
发布2.9.4.BETA测试版本
binarywang Jan 11, 2018
48fb5e9
微信支付去掉统一下单接口请求时关于openid和sub_openid的逻辑判断,由调用者自己控制相关参数
binarywang Jan 17, 2018
1a4ca8c
规范notifyUrl字段属性写法
binarywang Jan 18, 2018
be50ea0
Update WxMaUserServiceImpl.java
binarywang Jan 20, 2018
f2b0548
#436 添加一次性订阅消息接口
klausxie Jan 23, 2018
e331fb5
#441 从编译依赖中去掉lombok
unlimitedsola Jan 23, 2018
18689eb
#440 添加maven warpper以及依赖更新检查脚本
unlimitedsola Jan 23, 2018
6b408ea
#442 优化 pom.xml 文件
unlimitedsola Jan 24, 2018
8db4935
微信支付修复红包查询结果类解析问题
binarywang Jan 24, 2018
2ac2568
修复http请求连接释放问题
binarywang Jan 24, 2018
905f098
#443 在获取会员卡信息中增加balance字段,涉及金额的balance字段改为double类型
CodeIdeal Jan 24, 2018
801caca
#429 WxMaMessage增加缺少的MsgType属性
binarywang Jan 25, 2018
8e1c926
优化部分代码
binarywang Jan 25, 2018
fb8de94
发布2.9.5.BETA测试版本
binarywang Jan 25, 2018
b44f9b3
优化部分测试代码
binarywang Jan 27, 2018
a687d00
#425 小程序客服消息新增图文链接消息支持
binarywang Jan 27, 2018
2eb3fc5
#425 小程序客服消息新增小程序卡片消息支持
binarywang Jan 27, 2018
5bd2d20
#431 WxMpUser的sex相关字段调整:原sex变量改为sexDesc,原sexId改为sex
binarywang Jan 27, 2018
48d3163
优化部分代码
binarywang Jan 27, 2018
c755c3e
恢复2.9.4.BETA版本被误修改的代码
binarywang Jan 31, 2018
27117ee
发布2.9.6.BETA测试版本
binarywang Jan 31, 2018
2629f63
修复被误修改的红包相关参数
binarywang Feb 8, 2018
8a733d9
#470 增加小程序模板配置相关接口
Feb 26, 2018
fe7a470
#476 微信支付部分接口增加“单品优惠”的支持
binarywang Mar 3, 2018
c887289
优化代码
binarywang Mar 3, 2018
20e174e
Merge branch 'master' into develop
binarywang Mar 3, 2018
2058623
#477 企业号接口重构,分类管理
binarywang Mar 3, 2018
0b7c1da
fix compile warning
binarywang Mar 3, 2018
a6d73a2
#409 实现企业微信的userid与openid互换接口
binarywang Mar 3, 2018
9188cea
格式化代码,并清理无用代码
binarywang Mar 3, 2018
edea54b
#473 WxMpKfAccountRequest增加构造函数
binarywang Mar 5, 2018
b28f358
微信支付通知回调解析时的签名方式支持自定义
binarywang Mar 5, 2018
89a3cfa
发布2.9.7.BETA测试版本
binarywang Mar 5, 2018
f17d9cd
#479 修复公众号模板消息发送时pagepath问题
binarywang Mar 5, 2018
b4cf79f
#480 修复sex值可能为null导致的空指针问题
binarywang Mar 5, 2018
ae4cf4d
修复代码
binarywang Mar 6, 2018
ee3be3b
修复单元测试问题
lichenliang666 Mar 8, 2018
58dec7b
优化代码
627535195 Mar 9, 2018
070ff05
#490 code换取session_key接口响应结果类中去掉expires_in字段
binarywang Mar 11, 2018
a11de19
#471 上传多媒体文件时临时文件及时清理,防止本地产生过多系统垃圾
binarywang Mar 11, 2018
ca6f77a
发布2.9.8.BETA测试版
binarywang Mar 11, 2018
e3293d1
ignore versionsBackup files
binarywang Mar 11, 2018
0c7a472
#456 企业微信获取部门列表接口方法listAll修改为list,以支持按部分id获取其下属部门列表
binarywang Mar 18, 2018
3102838
#500 微信支付退款申请接口增加notify_url参数
binarywang Mar 22, 2018
9ec335d
发布2.9.9.BETA测试版本
binarywang Mar 23, 2018
f94c06a
fix something
binarywang Mar 24, 2018
6faae7e
Merge branch 'master' into develop
binarywang Mar 24, 2018
2c2ed5d
#513 修复开放平台小程序jscode2session 错误
007gzs Mar 25, 2018
e86adc1
fix javadoc
binarywang Mar 28, 2018
3d07676
#517 将XStreamTransformer的register方法设为public,方便用户自定义扩展
binarywang Mar 28, 2018
0a55dc5
#457 实现扫码支付回调通知的解析
binarywang Mar 28, 2018
44f6186
#515 小程序新增获取微信用户绑定手机号信息的解密方法
binarywang Mar 28, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,6 @@ Temporary Items
.apdisk
/.sonar/
sonar-project.properties

!/.mvn/wrapper/maven-wrapper.jar
*.versionsBackup
Binary file added .mvn/wrapper/maven-wrapper.jar
Binary file not shown.
1 change: 1 addition & 0 deletions .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.2/apache-maven-3.5.2-bin.zip
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ language: java

jdk:
- oraclejdk8
script: "mvn clean package -Dmaven.test.skip=true"
script: "./mvnw clean package -DskipTests=true"

#script:
# - mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent package sonar:sonar

branches:
only:
- develop

cache:
directories:
- '$HOME/.m2/repository'
Expand Down
2 changes: 2 additions & 0 deletions check-dependency-updates.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#!/usr/bin/env bash
./mvnw org.codehaus.mojo:versions-maven-plugin:display-dependency-updates
2 changes: 2 additions & 0 deletions check-plugin-updates.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#!/usr/bin/env bash
./mvnw org.codehaus.mojo:versions-maven-plugin:display-plugin-updates
2 changes: 2 additions & 0 deletions check-property-updates.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#!/usr/bin/env bash
./mvnw org.codehaus.mojo:versions-maven-plugin:display-property-updates
236 changes: 236 additions & 0 deletions mvnw
Original file line number Diff line number Diff line change
@@ -0,0 +1,236 @@
#!/bin/sh
# ----------------------------------------------------------------------------
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you 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.
# ----------------------------------------------------------------------------

# ----------------------------------------------------------------------------
# Maven2 Start Up Batch script
#
# Required ENV vars:
# ------------------
# JAVA_HOME - location of a JDK home dir
#
# Optional ENV vars
# -----------------
# M2_HOME - location of maven2's installed home dir
# MAVEN_OPTS - parameters passed to the Java VM when running Maven
# e.g. to debug Maven itself, use
# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
# MAVEN_SKIP_RC - flag to disable loading of mavenrc files
# ----------------------------------------------------------------------------

if [ -z "$MAVEN_SKIP_RC" ] ; then

if [ -f /etc/mavenrc ] ; then
. /etc/mavenrc
fi

if [ -f "$HOME/.mavenrc" ] ; then
. "$HOME/.mavenrc"
fi

fi

# OS specific support. $var _must_ be set to either true or false.
cygwin=false;
darwin=false;
mingw=false
case "`uname`" in
CYGWIN*) cygwin=true ;;
MINGW*) mingw=true;;
Darwin*) darwin=true
#
# Look for the Apple JDKs first to preserve the existing behaviour, and then look
# for the new JDKs provided by Oracle.
#
if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK ] ; then
#
# Apple JDKs
#
export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home
fi

if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Java/JavaVirtualMachines/CurrentJDK ] ; then
#
# Apple JDKs
#
export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
fi

if [ -z "$JAVA_HOME" ] && [ -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ] ; then
#
# Oracle JDKs
#
export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
fi

if [ -z "$JAVA_HOME" ] && [ -x "/usr/libexec/java_home" ]; then
#
# Apple JDKs
#
export JAVA_HOME=`/usr/libexec/java_home`
fi
;;
esac

if [ -z "$JAVA_HOME" ] ; then
if [ -r /etc/gentoo-release ] ; then
JAVA_HOME=`java-config --jre-home`
fi
fi

if [ -z "$M2_HOME" ] ; then
## resolve links - $0 may be a link to maven's home
PRG="$0"

# need this for relative symlinks
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG="`dirname "$PRG"`/$link"
fi
done

saveddir=`pwd`

M2_HOME=`dirname "$PRG"`/..

# make it fully qualified
M2_HOME=`cd "$M2_HOME" && pwd`

cd "$saveddir"
# echo Using m2 at $M2_HOME
fi

# For Cygwin, ensure paths are in UNIX format before anything is touched
if $cygwin ; then
[ -n "$M2_HOME" ] &&
M2_HOME=`cygpath --unix "$M2_HOME"`
[ -n "$JAVA_HOME" ] &&
JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
[ -n "$CLASSPATH" ] &&
CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
fi

# For Migwn, ensure paths are in UNIX format before anything is touched
if $mingw ; then
[ -n "$M2_HOME" ] &&
M2_HOME="`(cd "$M2_HOME"; pwd)`"
[ -n "$JAVA_HOME" ] &&
JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
# TODO classpath?
fi

if [ -z "$JAVA_HOME" ]; then
javaExecutable="`which javac`"
if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
# readlink(1) is not available as standard on Solaris 10.
readLink=`which readlink`
if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
if $darwin ; then
javaHome="`dirname \"$javaExecutable\"`"
javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
else
javaExecutable="`readlink -f \"$javaExecutable\"`"
fi
javaHome="`dirname \"$javaExecutable\"`"
javaHome=`expr "$javaHome" : '\(.*\)/bin'`
JAVA_HOME="$javaHome"
export JAVA_HOME
fi
fi
fi

if [ -z "$JAVACMD" ] ; then
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java"
else
JAVACMD="$JAVA_HOME/bin/java"
fi
else
JAVACMD="`which java`"
fi
fi

if [ ! -x "$JAVACMD" ] ; then
echo "Error: JAVA_HOME is not defined correctly." >&2
echo " We cannot execute $JAVACMD" >&2
exit 1
fi

if [ -z "$JAVA_HOME" ] ; then
echo "Warning: JAVA_HOME environment variable is not set."
fi

CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher

# traverses directory structure from process work directory to filesystem root
# first directory with .mvn subdirectory is considered project base directory
find_maven_basedir() {
local basedir=$(pwd)
local wdir=$(pwd)
while [ "$wdir" != '/' ] ; do
if [ -d "$wdir"/.mvn ] ; then
basedir=$wdir
break
fi
wdir=$(cd "$wdir/.."; pwd)
done
echo "${basedir}"
}

# concatenates all lines of a file
concat_lines() {
if [ -f "$1" ]; then
echo "$(tr -s '\n' ' ' < "$1")"
fi
}

export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-$(find_maven_basedir)}
MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"

# For Cygwin, switch paths to Windows format before running java
if $cygwin; then
[ -n "$M2_HOME" ] &&
M2_HOME=`cygpath --path --windows "$M2_HOME"`
[ -n "$JAVA_HOME" ] &&
JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
[ -n "$CLASSPATH" ] &&
CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
[ -n "$MAVEN_PROJECTBASEDIR" ] &&
MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
fi

# Provide a "standardized" way to retrieve the CLI args that will
# work with both Windows and non-Windows executions.
MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
export MAVEN_CMD_LINE_ARGS

WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain

# avoid using MAVEN_CMD_LINE_ARGS below since that would loose parameter escaping in $@
exec "$JAVACMD" \
$MAVEN_OPTS \
-classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
"-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
Loading