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.

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

Merge pull request #8 from roncoo/dev #10

Open
wants to merge 200 commits into
base: dev
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
200 commits
Select commit Hold shift + click to select a range
fd1293b
Merge pull request #8 from roncoo/dev
leslie52 Aug 22, 2016
d7bf6cb
修改log4j配置文件中,日志文件名字
18620936193 Sep 1, 2016
cd40503
Update README.md
leslie52 Sep 1, 2016
a7ef47e
Merge pull request #11 from roncoo/dev
leslie52 Sep 5, 2016
7ea3d29
1.0.0版本更新
leslie52 Sep 11, 2016
d0ac51a
1.0.0版本更新
leslie52 Sep 11, 2016
e0ab0f4
1.0.0版本更新
leslie52 Sep 11, 2016
3963d71
1.0.0版本更新
leslie52 Sep 11, 2016
edc16fe
Update UPDATELOG.md
leslie52 Sep 11, 2016
857a747
1.0.0版本更新
leslie52 Sep 11, 2016
dbd49b5
1.0.0版本更新
leslie52 Sep 11, 2016
4cac0a0
1.0.0版本更新
leslie52 Sep 11, 2016
53f79b6
1.0.0版本更新
leslie52 Sep 13, 2016
abe2ac7
Merge branch 'master' of https://github.com/roncoo/roncoo-pay
leslie52 Sep 13, 2016
fa37ee0
Update AccountController.java
leslie52 Sep 19, 2016
65d19d8
Update AccountController.java
leslie52 Sep 23, 2016
b22c6a8
增加文件顾虑
Mar 10, 2017
98dfccf
1. 商户后台增加结算记录查询、支付密码修改 2.boss后台增加支付密码初始123456
Apr 4, 2017
31433c1
修复分页乱码BUG
Apr 4, 2017
6e07aff
用户支付配置增加商户安全等级 商户服务器IP字段,增加商户服务器IP白名单拦截
Apr 5, 2017
5d8c490
更新至1.0.1版本
Apr 5, 2017
c0c38e0
Update UPDATELOG.md
leslie52 Apr 5, 2017
d0fc360
调整NetWorkUtil地址
Apr 5, 2017
0326f26
Merge branch 'master' of https://github.com/roncoo/roncoo-pay
Apr 5, 2017
cb5e5db
Update .project
laiyq Apr 14, 2017
efd5cbb
Update .project
laiyq Apr 14, 2017
ecbf2cf
添加微信、支付宝订单查询和订单轮询
Apr 26, 2017
355b150
更新至1.0.2
Apr 26, 2017
d131275
Update UPDATELOG.md
leslie52 Apr 26, 2017
1cf138f
Update UPDATELOG.md
leslie52 Apr 26, 2017
746b374
添加微信支付宝条码支付
Dec 14, 2017
f96e8f5
添加微信支付宝条码支付
Dec 14, 2017
b95843b
添加更新文档
Dec 14, 2017
f5a53e7
修改查询次数为10次
Dec 14, 2017
4f5420e
Merge branch 'master' of http://roncoopay.vicp.net/pay/openSource_ron…
Dec 15, 2017
a06824c
增加不支持支付方式异常显示
Dec 15, 2017
34c9674
Merge branch 'master' of http://roncoopay.vicp.net/pay/openSource_ron…
Dec 15, 2017
08a421f
修改支付宝SDK包引入方式
Dec 16, 2017
abc0455
修改支付宝SDK包引入方式
Dec 16, 2017
a4b80b5
添加小程序接口
Dec 25, 2017
3d76d91
修改
Dec 26, 2017
84bfaca
修改订单查询
Dec 28, 2017
0d834b1
添加配置文件
Dec 28, 2017
3ddeb4d
修改jdbc配置文件
Dec 28, 2017
5f7fa10
修改配置文件
Dec 28, 2017
f1604d3
修改配置文件
Dec 29, 2017
74effa6
修改打包方式
Dec 29, 2017
faaf565
修改打包方式
Dec 29, 2017
eaa30c2
修改打包方式
Dec 29, 2017
def67ff
修改打包方式
Dec 29, 2017
e2046f3
添加鉴权
Jan 11, 2018
4152c1e
修改鉴权页面
Jan 11, 2018
3128747
添加小程序鉴权
Jan 13, 2018
6934509
修改鉴权请求地址
Jan 13, 2018
f9d8c09
修改鉴权
Jan 13, 2018
d7c44ff
添加日志打印
Jan 15, 2018
e5a1f98
添加小程序校验文件
Jan 15, 2018
fc86558
先去掉鉴权
Jan 24, 2018
d8ded2c
添加小程序支付演示
Jan 24, 2018
fb5fd58
添加登录提示
Apr 13, 2018
cd003f7
修改登录流程,原登录地址已经变动
Apr 13, 2018
615dfe9
修改日志级别
Apr 13, 2018
a2135b4
修改注册链接,方便学院统计
Apr 17, 2018
6e37c3a
修复bug
Apr 26, 2018
5381cd9
修复系统角色修改的bug
laiyq Oct 18, 2018
758c5ef
角色权限和菜单全选和反选bug修复
laiyq Oct 18, 2018
04a65d0
jar包版本升级
laiyq Oct 18, 2018
6f68729
jar包版本升级
laiyq Oct 18, 2018
3032d62
jar包版本升级
laiyq Oct 18, 2018
5c3debb
jar包版本升级
laiyq Oct 18, 2018
9162660
jar包版本升级
laiyq Oct 18, 2018
7109283
jar包版本升级
laiyq Oct 18, 2018
3a909a2
jar包版本升级
laiyq Oct 18, 2018
e075170
修复bug
laiyq Oct 18, 2018
6874aad
更新jar版本
laiyq Oct 18, 2018
f8f7c49
调整登录
laiyq Dec 6, 2018
c162d30
调整登录
laiyq Dec 12, 2018
2515d9c
调整登录
laiyq Dec 12, 2018
40244c9
架构升级
laiyq Feb 20, 2019
4a2163a
bug修复
laiyq Feb 20, 2019
0f278fe
对账时间和结算时间调整
laiyq Feb 20, 2019
56700b6
端口调整
laiyq Feb 20, 2019
22ba866
端口调整
laiyq Feb 20, 2019
78b2363
微信小微商户进件
Feb 21, 2019
5712605
调整
laiyq Feb 21, 2019
4e4c0f7
调整对账时间
laiyq Feb 21, 2019
f87b86a
调整结算时间
laiyq Feb 21, 2019
d1294c7
架构升级
laiyq Feb 21, 2019
abbb1f0
调整
laiyq Feb 21, 2019
764f122
加入banner图
laiyq Feb 21, 2019
ccca546
架构升级
laiyq Feb 21, 2019
05d1124
jar包调整
laiyq Feb 21, 2019
61acbdb
架构升级
laiyq Feb 21, 2019
2873610
Merge branch 'master' of http://roncoopay.vicp.net/pay/openSource_ron…
laiyq Feb 21, 2019
564e396
修复
laiyq Feb 21, 2019
f0c5a35
修复登录权限控制
laiyq Feb 22, 2019
e8af8a0
Merge branch 'master' of http://roncoopay.vicp.net/pay/openSource_ron…
laiyq Feb 22, 2019
4f11d47
添加日志输出
laiyq Feb 22, 2019
71aa357
修改端口
laiyq Feb 22, 2019
38496a2
修改日志
laiyq Feb 22, 2019
67a069f
修改日志
laiyq Feb 22, 2019
eeb9860
修改启动方式
laiyq Feb 22, 2019
c5fe063
修改启动方式
laiyq Feb 22, 2019
3e40115
添加网关页面
laiyq Feb 22, 2019
0481f58
调整参数进行测试
laiyq Feb 22, 2019
fdf4ec0
修改日志名称
laiyq Feb 22, 2019
ca95fa0
还原配置
laiyq Feb 22, 2019
9a622fd
修改应用路径
laiyq Feb 25, 2019
710be1a
修改应用路径
laiyq Feb 25, 2019
b935320
维护更新说明
laiyq Feb 25, 2019
a7a7622
Merge branch 'master' of http://roncoopay.vicp.net/pay/openSource_ron…
laiyq Feb 25, 2019
82c79f9
维护更新说明
laiyq Feb 25, 2019
6665a10
修改小微商户添加
laiyq Feb 25, 2019
0d4af67
维护readme
laiyq Feb 25, 2019
d65587f
修改联系人方式
laiyq Mar 1, 2019
115a322
修改著作权时间
laiyq Mar 1, 2019
8e162be
修改联系人方式
laiyq Mar 1, 2019
b20524c
修改著作权时间
laiyq Mar 1, 2019
07d9fc5
去掉没有的改版遗留下的web.xml
laiyq Mar 4, 2019
57c339e
Update README.md
fengyws Mar 4, 2019
5ec525d
Update README.md
fengyws Mar 4, 2019
a73a064
Create .gitattributes
fengyws Mar 4, 2019
e659df2
更加过滤文件
fengyws Mar 4, 2019
1a4576b
增加过滤文件
fengyws Mar 4, 2019
31fbb4e
增加过滤文件
fengyws Mar 4, 2019
ef57d1f
修改xml字符串解析工具类
laiyq Mar 7, 2019
0c38f7d
Merge branch 'master' of http://roncoopay.vicp.net/pay/openSource_ron…
laiyq Mar 7, 2019
60419dc
Merge branch 'master' of https://github.com/roncoo/roncoo-pay
laiyq Mar 7, 2019
f67e472
Update README.md
wushuicheng Mar 14, 2019
8798a44
龙果支付系统--开源版--应用架构
wushuicheng Mar 14, 2019
32dc97c
Update README.md
wushuicheng Mar 14, 2019
2311850
Update README.md
wushuicheng Mar 14, 2019
fb9b832
Update README.md
wushuicheng Mar 14, 2019
a3396f9
Update README.md
wushuicheng Mar 14, 2019
d6b2379
Update README.md
wushuicheng Mar 14, 2019
c10f2fc
logo
wushuicheng Mar 14, 2019
7a6a749
Update README.md
wushuicheng Mar 14, 2019
e2d816a
增加支付流程图
wushuicheng Mar 14, 2019
6672b47
支付流程图
wushuicheng Mar 14, 2019
bafbea0
Update README.md
wushuicheng Mar 14, 2019
69adefb
Update README.md
wushuicheng Mar 14, 2019
115d37b
Update README.md
wushuicheng Mar 14, 2019
541988e
Update README.md
wushuicheng Mar 14, 2019
7ba9845
Update README.md
wushuicheng Mar 14, 2019
0e1b322
Update README.md
wushuicheng Mar 14, 2019
bc84c90
Update README.md
wushuicheng Mar 14, 2019
66ffc02
Update README.md
wushuicheng Mar 14, 2019
d221ce8
Update README.md
wushuicheng Mar 14, 2019
569673a
Update README.md
wushuicheng Mar 14, 2019
fe50300
Update README.md
wushuicheng Mar 14, 2019
7e6c2f4
Update README.md
wushuicheng Mar 14, 2019
65a79d6
更换logo
laiyq Mar 15, 2019
2a88c12
更换logo
laiyq Mar 15, 2019
bf8c86d
更换logo
laiyq Mar 15, 2019
2747b85
修改页脚信息
laiyq Mar 15, 2019
f5bb174
Update README.md
fengyws Mar 15, 2019
6381c86
修改验证码路径
laiyq Apr 16, 2019
fed6e0c
修改
laiyq Apr 16, 2019
e9083f3
添加校验
laiyq Apr 16, 2019
8a9f62d
Merge branch 'master' of http://roncoopay.vicp.net/pay/openSource_ron…
laiyq Apr 16, 2019
f359b80
Update README.md
wushuicheng Apr 30, 2019
dc5fd52
Update README.md
wushuicheng May 23, 2019
977ac73
Update README.md
hupitao Jun 11, 2019
84b1706
Update README.md
hupitao Jun 11, 2019
f54fa8c
进件记录初始化
Jul 12, 2019
cb61021
支付流程优化,增加花呗分期
hupitao Sep 26, 2019
72b9306
支付流程优化,增加花呗分期
hupitao Sep 26, 2019
4da08b5
支付流程优化,增加花呗分期
hupitao Sep 27, 2019
8a9b997
支付流程优化,增加花呗分期
hupitao Sep 27, 2019
e9e140e
支付流程优化,增加花呗分期
hupitao Sep 27, 2019
6f7504e
支付流程优化,增加花呗分期
hupitao Sep 27, 2019
f41bd29
支付流程优化,增加花呗分期
hupitao Sep 27, 2019
9c0083e
支付流程优化,增加花呗分期
hupitao Sep 27, 2019
4968bff
Merge branch 'master' of http://roncoopay.vicp.net/pay/opensource-demo
hupitao Sep 27, 2019
1a72bf4
增加花呗分期支付
hupitao Sep 27, 2019
7ef653a
增加花呗分期支付
hupitao Sep 27, 2019
f17ae0f
Merge branch 'master' of http://roncoopay.vicp.net/pay/openSource_ron…
hupitao Sep 27, 2019
a2963b3
流程优化
hupitao Sep 27, 2019
e4fc22e
更新版本号
hupitao Sep 27, 2019
5d0f5dd
修改登录后无权限问题
hupitao Nov 25, 2019
c2bef2e
修改登录后无权限问题
hupitao Nov 25, 2019
e9bad20
修改登录后无权限问题
hupitao Nov 25, 2019
80fabf6
优化序号生成方式
hupitao Dec 13, 2019
2c4e1b9
优化编号生成方式,使用IdWork替换数据库函数
hupitao Dec 13, 2019
bc68bc9
优化序号生成方式
hupitao Dec 13, 2019
f55909d
优化编号生成方式,使用IdWork替换数据库函数
hupitao Dec 13, 2019
8b43725
优化登录权限问题
hupitao Dec 18, 2019
29f79df
Merge branch 'master' of http://roncoopay.vicp.net/pay/openSource_ron…
hupitao Dec 18, 2019
96a2cf0
优化登录权限问题
hupitao Dec 18, 2019
666c118
Merge branch 'master' of http://roncoopay.vicp.net/pay/openSource_ron…
hupitao Dec 18, 2019
ae6f60b
Update README.md
wushuicheng Feb 1, 2020
54fedee
Update README.md
wushuicheng Feb 1, 2020
8c14069
Update README.md
wushuicheng Feb 1, 2020
153449d
修改商户后台账户明细查询bug
hupitao Mar 30, 2020
bd35d39
修改shiro版本为1.4.2
hupitao Mar 30, 2020
4cc8fb4
Update README.md
fengyws Apr 22, 2020
3954527
Update README.md
hupitao May 21, 2020
a04f441
升级依赖包版本
hupitao Jul 11, 2022
ddf3e0c
升级依赖包版本
hupitao Jul 11, 2022
9428382
Merge branch 'master' of https://github.com/roncoo/roncoo-pay
Jul 12, 2022
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
Prev Previous commit
Next Next commit
Update README.md
  • Loading branch information
wushuicheng authored Mar 14, 2019
commit d6b23790d4815d98b10012d6c1e5b9db666fb49f
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
![roncoo-pay-logo](roncoo-pay-logo.png "roncoo-pay-logo")

# 龙果支付系统 roncoo-pay

龙果支付系统(roncoo-pay)是国内首款开源的互联网支付系统,其核心目标是汇聚主流支付渠道,打造一款轻量、便捷、易用,且集支付、资金对账、资金清结算于一体的支付系统,满足互联网业务系统打通支付通道实现收款和业务资金管理需求。