Commit Graph

334 Commits

Author SHA1 Message Date
eson
117330ee16 基本完成重置密码和忘记密码 2023-08-14 14:09:38 +08:00
laodaming
35b02302eb fix 2023-08-14 12:30:14 +08:00
laodaming
2bb1c73e4a fix 2023-08-14 11:35:23 +08:00
laodaming
cfc7b22090 fix 2023-08-14 11:04:25 +08:00
laodaming
48afd3105f fix 2023-08-11 18:59:03 +08:00
eson
ae07370214 重置密码 2023-08-11 17:39:18 +08:00
laodaming
dbe6e99f2d fix 2023-08-11 14:52:16 +08:00
eson
9664271474 修改Wid为string 2023-08-11 12:07:26 +08:00
Hiven
83b0b7f5ab fix:修复上传 2023-08-10 19:08:06 +08:00
eson
432db5aec5 Merge branch 'develop' into feature/auth 2023-08-10 17:31:03 +08:00
eson
8c07a5f5d7 保存为了 websocket 2023-08-10 16:25:41 +08:00
Hiven
13ad52d095 fix:修复上传 2023-08-10 15:23:28 +08:00
eson
05e8def85a Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/auth 2023-08-09 14:21:22 +08:00
Hiven
d5e5cdc8f0 feat:获取资源详情 2023-08-09 14:18:27 +08:00
laodaming
2ed06a6df0 fix 2023-08-09 14:12:58 +08:00
Hiven
d810b87c09 feat:合图功能,封装上传base64等等 2023-08-09 11:46:24 +08:00
eson
056101121b Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/auth 2023-08-09 10:29:53 +08:00
laodaming
2f1ef81263 fix 2023-08-08 17:03:54 +08:00
laodaming
584498f556 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-08 16:27:53 +08:00
laodaming
6d58e6bb22 fix 2023-08-08 16:27:42 +08:00
eson
d7345b577c Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/auth 2023-08-08 15:21:56 +08:00
Hiven
399d3b9157 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-08 14:55:28 +08:00
Hiven
1887b6e7b6 =fix:修复 2023-08-08 14:55:17 +08:00
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