Commit Graph

953 Commits

Author SHA1 Message Date
laodaming
3f73edae00 fix 2023-08-09 17:11:45 +08:00
laodaming
28b9d1ac1f fix 2023-08-09 16:58:08 +08:00
eson
1913beb3f7 修改状态机的写法 2023-08-09 16:54:52 +08:00
eson
ca80a94f72 新改动 2023-08-09 16:17:24 +08:00
laodaming
64536beae6 fix 2023-08-09 16:06:40 +08:00
laodaming
fcf7c909a3 fix 2023-08-09 15:29:27 +08:00
Hiven
2d0d410c40 feat:获取资源详情 2023-08-09 15:17:02 +08:00
Hiven
29e42011a9 feat:获取资源详情 2023-08-09 15:15:12 +08:00
Hiven
aa96a52a5b Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-09 14:58:26 +08:00
Hiven
7b32eb9154 feat:获取资源详情 2023-08-09 14:58:20 +08:00
laodaming
f92bf8bfee fix 2023-08-09 14:49:15 +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
laodaming
e185ae7458 fix 2023-08-09 12:28:06 +08:00
Hiven
b1abc92b16 Merge branch 'feature/resource' into develop 2023-08-09 11:47:03 +08:00
Hiven
d810b87c09 feat:合图功能,封装上传base64等等 2023-08-09 11:46:24 +08:00
laodaming
cdeb7be118 fix 2023-08-09 11:16:36 +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
cce3c7f2f2 fix 2023-08-09 10:23:58 +08:00
laodaming
a23983b57c fix 2023-08-09 10:15:22 +08:00
laodaming
a50a183b74 fix 2023-08-08 19:17:21 +08:00
laodaming
5faeacd472 fix 2023-08-08 18:35:29 +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
laodaming
3c0d1a8d7a fix 2023-08-08 14:31:40 +08:00
eson
0adaa00a4c 合并 2023-08-08 14:20:57 +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
laodaming
93191d3beb fix 2023-08-08 12:22:15 +08:00
Hiven
ff86cceb17 fix:调整 2023-08-08 10:53:28 +08:00
Hiven
dcc3cc4a7d fix:修复 2023-08-07 19:51:12 +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
31a3966e39 fix 2023-08-07 19:13:16 +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
8b42c41bc5 fix:调整 2023-08-07 17:12:01 +08:00
Hiven
e2e2880514 fix:调整 2023-08-07 17:10:09 +08:00
Hiven
55d39ab303 fix:调整 2023-08-07 16:45:46 +08:00
Hiven
ee2bc46b92 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-07 16:20:01 +08:00
Hiven
b13fb6d1e6 fix:调整 2023-08-07 16:19:54 +08:00
laodaming
156ec586f0 fix 2023-08-07 14:16:09 +08:00
laodaming
956b18a72e fix 2023-08-07 13:20:18 +08:00
laodaming
48e1093469 fix 2023-08-07 13:18:20 +08:00
laodaming
e9c5e96c52 fix 2023-08-07 13:17:23 +08:00
laodaming
7510b363d6 fix 2023-08-07 12:31:31 +08:00
Hiven
0900329979 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-07 12:02:22 +08:00
Hiven
3d82709b7e fix:文件上传--base64 2023-08-07 12:02:11 +08:00
laodaming
31eb49efa3 fix 2023-08-07 11:49:17 +08:00
laodaming
00bbe2b4e9 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-07 11:45:02 +08:00
laodaming
315ad19dd4 fix 2023-08-07 11:44:54 +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
8e4e1c1cfd fix 2023-08-07 11:15:51 +08:00
laodaming
a106082364 fix 2023-08-07 10:48:14 +08:00
laodaming
624b90260f fix 2023-08-04 17:45:36 +08:00
Hiven
8adf1d6360 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-03 18:27:58 +08:00
Hiven
56acf68393 fix:接口调整 2023-08-03 18:27:52 +08:00
laodaming
a9d646c180 fix 2023-08-03 17:40:13 +08:00
Hiven
2c427662a8 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-03 17:37:52 +08:00
laodaming
7966077838 fix 2023-08-03 17:37:35 +08:00
Hiven
87803a6e44 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-03 17:37:32 +08:00
Hiven
6158779a95 调整 2023-08-03 17:37:25 +08:00
laodaming
07dae70930 fix 2023-08-03 17:37:21 +08:00
laodaming
ae9bad0baa fix 2023-08-03 17:36:11 +08:00
laodaming
9f01ecaf80 fix 2023-08-03 16:49:25 +08:00
laodaming
b40293fdd9 fix 2023-08-03 15:54:50 +08:00
Hiven
a864335c0e 用户模块--logo列表调整返回 2023-08-03 14:55:56 +08:00
Hiven
ddb93bae41 用户模块--logo列表完善 2023-08-03 14:50:07 +08:00
Hiven
bf84286ebb Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-03 14:38:23 +08:00
Hiven
39ffc78d6d 用户模块--logo列表 2023-08-03 14:38:17 +08:00
laodaming
1658238ff2 fix 2023-08-03 14:26:40 +08:00
Hiven
464133be97 上传logo 2023-08-02 18:19:21 +08:00
Hiven
d06241b267 上传logo 2023-08-02 18:14:53 +08:00
laodaming
786fc59b0d fixz 2023-08-02 15:10:16 +08:00
laodaming
1f8d9029eb Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-02 15:06:12 +08:00
laodaming
4aaa5c169d fix 2023-08-02 15:06:04 +08:00
Hiven
9363ca68b6 上传完善 2023-08-02 11:50: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
laodaming
87bb0f34f0 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-07-31 16:45:56 +08:00
laodaming
c86a6bbe75 fix 2023-07-31 16:45:48 +08:00
Hiven
034f479408 Merge branch 'orders' into develop 2023-07-31 11:33:41 +08:00
Hiven
f2109eee9b 订单退款 2023-07-31 11:32:40 +08:00
laodaming
5a713d4d9d fix 2023-07-31 10:08:56 +08:00
fe51e85983 修改为龙舟 2023-07-31 00:41:04 +08:00
7fd48edef8 do 2023-07-30 23:17:02 +08:00
049aedf115 完成配置replica_id 2023-07-30 19:25:59 +08:00
12f85aecd7 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/auth 2023-07-30 15:54:34 +08:00
Hiven
1225a4efdc 退款 2023-07-28 19:03:36 +08:00
laodaming
297c65776b fix 2023-07-28 17:39:28 +08:00
laodaming
1fd7721e99 fix 2023-07-28 17:38:21 +08:00
laodaming
3a9c1fb8d9 fix 2023-07-28 17:36:49 +08:00
laodaming
fef9f8d390 fix 2023-07-28 17:15:37 +08:00
laodaming
5871da7b54 fix 2023-07-28 15:44:42 +08:00
laodaming
a33f39df5c fix 2023-07-28 15:44:29 +08:00
laodaming
8be93b9d5c fix 2023-07-28 15:40:45 +08:00
laodaming
b3f28c3cb8 fix 2023-07-28 15:39:57 +08:00
laodaming
a3e0f4b7d7 fix 2023-07-28 15:39:15 +08:00
laodaming
9c3d9c06b3 fix 2023-07-28 15:19:48 +08:00
laodaming
3e703cf85a Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-07-28 15:10:15 +08:00
laodaming
f316a340c8 fix 2023-07-28 15:10:06 +08:00
eson
648ef75a2e fix 2023-07-28 13:10:43 +08:00
eson
719c41db00 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/auth 2023-07-28 13:10:32 +08:00
eson
11cc2547c9 修复 引用的错误 2023-07-28 12:17:08 +08:00
eson
66808fc735 完成所有的加密和加密链接 2023-07-28 12:15:56 +08:00
Hiven
335ecc1f41 分支合并 2023-07-28 11:20:12 +08:00
Hiven
334ea4aa3f 支付成功回调 2023-07-28 11:15:42 +08:00
laodaming
8f5bcc76ec fix 2023-07-28 11:13:47 +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
aa39146cfb fix 2023-07-28 10:22:01 +08:00
laodaming
164c737dd3 fix 2023-07-28 10:20:35 +08:00
laodaming
64e7361d50 fix 2023-07-28 10:02:40 +08:00
eson
3be161a011 tijiao 2023-07-27 19:47:52 +08:00
laodaming
2c537bf823 fix 2023-07-27 19:33:29 +08:00
laodaming
18bbc6788f fix 2023-07-27 19:30:40 +08:00
laodaming
687c18641f fix 2023-07-27 17:41:36 +08:00
laodaming
64a284bd77 fix 2023-07-27 17:37:56 +08:00
laodaming
9f9f7d3fd6 fix 2023-07-27 17:33:50 +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
d843fff73d fix 2023-07-27 16:29:09 +08:00
laodaming
58c0580cad fix 2023-07-27 16:27:42 +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
55a879ada8 fix 2023-07-27 14:31:53 +08:00
laodaming
c375d17c07 fix 2023-07-27 14:10:41 +08:00
laodaming
8469253131 fix 2023-07-27 12:32:03 +08:00
laodaming
2a06a28ad6 fix 2023-07-27 10:46:08 +08:00
eson
abc315a39b Merge branch 'feature/auth' of https://gitee.com/fusenpack/fusenapi into feature/auth 2023-07-27 10:20:05 +08:00
eson
19ad6625e6 合并 2023-07-27 10:18:49 +08:00
laodaming
2cb4549f00 fix 2023-07-27 10:08:30 +08:00
laodaming
2b30911ec6 fix 2023-07-27 10:06:27 +08:00
529a02ac75 需要合并新代码 2023-07-27 00:03:38 +08:00
laodaming
72543d519f fix 2023-07-26 19:29:23 +08:00
Hiven
dbf500813c 支付成功通知 2023-07-26 19:23:16 +08:00
laodaming
f609fa364d fix 2023-07-26 19:19:20 +08:00
laodaming
636bc0aee7 fix 2023-07-26 18:32:39 +08:00
laodaming
857a632cea fix 2023-07-26 18:20:15 +08:00
laodaming
9255a0073f fix 2023-07-26 18:14:04 +08:00
laodaming
32e954ccc8 fix 2023-07-26 18:09:09 +08:00
laodaming
265fd81b27 fix 2023-07-26 18:03:27 +08:00
laodaming
fdaddf9184 fix 2023-07-26 18:00:46 +08:00
laodaming
9a8bdcb5ba fix 2023-07-26 17:55:14 +08:00
laodaming
fcd20e7fc2 fix 2023-07-26 17:48:51 +08:00
laodaming
06e4f1f96e fix 2023-07-26 17:47:02 +08:00
laodaming
7280c38b16 fix 2023-07-26 17:39:56 +08:00
laodaming
0142e04ef5 fix 2023-07-26 17:30:35 +08:00
laodaming
be045b2615 fix 2023-07-26 17:13:14 +08:00
laodaming
3c5b0d7e42 fix 2023-07-26 17:09:04 +08:00
laodaming
d5ff15849d fix 2023-07-26 17:06:53 +08:00
laodaming
436ed9ae4f fix 2023-07-26 16:58:14 +08:00
laodaming
5a92db70eb fix 2023-07-26 16:50:06 +08:00
laodaming
3deda93e7e fix 2023-07-26 16:47:53 +08:00
laodaming
7dc9760d94 fix 2023-07-26 16:27:24 +08:00
laodaming
e25cc97ea0 fix 2023-07-26 16:23:38 +08:00
laodaming
88a59bbdea fix 2023-07-26 16:00:19 +08:00
laodaming
36aad6a088 fix 2023-07-26 15:15:37 +08:00
laodaming
a896d42bc1 fix 2023-07-26 15:12:24 +08:00
laodaming
e07d55efca fix 2023-07-26 15:08:43 +08:00
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
eson
01cc7da3b4 大改jwt 2023-07-26 12:15:15 +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
eson
4c104b56ae 忽略掉后台 2023-07-26 10:52:33 +08:00
laodaming
c378c6d8da fix 2023-07-26 10:03:15 +08:00
852c5e4a94 finish auto_config 2023-07-26 00:19:21 +08:00
laodaming
0657307265 fix 2023-07-25 19:43:28 +08:00
eson
38375ffdda Join集群 2023-07-25 19:42:26 +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
eson
7200531c27 添加节点分布式 2023-07-25 19:32:51 +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
eson
a248c6cbeb TODO: Email Valid Url 2023-07-24 19:43:56 +08:00
Hiven
03627b93e9 Merge branch 'develop' into orders 2023-07-24 19:17:07 +08:00
eson
b43b5dbd59 fix 2023-07-24 19:17:02 +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
eson
a10e100364 save 2023-07-24 17:22:06 +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
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
d5b829c212 fix 2023-06-28 17:08:43 +08:00
laodaming
979df28ae2 fix 2023-06-28 17:06:26 +08:00
laodaming
6abca6b271 fix 2023-06-28 17:05:31 +08:00
laodaming
b012db8e4e fix 2023-06-28 14:55:13 +08:00
laodaming
5b9a814fbb fix 2023-06-28 12:25:40 +08:00
laodaming
19f41f6dbc fix 2023-06-27 18:35:26 +08:00
eson
0851c922ef Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-27 18:10:18 +08:00
eson
13c5a45a5e 报价单接近完成 2023-06-27 18:09:56 +08:00
laodaming
84088a7a12 fix 2023-06-27 17:47:44 +08:00
laodaming
66ed487249 fix 2023-06-27 17:04:58 +08:00
laodaming
9050b4ab0e fix 2023-06-27 15:26:23 +08:00
laodaming
3a2fb3bc5d fix 2023-06-27 14:28:52 +08:00
laodaming
c5bcf9d676 fix 2023-06-27 14:25:25 +08:00
eson
116171dddd Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-26 19:52:18 +08:00
eson
d336f757ed 报价单 2023-06-26 19:51:59 +08:00
laodaming
6d8bdcb2a6 fix 2023-06-26 18:32:28 +08:00
laodaming
00873a7654 fix 2023-06-26 18:27:38 +08:00
laodaming
17d1522655 fix 2023-06-26 18:22:59 +08:00
laodaming
6d842cfc64 11 2023-06-26 18:21:50 +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
f3eea7f664 fix 2023-06-26 16:54: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
5116b06f2f fix 2023-06-25 18:05:29 +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
eson
a5ea734eb0 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-25 13:16:17 +08:00
eson
6bfa46e990 webset 单元测试完成, 缺少font_config的测试例子 2023-06-25 13:15:55 +08:00
laodaming
305bf83d4e fix 2023-06-25 12:28:06 +08:00
laodaming
4d4381b196 fix 2023-06-25 12:16:40 +08:00
laodaming
81b315b12b fix 2023-06-25 12:16:01 +08:00
laodaming
cd8a578dfe fix 2023-06-25 11:31:37 +08:00
laodaming
1a48387e92 fix 2023-06-25 11:28:37 +08:00
eson
efe02a0355 修复 AuthKey为空的时候 也可以过. 2023-06-25 11:26:47 +08:00
eson
8bd6f019ba Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-21 18:59:44 +08:00
eson
d987601afd faq 2023-06-21 18:59:27 +08:00
laodaming
cac0161585 fix 2023-06-21 18:06:39 +08:00
eson
28cc8a19ba 添加了通用的config.tpl 2023-06-21 16:46:25 +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
eson
8857f84bf6 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-21 14:26:51 +08:00
eson
2c0cd12a15 修复SetStatus的bug 2023-06-21 14:26:29 +08:00
laodaming
619ca1fde0 fix 2023-06-21 14:12:50 +08:00
laodaming
41386fca3b fix 2023-06-21 12:34:57 +08:00
eson
152e18b0e5 修复验证错误的问题, 验证allmodels的使用 2023-06-21 12:29:28 +08:00
eson
4fb57e1c39 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-21 12:22:18 +08:00
eson
7fe53f749e 完成AllModels序列化 2023-06-21 12:21:56 +08:00
laodaming
db9c2f3cc7 fix 2023-06-21 12:11:43 +08:00
eson
389f12b8c5 添加AllModels 2023-06-21 11:29:09 +08:00
laodaming
edeb2bb5f1 fix 2023-06-20 19:56:18 +08:00
eson
b2062d6448 修复SetStatus错误 2023-06-20 19:52:38 +08:00
eson
37f2326b21 修复了Code码重复的问题 2023-06-20 19:44:31 +08:00
eson
e6971575f1 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-20 19:37:08 +08:00
eson
e50dac6b1c Order订单待测试 2023-06-20 19:36:28 +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
d4d11db732 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-20 17:29:18 +08:00
eson
6c6066cea1 更新合并 2023-06-20 17:29:02 +08:00
laodaming
7ef6f453dc fix 2023-06-20 17:28:28 +08:00