Code

Merge pull request #8 from roncoo/dev#10

Code

Open

wuce7758 wants to merge 200 commits intodevroncoo/roncoo-pay:devfrom masterroncoo/roncoo-pay:masterCopy head branch name to clipboard

+326,743-7,133

Commits

Commits on Aug 22, 2016

• Merge pull request #8 from roncoo/dev

  Show description for fd1293b
  leslie52

  authored
  fd1293b

  Copy full SHA for fd1293b

Commits on Sep 1, 2016

• 修改log4j配置文件中，日志文件名字

  18620936193

  committed
  d7bf6cb

  Copy full SHA for d7bf6cb

• Update README.md

  leslie52

  authored
  cd40503

  Copy full SHA for cd40503

Commits on Sep 5, 2016

• Merge pull request #11 from roncoo/dev

  Show description for a7ef47e
  leslie52

  authored
  a7ef47e

  Copy full SHA for a7ef47e

Commits on Sep 11, 2016

• 1.0.0版本更新

  leslie52

  committed
  7ea3d29

  Copy full SHA for 7ea3d29

• 1.0.0版本更新

  leslie52

  committed
  d0ac51a

  Copy full SHA for d0ac51a

• 1.0.0版本更新

  leslie52

  committed
  e0ab0f4

  Copy full SHA for e0ab0f4

• 1.0.0版本更新

  leslie52

  committed
  3963d71

  Copy full SHA for 3963d71

• Update UPDATELOG.md

  leslie52

  authored
  edc16fe

  Copy full SHA for edc16fe

• 1.0.0版本更新

  leslie52

  committed
  857a747

  Copy full SHA for 857a747

• 1.0.0版本更新

  leslie52

  committed
  dbd49b5

  Copy full SHA for dbd49b5

• 1.0.0版本更新

  leslie52

  authored
  4cac0a0

  Copy full SHA for 4cac0a0

Commits on Sep 13, 2016

• 1.0.0版本更新

  leslie52

  committed
  53f79b6

  Copy full SHA for 53f79b6

• Merge branch 'master' of https://github.com/roncoo/roncoo-pay

  leslie52

  committed
  abe2ac7

  Copy full SHA for abe2ac7

Commits on Sep 19, 2016

• Update AccountController.java

  leslie52

  authored
  fa37ee0

  Copy full SHA for fa37ee0

Commits on Sep 23, 2016

• Update AccountController.java

  leslie52

  authored
  65d19d8

  Copy full SHA for 65d19d8

Commits on Mar 10, 2017

• 增加文件顾虑

  

  Peter

  committed
  b22c6a8

  Copy full SHA for b22c6a8

Commits on Apr 4, 2017

• 1. 商户后台增加结算记录查询、支付密码修改 2.boss后台增加支付密码初始123456

  

  zenghao

  committed
  98dfccf

  Copy full SHA for 98dfccf

• 修复分页乱码BUG

  

  zenghao

  committed
  31433c1

  Copy full SHA for 31433c1

Commits on Apr 5, 2017

• 用户支付配置增加商户安全等级 商户服务器IP字段,增加商户服务器IP白名单拦截

  

  Peter

  committed
  6e07aff

  Copy full SHA for 6e07aff

• 更新至1.0.1版本

  

  zenghao

  committed
  5d8c490

  Copy full SHA for 5d8c490

• Update UPDATELOG.md

  leslie52

  authored
  c0c38e0

  Copy full SHA for c0c38e0

• 调整NetWorkUtil地址

  

  Peter

  committed
  d0fc360

  Copy full SHA for d0fc360

• Merge branch 'master' of https://github.com/roncoo/roncoo-pay

  

  Peter

  committed
  0326f26

  Copy full SHA for 0326f26

Commits on Apr 14, 2017

• Update .project

  Show description for cb5e5db
  laiyq

  authored
  cb5e5db

  Copy full SHA for cb5e5db

• Update .project

  Show description for efd5cbb
  laiyq

  authored
  efd5cbb

  Copy full SHA for efd5cbb

Commits on Apr 26, 2017

• 添加微信、支付宝订单查询和订单轮询

  

  Administrator

  authored and

  Administrator

  committed
  ecbf2cf

  Copy full SHA for ecbf2cf

