69 Commits

Author SHA1 Message Date
cnzzs
16c7880e3e 修改pom配置 v2.0.1 2017-05-09 21:45:17 +08:00
cnzzs
89910f2474 补全注释 2017-05-09 21:40:15 +08:00
egzosn
3f38713898 Merge branch 'develop' of https://git.oschina.net/egzosn/pay-java-parent 2017-05-05 22:46:04 +08:00
egzosn
5d6e58aac8 补全注释 2017-05-05 19:21:35 +08:00
egzosn@gmail.com
5f4b6d9249 Merge branch 'develop-Actinia' of https://git.oschina.net/egzosn/pay-java-parent into develop
# Conflicts:
#	pay-java-demo/src/main/java/com/egzosn/pay/demo/entity/PayType.java
#	pay-java-demo/src/main/java/com/egzosn/pay/demo/service/PayResponse.java
#	pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/api/FuiouPayConfigStorage.java
#	pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/api/FuiouPayService.java
#	pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/utils/SimplePostRequestExecutor.java
2017-05-05 17:28:42 +08:00
egzosn@gmail.com
2541662b14 Merge branch 'develop-Actinia' of https://git.oschina.net/egzosn/pay-java-parent into develop
# Conflicts:
#	pay-java-demo/src/main/java/com/egzosn/pay/demo/entity/PayType.java
#	pay-java-demo/src/main/java/com/egzosn/pay/demo/service/PayResponse.java
#	pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/api/FuiouPayConfigStorage.java
#	pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/api/FuiouPayService.java
#	pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/utils/SimplePostRequestExecutor.java
2017-05-05 17:26:39 +08:00
egzosn
ed89d01844 Merge branch 'develop' of https://git.oschina.net/egzosn/pay-java-parent 2017-04-26 00:01:33 +08:00
egzosn
c3c23b836e 补全注释 2017-04-25 22:33:27 +08:00
Actinia-517
91b1074fba #新增#
新增退款接口
新增接口等注释
#修改#
更新新的支付接口
2017-04-25 21:40:47 +08:00
zzs
613221daed 移除版本bug 2017-04-21 14:46:56 +08:00
zzs
f814835b28 包名修改 2017-04-10 09:56:12 +08:00
zzs
445f86bd8a Merge remote-tracking branch 'origin/master'
# Conflicts:
#	pay-java-demo/src/main/java/com/egzosn/pay/demo/service/PayResponse.java
2017-04-10 09:22:51 +08:00
zzs
7152f001e4 包名修改 2017-04-10 09:22:18 +08:00
egzosn
0c8a0f8c53 demo添加代理配置 2017-04-09 11:27:31 +08:00
egzosn
303a1d326a 域名更换 2017-04-09 11:13:52 +08:00
zzs
f53bb6a82f Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	pay-java-demo/src/main/java/in/egan/pay/demo/dao/ApyAccountRepository.java
2017-03-20 16:43:33 +08:00
egzosn
174f602dd7 支付宝二维码支付实现 2017-03-19 23:26:24 +08:00
egzosn
d1f6c241a2 重新定义二维码支付的接口 2017-03-19 23:25:48 +08:00
zzs
021033a705 设置测试环境 2017-03-14 14:49:13 +08:00
egzosn
171abfc31a 增加注释,帮助文档 2017-03-12 15:53:21 +08:00
egzosn
58a3cbec71 增加注释,帮助文档 2017-03-12 15:49:44 +08:00
egzosn
1808c46ae9 增加注释,帮助文档 2017-03-12 15:42:34 +08:00
egzosn
e7286fca98 增加注释,帮助文档 2017-03-12 15:34:55 +08:00
egzosn
0b1001961f 增加注释,帮助文档 2017-03-12 15:23:05 +08:00
egzosn
e6740d8b6d 增加注释,帮助文档 2017-03-12 15:22:26 +08:00
egzosn
4daef9bdaa Merge branch 'develop' of https://git.oschina.net/egzosn/pay-java-parent 2017-03-12 09:49:53 +08:00
egzosn
e1f462d0c3 Merge branch 'develop' of https://git.oschina.net/egzosn/pay-java-parent 2017-03-12 09:43:43 +08:00
egzosn
9f9e7ec345 Merge branch 'master' into develop 2017-03-12 09:35:55 +08:00
egzosn
7344436267 版本更新 2017-03-12 09:35:00 +08:00
egzosn
5561a904d8 版本更新 2017-03-11 22:40:21 +08:00
egzosn
f951642a93 清理无效项 2017-03-11 22:37:54 +08:00
egzosn
608c149cc8 实现过渡板支付宝退款 2017-03-11 10:48:12 +08:00
egzosn
6a875e4464 Merge remote-tracking branch 'origin/develop' 2017-03-11 10:27:18 +08:00
zzs
a2518280dc .. 2017-03-10 23:15:02 +08:00
zzs
6701cfacb5 修复支付宝微信退款 2017-03-10 23:12:47 +08:00
zzs
d9918fa33e 修复2017支付宝bug 2017-03-09 14:44:37 +08:00
egzosn
27daa124bb 修复微信bug 2017-03-08 21:55:35 +08:00
egzosn
fc1220cc47 修复ClientHttpRequest的bug, 定义交易类型的“接口”方法 2017-03-08 21:55:04 +08:00
egzosn
3858ed1094 Merge remote-tracking branch 'origin/develop' 2017-03-08 21:50:29 +08:00
zzs
555a979c89 微信账单实现 2017-03-08 20:42:06 +08:00
zzs
028448de11 微信账单实现 2017-03-08 20:38:19 +08:00
zzs
a0d161b08b 根据交易类型进行调整 2017-03-08 20:37:29 +08:00
zzs
e171f33ebd 修复ClientHttpRequest的bug, 定义交易类型的“接口”方法 2017-03-08 20:35:16 +08:00
zzs
e814cb60ea 补充 2017-03-08 11:24:02 +08:00
zzs
ca99e3e342 补充 2017-03-08 10:45:54 +08:00
zzs
20f3faf627 sorry,文件遗漏 2017-03-08 10:37:43 +08:00
zzs
7f349557fd Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	pay-java-demo/src/main/java/in/egan/pay/demo/controller/PayController.java
2017-03-08 09:29:08 +08:00
egan
a5b5eba2dd 支付宝交易辅助接口实现。 2017-03-07 23:09:46 +08:00
egan
4340fec7a9 支付宝交易辅助接口实现。 2017-03-07 23:08:03 +08:00
egan
dc882dc37d 支付宝交易辅助接口实现。 2017-03-07 23:04:53 +08:00