Commit Graph

561 Commits

Author SHA1 Message Date
eson
8bea89754b Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/auth 2023-08-08 14:18:45 +08:00
laodaming
9e5b08b9eb fix 2023-08-08 12:56:53 +08:00
Hiven
2cd24098df Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-07 19:41:50 +08:00
Hiven
f87842deb4 fix:修复 2023-08-07 19:41:44 +08:00
laodaming
2c27b85c33 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-07 17:20:03 +08:00
laodaming
74708d3b21 fix 2023-08-07 17:19:55 +08:00
Hiven
e2e2880514 fix:调整 2023-08-07 17:10:09 +08:00
laodaming
7510b363d6 fix 2023-08-07 12:31:31 +08:00
Hiven
869873deda Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-07 11:34:28 +08:00
Hiven
39fe427f8e fix:文件上传--base64 2023-08-07 11:34:22 +08:00
laodaming
36efad44df fix 2023-08-07 11:25:06 +08:00
laodaming
a106082364 fix 2023-08-07 10:48:14 +08:00
laodaming
d5a6f780a5 fix 2023-08-04 16:50:01 +08:00
Hiven
56acf68393 fix:接口调整 2023-08-03 18:27:52 +08:00
Hiven
6158779a95 调整 2023-08-03 17:37:25 +08:00
Hiven
39ffc78d6d 用户模块--logo列表 2023-08-03 14:38:17 +08:00
Hiven
d06241b267 上传logo 2023-08-02 18:14:53 +08:00
Hiven
3388b446fd 上传完善 2023-08-02 11:30:27 +08:00
Hiven
d75bc8f2be 上传完善 2023-08-02 11:13:52 +08:00
laodaming
dab5320444 fix 2023-08-02 10:08:14 +08:00
Hiven
a0ed98d2d1 多文件上传--前端 2023-08-01 19:49:56 +08:00
Hiven
4a2a7822b7 多文件上传--后端 2023-08-01 18:15:55 +08:00
laodaming
c75e55a5cf fix 2023-08-01 10:30:57 +08:00
Hiven
1225a4efdc 退款 2023-07-28 19:03:36 +08:00
eson
719c41db00 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/auth 2023-07-28 13:10:32 +08:00
Hiven
335ecc1f41 分支合并 2023-07-28 11:20:12 +08:00
Hiven
334ea4aa3f 支付成功回调 2023-07-28 11:15:42 +08:00
laodaming
15b2a80f58 fix 2023-07-28 10:42:04 +08:00
laodaming
a158f562b6 fix 2023-07-28 10:37:23 +08:00
laodaming
164c737dd3 fix 2023-07-28 10:20:35 +08:00
laodaming
cf30fc2b88 fix 2023-07-27 17:07:54 +08:00
eson
42a965ab39 解决冲突 2023-07-27 16:54:57 +08:00
eson
d635811b5f Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/auth 2023-07-27 16:49:25 +08:00
eson
0ce35645b2 for save 2023-07-27 16:48:43 +08:00
laodaming
5532cd1a11 fix 2023-07-27 16:13:06 +08:00
laodaming
7297a1ef02 fix 2023-07-27 15:46:07 +08:00
laodaming
c375d17c07 fix 2023-07-27 14:10:41 +08:00
laodaming
8469253131 fix 2023-07-27 12:32:03 +08:00
529a02ac75 需要合并新代码 2023-07-27 00:03:38 +08:00
Hiven
dbf500813c 支付成功通知 2023-07-26 19:23:16 +08:00
laodaming
3deda93e7e fix 2023-07-26 16:47:53 +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
b0f598af68 fix 2023-07-25 18:04:01 +08:00
laodaming
d0fc91b61b fix 2023-07-25 17:41:38 +08:00
laodaming
9c72a8a4c9 fix 2023-07-25 17:10:50 +08:00
eson
a248c6cbeb TODO: Email Valid Url 2023-07-24 19:43:56 +08:00
eson
b43b5dbd59 fix 2023-07-24 19:17:02 +08:00
Hiven
05e5842992 Merge branch 'develop' into orders 2023-07-24 19:15:33 +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
eson
a10e100364 save 2023-07-24 17:22:06 +08:00
laodaming
7e22f47a0d fix 2023-07-24 16:07:05 +08:00
eson
4c2f823178 可以登录 2023-07-24 12:32:05 +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
1e2f6d8b7f fix 2023-07-24 10:30:08 +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
133af63064 fix 2023-07-21 17:20:46 +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
985fc93d00 fix 2023-07-21 11:34:36 +08:00
eson
44a3666d68 修改tpl的参数传入问题 2023-07-21 11:24:26 +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
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
903891000a Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-07-20 15:55:49 +08:00
Hiven
b93c2d4708 调整 2023-07-20 15:55:01 +08:00
laodaming
8a1209c6f0 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-07-20 15:46:05 +08:00
laodaming
5ef3b40dfe fix 2023-07-20 15:45:58 +08:00
Hiven
810f4fbee7 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-07-20 15:44:06 +08:00
Hiven
92110e02a6 接口调整 2023-07-20 15:43:48 +08:00
laodaming
bf3d9f9631 fix 2023-07-20 15:27:17 +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
b8333ecaf8 fix 2023-07-20 11:08: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
db15103c93 fix 2023-07-19 16:13:06 +08:00
laodaming
bd127a7884 fix 2023-07-19 14:58:05 +08:00
laodaming
f09220cf2d fix 2023-07-19 14:01:53 +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
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
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
56a8b32d90 fix 2023-07-14 14:07:23 +08:00
laodaming
6d3a3b2dda fix 2023-07-14 12:25:02 +08:00
laodaming
6cd5a6d0e8 fix 2023-07-13 19:05:13 +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
eson
3c9fb417aa 提交api前缀修改 2023-07-12 11:09:43 +08:00
laodaming
e0de8bfcf2 fix 2023-07-11 19:29:20 +08:00
laodaming
98c5727c7e fix 2023-07-11 17:08:19 +08:00
eson
fb06995b26 q! 2023-07-11 13:07:44 +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
laodaming
f07e4a2084 fix 2023-07-10 19:42:55 +08:00
laodaming
f9bfbf28ae fix 2023-07-10 18:32:54 +08:00
laodaming
6b96a3ecbe fix 2023-07-10 17:54:43 +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
2681c10b4c 删除一些冗余api文件 2023-07-10 14:00:23 +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
83bfa8977c fix 2023-07-05 17:00:03 +08:00
laodaming
2af55fb898 fix 2023-07-05 16:58:16 +08:00
laodaming
6337371cd1 fix 2023-07-05 16:03:16 +08:00
eson
c6005983f8 upload file 2023-07-04 19:59:54 +08:00
laodaming
31d22cda63 fix 2023-07-04 16:48:56 +08:00
laodaming
7e9cdbfb57 fix 2023-07-03 17:57:41 +08:00
laodaming
22b27141a4 fix 2023-07-03 17:33:59 +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
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
laodaming
02c41a5069 fix 2023-06-29 11:38:38 +08:00
laodaming
c422f493f4 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-06-29 11:15:51 +08:00
laodaming
58d02d0d50 fix 2023-06-29 11:15:42 +08:00
eson
8ba8a67dfb Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-28 19:33:00 +08:00
eson
d4e75b1efc TODO: 反射 2023-06-28 19:32:41 +08:00
laodaming
6abca6b271 fix 2023-06-28 17:05:31 +08:00
laodaming
5b9a814fbb fix 2023-06-28 12:25:40 +08:00
laodaming
19f41f6dbc fix 2023-06-27 18:35:26 +08:00
laodaming
66ed487249 fix 2023-06-27 17:04:58 +08:00
laodaming
c5bcf9d676 fix 2023-06-27 14:25:25 +08:00
eson
a101764dcb Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-26 18:20:04 +08:00
eson
d74d27ab2d backend 2023-06-26 18:19:51 +08:00
laodaming
42314b9807 fix 2023-06-26 17:59:54 +08:00
laodaming
7f71afd8b0 fix 2023-06-26 16:53:36 +08:00
eson
1a0156c686 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-25 18:30:58 +08:00
eson
96c43325c0 添加后台用户表直接分离 2023-06-25 18:30:39 +08:00
laodaming
15eb99d975 fix 2023-06-25 17:51:37 +08:00
laodaming
d876884397 fix 2023-06-25 17:11:42 +08:00
laodaming
002ec9d292 fix 2023-06-25 14:11:47 +08:00
laodaming
81b315b12b fix 2023-06-25 12:16:01 +08:00
laodaming
1a48387e92 fix 2023-06-25 11:28:37 +08:00
eson
aceb4c926f Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-25 11:27:13 +08:00
eson
efe02a0355 修复 AuthKey为空的时候 也可以过. 2023-06-25 11:26:47 +08:00
laodaming
32d368816e fix 2023-06-25 10:15:14 +08:00
eson
d987601afd faq 2023-06-21 18:59:27 +08:00
eson
b27aaab6b6 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-21 16:40:20 +08:00
eson
29d5c91736 修改api的request 2023-06-21 16:39:55 +08:00
laodaming
dfcceaea8e fix 2023-06-21 16:35:43 +08:00
laodaming
89dfd58e1c fix 2023-06-21 15:06:09 +08:00
laodaming
edeb2bb5f1 fix 2023-06-20 19:56:18 +08:00
laodaming
f6cee27c3f fix 2023-06-20 18:37:56 +08:00
laodaming
313e8a9457 fix 2023-06-20 18:05:29 +08:00
eson
6c6066cea1 更新合并 2023-06-20 17:29:02 +08:00
laodaming
4decb11321 fix 2023-06-20 16:43:38 +08:00
laodaming
73eef005ec fix 2023-06-20 16:38:03 +08:00
laodaming
0f4ae5164b fix 2023-06-20 14:59:13 +08:00
eson
8a4e122a0a Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-20 12:15:37 +08:00
eson
58547706c7 修改Order的命名域 2023-06-20 12:15:14 +08:00
laodaming
fbe3b42153 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-06-20 11:52:34 +08:00
laodaming
e71fb08bd4 fix 2023-06-20 11:52:26 +08:00
eson
db155a71a0 todo: add-address 2023-06-19 20:10:32 +08:00
eson
640d3261e0 添加自增控制 2023-06-19 18:27:31 +08:00
eson
05363b1849 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-19 15:52:37 +08:00
eson
4e8d0f3ceb 完成单元测试 2023-06-19 15:52:14 +08:00
laodaming
7a19292ae2 fix 2023-06-19 14:53:21 +08:00
laodaming
6a9650b9d1 fix 2023-06-19 14:47:54 +08:00
laodaming
bbb1a845ad fix 2023-06-19 12:23:02 +08:00
laodaming
eef4bb35c9 1 2023-06-19 10:34:21 +08:00
laodaming
175583ca51 fix 2023-06-16 18:24:31 +08:00
laodaming
3d7eef18d0 fix 2023-06-16 14:28:59 +08:00
laodaming
4a5d84fb22 fix 2023-06-15 19:14:19 +08:00
eson
51a33052d9 完成一些测试 2023-06-15 17:51:06 +08:00
eson
66c043534f Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-15 16:10:35 +08:00
eson
ab4e5852c1 修复序列化代码 2023-06-15 16:08:43 +08:00
laodaming
57dd04ea27 1 2023-06-15 15:10:22 +08:00
laodaming
33600c48eb fix 2023-06-15 12:00:32 +08:00
laodaming
255c3c3c88 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-06-15 11:39:24 +08:00
laodaming
0de54ec30c fix 2023-06-15 11:39:21 +08:00
eson
c55d837670 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-14 18:20:04 +08:00
eson
6a2cfb14e9 finish: gorm序列化 2023-06-14 18:17:45 +08:00
laodaming
f2893cc336 fix 2023-06-14 18:17:24 +08:00
laodaming
a5c3463fa9 fix 2023-06-14 17:59:48 +08:00
laodaming
f7da17778e fix 2023-06-14 16:04:43 +08:00
laodaming
5b2eef4822 fix 2023-06-14 14:57:20 +08:00
laodaming
6f6da3f481 fix 2023-06-14 14:05:27 +08:00
laodaming
d941402ef1 fix 2023-06-13 17:47:48 +08:00
laodaming
da347feac9 fix 2023-06-13 14:29:44 +08:00
laodaming
147af8ae29 fix 2023-06-13 14:13:40 +08:00
laodaming
be3279ba7e fix 2023-06-13 13:07:09 +08:00
laodaming
d455f3b256 fix 2023-06-13 12:15:06 +08:00
laodaming
8d190f0097 fix 2023-06-13 10:10:41 +08:00
laodaming
69e2fd4362 fix 2023-06-13 10:02:43 +08:00
laodaming
6e41658b7d fix 2023-06-12 20:06:23 +08:00
laodaming
fdcd8c46e0 fix 2023-06-12 20:05:51 +08:00
eson
bdaa3bf48b 1. TODO: guest_id 2. jwt的封装 2023-06-12 19:52:11 +08:00
eson
fc806b71c6 最新可以跑单元测试 2023-06-12 18:08:34 +08:00
laodaming
718b8118bf 11 2023-06-12 17:29:32 +08:00
laodaming
acc6f9c2b4 fix 2023-06-12 17:16:06 +08:00
laodaming
af984d9172 fix 2023-06-12 17:03:42 +08:00
eson
ff05e127bd Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-12 15:19:02 +08:00
eson
427140f140 jwt 认证初步完成 2023-06-12 15:17:42 +08:00
laodaming
52df088b8c fix 2023-06-12 10:15:40 +08:00
laodaming
417ee59b39 fix 2023-06-09 16:45:29 +08:00
laodaming
5e9bfeacb6 fix 2023-06-09 12:16:37 +08:00
laodaming
2a18f0c21a fix 2023-06-09 12:07:54 +08:00
laodaming
78e5b2cc59 fix 2023-06-08 19:33:30 +08:00
eson
427c7cc817 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-08 18:55:22 +08:00
eson
73e1fd09aa ok 2023-06-08 18:55:08 +08:00
laodaming
48879a8b29 fix 2023-06-08 17:13:11 +08:00
laodaming
58a4cc6fa0 fix 2023-06-08 17:02:38 +08:00
eson
8c3ce4e896 finish address-list 接口 2023-06-08 15:41:49 +08:00
eson
80f0abe037 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-08 11:37:15 +08:00
eson
47e9201d78 finish /user/status-config 2023-06-08 11:36:47 +08:00
laodaming
6f157dd921 1 2023-06-08 11:34:58 +08:00
eson
e790be8c1a Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-08 10:52:31 +08:00
eson
859c101c51 把server归到统一文件夹 2023-06-08 10:51:56 +08:00
laodaming
cef191a6e4 fix 2023-06-07 19:47:45 +08:00
eson
dc73ff1679 完善logic.tpl的错误 2023-06-07 18:30:58 +08:00
laodaming
9007cc8369 fix 2023-06-07 17:27:17 +08:00
eson
50106e3c12 更新logic response等使用方法 2023-06-07 11:57:04 +08:00
eson
12fd21df01 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-07 11:50:49 +08:00
eson
f6ed43229d 更新 2023-06-07 11:36:29 +08:00
laodaming
3d492ff720 fix 2023-06-07 11:35:04 +08:00
eson
48be41f64b jwt 认证 2023-06-06 20:08:32 +08:00
laodaming
d31f3a1e41 fix 2023-06-06 15:30:12 +08:00
laodaming
cf3a02ae7e fix 2023-06-06 15:01:13 +08:00
laodaming
213665eb59 fix 2023-06-06 13:07:39 +08:00
laodaming
5aa656c502 fix 2023-06-05 19:07:18 +08:00
eson
2ddc87ed59 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-05 17:57:55 +08:00
eson
ef46164dc3 api 模板的修改 2023-06-05 17:56:55 +08:00