• 更新至1.0.2

  

  zenghao

  committed
  355b150

  Copy full SHA for 355b150

• Update UPDATELOG.md

  leslie52

  authored
  d131275

  Copy full SHA for d131275

• Update UPDATELOG.md

  leslie52

  authored
  1cf138f

  Copy full SHA for 1cf138f

Commits on Dec 14, 2017

• 添加微信支付宝条码支付

  

  LYQ

  committed
  746b374

  Copy full SHA for 746b374

• 添加微信支付宝条码支付

  

  LYQ

  committed
  f96e8f5

  Copy full SHA for f96e8f5

• 添加更新文档

  

  LYQ

  committed
  b95843b

  Copy full SHA for b95843b

• 修改查询次数为10次

  

  Peter

  committed
  f5a53e7

  Copy full SHA for f5a53e7

Commits on Dec 15, 2017

• Merge branch 'master' of http://roncoopay.vicp.net/pay/openSource_roncoopay

  Show description for 4f5420e
  

  Peter

  committed
  4f5420e

  Copy full SHA for 4f5420e

• 增加不支持支付方式异常显示

  

  Peter

  committed
  a06824c

  Copy full SHA for a06824c

• Merge branch 'master' of http://roncoopay.vicp.net/pay/openSource_roncoopay

  Show description for 34c9674
  

  Peter

  committed
  34c9674

  Copy full SHA for 34c9674

Commits on Dec 16, 2017

• 修改支付宝SDK包引入方式

  

  Peter

  committed
  08a421f

  Copy full SHA for 08a421f

• 修改支付宝SDK包引入方式

  

  Peter

  committed
  abc0455

  Copy full SHA for abc0455

Commits on Dec 25, 2017

• 添加小程序接口

  

  LYQ

  committed
  a4b80b5

  Copy full SHA for a4b80b5

Commits on Dec 26, 2017

• 修改

  

  LYQ

  committed
  3d76d91

  Copy full SHA for 3d76d91

Commits on Dec 28, 2017

• 修改订单查询

  

  LYQ

  committed
  84bfaca

  Copy full SHA for 84bfaca

• 添加配置文件

  

  LYQ

  committed
  0d834b1

  Copy full SHA for 0d834b1

• 修改jdbc配置文件

  

  LYQ

  committed
  3ddeb4d

  Copy full SHA for 3ddeb4d

• 修改配置文件

  

  LYQ

  committed
  5f7fa10

  Copy full SHA for 5f7fa10

Commits on Dec 29, 2017

• 修改配置文件

  

  LYQ

  committed
  f1604d3

  Copy full SHA for f1604d3

• 修改打包方式

  

  LYQ

  committed
  74effa6

  Copy full SHA for 74effa6

• 修改打包方式

  

  LYQ

  committed
  faaf565

  Copy full SHA for faaf565

• 修改打包方式

  

  LYQ

  committed
  eaa30c2

  Copy full SHA for eaa30c2

• 修改打包方式

  

  LYQ

  committed
  def67ff

  Copy full SHA for def67ff

Commits on Jan 11, 2018

• 添加鉴权

  

  LYQ

  committed
  e2046f3

  Copy full SHA for e2046f3

• 修改鉴权页面

  

  LYQ

  committed
  4152c1e

  Copy full SHA for 4152c1e

Commits on Jan 13, 2018

• 添加小程序鉴权

  

  LYQ

  committed
  3128747

  Copy full SHA for 3128747

• 修改鉴权请求地址

  

  LYQ

  committed
  6934509

  Copy full SHA for 6934509

• 修改鉴权

  

  LYQ

  committed
  f9d8c09

  Copy full SHA for f9d8c09

Commits on Jan 15, 2018

• 添加日志打印

  

  LYQ

  committed
  d7c44ff

  Copy full SHA for d7c44ff

• 添加小程序校验文件

  

  LYQ

  committed
  e5a1f98

  Copy full SHA for e5a1f98

Commits on Jan 24, 2018

• 先去掉鉴权

  

  LYQ

  committed
  fc86558

  Copy full SHA for fc86558

• 添加小程序支付演示

  

  LYQ

  committed
  d8ded2c

  Copy full SHA for d8ded2c

Commits on Apr 13, 2018

