 Rzy
|
71ccc46f23
|
Merge remote-tracking branch 'origin/feature_413_cjh' into feature/rzy/api_1.0
|
2024-08-05 17:07:35 +08:00 |
|
Rzy
|
79723bd945
|
支付准备
|
2024-08-05 17:07:11 +08:00 |
wolter
|
0ac4feb07a
|
后台，订单字段调整fix
|
2024-08-05 17:01:58 +08:00 |
 陈俊宏
|
a7cf191437
|
Merge branch 'dev/dev1.0' into feature_413_cjh
|
2024-08-05 16:42:44 +08:00 |
|
陈俊宏
|
0f747c2578
|
支付回调
|
2024-08-05 16:42:25 +08:00 |
|
Rzy
|
7dc1f9ef08
|
Merge branch 'dev/dev1.0' into feature/rzy/api_1.0
|
2024-08-05 16:23:48 +08:00 |
|
Rzy
|
50924acbc7
|
Merge branch 'dev/dev1.0' of https://gitea.cdlsxd.cn/BaseSystem/PaymentCenter into dev/dev1.0
# Conflicts:
# app/models/appmodel/app.go
|
2024-08-05 16:22:09 +08:00 |
|
Rzy
|
3e7df62375
|
<feat>网页支付
|
2024-08-05 16:20:01 +08:00 |
|
wolter
|
65621d439b
|
后台，更新请求日志和回调日志data
|
2024-08-05 15:42:20 +08:00 |
|
陈俊宏
|
39fb6d4d93
|
支付回调
|
2024-08-05 15:30:02 +08:00 |
|
wolter
|
5326e9c8d9
|
更新models
|
2024-08-05 14:47:20 +08:00 |
|
wolter
|
490e2fa15f
|
后台，添加定时任务
|
2024-08-05 14:40:57 +08:00 |
|
Rzy
|
b1a1a4cd50
|
<feat>api表单验证
|
2024-08-05 14:05:46 +08:00 |
|
Rzy
|
8ead5e11e2
|
加密解密
|
2024-08-05 10:59:02 +08:00 |
|
Rzy
|
4d28483087
|
Merge branch 'dev/dev1.0' into feature/rzy/api_1.0
# Conflicts:
# app/constants/errorcode/error_code.go
|
2024-08-05 10:56:30 +08:00 |
|
Rzy
|
13dce2d1c3
|
加密解密
|
2024-08-05 10:55:35 +08:00 |
|
Rzy
|
aa1481b923
|
合并代码
|
2024-08-02 18:38:51 +08:00 |
|
Rzy
|
b781a61f21
|
Merge branch 'feature/rzy/api_1.0' into dev/dev1.0
# Conflicts:
# app/constants/common/common.go
# app/constants/errorcode/error_code.go
# app/data/app.go
# app/http/controllers/base.go
# app/http/requestmapping/front.go
# app/http/routes/route.go
# app/services/app.go
# app/utils/util.go
# go.mod
# go.sum
|
2024-08-02 18:34:37 +08:00 |
|
Rzy
|
6e6e01a823
|
中间件
|
2024-08-02 18:25:28 +08:00 |
|
陈俊宏
|
fb5c0e458b
|
回调查询
|
2024-08-02 18:14:04 +08:00 |
|
陈俊宏
|
b8e32f407a
|
Merge branch 'dev/dev1.0' into feature_413_cjh
# Conflicts:
# app/constants/common/common.go
|
2024-08-02 17:34:07 +08:00 |
|
wolter
|
f1bb1ad53b
|
fix
|
2024-08-02 17:32:49 +08:00 |
|
wolter
|
b8da95788b
|
更新支付方式请求参数
|
2024-08-02 17:23:38 +08:00 |
|
wolter
|
88b95cb67a
|
后台
|
2024-08-02 17:21:18 +08:00 |
|
陈俊宏
|
4842aa47a3
|
必要位置添加日志
|
2024-08-02 16:53:48 +08:00 |
|
陈俊宏
|
a79b18d279
|
支付退款+退款单查询+订单关闭
|
2024-08-02 16:37:37 +08:00 |
|
陈俊宏
|
f1ee9b4196
|
支付退款+退款单查询+订单关闭
|
2024-08-02 16:37:07 +08:00 |
|
wolter
|
bf4e24619d
|
修改后台路由，添加auth校验
|
2024-08-02 14:32:44 +08:00 |
|
wolter
|
92c1a3c230
|
添加dockerfile
|
2024-08-02 14:02:13 +08:00 |
|
wolter
|
f8f0ac2913
|
应用和支付方式修改不能修改商户id
|
2024-08-02 13:54:25 +08:00 |
|
陈俊宏
|
4d4338f178
|
支付调起+订单查询
|
2024-08-02 13:49:28 +08:00 |
|
陈俊宏
|
c1e354e4ab
|
支付调起+订单查询
|
2024-08-02 13:47:52 +08:00 |
|
Rzy
|
28bd78ab7f
|
Merge branch 'dev/dev1.0' into feature/rzy/api_1.0
|
2024-08-02 11:44:09 +08:00 |
|
Rzy
|
a056e2b26a
|
api中间件
|
2024-08-02 11:41:54 +08:00 |
|
wolter
|
7a3823a2a7
|
更新订单和订单日志
|
2024-08-02 10:41:57 +08:00 |
|
Rzy
|
753b466605
|
Merge branch 'dev/dev1.0' into feature/rzy/api_1.0
|
2024-08-02 09:42:03 +08:00 |
|
陈俊宏
|
0b844afa5f
|
Merge branch 'dev/dev1.0' into feature_413_cjh
|
2024-08-02 09:23:06 +08:00 |
|
wolter
|
5a60a92f4b
|
调整字段白名单和下游通知地址由app管理，更新应用模块
|
2024-08-02 09:18:49 +08:00 |
|
Rzy
|
dd3255e220
|
<feat>新增rsa,sm2,sm4加解密以及测试用例
|
2024-08-01 16:40:54 +08:00 |
|
Rzy
|
4be80f228e
|
<fix>(解决冲突)：之后会另起分支
|
2024-08-01 14:53:22 +08:00 |
|
陈俊宏
|
1a292ff5d3
|
Merge branch 'dev/dev1.0' into feature_413_cjh
# Conflicts:
# app/constants/common/common.go
# app/data/app.go
# app/data/order_log.go
# app/data/pay_channel.go
|
2024-08-01 14:48:39 +08:00 |
|
陈俊宏
|
d343257e23
|
支付提交一波
|
2024-08-01 14:46:56 +08:00 |
|
wolter
|
95a050d64e
|
商户模块
|
2024-08-01 14:43:39 +08:00 |
|
wolter
|
689b0f80db
|
增加data层，更新model数据表
|
2024-07-31 18:38:17 +08:00 |
|
wolter
|
89f1c7895a
|
修改项目module
|
2024-07-31 17:21:03 +08:00 |
 wuchao
|
c57b4eaa54
|
更新--初始化版本
|
2024-06-17 14:14:56 +08:00 |
|
wuchao
|
2d3aded2ef
|
更新--初始化版本
|
2024-06-17 14:10:13 +08:00 |
qiyunfanbo126.com
|
806f3b9781
|
增加队列
|
2024-05-27 10:39:55 +08:00 |
 樊波
|
192d2abff7
|
删除 plugin
|
2024-05-17 17:00:17 +08:00 |
|
樊波
|
226b62eb96
|
上传文件至 /
|
2024-05-17 16:58:58 +08:00 |