Commit Graph

70 Commits

Author SHA1 Message Date
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
wolter f1bb1ad53b fix 2024-08-02 17:32:49 +08:00
wolter 88b95cb67a 后台 2024-08-02 17:21:18 +08:00
wolter f8f0ac2913 应用和支付方式修改不能修改商户id 2024-08-02 13:54:25 +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
wolter 5a60a92f4b 调整字段白名单和下游通知地址由app管理,更新应用模块 2024-08-02 09:18:49 +08:00
wolter 95a050d64e 商户模块 2024-08-01 14:43:39 +08:00
qiyunfanbo126.com c05c75362f master分支初始化 2024-05-07 18:53:07 +08:00
qiyunfanbo126.com f1a968c3a2 封装基础数据操作,错误返回 2024-05-07 18:32:07 +08:00
wuchao a5c7896d0a 用户列表 2024-05-07 10:07:09 +08:00
wuchao 3f0836c5cd 用户列表 2024-05-07 10:00:35 +08:00
wolter e2efa4bfcd init 2024-05-06 18:30:29 +08:00
wolter bfe5bfb9a8 init 2024-05-06 16:01:12 +08:00
qiyunfanbo126.com 2f268160bb 初始化,修复trace 2024-04-30 14:58:30 +08:00