• 添加登录提示

  

  LYQ

  committed
  fb5fd58

  Copy full SHA for fb5fd58

• 修改登录流程，原登录地址已经变动

  

  LYQ

  committed
  cd003f7

  Copy full SHA for cd003f7

• 修改日志级别

  

  LYQ

  committed
  615dfe9

  Copy full SHA for 615dfe9

Commits on Apr 17, 2018

• 修改注册链接，方便学院统计

  

  LYQ

  committed
  a2135b4

  Copy full SHA for a2135b4

Commits on Apr 26, 2018

• 修复bug

  

  LYQ

  committed
  6e37c3a

  Copy full SHA for 6e37c3a

Commits on Oct 18, 2018

• 修复系统角色修改的bug

  laiyq

  committed
  5381cd9

  Copy full SHA for 5381cd9

• 角色权限和菜单全选和反选bug修复

  laiyq

  committed
  758c5ef

  Copy full SHA for 758c5ef

• jar包版本升级

  laiyq

  committed
  04a65d0

  Copy full SHA for 04a65d0

• jar包版本升级

  laiyq

  committed
  6f68729

  Copy full SHA for 6f68729

• jar包版本升级

  laiyq

  committed
  3032d62

  Copy full SHA for 3032d62

• jar包版本升级

  laiyq

  committed
  5c3debb

  Copy full SHA for 5c3debb

• jar包版本升级

  laiyq

  committed
  9162660

  Copy full SHA for 9162660

• jar包版本升级

  laiyq

  committed
  7109283

  Copy full SHA for 7109283

• jar包版本升级

  laiyq

  committed
  3a909a2

  Copy full SHA for 3a909a2

• 修复bug

  laiyq

  committed
  e075170

  Copy full SHA for e075170

• 更新jar版本

  laiyq

  committed
  6874aad

  Copy full SHA for 6874aad

Commits on Dec 6, 2018

• 调整登录

  laiyq

  committed
  f8f7c49

  Copy full SHA for f8f7c49

Commits on Dec 12, 2018

• 调整登录

  laiyq

  committed
  c162d30

  Copy full SHA for c162d30

• 调整登录

  laiyq

  committed
  2515d9c

  Copy full SHA for 2515d9c

Commits on Feb 20, 2019

• 架构升级

  laiyq

  committed
  40244c9

  Copy full SHA for 40244c9

• bug修复

  laiyq

  committed
  4a2163a

  Copy full SHA for 4a2163a

• 对账时间和结算时间调整

  laiyq

  committed
  0f278fe

  Copy full SHA for 0f278fe

• 端口调整

  laiyq

  committed
  56700b6

  Copy full SHA for 56700b6

• 端口调整

  laiyq

  committed
  22ba866

  Copy full SHA for 22ba866

Commits on Feb 21, 2019

• 微信小微商户进件

  

  Quanf

  committed
  78b2363

  Copy full SHA for 78b2363

• 调整

  laiyq

  committed
  5712605

  Copy full SHA for 5712605

• 调整对账时间

  laiyq

  committed
  4e4c0f7

  Copy full SHA for 4e4c0f7

• 调整结算时间

  laiyq

  committed
  f87b86a

  Copy full SHA for f87b86a

• 架构升级

  laiyq

  committed
  d1294c7

  Copy full SHA for d1294c7

• 调整

  laiyq

  committed
  abbb1f0

  Copy full SHA for abbb1f0

• 加入banner图

  laiyq

  committed
  764f122

  Copy full SHA for 764f122

• 架构升级

  laiyq

  committed
  ccca546

  Copy full SHA for ccca546

• jar包调整

  laiyq

  committed
  05d1124

  Copy full SHA for 05d1124

• 架构升级

  laiyq

  committed
  61acbdb

  Copy full SHA for 61acbdb

• Merge branch 'master' of http://roncoopay.vicp.net/pay/openSource_roncoopay

  laiyq

  committed
  2873610

  Copy full SHA for 2873610

• 修复

  laiyq

  committed
  564e396

  Copy full SHA for 564e396

Commits on Feb 22, 2019

• 修复登录权限控制

  laiyq

  committed
  f0c5a35

  Copy full SHA for f0c5a35

