Commit Graph

522 Commits

Author SHA1 Message Date
laodaming
34d5e62824 fix 2023-07-26 15:06:29 +08:00
laodaming
ae58ebe35a fix 2023-07-26 15:05:53 +08:00
laodaming
918b5903d7 fix 2023-07-26 15:01:59 +08:00
laodaming
e40a4d43f4 fix 2023-07-26 14:35:29 +08:00
laodaming
16feddfe3e fix 2023-07-26 12:27:34 +08:00
laodaming
b9afdf1dda fix 2023-07-26 11:53:57 +08:00
laodaming
999dc36e76 fix 2023-07-26 11:53:06 +08:00
Hiven
e05fcd8248 合并代码 2023-07-26 11:09:18 +08:00
Hiven
95baad761a 支付模块 2023-07-26 11:06:05 +08:00
laodaming
c7536d0fdb fix 2023-07-26 11:02:30 +08:00
laodaming
c378c6d8da fix 2023-07-26 10:03:15 +08:00
laodaming
0657307265 fix 2023-07-25 19:43:28 +08:00
laodaming
59edb394fa fix 2023-07-25 19:37:56 +08:00
laodaming
3be83ed424 fix 2023-07-25 19:35:52 +08:00
laodaming
743ea96157 fix 2023-07-25 19:33:59 +08:00
laodaming
222b9ec155 fix 2023-07-25 18:34:56 +08:00
laodaming
932ee1a578 fix 2023-07-25 18:21:30 +08:00
laodaming
b0f598af68 fix 2023-07-25 18:04:01 +08:00
laodaming
d0fc91b61b fix 2023-07-25 17:41:38 +08:00
laodaming
17aac7ad66 fix 2023-07-25 17:12:37 +08:00
laodaming
9c72a8a4c9 fix 2023-07-25 17:10:50 +08:00
laodaming
a4164dbdf6 fix 2023-07-25 12:06:19 +08:00
laodaming
5fadf0697d fix 2023-07-24 19:44:28 +08:00
Hiven
03627b93e9 Merge branch 'develop' into orders 2023-07-24 19:17:07 +08:00
laodaming
25c3de6b99 fix 2023-07-24 19:16:38 +08:00
Hiven
05e5842992 Merge branch 'develop' into orders 2023-07-24 19:15:33 +08:00
laodaming
b28fefdb0e fix 2023-07-24 18:39:27 +08:00
laodaming
148e0681ec fix 2023-07-24 18:28:58 +08:00
laodaming
fc59840235 fix 2023-07-24 18:08:19 +08:00
Hiven
fd9e30ea74 订单列表--完善 2023-07-24 18:04:24 +08:00
laodaming
9d4bbbf80b fix 2023-07-24 18:02:30 +08:00
laodaming
7e22f47a0d fix 2023-07-24 16:07:05 +08:00
eson
7ec78d1c35 重新调整w,r的入口 2023-07-24 13:17:02 +08:00
Hiven
95e6491de5 Merge branch 'develop' into orders 2023-07-24 13:07:04 +08:00
Hiven
f5cfed20d3 调整 2023-07-24 13:03:43 +08:00
eson
4c2f823178 可以登录 2023-07-24 12:32:05 +08:00
Hiven
5b4c43978e Merge branch 'develop' into orders 2023-07-24 12:20:38 +08:00
Hiven
f792215c2f 订单 2023-07-24 12:19:34 +08:00
eson
98ae3e2106 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-07-24 12:18:43 +08:00
eson
900d5bf24b 修改表单 2023-07-24 12:18:27 +08:00
laodaming
b0c9c8d310 fix 2023-07-24 10:37:11 +08:00
laodaming
1e2f6d8b7f fix 2023-07-24 10:30:08 +08:00
eson
72a6412eed fix 2023-07-24 10:27:06 +08:00
Hiven
f4def7f8a0 修复 2023-07-24 10:26:24 +08:00
Hiven
3201f4d26d 修复 2023-07-24 10:10:26 +08:00
Hiven
6b3ad339c6 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-07-21 18:17:43 +08:00
Hiven
a65efe5777 订单列表 2023-07-21 18:17:01 +08:00
laodaming
80a94de6df fix 2023-07-21 17:49:02 +08:00
laodaming
9400fcfaeb fix 2023-07-21 17:32:15 +08:00
laodaming
91131161c9 fix 2023-07-21 17:31:28 +08:00
laodaming
001716785d fix 2023-07-21 17:27:31 +08:00
laodaming
fef5d33f08 fix 2023-07-21 17:23:48 +08:00
laodaming
83fc1b30c7 fix 2023-07-21 17:21:31 +08:00
laodaming
133af63064 fix 2023-07-21 17:20:46 +08:00
laodaming
53a4df065c fix 2023-07-21 16:19:59 +08:00
laodaming
0b5270f3b7 fix 2023-07-21 16:14:42 +08:00
eson
efde0005f9 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-07-21 15:20:56 +08:00
eson
2825f8ae54 所有序列化, 都加入 BeforeLogic AfterLogic方法. 便于处理 w r的传递的参数 2023-07-21 15:20:18 +08:00
eson
373d5dca45 处理 有问题的handler 2023-07-21 14:20:21 +08:00
laodaming
0311bf82fc fix 2023-07-21 14:15:43 +08:00
laodaming
7e4708e8d8 fix 2023-07-21 14:07:42 +08:00
laodaming
50817d7ae2 fix 2023-07-21 12:27:37 +08:00
laodaming
eb25e5bfcc fix 2023-07-21 12:14:19 +08:00
laodaming
4e13550044 fix 2023-07-21 12:08:32 +08:00
laodaming
b36ad4bd25 fix 2023-07-21 11:59:01 +08:00
laodaming
985fc93d00 fix 2023-07-21 11:34:36 +08:00
eson
44a3666d68 修改tpl的参数传入问题 2023-07-21 11:24:26 +08:00
eson
d7dc0406f6 完整的模板 2023-07-21 11:03:14 +08:00
eson
3d678dc243 添加测试main 2023-07-21 10:47:54 +08:00
eson
8a4f990214 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-07-21 10:46:48 +08:00
eson
4fbfd90c0d 修复main.go入口的错误 2023-07-21 10:46:25 +08:00
laodaming
edd4104ce7 fix 2023-07-21 10:33:43 +08:00
eson
728aeb17e2 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-07-21 10:28:36 +08:00
eson
65d0663d28 修复模板的问题 2023-07-21 10:28:17 +08:00
laodaming
532929a563 fix 2023-07-20 18:18:36 +08:00
laodaming
10aa0d14f0 fix 2023-07-20 18:06:48 +08:00
laodaming
0e752e31fd fix 2023-07-20 18:04:50 +08:00
Hiven
2f5ce8dd77 用户订单列表完善 2023-07-20 17:49:09 +08:00
laodaming
421b63846a fix 2023-07-20 17:47:28 +08:00
laodaming
0e72027ff3 fix 2023-07-20 17:35:13 +08:00
eson
fd1a56c11a Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-07-20 16:34:08 +08:00
eson
7c2762065c 修复模板 2023-07-20 16:32:41 +08:00
Hiven
8258dfa8c1 调整 2023-07-20 16:09:41 +08:00
Hiven
b93c2d4708 调整 2023-07-20 15:55:01 +08:00
Hiven
810f4fbee7 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-07-20 15:44:06 +08:00
laodaming
20e32ae078 fix 2023-07-20 15:43:55 +08:00
Hiven
92110e02a6 接口调整 2023-07-20 15:43:48 +08:00
laodaming
4a1655d6fa Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-07-20 15:29:07 +08:00
laodaming
bf3d9f9631 fix 2023-07-20 15:27:17 +08:00
eson
06349aafa7 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-07-20 15:21:24 +08:00
eson
8c7884bcc3 解决部分 2023-07-20 15:21:03 +08:00
laodaming
9ff4468778 fix 2023-07-20 14:56:28 +08:00
Hiven
f2eec528ce 调整 2023-07-20 14:46:13 +08:00
Hiven
52d47f78ac 获取用户订单列表接口,以及工具方法 2023-07-20 14:43:59 +08:00
laodaming
4a2230d90c fix 2023-07-20 12:27:07 +08:00
laodaming
fd93688d27 fix 2023-07-20 11:09:20 +08:00
laodaming
b8333ecaf8 fix 2023-07-20 11:08:35 +08:00
eson
3e1d4d2e4f Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-07-20 10:13:52 +08:00
eson
6264440017 添加gorm的model结构一个表名的入口 2023-07-20 10:13:18 +08:00
laodaming
47e22e6891 fix 2023-07-19 19:41:35 +08:00
laodaming
3bd08c8c2b fix 2023-07-19 19:33:26 +08:00
laodaming
31132364ad fix 2023-07-19 19:29:50 +08:00
laodaming
3ef96dab13 fix 2023-07-19 18:27:27 +08:00
laodaming
37078d5772 fix 2023-07-19 17:36:27 +08:00
laodaming
99bd3592af fix 2023-07-19 17:34:07 +08:00
laodaming
d4c77b2a13 fix 2023-07-19 16:57:34 +08:00
laodaming
c49874fec7 fix 2023-07-19 16:53:24 +08:00
laodaming
7ebc7f8476 fix 2023-07-19 16:51:08 +08:00
laodaming
e24fc4825c fix 2023-07-19 16:47:14 +08:00
laodaming
9647fe060a fix 2023-07-19 16:19:45 +08:00
laodaming
12bc736d49 fix 2023-07-19 16:14:07 +08:00
laodaming
db15103c93 fix 2023-07-19 16:13:06 +08:00
laodaming
bd127a7884 fix 2023-07-19 14:58:05 +08:00
laodaming
245122d049 fix 2023-07-19 14:04:30 +08:00
laodaming
f09220cf2d fix 2023-07-19 14:01:53 +08:00
eson
620257e0c5 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-07-19 11:04:56 +08:00
eson
ad60c63e2c 自动启动代理服务器 2023-07-19 10:59:13 +08:00
laodaming
d466364385 fix 2023-07-19 10:48:52 +08:00
laodaming
c6f445708d fix 2023-07-19 09:55:00 +08:00
eson
e3373bde65 测试通过 2023-07-18 18:23:18 +08:00
eson
c13225d2fa 正常的版本 2023-07-18 16:44:46 +08:00
eson
e4e9339071 修复proxy不传递query参数的问题 2023-07-18 13:04:29 +08:00
eson
125de6dde8 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-07-17 19:44:09 +08:00
eson
4d9f14eb30 更新 2023-07-17 19:43:43 +08:00
laodaming
9e7b3267aa fix 2023-07-17 19:39:35 +08:00
laodaming
e1bc5fbe51 fix 2023-07-17 17:08:45 +08:00
laodaming
eedce6c2d7 fix 2023-07-17 16:04:53 +08:00
laodaming
2eb8bf936f fix 2023-07-17 15:38:41 +08:00
laodaming
73ce1e6db3 fix 2023-07-17 14:40:24 +08:00
laodaming
fffdf448c4 fix 2023-07-17 11:42:29 +08:00
laodaming
ae1b3e1e64 fix 2023-07-17 11:28:59 +08:00
laodaming
46418f2338 fix 2023-07-17 10:54:37 +08:00
eson
46430a1ce6 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-07-14 19:26:19 +08:00
eson
e837c745b1 注册 2023-07-14 19:26:00 +08:00
laodaming
edd3d7353d fix 2023-07-14 19:25:52 +08:00
laodaming
0db42491ae fix 2023-07-14 16:48:04 +08:00
laodaming
3a6ab7a666 fix 2023-07-14 15:57:27 +08:00
laodaming
d122f9b0c0 fix 2023-07-14 14:43:59 +08:00
laodaming
86a2deacfb fix 2023-07-14 14:38:34 +08:00
laodaming
56a8b32d90 fix 2023-07-14 14:07:23 +08:00
laodaming
6d3a3b2dda fix 2023-07-14 12:25:02 +08:00
laodaming
52f65afe1a fix 2023-07-13 19:06:02 +08:00
laodaming
6cd5a6d0e8 fix 2023-07-13 19:05:13 +08:00
laodaming
e4925c2194 fix 2023-07-13 11:36:02 +08:00
laodaming
0f96eaac30 fix 2023-07-12 15:27:09 +08:00
eson
b9f8876fde 修改端口 修改全局的vue路径 2023-07-12 14:23:10 +08:00
eson
16dbf3cb0d Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-07-12 14:11:31 +08:00
eson
4dbb77b306 最新的api路径 2023-07-12 14:11:04 +08:00
laodaming
2fa77828b4 fix 2023-07-12 11:46:46 +08:00
laodaming
cf59a03129 fix 2023-07-12 10:40:11 +08:00
eson
55eabd5cae 调整框架的超时为 15秒 2023-07-12 10:22:03 +08:00
eson
a4f429a528 新增自定义的 Cors 2023-07-11 19:43:46 +08:00
laodaming
e0de8bfcf2 fix 2023-07-11 19:29:20 +08:00
laodaming
ccf1ae19b2 fix 2023-07-11 18:37:36 +08:00
laodaming
d2766d5bd3 fix 2023-07-11 17:45:34 +08:00
laodaming
98c5727c7e fix 2023-07-11 17:08:19 +08:00
eson
43e2e835eb Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-07-11 13:08:11 +08:00
eson
fb06995b26 q! 2023-07-11 13:07:44 +08:00
laodaming
f0277f6a40 fix 2023-07-11 12:05:33 +08:00
laodaming
8c2cfcb37b fix 2023-07-11 11:53:15 +08:00
laodaming
dea09094b7 fix 2023-07-11 11:36:01 +08:00
laodaming
9bcb1d9377 fix 2023-07-11 11:33:43 +08:00
laodaming
22d0f6a5b1 fix 2023-07-11 11:28:57 +08:00
eson
5f3d6eb120 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-07-11 10:16:41 +08:00
eson
b06a8e8da2 修改过期时间 2023-07-11 10:16:22 +08:00
laodaming
f07e4a2084 fix 2023-07-10 19:42:55 +08:00
laodaming
f9bfbf28ae fix 2023-07-10 18:32:54 +08:00
laodaming
852fca2afa fix 2023-07-10 18:28:37 +08:00
laodaming
6b96a3ecbe fix 2023-07-10 17:54:43 +08:00
eson
fb4414fab6 转成 标准的jwt Token 2023-07-10 17:54:10 +08:00
eson
8f95be2ba5 测试登录成功 2023-07-10 17:38:44 +08:00
eson
53175d539c 改动json email名字 2023-07-10 17:24:06 +08:00
eson
e16222849c 添加跨域名 2023-07-10 17:07:29 +08:00
eson
d8b43a7f83 修改了所有端口 不冲突 2023-07-10 13:07:59 +08:00
eson
53c349413c 启动 停止脚本 2023-07-10 13:05:49 +08:00
eson
00e2d4b16b 修改端口到后端正确 2023-07-10 12:15:32 +08:00
eson
27dfa0a2bf 更新好 requests版本 2023-07-07 18:44:34 +08:00
eson
7818b88b70 upload 上传 签名 直接上传都可以 2023-07-07 17:49:12 +08:00
eson
975fe89eca 生命周期的指令上传 2023-07-07 14:49:02 +08:00
eson
0a5da30062 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-07-06 18:23:50 +08:00
eson
d64eb320ed Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-07-06 18:23:43 +08:00
laodaming
2b1728aac5 fix 2023-07-06 17:43:07 +08:00
eson
1c74c0ea4b 添加s3 2023-07-05 19:00:33 +08:00
laodaming
c1de53c098 fix 2023-07-05 18:08:18 +08:00
laodaming
2af55fb898 fix 2023-07-05 16:58:16 +08:00
laodaming
f7ed913470 fix 2023-07-05 16:21:26 +08:00
laodaming
78c09f1b40 fix 2023-07-05 16:08:25 +08:00
laodaming
6337371cd1 fix 2023-07-05 16:03:16 +08:00
laodaming
3614e90e99 fix 2023-07-04 17:17:37 +08:00
laodaming
31d22cda63 fix 2023-07-04 16:48:56 +08:00
laodaming
22b27141a4 fix 2023-07-03 17:33:59 +08:00
eson
9a840f420e 最新版本 2023-07-03 14:34:16 +08:00
laodaming
c17ab5ae5c fix 2023-06-30 17:20:11 +08:00
eson
7d386237fb Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-29 18:05:38 +08:00
eson
9b56d7ba51 TODO: render/ 相关模块 2023-06-29 18:04:59 +08:00
laodaming
9f865eb1c5 fix 2023-06-29 17:48:07 +08:00
laodaming
81a64b2129 fix 2023-06-29 17:25:34 +08:00
laodaming
f09e1b8f93 fix 2023-06-29 13:59:55 +08:00
laodaming
543308ddbc fix 2023-06-29 11:46:04 +08:00
laodaming
519d9952e0 fix 2023-06-29 11:43:07 +08:00