wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								3d5e33fed0
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'refs/remotes/origin/feature/rzy/api_1.0' into dev/dev1.0
							
							
							
							
							
							
							
							# Conflicts:
#	app/constants/errorcode/error_code.go
#	app/services/thirdpay/notify/notify.go 
							
						 | 
						
							2024-08-08 09:14:08 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								f85d6cc410
								
							
						 | 
						
							
							
								
								<feat>订单回调
							
							
							
							
							
						 | 
						
							2024-08-07 18:49:43 +08:00 | 
						
					
				
					
						
							
							
								 
								wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								bf1bc4b1a2
								
							
						 | 
						
							
							
								
								后台,密钥对生成
							
							
							
							
							
						 | 
						
							2024-08-07 17:14:03 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								fa6b385209
								
							
						 | 
						
							
							
								
								Merge branch 'dev/dev1.0' into feature/rzy/api_1.0
							
							
							
							
							
							
							
							# Conflicts:
#	app/constants/common/common.go
#	app/constants/errorcode/error_code.go
#	app/http/entities/backend/order.go 
							
						 | 
						
							2024-08-06 17:02:25 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								943c3401c6
								
							
						 | 
						
							
							
								
								<feat>支付接口
							
							
							
							
							
						 | 
						
							2024-08-06 16:53:59 +08:00 | 
						
					
				
					
						
							
							
								 
								wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								50382f2c0a
								
							
						 | 
						
							
							
								
								后台,定时任务查询订单状态和关闭订单
							
							
							
							
							
						 | 
						
							2024-08-05 17:51:57 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								b1a1a4cd50
								
							
						 | 
						
							
							
								
								<feat>api表单验证
							
							
							
							
							
						 | 
						
							2024-08-05 14:05:46 +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 | 
						
					
				
					
						
							
							
								
								 陈俊宏
							
						 | 
						
							
							
							
							
							
								
							
							
								b8e32f407a
								
							
						 | 
						
							
							
								
								Merge branch 'dev/dev1.0' into feature_413_cjh
							
							
							
							
							
							
							
							# Conflicts:
#	app/constants/common/common.go 
							
						 | 
						
							2024-08-02 17:34:07 +08:00 | 
						
					
				
					
						
							
							
								
								 陈俊宏
							
						 | 
						
							
							
							
							
							
								
							
							
								f1ee9b4196
								
							
						 | 
						
							
							
								
								支付退款+退款单查询+订单关闭
							
							
							
							
							
						 | 
						
							2024-08-02 16:37:07 +08:00 | 
						
					
				
					
						
							
							
								 
								wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								bf4e24619d
								
							
						 | 
						
							
							
								
								修改后台路由,添加auth校验
							
							
							
							
							
						 | 
						
							2024-08-02 14:32:44 +08:00 | 
						
					
				
					
						
							
							
								
								 陈俊宏
							
						 | 
						
							
							
							
							
							
								
							
							
								4d4338f178
								
							
						 | 
						
							
							
								
								支付调起+订单查询
							
							
							
							
							
						 | 
						
							2024-08-02 13:49:28 +08:00 | 
						
					
				
					
						
							
							
								
								 陈俊宏
							
						 | 
						
							
							
							
							
							
								
							
							
								c1e354e4ab
								
							
						 | 
						
							
							
								
								支付调起+订单查询
							
							
							
							
							
						 | 
						
							2024-08-02 13:47:52 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								a056e2b26a
								
							
						 | 
						
							
							
								
								api中间件
							
							
							
							
							
						 | 
						
							2024-08-02 11:41:54 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								dd3255e220
								
							
						 | 
						
							
							
								
								<feat>新增rsa,sm2,sm4加解密以及测试用例
							
							
							
							
							
						 | 
						
							2024-08-01 16:40:54 +08:00 | 
						
					
				
					
						
							
							
								 
								wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								89f1c7895a
								
							
						 | 
						
							
							
								
								修改项目module
							
							
							
							
							
						 | 
						
							2024-07-31 17:21:03 +08:00 | 
						
					
				
					
						
							
							
								
								 wuchao
							
						 | 
						
							
							
							
							
							
								
							
							
								2d3aded2ef
								
							
						 | 
						
							
							
								
								更新--初始化版本
							
							
							
							
							
						 | 
						
							2024-06-17 14:10:13 +08:00 | 
						
					
				
					
						
							
							
								 
								qiyunfanbo126.com
							
						 | 
						
							
							
							
							
							
								
							
							
								806f3b9781
								
							
						 | 
						
							
							
								
								增加队列
							
							
							
							
							
						 | 
						
							2024-05-27 10:39:55 +08:00 | 
						
					
				
					
						
							
							
								 
								wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								8ce86e4621
								
							
						 | 
						
							
							
								
								随机字符串生成
							
							
							
							
							
						 | 
						
							2024-05-08 11:13:57 +08:00 | 
						
					
				
					
						
							
							
								 
								qiyunfanbo126.com
							
						 | 
						
							
							
							
							
							
								
							
							
								8c11d75d8c
								
							
						 | 
						
							
							
								
								init项目
							
							
							
							
							
						 | 
						
							2024-04-29 15:13:21 +08:00 |