• Merge branch 'master' of http://roncoopay.vicp.net/pay/openSource_roncoopay

  laiyq

  committed
  e8af8a0

  Copy full SHA for e8af8a0

• 添加日志输出

  laiyq

  committed
  4f11d47

  Copy full SHA for 4f11d47

• 修改端口

  laiyq

  committed
  71aa357

  Copy full SHA for 71aa357

• 修改日志

  laiyq

  committed
  38496a2

  Copy full SHA for 38496a2

• 修改日志

  laiyq

  committed
  67a069f

  Copy full SHA for 67a069f

• 修改启动方式

  laiyq

  committed
  eeb9860

  Copy full SHA for eeb9860

• 修改启动方式

  laiyq

  committed
  c5fe063

  Copy full SHA for c5fe063

• 添加网关页面

  laiyq

  committed
  3e40115

  Copy full SHA for 3e40115

• 调整参数进行测试

  laiyq

  committed
  0481f58

  Copy full SHA for 0481f58

• 修改日志名称

  laiyq

  committed
  fdf4ec0

  Copy full SHA for fdf4ec0

• 还原配置

  laiyq

  committed
  ca95fa0

  Copy full SHA for ca95fa0

Commits on Feb 25, 2019

• 修改应用路径

  laiyq

  committed
  9a622fd

  Copy full SHA for 9a622fd

• 修改应用路径

  laiyq

  committed
  710be1a

  Copy full SHA for 710be1a

• 维护更新说明

  laiyq

  committed
  b935320

  Copy full SHA for b935320

• Merge branch 'master' of http://roncoopay.vicp.net/pay/openSource_roncoopay

  laiyq

  committed
  a7a7622

  Copy full SHA for a7a7622

• 维护更新说明

  laiyq

  committed
  82c79f9

  Copy full SHA for 82c79f9

• 修改小微商户添加

  laiyq

  committed
  6665a10

  Copy full SHA for 6665a10

• 维护readme

  laiyq

  committed
  0d4af67

  Copy full SHA for 0d4af67

Commits on Mar 1, 2019

• 修改联系人方式

  laiyq

  committed
  d65587f

  Copy full SHA for d65587f

• 修改著作权时间

  laiyq

  committed
  115a322

  Copy full SHA for 115a322

• 修改联系人方式

  laiyq

  committed
  8e162be

  Copy full SHA for 8e162be

• 修改著作权时间

  laiyq

  committed
  b20524c

  Copy full SHA for b20524c

Commits on Mar 4, 2019

• 去掉没有的改版遗留下的web.xml

  laiyq

  committed
  07d9fc5

  Copy full SHA for 07d9fc5

• Update README.md

  fengyws

  authored
  57c339e

  Copy full SHA for 57c339e

• Update README.md

  fengyws

  authored
  5ec525d

  Copy full SHA for 5ec525d

• Create .gitattributes

  fengyws

  authored
  a73a064

  Copy full SHA for a73a064

• 更加过滤文件

  fengyws

  authored
  e659df2

  Copy full SHA for e659df2

• 增加过滤文件

  fengyws

  authored
  1a4576b

  Copy full SHA for 1a4576b

• 增加过滤文件

  fengyws

  authored
  31fbb4e

  Copy full SHA for 31fbb4e

Commits on Mar 7, 2019

• 修改xml字符串解析工具类

  laiyq

  committed
  ef57d1f

  Copy full SHA for ef57d1f

• Merge branch 'master' of http://roncoopay.vicp.net/pay/openSource_roncoopay

  laiyq

  committed
  0c38f7d

  Copy full SHA for 0c38f7d

• Merge branch 'master' of https://github.com/roncoo/roncoo-pay

  laiyq

  committed
  60419dc

  Copy full SHA for 60419dc

Commits on Mar 14, 2019

• Update README.md

  wushuicheng

  authored
  f67e472

  Copy full SHA for f67e472

• 龙果支付系统--开源版--应用架构

  Show description for 8798a44
  wushuicheng

  authored
  8798a44

  Copy full SHA for 8798a44

• Update README.md

  wushuicheng

  authored
  32dc97c

  Copy full SHA for 32dc97c

• Update README.md

  wushuicheng

  authored
  2311850

  Copy full SHA for 2311850

• Update README.md

  wushuicheng

  authored
  fb9b832

  Copy full SHA for fb9b832

• Update README.md

  wushuicheng

  authored
  a3396f9

  Copy full SHA for a3396f9

• Update README.md

  wushuicheng

  authored
  d6b2379

  Copy full SHA for d6b2379

• logo

  wushuicheng

  authored
  c10f2fc

  Copy full SHA for c10f2fc

• Update README.md

  wushuicheng

  authored
  7a6a749

  Copy full SHA for 7a6a749

• 增加支付流程图

  Show description for e2d816a
  wushuicheng

  authored
  e2d816a

  Copy full SHA for e2d816a

• 支付流程图

  Show description for 6672b47
  wushuicheng

  authored
  6672b47

  Copy full SHA for 6672b47

• Update README.md

  wushuicheng

  authored
  bafbea0

  Copy full SHA for bafbea0

• Update README.md

  wushuicheng

  authored
  69adefb

  Copy full SHA for 69adefb

• Update README.md

  wushuicheng

  authored
  115d37b

  Copy full SHA for 115d37b

• Update README.md

  wushuicheng

  authored
  541988e

  Copy full SHA for 541988e

• Update README.md

  wushuicheng

  authored
  7ba9845

  Copy full SHA for 7ba9845

• Update README.md

  wushuicheng

  authored
  0e1b322

  Copy full SHA for 0e1b322

• Update README.md

  wushuicheng

  authored
  bc84c90

  Copy full SHA for bc84c90

• Update README.md

  wushuicheng

  authored
  66ffc02

  Copy full SHA for 66ffc02

• Update README.md

  wushuicheng

  authored
  d221ce8

  Copy full SHA for d221ce8

• Update README.md

  wushuicheng

  authored
  569673a

  Copy full SHA for 569673a

• Update README.md

  wushuicheng

  authored
  fe50300

  Copy full SHA for fe50300

• Update README.md

  wushuicheng

  authored
  7e6c2f4

  Copy full SHA for 7e6c2f4

Commits on Mar 15, 2019

• 更换logo

  laiyq

  committed
  65a79d6

  Copy full SHA for 65a79d6

• 更换logo

  laiyq

  committed
  2a88c12

  Copy full SHA for 2a88c12

• 更换logo

  laiyq

  committed
  bf8c86d

  Copy full SHA for bf8c86d

• 修改页脚信息

  laiyq

  committed
  2747b85

  Copy full SHA for 2747b85

• Update README.md

  fengyws

  authored
  f5bb174

  Copy full SHA for f5bb174

Commits on Apr 16, 2019

• 修改验证码路径

  laiyq

  committed
  6381c86

  Copy full SHA for 6381c86

• 修改

  laiyq

  committed
  fed6e0c

  Copy full SHA for fed6e0c

• 添加校验

  laiyq

  committed
  e9083f3

  Copy full SHA for e9083f3

• Merge branch 'master' of http://roncoopay.vicp.net/pay/openSource_roncoopay

  laiyq

  committed
  8a9f62d

  Copy full SHA for 8a9f62d

Commits on Apr 30, 2019

• Update README.md

  wushuicheng

  authored
  f359b80

  Copy full SHA for f359b80

Commits on May 23, 2019

• Update README.md

  Show description for dc5fd52
  wushuicheng

  authored
  dc5fd52

  Copy full SHA for dc5fd52

Commits on Jun 11, 2019

• Update README.md

  hupitao

  authored
  977ac73

  Copy full SHA for 977ac73

• Update README.md

  hupitao

  authored
  84b1706

  Copy full SHA for 84b1706

Commits on Jul 12, 2019

• 进件记录初始化

  

  Quanf

  committed
  f54fa8c

  Copy full SHA for f54fa8c

Commits on Sep 26, 2019

• 支付流程优化，增加花呗分期

  hupitao

  committed
  cb61021

  Copy full SHA for cb61021

• 支付流程优化，增加花呗分期

  hupitao

  committed
  72b9306

  Copy full SHA for 72b9306

Commits on Sep 27, 2019

• 支付流程优化，增加花呗分期

  hupitao

  committed
  4da08b5

  Copy full SHA for 4da08b5

• 支付流程优化，增加花呗分期

  hupitao

  committed
  8a9b997

  Copy full SHA for 8a9b997

• 支付流程优化，增加花呗分期

  hupitao

  committed
  e9e140e

  Copy full SHA for e9e140e

• 支付流程优化，增加花呗分期

  hupitao

  committed
  6f7504e

  Copy full SHA for 6f7504e

• 支付流程优化，增加花呗分期

  hupitao

  committed
  f41bd29

  Copy full SHA for f41bd29

• 支付流程优化，增加花呗分期

  hupitao

  committed
  9c0083e

  Copy full SHA for 9c0083e

• Merge branch 'master' of http://roncoopay.vicp.net/pay/opensource-demo

  hupitao

  committed
  4968bff

  Copy full SHA for 4968bff

• 增加花呗分期支付

  hupitao

  committed
  1a72bf4

  Copy full SHA for 1a72bf4

• 增加花呗分期支付

  hupitao

  committed
  7ef653a

  Copy full SHA for 7ef653a

• Merge branch 'master' of http://roncoopay.vicp.net/pay/openSource_roncoopay

  hupitao

  committed
  f17ae0f

  Copy full SHA for f17ae0f

• 流程优化

  hupitao

  committed
  a2963b3

  Copy full SHA for a2963b3

• 更新版本号

  hupitao

  committed
  e4fc22e

  Copy full SHA for e4fc22e

Commits on Nov 25, 2019

• 修改登录后无权限问题

  hupitao

  committed
  5d0f5dd

  Copy full SHA for 5d0f5dd

• 修改登录后无权限问题

  hupitao

  committed
  c2bef2e

  Copy full SHA for c2bef2e

• 修改登录后无权限问题

  hupitao

  committed
  e9bad20

  Copy full SHA for e9bad20

Commits on Dec 13, 2019

• 优化序号生成方式

  hupitao

  committed
  80fabf6

  Copy full SHA for 80fabf6

• 优化编号生成方式，使用IdWork替换数据库函数

  hupitao

  committed
  2c4e1b9

  Copy full SHA for 2c4e1b9

• 优化序号生成方式

  hupitao

  committed
  bc68bc9

  Copy full SHA for bc68bc9

• 优化编号生成方式，使用IdWork替换数据库函数

  hupitao

  committed
  f55909d

  Copy full SHA for f55909d

Commits on Dec 18, 2019

• 优化登录权限问题

  hupitao

  committed
  8b43725

  Copy full SHA for 8b43725

• Merge branch 'master' of http://roncoopay.vicp.net/pay/openSource_roncoopay

  hupitao

  committed
  29f79df

  Copy full SHA for 29f79df

• 优化登录权限问题

  hupitao

  committed
  96a2cf0

  Copy full SHA for 96a2cf0

• Merge branch 'master' of http://roncoopay.vicp.net/pay/openSource_roncoopay

  hupitao

  committed
  666c118

  Copy full SHA for 666c118

Commits on Feb 1, 2020

• Update README.md

  Show description for ae6f60b
  wushuicheng

  authored
  ae6f60b

  Copy full SHA for ae6f60b

• Update README.md

  Show description for 54fedee
  wushuicheng

  authored
  54fedee

  Copy full SHA for 54fedee

• Update README.md

  Show description for 8c14069
  wushuicheng

  authored
  8c14069

  Copy full SHA for 8c14069

Commits on Mar 30, 2020

• 修改商户后台账户明细查询bug

  hupitao

  committed
  153449d

  Copy full SHA for 153449d

• 修改shiro版本为1.4.2

  hupitao

  committed
  bd35d39

  Copy full SHA for bd35d39

Commits on Apr 22, 2020

• Update README.md

  fengyws

  authored
  4cc8fb4

  Copy full SHA for 4cc8fb4

Commits on May 21, 2020

• Update README.md

  hupitao

  authored
  3954527

  Copy full SHA for 3954527

Commits on Jul 11, 2022

• 升级依赖包版本

  hupitao

  committed
  a04f441

  Copy full SHA for a04f441

• 升级依赖包版本

  hupitao

  committed
  ddf3e0c

  Copy full SHA for ddf3e0c

Commits on Jul 12, 2022

• Merge branch 'master' of https://github.com/roncoo/roncoo-pay

  Show description for 9428382
  

  fengyw

  committed
  9428382

  Copy full SHA for 9428382