Compare commits

...

3270 Commits

Author SHA1 Message Date
laodaming
55e079b0e6 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-27 18:35:01 +08:00
laodaming
dfbc125e69 fix 2023-11-27 18:34:58 +08:00
momo
cc4a840732 鉴权调整 2023-11-27 18:23:42 +08:00
momo
c1c5bbe0e2 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-27 18:18:01 +08:00
momo
25c7c0a414 鉴权调整 2023-11-27 18:17:59 +08:00
laodaming
3052c5192b Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-27 17:55:23 +08:00
laodaming
b842216033 fix 2023-11-27 17:55:16 +08:00
momo
273ba1f53f 鉴权调整 2023-11-27 17:53:43 +08:00
momo
3f06fb0e09 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-27 17:13:09 +08:00
momo
245b12d69d 下单调整分布式锁 2023-11-27 17:13:03 +08:00
laodaming
663b831ec1 fix 2023-11-27 17:12:41 +08:00
laodaming
e4ee77abe9 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-27 17:06:15 +08:00
laodaming
6fdcd68726 fix 2023-11-27 17:06:08 +08:00
momo
b91ea42ab6 下单调整分布式锁 2023-11-27 17:02:56 +08:00
laodaming
8e80bf7d4d Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-27 17:02:45 +08:00
laodaming
c66f7435e3 fix 2023-11-27 17:02:38 +08:00
momo
c8cf9650a0 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-27 17:02:00 +08:00
momo
a2e25fa92d 下单调整分布式锁 2023-11-27 17:01:57 +08:00
laodaming
0a7d83a7a4 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-27 17:00:37 +08:00
laodaming
3965512ef2 fix 2023-11-27 17:00:29 +08:00
momo
4bc3f4db53 下单调整分布式锁 2023-11-27 16:56:20 +08:00
momo
602e77aef9 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-27 16:50:17 +08:00
momo
3212aef056 下单调整分布式锁 2023-11-27 16:50:14 +08:00
laodaming
53b38964cc fix 2023-11-27 16:44:48 +08:00
momo
db656bae90 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-27 16:37:10 +08:00
momo
8d2867be57 下单调整分布式锁 2023-11-27 16:37:07 +08:00
laodaming
af60136caf Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-27 16:32:15 +08:00
laodaming
4ddce1401a fix 2023-11-27 16:32:08 +08:00
momo
299031ac3f Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-27 16:32:04 +08:00
momo
7a4c94af58 下单调整分布式锁 2023-11-27 16:32:01 +08:00
laodaming
d65a73a151 fix 2023-11-27 16:30:21 +08:00
laodaming
fdde41fa4f fix 2023-11-27 16:26:31 +08:00
laodaming
29ddc7cff8 fix 2023-11-27 16:23:31 +08:00
laodaming
0a6cf855c3 fix 2023-11-27 16:19:34 +08:00
laodaming
779c555aa5 fix 2023-11-27 16:16:17 +08:00
laodaming
be8254584e fix 2023-11-27 16:12:38 +08:00
laodaming
6d515d303b fix 2023-11-27 16:10:20 +08:00
laodaming
03da869c44 fix 2023-11-27 16:03:01 +08:00
laodaming
94862aafbc fix 2023-11-27 15:55:31 +08:00
laodaming
a4aa2c5f07 fix 2023-11-27 15:51:30 +08:00
laodaming
7cd73a8c96 fix 2023-11-27 15:49:22 +08:00
laodaming
6db48bd2b5 fix 2023-11-27 15:45:45 +08:00
laodaming
22228b5bb2 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-27 15:28:15 +08:00
laodaming
7337cdf152 fix 2023-11-27 15:28:08 +08:00
momo
ab86be2ea0 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-27 15:09:23 +08:00
momo
9c13e34d99 权限检验中间件 2023-11-27 15:09:19 +08:00
laodaming
3c8cb1b5f4 fix 2023-11-27 15:05:18 +08:00
laodaming
80d04d9ae1 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-27 14:58:35 +08:00
laodaming
8531bb1489 fix 2023-11-27 14:58:26 +08:00
momo
9cb514ca75 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-27 14:46:56 +08:00
momo
4889590b35 权限检验中间件 2023-11-27 14:46:50 +08:00
laodaming
fdb8082095 fix 2023-11-27 14:41:10 +08:00
laodaming
42e2001160 fix 2023-11-27 14:04:09 +08:00
laodaming
f0bb6d4fe2 fix 2023-11-27 14:02:47 +08:00
laodaming
6585fecc6a fix 2023-11-27 12:31:53 +08:00
laodaming
20a84e4899 fix 2023-11-27 12:02:33 +08:00
laodaming
4eb435e1d1 fix 2023-11-27 12:01:06 +08:00
laodaming
6f1ced3bf8 fix 2023-11-27 11:46:04 +08:00
laodaming
209073d08a fix 2023-11-27 11:40:44 +08:00
laodaming
cbe4e8503d fix 2023-11-27 11:35:47 +08:00
laodaming
49a915a7a2 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-27 11:18:58 +08:00
laodaming
1bb2e190a2 fix 2023-11-27 11:18:47 +08:00
momo
205767efd5 上传logo 2023-11-24 18:48:23 +08:00
momo
fde34cd9b1 上传logo 2023-11-24 18:45:46 +08:00
momo
56c3ab71bc 合图重传 2023-11-24 18:40:42 +08:00
momo
916c852a71 合图重传 2023-11-24 18:26:12 +08:00
momo
093864943e 优化 2023-11-24 17:09:22 +08:00
momo
aa3aa3ce62 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-24 17:02:49 +08:00
momo
6092a1c3be 优化 2023-11-24 17:02:39 +08:00
laodaming
9f4745b740 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-24 16:52:00 +08:00
laodaming
b72d1675e4 fix 2023-11-24 16:51:46 +08:00
momo
bf46f423c1 优化 2023-11-24 16:47:09 +08:00
momo
ab72563523 优化 2023-11-24 16:29:37 +08:00
momo
5d05c936c7 优化 2023-11-24 16:08:35 +08:00
momo
d21e004be7 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-24 16:06:17 +08:00
momo
afc26eb0a1 优化 2023-11-24 16:05:59 +08:00
laodaming
4cacf2c16d Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-24 16:01:41 +08:00
laodaming
21f587ed55 fix 2023-11-24 16:01:29 +08:00
momo
e8a2778db0 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-24 15:50:22 +08:00
momo
01b16bba68 优化我的logo列表 2023-11-24 15:50:18 +08:00
laodaming
e21b0b337f fix 2023-11-24 15:47:02 +08:00
laodaming
43b45a5461 fix 2023-11-24 15:02:11 +08:00
laodaming
a179924253 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-24 14:54:30 +08:00
laodaming
48ac52037d fix 2023-11-24 14:53:57 +08:00
laodaming
2fd6c1459f fix 2023-11-24 14:44:54 +08:00
momo
d9bd54a002 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-24 14:35:10 +08:00
momo
2f631b9a9f 优化我的logo列表 2023-11-24 14:34:52 +08:00
laodaming
689433001f Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-24 14:12:05 +08:00
laodaming
eebdc0f384 fix 2023-11-24 14:11:06 +08:00
eson
5005bac4a5 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-11-24 13:16:01 +08:00
eson
747adc64ca 更新 2023-11-24 13:15:26 +08:00
laodaming
eb06aca1ae fix 2023-11-24 13:11:45 +08:00
laodaming
c1fb491dea Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-24 13:08:22 +08:00
eson
b9c611f235 fix 2023-11-24 13:07:55 +08:00
laodaming
b86b968e36 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-24 13:07:54 +08:00
laodaming
de89d8442c fix 2023-11-24 12:31:13 +08:00
eson
c9d0ab7e9a 添加日志 2023-11-24 12:29:25 +08:00
laodaming
95b19c4522 fix 2023-11-24 12:24:40 +08:00
laodaming
ca91a6f3ce fix 2023-11-24 12:21:00 +08:00
laodaming
681ec8269c fix 2023-11-24 12:06:00 +08:00
laodaming
dbf39e3057 fix 2023-11-24 12:05:09 +08:00
laodaming
8c45de4d25 fix 2023-11-24 11:45:56 +08:00
eson
963940c367 更新 profile 2023-11-24 11:40:36 +08:00
eson
fb2bcd87eb 更新 2023-11-24 11:18:17 +08:00
eson
e164ced733 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-11-24 11:14:33 +08:00
eson
4c8955168f 更新 2023-11-24 11:13:17 +08:00
momo
ce006803c1 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-24 11:01:11 +08:00
momo
c65b8f54a5 设置当前logo调整 2023-11-24 11:01:06 +08:00
laodaming
18d0c3d55c fix 2023-11-24 10:55:37 +08:00
laodaming
95d9c628d7 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-24 10:53:07 +08:00
laodaming
82db686b05 fix 2023-11-24 10:52:54 +08:00
eson
9ffd7226f9 测试 2023-11-24 10:38:05 +08:00
eson
47aefb5e00 修改强制给表 2023-11-24 10:25:43 +08:00
eson
f97d4d9c6d 测试 email更新 2023-11-24 10:17:10 +08:00
momo
0e4fe65d27 重置密码优化 2023-11-24 10:15:48 +08:00
laodaming
9c97414597 fix 2023-11-23 18:25:54 +08:00
eson
b9b0ab98ee info 2023-11-23 18:05:59 +08:00
eson
1a44a41c22 info 2023-11-23 17:58:07 +08:00
eson
6a6871af49 测试 2023-11-23 17:52:54 +08:00
eson
d2560df18a 测试 2023-11-23 17:50:12 +08:00
eson
ffc062ce6e 测试 2023-11-23 17:46:11 +08:00
eson
39e56533ae 测试 2023-11-23 17:30:22 +08:00
eson
c53b5e8f7b 添加日志 2023-11-23 17:20:39 +08:00
momo
f9380df215 订单优化调整 2023-11-23 16:47:18 +08:00
momo
788822db37 支付优化调整 2023-11-23 16:22:12 +08:00
momo
24df252924 支付优化调整 2023-11-23 15:59:41 +08:00
momo
cfc1468307 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-23 15:37:51 +08:00
momo
eba030508f 上传文件调整 2023-11-23 15:37:48 +08:00
laodaming
d986228964 fix 2023-11-23 15:04:17 +08:00
laodaming
34d6b01ce6 fix 2023-11-23 14:43:43 +08:00
laodaming
d3cb276293 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-23 14:17:56 +08:00
laodaming
22b8340a0d fix 2023-11-23 14:17:48 +08:00
momo
9e9d161137 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-23 14:07:10 +08:00
momo
7c8a8044c9 上传文件调整 2023-11-23 14:07:05 +08:00
laodaming
d0db3f4ef0 fix 2023-11-23 12:33:29 +08:00
laodaming
9b60897a2a fix 2023-11-23 12:24:12 +08:00
laodaming
f18e1760a2 fix 2023-11-23 12:05:18 +08:00
laodaming
ab472a32f6 fix 2023-11-23 11:31:55 +08:00
laodaming
982f5e1df9 fix 2023-11-23 11:19:11 +08:00
laodaming
f86c687bd8 fix 2023-11-23 11:14:16 +08:00
laodaming
53f63d8207 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-23 11:12:44 +08:00
laodaming
e813ec5575 fix 2023-11-23 11:12:37 +08:00
momo
57416fffea 合图调整 2023-11-23 10:50:08 +08:00
momo
680201e43e 合图调整 2023-11-23 10:44:06 +08:00
laodaming
53e20dfd63 fix 2023-11-23 10:40:32 +08:00
laodaming
0cca95db04 fix 2023-11-23 10:35:34 +08:00
laodaming
c123240588 fix 2023-11-23 10:15:08 +08:00
laodaming
dbcd2f4559 fix 2023-11-22 18:57:10 +08:00
laodaming
060c134679 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-22 18:55:05 +08:00
laodaming
42f31ed4cc fix 2023-11-22 18:54:58 +08:00
momo
38800470f2 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-22 18:34:27 +08:00
momo
f80cb3cc64 后台授权模块调整 2023-11-22 18:34:20 +08:00
laodaming
baba117865 fix 2023-11-22 18:17:52 +08:00
momo
2039414e2a Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-22 18:15:28 +08:00
momo
64f3547858 后台授权模块调整 2023-11-22 18:15:25 +08:00
laodaming
9c0e2223d4 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-22 18:02:13 +08:00
laodaming
50b0938dd8 fix 2023-11-22 18:02:05 +08:00
momo
de05d258ef 合图调整 2023-11-22 17:45:15 +08:00
momo
c6ad2dbe8e Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-22 16:46:58 +08:00
momo
7b476f3e92 合图调整 2023-11-22 16:46:56 +08:00
laodaming
dd71063cdb fix 2023-11-22 16:34:26 +08:00
laodaming
4f814d7361 fix 2023-11-22 16:04:48 +08:00
laodaming
9f412fe108 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-22 15:37:08 +08:00
laodaming
a8d1f8e831 fix 2023-11-22 15:36:58 +08:00
momo
efe7e00821 合图调整 2023-11-22 15:33:07 +08:00
momo
24afaa8a91 合图调整 2023-11-22 15:22:43 +08:00
momo
86bf47ce61 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-22 15:01:23 +08:00
momo
ab153ea15b 合图调整 2023-11-22 15:01:19 +08:00
laodaming
79faa6a377 fix 2023-11-22 13:13:12 +08:00
laodaming
e5a73420b6 fix 2023-11-22 13:07:05 +08:00
laodaming
67ac4b37a2 fix 2023-11-22 12:30:50 +08:00
laodaming
233987634c fix 2023-11-22 12:28:16 +08:00
laodaming
b46b707586 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-22 11:31:46 +08:00
laodaming
9cb54041cd fix 2023-11-22 11:18:29 +08:00
momo
ead94222b6 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-22 10:56:29 +08:00
momo
6ed88bb607 后台权限组详情/授权菜单接口等等 2023-11-22 10:56:25 +08:00
laodaming
760d9928dc fix 2023-11-22 10:47:19 +08:00
laodaming
50e8a42e34 fix 2023-11-22 10:19:27 +08:00
momo
62e0c55939 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-22 10:16:52 +08:00
momo
1a9d4eca2e 后台权限组详情/授权菜单接口等等 2023-11-22 10:16:47 +08:00
laodaming
53a99c36b1 fix 2023-11-22 10:12:46 +08:00
laodaming
040016d88f fix 2023-11-21 18:19:14 +08:00
laodaming
3c6aadb253 fix 2023-11-21 18:10:30 +08:00
laodaming
67035477c1 fix 2023-11-21 17:12:33 +08:00
laodaming
4c919de552 fix 2023-11-21 17:08:22 +08:00
laodaming
d2619efa56 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-21 15:47:14 +08:00
laodaming
86114360bb fix 2023-11-21 15:16:57 +08:00
laodaming
d2ed9e9eeb fix 2023-11-21 15:14:10 +08:00
laodaming
be076197d2 fix 2023-11-21 15:07:44 +08:00
momo
ca1c10382a 3D模型数据资源备份镜像批量处理 2023-11-21 14:51:06 +08:00
momo
7ef4139f4e 3D模型数据资源备份镜像批量处理 2023-11-21 14:43:46 +08:00
momo
c1a164da7a 3D模型数据资源备份镜像批量处理 2023-11-21 14:34:45 +08:00
momo
5e1ba64e87 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-21 14:33:56 +08:00
momo
d074a56b83 3D模型数据资源备份镜像批量处理 2023-11-21 14:33:52 +08:00
laodaming
787f33f555 fix 2023-11-21 12:09:02 +08:00
laodaming
ceefccb3b2 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-21 11:59:20 +08:00
laodaming
cbbc5e0ff1 fix 2023-11-21 11:59:10 +08:00
momo
3749f04e6a 3D模型数据资源备份镜像批量处理 2023-11-21 11:49:29 +08:00
momo
6d748f3dda Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-21 11:45:17 +08:00
momo
7bdb1f3385 3D模型数据资源备份镜像批量处理 2023-11-21 11:45:12 +08:00
laodaming
297dffcbc0 fix 2023-11-21 11:39:03 +08:00
laodaming
06b826769b fix 2023-11-21 10:38:11 +08:00
laodaming
f946f2926a fix 2023-11-21 10:13:12 +08:00
laodaming
f4cbb23aa0 fix 2023-11-21 10:08:46 +08:00
laodaming
ce1ea141d2 fix 2023-11-21 10:02:27 +08:00
laodaming
9ca89cf975 fix 2023-11-20 17:33:38 +08:00
laodaming
80a4e40748 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-20 17:16:57 +08:00
laodaming
a410a8f758 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-20 17:16:31 +08:00
laodaming
f9f5275694 fix 2023-11-20 17:16:17 +08:00
momo
e2552f50be 新增阿里云OSS上传文件逻辑 2023-11-20 17:16:14 +08:00
momo
111e450096 新增阿里云OSS上传文件逻辑 2023-11-20 14:49:18 +08:00
momo
fea04f12d7 新增阿里云OSS上传文件逻辑 2023-11-20 14:48:54 +08:00
momo
138b0d0c4e 新增阿里云OSS上传文件逻辑 2023-11-20 14:48:00 +08:00
momo
e806342959 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-20 14:34:18 +08:00
momo
7e522785ff 新增阿里云OSS上传文件逻辑 2023-11-20 14:34:12 +08:00
laodaming
7febe9dddc fix 2023-11-20 14:25:12 +08:00
laodaming
ca5f1c4040 fix 2023-11-20 12:32:24 +08:00
laodaming
be0a5a8e98 fix 2023-11-20 12:31:33 +08:00
laodaming
e7eeb9114c fix 2023-11-20 12:08:04 +08:00
laodaming
833f0ffcf5 修复 2023-11-20 12:03:07 +08:00
laodaming
2a5c6a4d9e 修复 2023-11-20 11:54:30 +08:00
laodaming
5db55ed7af fix 2023-11-20 11:37:03 +08:00
laodaming
b3c4bedf4b Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-17 18:37:25 +08:00
laodaming
a359975d51 fix 2023-11-17 18:37:19 +08:00
momo
65105982b2 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-17 18:21:09 +08:00
momo
8f6b9207d2 调整 2023-11-17 18:21:04 +08:00
laodaming
57fc586eb8 fix 2023-11-17 18:17:33 +08:00
momo
28f5fa1019 新增:权限分组模块 2023-11-17 17:18:06 +08:00
momo
f7fd8dc29e 新增:权限分组模块 2023-11-17 17:14:33 +08:00
laodaming
959ec41656 fix 2023-11-17 16:50:55 +08:00
laodaming
ffa9b9d703 fix 2023-11-17 16:48:24 +08:00
laodaming
254b32eec4 fix 2023-11-17 16:44:08 +08:00
laodaming
0862a8e652 fix 2023-11-17 16:40:50 +08:00
laodaming
3996b3e1cb Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-17 16:02:40 +08:00
laodaming
5b7aa513a2 fix 2023-11-17 16:02:35 +08:00
momo
3a51cc35ca 新增:权限分组模块 2023-11-17 15:36:44 +08:00
momo
4097d00f80 新增:权限分组模块 2023-11-17 15:36:17 +08:00
laodaming
ceece7c8f6 fix 2023-11-17 15:30:56 +08:00
laodaming
4ae0a9d659 fix 2023-11-17 15:30:35 +08:00
laodaming
440f939725 fix 2023-11-17 15:29:43 +08:00
momo
4cda7f0d3c 新增:权限分组模块 2023-11-17 15:23:59 +08:00
momo
ee2b0b5b81 新增:权限分组模块 2023-11-17 15:23:24 +08:00
momo
3900dffdbe 新增:权限分组模块 2023-11-17 15:21:45 +08:00
laodaming
648e200d87 fix 2023-11-17 15:16:34 +08:00
laodaming
86216a6456 fix 2023-11-17 15:11:23 +08:00
laodaming
71850d505e fix 2023-11-17 15:09:26 +08:00
laodaming
c232e52047 fix 2023-11-17 15:06:03 +08:00
momo
6f14668342 新增:权限分组模块 2023-11-17 14:53:28 +08:00
momo
93924f1f3d Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-17 11:53:44 +08:00
momo
ba551fb724 新增:权限分组模块 2023-11-17 11:53:35 +08:00
laodaming
6e71132721 fix 2023-11-17 11:42:27 +08:00
laodaming
27d4166fae fix 2023-11-17 11:40:08 +08:00
momo
73ee2281b9 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-17 11:38:11 +08:00
momo
5f2f0c6eb7 新增:权限分组模块 2023-11-17 11:38:05 +08:00
laodaming
58c21b1804 fix 2023-11-17 11:25:16 +08:00
laodaming
3cc3751d09 fix 2023-11-17 11:24:54 +08:00
laodaming
18b27b61ac fix 2023-11-17 11:15:03 +08:00
laodaming
6a7b9d295e Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-17 11:10:45 +08:00
laodaming
3f2c872463 fix 2023-11-17 11:10:38 +08:00
eson
904de02083 添加logo_selected固定选择默认的 2023-11-17 11:03:19 +08:00
momo
a53242b8d3 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-17 10:34:18 +08:00
momo
0c4f7847fc 新增:权限分组模块 2023-11-17 10:34:13 +08:00
laodaming
a340da2359 fix 2023-11-17 10:33:40 +08:00
laodaming
0bec257730 fix 2023-11-17 10:22:23 +08:00
laodaming
62222bb781 fix 2023-11-17 10:07:05 +08:00
laodaming
cc1b2a657b fix 2023-11-17 09:57:32 +08:00
laodaming
4d7a2edeea Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-16 18:40:47 +08:00
laodaming
e305da3feb fix 2023-11-16 18:40:37 +08:00
momo
e5c2813cc1 调整 2023-11-16 18:34:03 +08:00
laodaming
1a6386f7df fix 2023-11-16 18:29:45 +08:00
laodaming
b21a2beff8 fix 2023-11-16 17:57:25 +08:00
laodaming
48f63db5eb fix 2023-11-16 17:42:05 +08:00
laodaming
32152074a1 fix 2023-11-16 17:20:32 +08:00
laodaming
b0750bdafc fix 2023-11-16 17:18:18 +08:00
laodaming
804a7f656e fix 2023-11-16 17:10:09 +08:00
laodaming
a8cddf020f fix 2023-11-16 16:59:51 +08:00
laodaming
7d9f271b7c Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-16 16:57:37 +08:00
laodaming
f8b8d98723 fix 2023-11-16 16:57:29 +08:00
momo
b045d44d14 调整 2023-11-16 16:35:22 +08:00
laodaming
2aae36dfca fix 2023-11-16 14:57:36 +08:00
laodaming
97d94919e4 增加删除部门接口 2023-11-16 14:52:27 +08:00
laodaming
aec7ea5c08 增加删除部门接口 2023-11-16 14:39:09 +08:00
laodaming
67ef0ae547 增加删除部门接口 2023-11-16 14:37:02 +08:00
laodaming
8ce1f61611 增加删除部门接口 2023-11-16 14:33:53 +08:00
laodaming
c7ca444fe7 增加添加部门接口 2023-11-16 14:29:24 +08:00
laodaming
6fb16aa12c 增加添加部门接口 2023-11-16 14:15:45 +08:00
laodaming
def6990eba 增加添加部门接口 2023-11-16 14:07:53 +08:00
laodaming
0ae230ddba fix 2023-11-16 11:50:43 +08:00
laodaming
7860b94a55 fix 2023-11-16 11:37:35 +08:00
laodaming
d4c7aad3ab fix 2023-11-16 11:33:26 +08:00
laodaming
d362c1d496 fix 2023-11-16 10:53:59 +08:00
laodaming
41e446e3a5 fix 2023-11-15 18:42:49 +08:00
laodaming
0fee793931 fix 2023-11-15 18:31:36 +08:00
laodaming
b4b9557fe9 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-15 17:58:23 +08:00
laodaming
607398f7ec fix 2023-11-15 17:58:14 +08:00
momo
51fd9a634e Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-15 17:55:56 +08:00
momo
e28b32c76d 调整 2023-11-15 17:55:46 +08:00
laodaming
29a45315a2 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-15 17:41:24 +08:00
laodaming
3919dae9fe fix 2023-11-15 17:41:16 +08:00
momo
e6b8124a72 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-15 17:40:52 +08:00
momo
c94f4d0ee7 调整 2023-11-15 17:39:54 +08:00
laodaming
4e53d11cbd fix 2023-11-15 17:37:40 +08:00
laodaming
33c5cc6b0b fix 2023-11-15 17:11:19 +08:00
laodaming
b9399f887b fix 2023-11-15 17:08:40 +08:00
laodaming
68e8a9a988 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-15 17:07:11 +08:00
laodaming
4a4df586c6 fix 2023-11-15 17:07:04 +08:00
momo
9fddc59c56 调整 2023-11-15 17:03:37 +08:00
momo
0d66003dee 调整 2023-11-15 16:49:28 +08:00
laodaming
0aa7baee1e fix 2023-11-15 16:43:32 +08:00
laodaming
1a2c9a8f49 fix 2023-11-15 16:32:07 +08:00
laodaming
6d7a88ef29 fix 2023-11-15 15:50:18 +08:00
laodaming
d457c5391f fix 2023-11-15 15:16:27 +08:00
laodaming
da2cbb5c4a fix 2023-11-15 15:16:14 +08:00
laodaming
2fa8955aa4 fix 2023-11-15 14:45:24 +08:00
laodaming
01b6046d5a fix 2023-11-15 14:42:14 +08:00
laodaming
dd4c9ca1e0 fix 2023-11-15 14:32:47 +08:00
laodaming
1041caad23 fix 2023-11-15 14:28:14 +08:00
laodaming
6822c3d94c fix 2023-11-15 14:18:45 +08:00
laodaming
84f8323832 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-15 14:12:12 +08:00
laodaming
d89f2f38d3 fix 2023-11-15 14:12:05 +08:00
eson
4018826abe fix 2023-11-15 12:30:39 +08:00
laodaming
00be6206a9 fix 2023-11-15 12:30:08 +08:00
laodaming
99e7ce25de fix 2023-11-15 11:49:00 +08:00
laodaming
3ef91f9b93 fix 2023-11-15 11:23:50 +08:00
laodaming
1cc0cc8d72 fix 2023-11-14 18:39:10 +08:00
laodaming
4aef652b20 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-14 17:33:13 +08:00
laodaming
d64429f0bb fix 2023-11-14 17:33:05 +08:00
momo
65a055fcf9 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-14 15:03:07 +08:00
momo
9563cbab8d feat:新增接口模块 2023-11-14 15:03:01 +08:00
laodaming
d471c1b43e fix 2023-11-14 14:20:14 +08:00
laodaming
79a6c3fa24 fix 2023-11-14 14:00:00 +08:00
laodaming
420829cec3 fix 2023-11-14 12:13:04 +08:00
laodaming
1cfc190b73 fix 2023-11-14 11:58:04 +08:00
laodaming
76e534ef0b fix 2023-11-14 11:57:41 +08:00
laodaming
cf06e4fc6a fix 2023-11-14 11:57:09 +08:00
momo
c19dbc1a41 合并冲突 2023-11-14 11:50:41 +08:00
momo
8542091977 新增部门角色 2023-11-14 11:45:25 +08:00
laodaming
15671c02c3 新增部门列表 2023-11-14 11:26:08 +08:00
laodaming
561ce385a1 fix 2023-11-13 21:48:31 +08:00
laodaming
0f72151aa7 fix 2023-11-13 19:19:59 +08:00
laodaming
e4c8d033dc fix 2023-11-13 18:57:11 +08:00
laodaming
3bde233e8a Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-13 18:07:38 +08:00
laodaming
b7e67a9000 fix 2023-11-13 18:05:42 +08:00
laodaming
f279c4edc9 fix 2023-11-13 17:59:46 +08:00
laodaming
eec742d48a fix 2023-11-13 17:52:20 +08:00
momo
c9385ab091 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-13 17:09:43 +08:00
momo
b45645edc3 fix:调整订单列表 2023-11-13 17:08:50 +08:00
laodaming
14b70c809c fix 2023-11-13 10:42:22 +08:00
laodaming
8c09cf7635 fix 2023-11-13 10:35:51 +08:00
laodaming
7004812acf fix 2023-11-13 10:19:12 +08:00
laodaming
27c571e4a6 fix 2023-11-13 10:13:51 +08:00
laodaming
234f8399ab fix 2023-11-13 09:57:52 +08:00
laodaming
9a82b28377 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-10 17:23:34 +08:00
laodaming
b683cbea4f fix 2023-11-10 17:23:05 +08:00
momo
c29964a05b 调整 2023-11-10 17:21:36 +08:00
momo
9c5f1848a6 调整 2023-11-10 17:20:18 +08:00
eson
36aa17bd1a update 2023-11-10 17:14:38 +08:00
momo
c1d8d78a2e 调整 2023-11-10 17:07:51 +08:00
momo
7c76066d04 调整 2023-11-10 16:35:37 +08:00
momo
9d2d569107 调整 2023-11-10 16:34:58 +08:00
laodaming
14ebccce5f fix 2023-11-10 16:33:20 +08:00
laodaming
41e650488d fix 2023-11-10 16:31:10 +08:00
laodaming
ad9d89a1bb fix 2023-11-10 16:04:45 +08:00
laodaming
e2f5fd359f fix 2023-11-10 15:55:21 +08:00
laodaming
81f3eb6675 fix 2023-11-10 15:53:46 +08:00
laodaming
ca6f0c51e5 fix 2023-11-10 15:43:46 +08:00
laodaming
e999672037 fix 2023-11-10 15:29:44 +08:00
laodaming
d6a25673bc fix 2023-11-10 15:24:25 +08:00
laodaming
360c19a8f5 fix 2023-11-10 10:23:26 +08:00
laodaming
5c1f33a8a8 fix 2023-11-09 17:15:51 +08:00
laodaming
286616c13a fix 2023-11-09 16:53:31 +08:00
laodaming
591278273f fix 2023-11-09 16:11:36 +08:00
momo
a405a89567 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-09 14:52:39 +08:00
momo
abb19cc493 fix:调整订单发票商品单3 2023-11-09 14:52:31 +08:00
laodaming
892509b5db fix 2023-11-09 14:30:06 +08:00
momo
6b44eb780d fix:调整订单商品单位 2023-11-09 12:28:50 +08:00
momo
90846eb673 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-08 18:24:32 +08:00
momo
5b8e5d41fe fix:调整订单商品单位 2023-11-08 18:17:00 +08:00
laodaming
947f4c3f17 fix 2023-11-08 17:04:01 +08:00
laodaming
2578d6e4da fix 2023-11-08 16:56:52 +08:00
laodaming
daeea52d64 fix 2023-11-08 15:54:26 +08:00
laodaming
f5ab99ae25 fix 2023-11-08 15:41:03 +08:00
laodaming
d040adc9e8 fix 2023-11-08 15:30:00 +08:00
laodaming
1b77cb2ec2 fix 2023-11-08 15:17:48 +08:00
momo
3641a40a69 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-07 18:41:08 +08:00
momo
b11b78deab fix:设置logo数据库为用户自己素材 2023-11-07 18:40:59 +08:00
laodaming
11096ad67f fix 2023-11-07 18:40:24 +08:00
laodaming
d42437d63b fix 2023-11-07 18:29:13 +08:00
laodaming
a59557bc85 fix 2023-11-07 17:42:24 +08:00
laodaming
cc2f1489f3 fix 2023-11-07 16:44:58 +08:00
laodaming
071526f7a7 fix 2023-11-07 16:31:51 +08:00
laodaming
c61043ad65 fix 2023-11-07 16:26:29 +08:00
laodaming
3429f61ebc 增加飞书webhook监听处理 2023-11-07 14:39:34 +08:00
laodaming
39283bf55f 增加飞书webhook监听处理 2023-11-07 14:23:34 +08:00
laodaming
05df11bd7f Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-07 14:20:49 +08:00
laodaming
1c3db93ffd 增加飞书webhook监听处理 2023-11-07 14:20:40 +08:00
momo
f36d490776 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-07 14:19:56 +08:00
momo
f6527e8c7d fix:设置logo数据库为用户自己素材 2023-11-07 14:19:49 +08:00
laodaming
e101afccc6 增加飞书webhook监听处理 2023-11-07 14:19:18 +08:00
laodaming
6bfcc53073 fix 2023-11-07 14:15:28 +08:00
momo
241bed34c3 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-07 14:13:14 +08:00
momo
a875e13e55 fix:设置logo数据库为用户自己素材 2023-11-07 14:13:07 +08:00
laodaming
e5480583d9 fix 2023-11-07 14:07:06 +08:00
laodaming
2e47d654be fix 2023-11-07 13:27:29 +08:00
laodaming
e791002e2e fix 2023-11-07 13:14:07 +08:00
laodaming
2b52fb23a2 fix 2023-11-07 13:11:41 +08:00
laodaming
83c92deda4 fix 2023-11-07 13:01:25 +08:00
laodaming
1ef3b816a7 fix 2023-11-07 12:17:35 +08:00
laodaming
e90af652ca fix 2023-11-07 11:40:16 +08:00
laodaming
139c289f1d fix 2023-11-07 11:25:11 +08:00
laodaming
4b8af75652 fix 2023-11-07 11:23:30 +08:00
laodaming
108167430d fix 2023-11-07 11:08:12 +08:00
laodaming
96d3a9111d fix 2023-11-07 11:06:04 +08:00
laodaming
25b774c905 fix 2023-11-07 10:46:55 +08:00
laodaming
07fcd4b7b7 fix 2023-11-07 10:19:06 +08:00
laodaming
2243208ae9 fix 2023-11-07 10:17:33 +08:00
laodaming
975469e190 fix 2023-11-07 10:16:20 +08:00
laodaming
be7823cfba fix 2023-11-06 18:34:28 +08:00
laodaming
b1cd37497c fix 2023-11-06 18:29:11 +08:00
laodaming
03af6aa70e fix 2023-11-06 18:25:37 +08:00
laodaming
71f7be0149 fix 2023-11-06 17:35:13 +08:00
laodaming
e5fbfd1a93 fix 2023-11-06 17:30:52 +08:00
laodaming
c3b75656a4 fix 2023-11-06 17:28:34 +08:00
laodaming
64ec884b88 fix 2023-11-06 17:26:53 +08:00
laodaming
92423be010 fix 2023-11-06 17:16:59 +08:00
eson
71c87b2993 提高代理的传输时间和空间 2023-11-06 15:50:10 +08:00
laodaming
83885990c0 fix 2023-11-06 15:28:21 +08:00
laodaming
21f62035cf fix 2023-11-06 15:19:14 +08:00
laodaming
ee06eef1d3 fix 2023-11-06 15:19:08 +08:00
laodaming
1965692f0f fix 2023-11-06 15:17:29 +08:00
laodaming
deed8bb14c fix 2023-11-06 15:06:15 +08:00
laodaming
8c175ad9cc fix 2023-11-06 15:00:39 +08:00
laodaming
fd86cccdf2 fix 2023-11-06 14:59:23 +08:00
laodaming
09fcd6c7ab fix 2023-11-06 14:38:33 +08:00
laodaming
1a9381a9a8 fix 2023-11-06 14:36:33 +08:00
laodaming
0bcebe80a0 fix 2023-11-06 14:26:09 +08:00
laodaming
ebb7354d23 fix 2023-11-06 14:09:40 +08:00
laodaming
005589007e fix 2023-11-06 11:46:10 +08:00
laodaming
961183d17b fix 2023-11-06 10:14:11 +08:00
laodaming
5a56ce7918 fix 2023-11-06 10:12:42 +08:00
laodaming
eca69bb085 fix 2023-11-06 10:06:33 +08:00
laodaming
f15f8a32be fix 2023-11-06 09:54:21 +08:00
momo
2971e34325 fix:订单调整 2023-11-03 17:45:12 +08:00
eson
af9bf73313 fix 2023-11-03 17:15:17 +08:00
momo
9573286e7f Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-03 17:09:14 +08:00
momo
859a835d5b fix:订单调整 2023-11-03 17:09:05 +08:00
laodaming
c02ab392c4 fix 2023-11-03 16:33:07 +08:00
laodaming
0a45391f7c fix 2023-11-03 16:23:57 +08:00
laodaming
8b651e526f fix 2023-11-03 16:17:05 +08:00
laodaming
43e51b076f fix 2023-11-03 16:13:53 +08:00
laodaming
8759180068 fix 2023-11-03 16:07:11 +08:00
laodaming
911ca91800 fix 2023-11-03 15:35:53 +08:00
laodaming
e0169d98b7 fix 2023-11-03 15:15:01 +08:00
laodaming
11be388dcc fix 2023-11-03 14:58:09 +08:00
laodaming
5d343ad006 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-03 14:05:19 +08:00
laodaming
e434d11bd0 fix 2023-11-03 14:05:17 +08:00
momo
17d35418da fix:订单调整 2023-11-03 11:15:08 +08:00
momo
b73ba40b8e Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-02 16:09:30 +08:00
momo
6c00dca9ec fix:资源管理--图片缩略处理返回错误 2023-11-02 16:09:23 +08:00
laodaming
9403b72ad6 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-02 16:00:58 +08:00
laodaming
3cd976976a fix 2023-11-02 16:00:49 +08:00
momo
d9e854ca45 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-02 15:58:15 +08:00
momo
6cea240822 fix:订单优化 2023-11-02 15:58:13 +08:00
laodaming
5721bb31c8 fix 2023-11-02 15:41:04 +08:00
laodaming
e916b572c5 fix 2023-11-02 15:29:25 +08:00
momo
3366ed74f4 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-02 15:28:37 +08:00
momo
416b9d22d7 fix:订单优化 2023-11-02 15:28:30 +08:00
laodaming
6da4856538 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-02 15:25:45 +08:00
laodaming
47bc4200a7 fix 2023-11-02 15:25:39 +08:00
momo
2e08e3db7b Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-02 15:23:04 +08:00
momo
d15b483062 fix:订单优化 2023-11-02 15:22:56 +08:00
laodaming
3af8cf9481 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-02 15:21:19 +08:00
laodaming
f167aad093 fix 2023-11-02 15:21:12 +08:00
momo
cf2a352f1e fix:订单优化 2023-11-02 15:20:32 +08:00
momo
6dfdd667ad Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-02 15:16:51 +08:00
momo
2d0ea47c7c fix:订单优化 2023-11-02 15:16:44 +08:00
laodaming
ea859786da fix 2023-11-02 15:09:47 +08:00
laodaming
c8ff395fe4 fix 2023-11-02 15:07:38 +08:00
laodaming
8d49d4f164 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-02 15:00:48 +08:00
laodaming
855189b565 fix 2023-11-02 15:00:37 +08:00
momo
c8e63f4a57 fix:订单优化 2023-11-02 15:00:20 +08:00
momo
5efe255a77 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-02 14:53:39 +08:00
momo
bc7037f1fa fix:订单优化 2023-11-02 14:53:28 +08:00
laodaming
ba9cb470a6 fix 2023-11-02 12:25:51 +08:00
laodaming
ca24f9db30 fix 2023-11-02 12:21:28 +08:00
laodaming
afbf183b97 fix 2023-11-02 12:15:52 +08:00
laodaming
cd75ee795f fix 2023-11-02 12:01:07 +08:00
laodaming
7342c0d72a fix 2023-11-02 11:48:15 +08:00
laodaming
265489956c fix 2023-11-02 11:32:04 +08:00
laodaming
1bd606a89c fix 2023-11-02 10:10:22 +08:00
laodaming
496a56be5d fix 2023-11-01 18:31:14 +08:00
laodaming
24e4d0adf4 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-11-01 18:23:20 +08:00
laodaming
417126484b fix 2023-11-01 18:23:13 +08:00
momo
7417095e10 feat:订单模块新增商品单位 2023-11-01 18:13:01 +08:00
laodaming
b868ef19ae fix 2023-11-01 17:10:53 +08:00
laodaming
f6f305f0f3 fix 2023-11-01 16:58:26 +08:00
laodaming
58423feac4 fix 2023-11-01 16:18:48 +08:00
laodaming
31ddad6dc1 fix 2023-11-01 16:06:18 +08:00
laodaming
08f222d777 fix 2023-11-01 16:03:21 +08:00
laodaming
b09925dd09 fix 2023-11-01 15:45:21 +08:00
laodaming
77066ec392 fix 2023-11-01 15:43:25 +08:00
laodaming
537de58afc fix 2023-11-01 15:22:33 +08:00
laodaming
1948a60c29 fix 2023-11-01 15:09:53 +08:00
laodaming
12795e2115 fix 2023-11-01 14:56:36 +08:00
laodaming
37055bbf0f fix 2023-11-01 14:49:36 +08:00
laodaming
60f6f58e69 fix 2023-11-01 14:48:50 +08:00
laodaming
347cfdeaef fix 2023-11-01 14:35:37 +08:00
laodaming
91b45e3595 fix 2023-11-01 14:04:03 +08:00
laodaming
a6a01dae3d fix 2023-11-01 12:18:49 +08:00
laodaming
b12a61b2f6 fix 2023-11-01 11:23:00 +08:00
laodaming
c387f5d17b fix 2023-11-01 11:22:29 +08:00
laodaming
042b23c647 fix 2023-10-31 18:00:08 +08:00
laodaming
42fae2b6fc fix 2023-10-31 17:56:53 +08:00
laodaming
8434bd1d95 fix 2023-10-31 17:53:49 +08:00
laodaming
21f06c6e39 fix 2023-10-31 17:46:15 +08:00
laodaming
528af06922 fix 2023-10-31 17:38:21 +08:00
laodaming
ac07b86971 fix 2023-10-31 17:31:35 +08:00
laodaming
ef53f59551 fix 2023-10-31 15:23:01 +08:00
laodaming
8c026be22d fix 2023-10-31 15:08:00 +08:00
laodaming
485319d4f8 fix 2023-10-31 15:03:15 +08:00
laodaming
4c4e1c1cc6 fix 2023-10-31 14:47:56 +08:00
laodaming
33f8742ad1 fix 2023-10-31 14:28:36 +08:00
laodaming
51f8b68b5b fix 2023-10-31 14:25:46 +08:00
laodaming
10497080c1 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-31 14:23:14 +08:00
laodaming
7f85a0adeb fix 2023-10-31 14:23:08 +08:00
momo
a347d89bfd Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-31 12:26:48 +08:00
momo
fb16483c40 fix:合图优化0001 2023-10-31 12:26:44 +08:00
laodaming
12b0be2f6d fix 2023-10-31 12:22:04 +08:00
laodaming
361a8eb580 fix 2023-10-31 12:20:42 +08:00
laodaming
bc87a3a114 fix 2023-10-30 18:39:27 +08:00
laodaming
9c027b59db Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-30 18:32:24 +08:00
laodaming
5273ea7183 fix 2023-10-30 18:31:14 +08:00
momo
9fdba9c9cc Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-30 18:30:24 +08:00
momo
0db8e026a3 fix:订单调整 2023-10-30 18:29:47 +08:00
laodaming
aa4acd1bd2 fix 2023-10-30 18:26:52 +08:00
laodaming
2970f368bc 删除产品服务无用的接口 2023-10-30 18:24:42 +08:00
laodaming
fd53f078ae Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-30 18:07:02 +08:00
laodaming
cd449c1c6e 删除产品服务无用的接口 2023-10-30 18:06:56 +08:00
momo
a9ba1e1e38 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-30 17:59:18 +08:00
momo
e34331817b fix:订单详情--状态支付首款才显示倒计时未支付 2023-10-30 17:59:04 +08:00
laodaming
2cedc71241 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-30 17:42:46 +08:00
laodaming
4fe9ee2d8d 删除产品服务无用的接口 2023-10-30 17:42:39 +08:00
momo
b3c1e21ccf fix:上传logo--debug模式 2023-10-30 17:41:53 +08:00
momo
8dcd2b531a fix:上传logo--debug模式 2023-10-30 17:28:05 +08:00
momo
6251fea936 fix:上传logo--debug模式 2023-10-30 17:10:49 +08:00
laodaming
6adbfef8e8 删除产品服务无用的接口 2023-10-30 16:54:09 +08:00
laodaming
55f1be350b 删除产品服务无用的接口 2023-10-30 16:50:58 +08:00
laodaming
0c3e93bba6 fix 2023-10-30 16:30:01 +08:00
laodaming
a9bec4c4fd Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-30 16:19:51 +08:00
laodaming
b4827419d0 fix 2023-10-30 16:19:44 +08:00
momo
2af7e4c4d4 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-30 16:19:34 +08:00
momo
6d0c17557b Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-30 16:19:17 +08:00
laodaming
f02cf6fca2 fix 2023-10-30 16:19:14 +08:00
momo
9d8ae61a56 fix:上传logo--debug模式 2023-10-30 16:19:14 +08:00
laodaming
b4ffd1527a Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-30 16:09:52 +08:00
laodaming
ce12e09972 fix 2023-10-30 16:09:46 +08:00
momo
729b83f195 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-30 16:02:37 +08:00
momo
ae6b4aa0d3 fix:上传logo--debug模式 2023-10-30 16:02:26 +08:00
laodaming
4bedece94e fix 2023-10-30 15:33:28 +08:00
momo
b1673687a8 fix:上传logo--debug模式 2023-10-30 15:30:31 +08:00
momo
f5779ba6c1 fix:上传logo--debug模式 2023-10-30 15:23:19 +08:00
momo
a0267481df fix:上传logo--debug模式 2023-10-30 15:18:34 +08:00
momo
619f0fde1a Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-30 15:11:46 +08:00
momo
0895df9d5d fix:上传logo--debug模式 2023-10-30 15:11:36 +08:00
laodaming
6688e5f830 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-30 15:03:12 +08:00
laodaming
c51a034a9f fix 2023-10-30 15:03:00 +08:00
momo
50fd645a1f fix:上传logo--debug模式 2023-10-30 14:43:33 +08:00
momo
5773f159d2 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-30 14:23:37 +08:00
momo
4a3d12c926 fix:上传logo--debug模式 2023-10-30 14:23:28 +08:00
laodaming
cdbc82f689 fix 2023-10-30 14:12:05 +08:00
laodaming
459e2759b3 fix 2023-10-30 14:10:43 +08:00
momo
2594714709 fix:上传logo--debug模式 2023-10-30 12:04:12 +08:00
momo
a216dd11e3 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-30 11:42:56 +08:00
momo
4bb86f4790 feat:修改订单状态文案/订单发票样式 2023-10-30 11:42:50 +08:00
laodaming
c7ab3419b4 fix 2023-10-27 17:46:24 +08:00
laodaming
cd5990ca62 fix 2023-10-27 17:37:04 +08:00
laodaming
edd19afcf3 fix 2023-10-27 17:33:07 +08:00
laodaming
28076f2441 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-27 17:26:54 +08:00
laodaming
8d60b893c7 fix 2023-10-27 17:26:48 +08:00
momo
905300ec47 fix:订单模块修改数字金额 2023-10-27 17:15:24 +08:00
momo
7530b6dfdc fix:订单模块修改数字金额 2023-10-27 16:36:09 +08:00
laodaming
9bdaa75514 fix 2023-10-27 15:31:23 +08:00
laodaming
ed910df0b8 fix 2023-10-27 11:29:39 +08:00
laodaming
e9523e29e7 fix 2023-10-27 11:28:09 +08:00
laodaming
813e315ae3 fix 2023-10-27 11:24:41 +08:00
laodaming
ee9b3f3a22 fix 2023-10-27 11:17:07 +08:00
laodaming
b65618bd0c fix 2023-10-27 11:10:06 +08:00
laodaming
a1f87d86e3 fix 2023-10-27 11:06:21 +08:00
laodaming
c4e8c1d492 fix 2023-10-27 11:04:20 +08:00
laodaming
67165dcb47 fix 2023-10-27 11:02:50 +08:00
laodaming
344eeebecb fix 2023-10-27 10:57:48 +08:00
laodaming
5b4ea9995b fix 2023-10-27 10:42:52 +08:00
laodaming
ebd7c05523 fix 2023-10-27 10:39:14 +08:00
laodaming
058c6d6391 fix 2023-10-27 10:25:29 +08:00
laodaming
ba0d6b2525 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-26 18:34:29 +08:00
laodaming
d69f0e4d72 fix 2023-10-26 18:34:25 +08:00
momo
6e71fde6f5 fix:upload设置 2023-10-26 17:36:49 +08:00
momo
3e018487c6 fix:upload设置 2023-10-26 17:23:42 +08:00
momo
1f4efbb72b fix:upload设置 2023-10-26 17:21:31 +08:00
momo
c26c3ea192 fix:upload设置 2023-10-26 17:05:01 +08:00
momo
53675d2d60 fix:upload设置 2023-10-26 17:04:03 +08:00
momo
ace57c52f4 fix:upload设置 2023-10-26 16:46:14 +08:00
momo
6d8401d3e0 fix:upload设置 2023-10-26 15:50:02 +08:00
momo
5f1fbe977d Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-26 15:36:39 +08:00
momo
1a034d7e9b fix:upload设置 2023-10-26 15:36:28 +08:00
eson
4bf7ac23db Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-10-26 15:28:48 +08:00
eson
17c00236cf info 2023-10-26 15:28:44 +08:00
momo
1e2ce0a18f fix:前台从logo数据库存储为用户素材 2023-10-26 15:28:19 +08:00
momo
850c8f0d39 fix:upload设置 2023-10-26 15:08:41 +08:00
momo
c8f2f1346d fix:upload设置 2023-10-26 15:06:07 +08:00
momo
e892768dc3 fix:upload设置 2023-10-26 15:03:54 +08:00
momo
094423042e fix:upload设置 2023-10-26 15:00:11 +08:00
momo
7cc39dfd3b fix:upload设置 2023-10-26 14:48:25 +08:00
momo
c9b0abb525 fix:upload设置 2023-10-26 14:46:22 +08:00
momo
893e21fd4d Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-26 14:35:26 +08:00
momo
639e9f8d4a fix:前台从logo数据库存储为用户素材 2023-10-26 14:35:22 +08:00
eson
a6cdd880c8 info 2023-10-26 11:45:52 +08:00
eson
f9ae25ace5 info 2023-10-26 11:44:12 +08:00
eson
aef2ee18dd info 2023-10-26 11:43:19 +08:00
eson
21196c62ee info 2023-10-26 11:41:35 +08:00
eson
c272a9de77 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-10-26 11:30:03 +08:00
eson
78ce8c41bd info 2023-10-26 11:29:58 +08:00
laodaming
43d5fe6692 fix 2023-10-26 11:20:28 +08:00
laodaming
898ead74d1 fix 2023-10-26 11:17:47 +08:00
laodaming
bb5fa34611 fix 2023-10-26 11:17:11 +08:00
laodaming
a240d9a3e3 fix 2023-10-26 11:11:49 +08:00
laodaming
bd07bf3264 fix 2023-10-26 11:02:14 +08:00
laodaming
ebd4d88f31 fix 2023-10-26 10:59:56 +08:00
laodaming
832b68752b fix 2023-10-26 10:57:09 +08:00
eson
99aa49ece5 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-10-26 10:21:56 +08:00
eson
e56588125b info 2023-10-26 10:21:46 +08:00
momo
b9e35bba6c Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-25 19:15:17 +08:00
momo
ffd3c95ade fix:后台上传文件 2023-10-25 19:15:07 +08:00
laodaming
eaf5f86a19 fix 2023-10-25 18:30:52 +08:00
laodaming
87d3985a60 fix 2023-10-25 18:28:45 +08:00
laodaming
bd8615e9f2 fix 2023-10-25 18:25:54 +08:00
laodaming
425e53e445 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-25 18:21:15 +08:00
laodaming
76412c96ce fix 2023-10-25 18:21:06 +08:00
eson
aef76fb689 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-10-25 16:40:43 +08:00
eson
2c9609d0c3 logo search 2023-10-25 16:40:38 +08:00
laodaming
075f89df49 fix 2023-10-25 15:05:46 +08:00
laodaming
62dd14a627 fix 2023-10-25 14:59:27 +08:00
laodaming
735098b2c7 fix 2023-10-25 14:54:41 +08:00
laodaming
6430c18d2a fix 2023-10-25 14:49:08 +08:00
laodaming
6b4617b6e7 fix 2023-10-25 14:43:49 +08:00
laodaming
9cb979d830 fix 2023-10-25 14:37:32 +08:00
laodaming
8dc98d4aca fix 2023-10-25 14:27:47 +08:00
laodaming
91f6970eb0 fix 2023-10-25 14:13:18 +08:00
laodaming
afc6088f70 fix 2023-10-25 14:09:12 +08:00
laodaming
16fc420030 fix 2023-10-25 13:14:07 +08:00
laodaming
90275a865c fix 2023-10-25 13:12:00 +08:00
laodaming
fb89b488d2 fix 2023-10-25 13:11:47 +08:00
laodaming
6901177f05 fix 2023-10-25 13:06:19 +08:00
laodaming
5855ba8dde Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-25 12:30:43 +08:00
laodaming
12c9732fa8 fix 2023-10-25 12:30:37 +08:00
eson
5bf706e528 logo search 2023-10-25 10:23:21 +08:00
eson
fe5ec165f2 logo search 2023-10-25 10:15:15 +08:00
momo
a3197b7d55 fix:订单发票调整 2023-10-24 15:37:47 +08:00
momo
ef06ecd774 fix:订单发票调整 2023-10-24 15:22:39 +08:00
laodaming
56f4460995 fix 2023-10-24 13:59:05 +08:00
laodaming
e35ba06a97 fix 2023-10-24 12:28:44 +08:00
laodaming
ffd371d54c fix 2023-10-24 10:19:42 +08:00
laodaming
9f12f7035c fix 2023-10-24 10:07:08 +08:00
laodaming
5b92c3833b fix 2023-10-23 13:05:39 +08:00
eson
125ef2b179 logo search 2023-10-20 16:42:58 +08:00
eson
c596831b0c logo search 2023-10-20 16:40:18 +08:00
eson
1859a028aa logo search 2023-10-20 16:14:00 +08:00
eson
a72c033e5b logo search 2023-10-20 16:08:26 +08:00
eson
34cabe5f70 logo search 2023-10-20 16:05:12 +08:00
eson
39d311c858 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-10-20 15:59:08 +08:00
eson
956cbde1bc logo search 2023-10-20 15:59:03 +08:00
laodaming
28ad9528d2 fix 2023-10-20 15:15:27 +08:00
laodaming
d197771eb3 fix 2023-10-20 15:15:03 +08:00
laodaming
65f7e1bee4 fix 2023-10-20 15:14:48 +08:00
laodaming
6c341590ee fix 2023-10-20 15:14:41 +08:00
laodaming
6a9bfa0ef0 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-20 14:43:43 +08:00
laodaming
7e55d52874 fix 2023-10-20 14:43:37 +08:00
eson
615032a0a8 logo search 2023-10-20 14:39:33 +08:00
eson
147298188b Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-10-20 14:37:04 +08:00
eson
be16fdbfc2 logo search 2023-10-20 14:37:00 +08:00
laodaming
396e2cc16f Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-20 14:36:23 +08:00
laodaming
95fc072b0b fix 2023-10-20 14:36:16 +08:00
eson
73dec168ca Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-10-20 14:34:20 +08:00
eson
aac869e435 logo search 2023-10-20 14:34:16 +08:00
momo
396ef61206 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-20 14:32:00 +08:00
eson
215dc8d254 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-10-20 14:31:58 +08:00
momo
132312ea06 feat:合图调整返回 2023-10-20 14:31:47 +08:00
eson
d34c5ed03b logo search 2023-10-20 14:29:16 +08:00
laodaming
3795421f08 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-20 14:28:41 +08:00
laodaming
ea59eda5b1 fix 2023-10-20 14:28:34 +08:00
eson
441faaa104 logo search 2023-10-20 14:27:48 +08:00
eson
1b7bad9479 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-10-20 14:26:13 +08:00
eson
5cddfc8a97 logo search 2023-10-20 14:26:06 +08:00
laodaming
754db92a9a Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-20 14:23:49 +08:00
laodaming
a56eed8563 fix 2023-10-20 14:23:41 +08:00
eson
723b50da53 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-10-20 14:23:17 +08:00
eson
8b21e567f2 logo search 2023-10-20 14:23:13 +08:00
laodaming
962948afdb fix 2023-10-20 14:22:08 +08:00
laodaming
4c50131761 fix 2023-10-20 14:12:29 +08:00
laodaming
c523a5a7c6 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-20 14:10:28 +08:00
laodaming
a58cccfff6 fix 2023-10-20 14:10:03 +08:00
eson
ee33f2ba74 logo search 2023-10-20 14:08:58 +08:00
eson
998c9d2645 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-10-20 14:06:40 +08:00
eson
c136231742 logo search 2023-10-20 14:06:36 +08:00
laodaming
3b8773f4de Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-20 14:01:17 +08:00
laodaming
db3f6d9774 fix 2023-10-20 14:01:09 +08:00
eson
d9d16753c0 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-10-20 13:25:40 +08:00
eson
48a63dad45 logo search 2023-10-20 13:25:35 +08:00
laodaming
94a503f95d fix 2023-10-20 12:31:58 +08:00
laodaming
9b1db4740d fix 2023-10-20 12:01:51 +08:00
laodaming
24dd57d57d fix 2023-10-20 11:53:28 +08:00
laodaming
4973687e07 fix 2023-10-20 11:47:46 +08:00
laodaming
0b274c4755 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-20 11:46:58 +08:00
laodaming
82f1e3984f fix 2023-10-20 11:46:51 +08:00
eson
cd4ca1c1e0 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-10-20 11:42:03 +08:00
eson
4f07c86e7e logo search 2023-10-20 11:41:50 +08:00
laodaming
6253acf53c fix 2023-10-20 11:12:08 +08:00
laodaming
4aaf1a1587 fix 2023-10-20 10:59:36 +08:00
laodaming
0c3fe73ce2 fix 2023-10-20 10:54:37 +08:00
laodaming
1a9f117530 fix 2023-10-20 10:53:37 +08:00
laodaming
f739f7bc0e fix 2023-10-20 10:47:24 +08:00
laodaming
ff1698a49c fix 2023-10-20 10:33:33 +08:00
laodaming
45682bbf99 fix 2023-10-20 10:23:11 +08:00
laodaming
fe01a42f82 fix 2023-10-20 10:22:11 +08:00
laodaming
f119bc44d9 fix 2023-10-19 18:42:37 +08:00
laodaming
dc959ec49b fix 2023-10-19 18:42:28 +08:00
laodaming
b81a3682c2 fix 2023-10-19 15:55:12 +08:00
laodaming
6c7ef6e92e fix 2023-10-19 15:33:28 +08:00
laodaming
ee37c10399 fix 2023-10-19 11:59:10 +08:00
laodaming
05ec312127 fix 2023-10-19 11:51:49 +08:00
laodaming
bbf5cb03ad fix 2023-10-19 11:21:25 +08:00
laodaming
cfd5dcd423 fix 2023-10-19 11:08:45 +08:00
laodaming
934071801d fix 2023-10-19 10:00:19 +08:00
laodaming
e809ed3423 fix 2023-10-18 18:25:10 +08:00
laodaming
ae4d8b7fb2 fix 2023-10-18 17:46:51 +08:00
laodaming
646a42150f fix 2023-10-18 17:40:12 +08:00
laodaming
ecd06fc837 fix 2023-10-18 17:39:31 +08:00
laodaming
bef22ffbcc fix 2023-10-18 17:22:07 +08:00
laodaming
30bedd0877 fix 2023-10-18 17:18:25 +08:00
laodaming
5a521c8a5f fix 2023-10-18 17:07:19 +08:00
laodaming
44bcaf131e fix 2023-10-18 16:08:53 +08:00
laodaming
6060ae264b Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-18 16:05:29 +08:00
laodaming
292f2f1ca3 fix 2023-10-18 16:05:18 +08:00
momo
b26e79eb1b Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-18 16:05:11 +08:00
momo
82ff819cf8 feat:合图新增debug模块 2023-10-18 16:05:08 +08:00
eson
bf0f8b9a5d Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-10-18 15:44:05 +08:00
eson
984134aaec debug toekn 2023-10-18 15:44:01 +08:00
laodaming
6c94bc29c9 fix 2023-10-18 15:38:26 +08:00
laodaming
8da41cee3b fix 2023-10-18 15:32:58 +08:00
laodaming
22f9bf7165 fix 2023-10-18 15:28:47 +08:00
laodaming
6de13a61f7 fix 2023-10-18 15:10:45 +08:00
laodaming
379230dd39 fix 2023-10-18 15:05:38 +08:00
laodaming
79ce15a92a fix 2023-10-18 14:59:21 +08:00
laodaming
fbbf6b984f fix 2023-10-18 14:40:50 +08:00
laodaming
57e6b0227f fix 2023-10-18 14:37:18 +08:00
laodaming
4b7f920b5a Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-18 14:35:41 +08:00
laodaming
90e0169eb7 fix 2023-10-18 14:35:33 +08:00
momo
a5b0cc0a65 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-18 14:01:53 +08:00
momo
e94917a9d2 feat:合图新增debug模块 2023-10-18 14:01:46 +08:00
laodaming
4064cc8c2b Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-18 12:21:19 +08:00
laodaming
56f17f1bd8 fix 2023-10-18 12:21:11 +08:00
momo
f0e50d3cd2 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-18 12:10:36 +08:00
momo
2ab8a4b213 feat:合图新增debug模块 2023-10-18 12:10:29 +08:00
laodaming
5a173a491c fix 2023-10-18 12:02:04 +08:00
laodaming
bbf7c06bd4 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-18 11:57:32 +08:00
laodaming
616fc938cb fix 2023-10-18 11:57:26 +08:00
momo
86547b9267 feat:合图新增debug模块 2023-10-18 11:54:58 +08:00
momo
c237fe6adc Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-18 11:48:39 +08:00
momo
e14fd8b286 feat:合图新增debug模块 2023-10-18 11:48:32 +08:00
laodaming
a0692df845 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-18 11:44:54 +08:00
laodaming
95df7ccd04 fix 2023-10-18 11:44:47 +08:00
eson
87d49e2c18 debug toekn 2023-10-18 11:17:43 +08:00
eson
9b74c5e703 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-10-18 11:14:54 +08:00
eson
a8aeacfd96 debug toekn 2023-10-18 11:14:49 +08:00
laodaming
732479d97b fix 2023-10-18 11:14:06 +08:00
eson
958624afde Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-10-18 11:07:52 +08:00
eson
8d7ee20a28 debug toekn 2023-10-18 11:07:48 +08:00
laodaming
571e9e6fac fix 2023-10-18 11:03:07 +08:00
momo
6a982689ef feat:合图新增debug模块 2023-10-18 11:01:40 +08:00
eson
c35e1402c3 Merge branch 'feature/debug-token' into develop 2023-10-18 10:27:39 +08:00
eson
b53313811b Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/debug-token 2023-10-18 10:23:12 +08:00
momo
5d05e68bbb feat:新增订单发票,下单地址调整 2023-10-17 18:41:48 +08:00
momo
bcf9dd8ab9 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-17 18:32:51 +08:00
momo
6ae2cce870 feat:新增订单发票,下单地址调整 2023-10-17 18:32:43 +08:00
eson
7a560eee63 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-10-17 18:28:06 +08:00
eson
ff810b8405 debug toekn 2023-10-17 18:26:48 +08:00
laodaming
aa1ab9937a fix 2023-10-17 18:16:11 +08:00
laodaming
b90f56502d fix 2023-10-17 17:49:49 +08:00
eson
e00dc9f3cf debug toekn 2023-10-17 17:25:48 +08:00
laodaming
68cf3a10d6 fix 2023-10-17 17:25:34 +08:00
laodaming
bfe0ee0652 fix 2023-10-17 17:08:30 +08:00
laodaming
c79a1aab49 fix 2023-10-17 16:19:44 +08:00
laodaming
0c5a5a466f fix 2023-10-17 15:56:48 +08:00
laodaming
e9255389e2 fix 2023-10-17 15:40:55 +08:00
laodaming
68a31236b3 整合目前新的详情接口 2023-10-17 15:40:44 +08:00
laodaming
ea1335607a 整合目前新的详情接口 2023-10-17 15:33:46 +08:00
eson
a1e0c7c5f5 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-10-17 14:42:39 +08:00
laodaming
77caf2e631 fix 2023-10-16 18:54:23 +08:00
momo
0310a6bd21 fix:合图 2023-10-16 18:35:59 +08:00
momo
333db69e4a fix:合图 2023-10-16 18:22:52 +08:00
momo
65acd1ff86 fix:合图 2023-10-16 18:17:30 +08:00
momo
b8f1997ed7 fix:订单 2023-10-16 17:42:03 +08:00
momo
ab312efbb5 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-16 17:23:45 +08:00
momo
2780e311e1 fix:算法请求调整 2023-10-16 17:23:36 +08:00
laodaming
35293e8404 fix 2023-10-16 17:16:14 +08:00
laodaming
49872fd620 fix 2023-10-16 17:15:18 +08:00
laodaming
d97fbfdebf fix 2023-10-16 17:09:15 +08:00
laodaming
7495d458e6 fix 2023-10-16 17:06:17 +08:00
laodaming
a0d619692f fix 2023-10-16 17:01:58 +08:00
laodaming
06303361e0 fix 2023-10-16 16:54:07 +08:00
laodaming
2aeff09639 fix 2023-10-16 15:56:02 +08:00
eson
3d67fbbb62 fix 2023-10-16 15:42:19 +08:00
laodaming
58978104bf fix 2023-10-16 15:31:35 +08:00
laodaming
95b7f1f859 fix 2023-10-16 15:29:06 +08:00
laodaming
f1afffd198 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-16 15:26:52 +08:00
laodaming
a1e6be40db fix 2023-10-16 15:26:45 +08:00
eson
8af873ac42 fix 2023-10-16 15:19:25 +08:00
laodaming
7f88233f28 fix 2023-10-16 15:18:43 +08:00
laodaming
669be27e0a fix 2023-10-16 15:05:03 +08:00
laodaming
57f3270af2 fix 2023-10-16 12:27:39 +08:00
laodaming
b95c2f90d5 fix 2023-10-16 12:04:27 +08:00
laodaming
ce413c494c fix 2023-10-16 11:16:39 +08:00
laodaming
2e421a2968 fix 2023-10-16 10:57:33 +08:00
laodaming
4a620d46d5 fix 2023-10-16 10:04:30 +08:00
laodaming
23b2eded5a fix 2023-10-13 18:17:31 +08:00
laodaming
dbffda69fd fix 2023-10-13 17:44:02 +08:00
laodaming
7b3a16353c fix 2023-10-12 18:33:29 +08:00
laodaming
2c8b8b1aac fix 2023-10-12 18:29:47 +08:00
laodaming
2a1ceded61 fix 2023-10-12 17:02:16 +08:00
laodaming
d1313fca0c fix 2023-10-12 16:01:38 +08:00
laodaming
22ee293bfb fix 2023-10-12 14:44:09 +08:00
laodaming
e2b174a58f Merge branch 'develop' into feature/websocket 2023-10-12 14:31:04 +08:00
laodaming
f5744c8d09 fix 2023-10-12 14:30:06 +08:00
laodaming
882be02d07 fix 2023-10-12 14:02:55 +08:00
laodaming
0b6428cf34 fix 2023-10-12 14:01:23 +08:00
laodaming
d0e0d17b5d fix 2023-10-12 12:30:33 +08:00
laodaming
1625975814 fix 2023-10-12 11:49:52 +08:00
laodaming
96c866f1d4 fix 2023-10-12 11:27:16 +08:00
laodaming
88ea78d67b fix 2023-10-12 11:25:26 +08:00
laodaming
8a349399e1 fix 2023-10-12 11:19:01 +08:00
laodaming
cefe601046 fix 2023-10-12 11:05:05 +08:00
laodaming
edc50a15ec fix 2023-10-11 19:13:54 +08:00
laodaming
f65ff33e19 fix 2023-10-11 19:12:45 +08:00
laodaming
9dad383b03 fix 2023-10-11 19:10:03 +08:00
laodaming
7cc1addfe4 fix 2023-10-11 19:01:48 +08:00
laodaming
d93b009816 fix 2023-10-11 18:54:54 +08:00
laodaming
2e4be2800f fix 2023-10-11 18:54:14 +08:00
laodaming
afe8b26eee fix 2023-10-11 18:37:47 +08:00
laodaming
394f0c6e46 fix 2023-10-11 18:32:35 +08:00
laodaming
91c984db43 fix 2023-10-11 18:29:58 +08:00
laodaming
3d000cdc14 fix 2023-10-11 18:10:24 +08:00
laodaming
e77638b0e1 fix 2023-10-11 18:06:40 +08:00
laodaming
90277394fa fix 2023-10-11 17:58:38 +08:00
laodaming
c24ddb4af2 fix 2023-10-11 17:54:46 +08:00
laodaming
a138cdbd01 fix 2023-10-11 17:50:08 +08:00
laodaming
df1b599e51 fix 2023-10-11 16:28:39 +08:00
laodaming
aa31451210 fix 2023-10-11 16:21:20 +08:00
laodaming
1b48a50da3 fix 2023-10-11 15:50:43 +08:00
laodaming
8e11157c92 Merge branch 'develop' into feature/websocket 2023-10-11 15:22:48 +08:00
momo
9b09a33f47 fix:算法请求调整 2023-10-11 15:13:13 +08:00
momo
3bb31daaa1 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-11 15:10:42 +08:00
momo
c67a7664ec fix:算法请求调整 2023-10-11 15:10:38 +08:00
laodaming
9627cc12bf fix 2023-10-11 14:42:49 +08:00
laodaming
2b084bfdc9 fix 2023-10-11 14:19:22 +08:00
eson
68c332f20e contact us 2023-10-11 14:10:44 +08:00
eson
2d897d26d0 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-10-11 12:23:46 +08:00
eson
9bb5f1b2dd contact us 2023-10-11 12:23:41 +08:00
laodaming
a6f0d49c6e fix 2023-10-11 12:20:38 +08:00
laodaming
eb81faad39 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-11 12:17:02 +08:00
laodaming
2f45b83ba3 fix 2023-10-11 12:16:54 +08:00
momo
58d44a38a6 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-11 12:11:24 +08:00
momo
c04231d6d7 fix:算法请求调整 2023-10-11 12:11:21 +08:00
laodaming
5584bfc4da Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-11 12:10:14 +08:00
laodaming
b86d6748b4 fix 2023-10-11 12:10:08 +08:00
eson
fff760253a Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-10-11 11:55:49 +08:00
eson
c6fa875148 email limit & password limit 2023-10-11 11:55:44 +08:00
laodaming
543099c8d7 fix 2023-10-11 11:52:54 +08:00
laodaming
350f06116e Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-11 11:49:11 +08:00
laodaming
77cb259124 fix 2023-10-11 11:49:04 +08:00
eson
5b483dadb5 info nofitycation 2023-10-11 11:36:09 +08:00
eson
5b0b45b141 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-10-11 11:26:22 +08:00
laodaming
8f8419b8c1 fix 2023-10-11 11:26:11 +08:00
eson
10e794110f info address list 2023-10-11 11:25:38 +08:00
laodaming
501c4643f4 fix 2023-10-11 11:22:34 +08:00
laodaming
7883056ded fix 2023-10-11 11:22:11 +08:00
laodaming
c8e6467e9a fix 2023-10-11 11:18:50 +08:00
laodaming
3a9de995b2 fix 2023-10-11 10:49:00 +08:00
momo
a1bed56d19 fix:算法请求调整 2023-10-11 10:16:45 +08:00
momo
a401d1e4c9 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-11 10:14:54 +08:00
momo
a8df57808f fix:算法请求调整 2023-10-11 10:14:31 +08:00
laodaming
97ae9e4d8e fix 2023-10-10 18:11:47 +08:00
laodaming
8cf76c7051 fix 2023-10-10 18:08:58 +08:00
laodaming
a0106e30cc fix 2023-10-10 17:50:56 +08:00
laodaming
9e71d9a60f fix 2023-10-10 17:49:47 +08:00
momo
5e9c1df5da fix:算法请求调整 2023-10-10 17:30:31 +08:00
momo
ba40f63b42 fix:算法请求调整 2023-10-10 17:25:51 +08:00
momo
fec42ad634 fix:算法请求调整 2023-10-10 17:17:28 +08:00
momo
21475d7d52 fix:算法请求调整 2023-10-10 15:58:37 +08:00
momo
14e909a9a6 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-10 15:10:42 +08:00
momo
984690c47a fix:算法请求调整 2023-10-10 15:10:15 +08:00
laodaming
ce31946e53 fix 2023-10-10 15:09:20 +08:00
laodaming
056fed40f1 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-10 15:08:48 +08:00
laodaming
8f92776103 fix 2023-10-10 15:08:41 +08:00
momo
2dc5a2435f fix:算法请求调整 2023-10-10 15:03:12 +08:00
laodaming
8593eb2dd3 fix 2023-10-10 14:59:00 +08:00
momo
3105c29071 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-10 14:58:55 +08:00
momo
6e8d47ae91 fix:算法请求调整 2023-10-10 14:58:36 +08:00
laodaming
2068825ae1 fix 2023-10-10 14:19:11 +08:00
laodaming
3f0d8d017e fix 2023-10-10 14:15:43 +08:00
momo
019a717706 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-10 11:29:43 +08:00
momo
11ef2223d3 fix:订单列表 2023-10-10 11:29:28 +08:00
eson
ae27baa79b Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-10-10 11:21:50 +08:00
eson
73caa3cedd info address list 2023-10-10 11:21:43 +08:00
laodaming
1cfbbe7283 fix 2023-10-09 18:28:43 +08:00
laodaming
cbb57c8c34 fix 2023-10-09 18:21:45 +08:00
laodaming
83ef491069 fix 2023-10-09 17:57:54 +08:00
laodaming
0ce7cf8f17 fix 2023-10-09 17:56:28 +08:00
laodaming
32cda95788 fix 2023-10-09 17:30:29 +08:00
laodaming
83585d1c37 fix 2023-10-09 17:27:47 +08:00
laodaming
142bdbdcb9 fix 2023-10-09 17:02:30 +08:00
laodaming
d054d1a9ba fix 2023-10-09 17:01:44 +08:00
laodaming
b4e98d5238 fix 2023-10-09 16:14:03 +08:00
eson
ff0960e2bb Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-10-09 16:03:18 +08:00
eson
bdb093e7da 添加 .gitignore 忽略二进制执行文件 2023-10-09 16:02:46 +08:00
laodaming
41949bef72 fix 2023-10-09 15:15:44 +08:00
laodaming
d73d748436 fix 2023-10-09 15:05:50 +08:00
eson
16acfb7320 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-10-09 14:42:01 +08:00
eson
9fdc5b4dbf proxyserver 2023-10-09 14:41:57 +08:00
laodaming
f42c8bd18c fix 2023-10-09 14:08:43 +08:00
laodaming
ba3e7ce31b fix 2023-10-09 12:28:08 +08:00
laodaming
12a6e95a11 fix 2023-10-09 11:20:38 +08:00
laodaming
e91bc83912 fix 2023-10-09 10:08:05 +08:00
laodaming
49877b4ef7 fix 2023-10-09 10:04:41 +08:00
laodaming
23b8e3cf3c fix 2023-10-09 10:03:15 +08:00
laodaming
7c065901c4 fix 2023-10-09 10:01:44 +08:00
momo
17dc892c07 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-08 18:38:45 +08:00
momo
634f1b9584 fix:新增订单关闭 2023-10-08 18:38:39 +08:00
laodaming
9faae14892 fix 2023-10-08 18:11:11 +08:00
laodaming
6bd9a0ab05 fix 2023-10-08 18:07:34 +08:00
laodaming
8d4901cdcd fix 2023-10-08 18:00:21 +08:00
laodaming
af35164fb2 fix 2023-10-08 17:15:27 +08:00
laodaming
1a3fbfb175 fix 2023-10-08 17:13:28 +08:00
laodaming
939ee8e0fe fix 2023-10-08 17:07:59 +08:00
laodaming
f5de417b99 fix 2023-10-08 17:06:10 +08:00
laodaming
4dce0d7087 fix 2023-10-08 17:04:37 +08:00
momo
d2f24772ca Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-08 16:54:51 +08:00
momo
d69870c882 fix:订单列表 2023-10-08 16:54:48 +08:00
laodaming
96b69fc8b9 fix 2023-10-08 16:27:25 +08:00
laodaming
066c911439 fix 2023-10-08 16:08:47 +08:00
laodaming
885aa081c6 fix 2023-10-08 16:07:55 +08:00
laodaming
d191bb3ca4 fix 2023-10-08 16:00:45 +08:00
laodaming
fdcd485f9f fix 2023-10-08 15:53:53 +08:00
momo
88f407edb9 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-08 15:48:34 +08:00
momo
6dc591283e fix:合图调整 2023-10-08 15:48:22 +08:00
laodaming
ddfe91a42e 新增获取收藏列表接口 2023-10-08 15:29:03 +08:00
momo
8c69e4d2d3 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-08 14:32:36 +08:00
momo
296194e730 fix:上传logo,报错信息反馈给前端 2023-10-08 14:32:31 +08:00
laodaming
a59273fe5b Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-08 12:31:12 +08:00
laodaming
385540937e 11 2023-10-08 12:31:06 +08:00
eson
d146fbb631 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-10-08 12:19:03 +08:00
eson
bdf0dd7605 info address default 2023-10-08 12:18:58 +08:00
laodaming
cfea0cb09b Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-08 12:11:28 +08:00
laodaming
23094b2427 11 2023-10-08 12:11:19 +08:00
eson
7a2820e496 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-10-08 12:09:51 +08:00
eson
0f7d35ea00 info address default 2023-10-08 12:09:46 +08:00
laodaming
243fd29a60 增加收藏页的添加和删除接口 2023-10-08 12:06:48 +08:00
laodaming
98967990e7 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-08 12:04:08 +08:00
eson
8bc1607f00 info address default 2023-10-08 12:04:02 +08:00
laodaming
b93691a0bf 增加收藏页的添加和删除接口 2023-10-08 12:04:00 +08:00
eson
bfeacad5f0 info address default 2023-10-08 11:55:06 +08:00
eson
f8c8c634cb info address default 2023-10-08 11:46:51 +08:00
eson
24304b0c85 info address default 2023-10-08 11:38:10 +08:00
eson
32b8ceeb96 info address default 2023-10-08 11:29:04 +08:00
eson
fa011a1670 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-10-08 11:23:28 +08:00
eson
0410685138 info address default 2023-10-08 11:23:22 +08:00
laodaming
0fde3c8d91 fix 2023-10-08 10:33:25 +08:00
laodaming
cb4e15e54b Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-08 10:31:49 +08:00
laodaming
f933fcac69 fix 2023-10-08 10:31:42 +08:00
momo
e87ece4071 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-08 10:23:44 +08:00
momo
1480298bd7 fix:订单逻辑 2023-10-08 10:23:39 +08:00
laodaming
414a3f8507 fix 2023-10-08 10:22:00 +08:00
momo
3f78cfd824 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-07 18:37:04 +08:00
momo
ae2c41364f fix:删除订单 2023-10-07 18:36:59 +08:00
laodaming
0350315354 fix 2023-10-07 18:09:17 +08:00
eson
6aa842e328 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-10-07 17:58:29 +08:00
eson
ced3ce8657 info address default 2023-10-07 17:58:24 +08:00
laodaming
d4867a7089 删除产品服务不用的接口 2023-10-07 17:42:34 +08:00
momo
e031f804f3 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-07 17:31:29 +08:00
momo
73a67aa21a fix 2023-10-07 17:31:24 +08:00
laodaming
e46ac8ff63 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-07 17:08:01 +08:00
laodaming
734c4e9102 fix 2023-10-07 17:07:53 +08:00
momo
f2226ff0e4 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-07 17:03:45 +08:00
momo
e9f6b6cc68 fix 2023-10-07 17:03:28 +08:00
eson
da162f859e Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-10-07 16:59:56 +08:00
eson
586e02c842 info address used 2023-10-07 16:59:52 +08:00
momo
0b0e08c377 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-07 16:59:26 +08:00
momo
679a0c660f fix 2023-10-07 16:59:19 +08:00
momo
7b124d95c1 fix 2023-10-07 16:58:51 +08:00
laodaming
ff086a8fa4 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-07 16:58:30 +08:00
laodaming
560bc9a7d2 fix 2023-10-07 16:58:22 +08:00
momo
f5620e397e fix 2023-10-07 16:58:00 +08:00
momo
807f1aa70e Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-07 16:42:53 +08:00
momo
c57f2acafd fix 2023-10-07 16:42:40 +08:00
laodaming
66acaa6095 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-07 16:25:45 +08:00
laodaming
e042cf209d 11 2023-10-07 16:25:39 +08:00
momo
9cfdfdbc77 fix 2023-10-07 16:14:46 +08:00
momo
0b8fc0915b fix 2023-10-07 16:13:08 +08:00
momo
342d1f99ec Merge branches 'develop' and 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-07 16:12:35 +08:00
momo
7301463857 fix:优化订单自动取消 2023-10-07 16:12:29 +08:00
laodaming
7fa7b868ca 11 2023-10-07 16:10:51 +08:00
laodaming
67fe103ac1 11 2023-10-07 16:03:54 +08:00
laodaming
34b2aef763 11 2023-10-07 15:55:12 +08:00
laodaming
9858300984 11 2023-10-07 15:44:44 +08:00
momo
6cdb8b6e6b fix 2023-10-07 15:42:25 +08:00
momo
a8a7132a66 Merge branches 'develop' and 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-07 15:39:19 +08:00
momo
1f46911f51 fix 2023-10-07 15:38:59 +08:00
laodaming
b0203593bb 11 2023-10-07 15:36:57 +08:00
laodaming
f980520ba7 11 2023-10-07 15:16:49 +08:00
laodaming
550ca5b7b9 11 2023-10-07 15:16:26 +08:00
laodaming
9dbcf33cb9 11 2023-10-07 15:15:16 +08:00
laodaming
7d3f614356 11 2023-10-07 15:09:49 +08:00
laodaming
6a35779bd5 11 2023-10-07 15:00:41 +08:00
laodaming
a9bb36d394 fix 2023-10-07 14:30:44 +08:00
laodaming
87dd183279 fix 2023-10-07 14:24:57 +08:00
momo
6743f4dff1 fix调整 2023-10-07 14:11:11 +08:00
momo
e6d4e84fd4 fix调整 2023-10-07 14:10:06 +08:00
momo
eb4fd9cff9 fix调整 2023-10-07 14:06:00 +08:00
momo
ce35498c7e fix调整 2023-10-07 13:41:06 +08:00
momo
fcb3dd13c6 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-07 13:33:51 +08:00
momo
2261421ba5 fix调整 2023-10-07 13:33:40 +08:00
laodaming
fdd6ac9b44 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-07 12:06:27 +08:00
laodaming
a10d41405b fix 2023-10-07 12:06:21 +08:00
momo
8870b389be fix列表调整 2023-10-07 11:54:38 +08:00
momo
df5414fc1d fix列表调整 2023-10-07 11:53:12 +08:00
momo
8d987c4c54 fix:合图调整 2023-10-07 11:48:53 +08:00
momo
c2f61fc61a Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-07 11:32:16 +08:00
momo
122d558765 fix:合图调整 2023-10-07 11:32:11 +08:00
laodaming
d113ef1c6e fix 2023-10-07 11:24:18 +08:00
laodaming
aafcbfcf50 fix 2023-10-07 10:43:33 +08:00
momo
cf83bd068b fix:订单模块 2023-10-07 10:40:44 +08:00
laodaming
cc6da9a648 fix 2023-10-07 10:13:15 +08:00
momo
7c0b1107f8 fix:支付 2023-09-28 18:27:43 +08:00
momo
d7894fd5c8 fix:支付 2023-09-28 18:27:15 +08:00
momo
3a51a5f297 fix:支付 2023-09-28 18:17:43 +08:00
momo
821c2063c9 fix:支付 2023-09-28 18:04:35 +08:00
momo
e991ee3966 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-28 17:53:46 +08:00
momo
642ca772e8 fix:支付 2023-09-28 17:53:41 +08:00
eson
de751d5d68 info address used 2023-09-28 17:27:52 +08:00
eson
f7d0a6422e info address used 2023-09-28 17:06:38 +08:00
eson
649e635d17 info get profile 2023-09-28 16:54:10 +08:00
eson
989b2daacc info get profile 2023-09-28 16:47:02 +08:00
eson
db0c8a2532 info get profile 2023-09-28 15:26:02 +08:00
eson
316ebd9fca info get profile 2023-09-28 15:19:45 +08:00
eson
6072341a2b info get profile 2023-09-28 14:42:26 +08:00
eson
1f9123c0f4 info get profile 2023-09-28 13:32:37 +08:00
eson
91bc3310a1 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-28 13:25:12 +08:00
eson
d92c77766c info get profile 2023-09-28 13:25:06 +08:00
momo
4032255694 fix:支付 2023-09-28 10:51:53 +08:00
momo
b7a41d39e3 fix:支付 2023-09-28 10:05:55 +08:00
momo
7573f9ccf6 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-28 10:00:08 +08:00
momo
5ecb8537c2 fix:支付 2023-09-28 09:59:53 +08:00
laodaming
cb378afb1f Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-27 18:35:29 +08:00
laodaming
06ab4a596f fix 2023-09-27 18:35:20 +08:00
momo
ccc5a2dabc fix:支付 2023-09-27 18:22:30 +08:00
momo
4cb921853e Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-27 18:01:21 +08:00
momo
4a55844d73 fix:支付 2023-09-27 18:00:35 +08:00
laodaming
fbeebabf27 fix 2023-09-27 17:52:03 +08:00
momo
8d9ff4fe10 fix:支付 2023-09-27 17:51:25 +08:00
momo
f68032c8ea fix:支付 2023-09-27 17:40:44 +08:00
momo
39efb7eefb Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-27 17:24:05 +08:00
momo
fef541dfe5 fix:支付 2023-09-27 17:23:58 +08:00
laodaming
8bce140dd2 fix 2023-09-27 17:10:17 +08:00
laodaming
60749646e2 fix 2023-09-27 17:03:15 +08:00
laodaming
13420cd400 fix 2023-09-27 17:01:30 +08:00
laodaming
50c5e28381 fix 2023-09-27 16:51:29 +08:00
laodaming
b6d0ef1c7c fix 2023-09-27 16:36:38 +08:00
laodaming
1dfa390557 fix 2023-09-27 16:16:33 +08:00
laodaming
142ada5b07 fix 2023-09-27 16:09:28 +08:00
laodaming
e917792988 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-27 16:01:33 +08:00
laodaming
b6d4d06c25 fix 2023-09-27 16:01:22 +08:00
eson
31b712784f info get profile 2023-09-27 15:48:13 +08:00
eson
0a8f3cd5ba info get profile 2023-09-27 15:47:40 +08:00
eson
89e8b4cff9 info get profile 2023-09-27 15:46:35 +08:00
eson
2f4f59d6ab Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-27 15:37:06 +08:00
eson
43752954ae info get profile 2023-09-27 15:37:02 +08:00
laodaming
9e2526405f fix 2023-09-27 15:12:18 +08:00
laodaming
2ac507ef34 fix 2023-09-27 14:14:16 +08:00
laodaming
59114aa94a fix 2023-09-27 14:13:34 +08:00
laodaming
d5e5f7e6e2 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-27 14:05:34 +08:00
laodaming
02f2e08329 fix 2023-09-27 14:05:26 +08:00
eson
3dc822fcde info get profile 2023-09-27 12:28:53 +08:00
eson
d61e939685 info get profile 2023-09-27 12:24:47 +08:00
eson
fe57705286 info get profile 2023-09-27 12:23:02 +08:00
eson
b4f201eb98 info get profile 2023-09-27 12:18:16 +08:00
eson
943eba6f1a info get profile 2023-09-27 12:12:28 +08:00
eson
8654ab3ecd Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-27 12:04:57 +08:00
eson
82ce9a5114 info get profile 2023-09-27 12:04:53 +08:00
laodaming
465bc5e62d Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-27 11:57:16 +08:00
laodaming
788dbd325e fix 2023-09-27 11:57:10 +08:00
eson
53446bb606 info get profile 2023-09-27 11:55:21 +08:00
eson
945a8ec83c Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-27 11:51:28 +08:00
eson
5fcd76e32e info get profile 2023-09-27 11:51:24 +08:00
laodaming
840f7c8675 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-27 11:48:22 +08:00
laodaming
4ea3487043 fix 2023-09-27 11:48:15 +08:00
eson
887bc555fa Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-27 11:47:43 +08:00
eson
4e45e1e393 info get profile 2023-09-27 11:47:38 +08:00
laodaming
884ce87972 fix 2023-09-27 11:36:09 +08:00
eson
9de1099b12 info get profile 2023-09-27 11:35:34 +08:00
eson
899db716f1 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-27 11:30:22 +08:00
eson
2eadff7876 info get profile 2023-09-27 11:30:17 +08:00
laodaming
0967df9113 fix 2023-09-27 11:23:22 +08:00
laodaming
36ae64f3e7 fix 2023-09-27 11:21:16 +08:00
laodaming
ab916ac13d fix 2023-09-27 11:13:37 +08:00
momo
6eccd11386 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-27 11:11:52 +08:00
momo
f876971e50 fix:支付 2023-09-27 11:10:31 +08:00
laodaming
e6bd26a775 fix 2023-09-27 10:16:40 +08:00
momo
6c53238457 fix:支付 2023-09-27 10:12:52 +08:00
momo
032d089359 fix:支付 2023-09-27 10:09:26 +08:00
momo
b9b7309edc Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-26 18:47:08 +08:00
momo
d22be1d676 fix:支付 2023-09-26 18:46:44 +08:00
laodaming
2d0b23e063 fix 2023-09-26 18:38:36 +08:00
laodaming
01b78a099a fix 2023-09-26 18:35:27 +08:00
momo
fcfea291e5 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-26 18:21:13 +08:00
momo
9c08acc97a fix:支付 2023-09-26 18:20:48 +08:00
momo
1203c087d8 fix:支付 2023-09-26 18:18:48 +08:00
eson
91c1c580f9 info get profile 2023-09-26 18:03:29 +08:00
eson
b571b1b31c info get profile 2023-09-26 17:57:54 +08:00
eson
62565fac4e Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-26 17:45:12 +08:00
eson
54613f5be0 info get profile 2023-09-26 17:45:07 +08:00
momo
dd8b864a7f Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-26 17:32:30 +08:00
momo
8d3fce919f fix:支付 2023-09-26 17:32:21 +08:00
eson
c880cba0a3 info get profile 2023-09-26 17:21:01 +08:00
eson
194dc50eaa info get profile 2023-09-26 17:20:44 +08:00
momo
ee6e31473e Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-26 17:18:20 +08:00
momo
0989faf35a fix:支付 2023-09-26 17:18:04 +08:00
eson
93b0cadea9 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-26 17:16:15 +08:00
eson
f387e46977 info get profile 2023-09-26 17:16:10 +08:00
momo
c46d9d8fd9 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-26 17:12:27 +08:00
momo
ad01dbc0e5 fix:支付 2023-09-26 17:12:12 +08:00
laodaming
26389bf4d6 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-26 17:08:56 +08:00
laodaming
15888a953b fix 2023-09-26 17:08:49 +08:00
momo
2c995e9512 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-26 17:04:45 +08:00
momo
44fd4f03e3 fix:支付 2023-09-26 17:04:27 +08:00
laodaming
76f4a682ac fix 2023-09-26 17:01:31 +08:00
momo
9e6f919fa8 fix:支付 2023-09-26 16:53:34 +08:00
laodaming
e2508cc347 fix 2023-09-26 16:40:13 +08:00
laodaming
d07350969f fix 2023-09-26 16:36:35 +08:00
momo
6e9f47ff85 fix:支付 2023-09-26 16:30:51 +08:00
laodaming
42bd585fe9 fix 2023-09-26 16:20:53 +08:00
momo
f20b4fad3e fix:支付 2023-09-26 16:16:58 +08:00
laodaming
871a7a278b Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-26 15:30:20 +08:00
momo
83dc607ec4 fix:支付 2023-09-26 15:29:33 +08:00
laodaming
fae365d59e Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-26 15:28:27 +08:00
laodaming
821cbb8879 fix 2023-09-26 15:28:17 +08:00
momo
821e36281a fix:支付 2023-09-26 15:25:05 +08:00
momo
ef522551e4 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-26 15:14:12 +08:00
momo
c7a2cf7d1c fix:支付 2023-09-26 15:14:08 +08:00
eson
4dfeebeaed Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-26 15:02:13 +08:00
eson
31debda97f info update profile 2023-09-26 15:02:09 +08:00
laodaming
a1d78b7a0c fix 2023-09-26 14:56:32 +08:00
laodaming
03cbe2894e fix 2023-09-26 14:48:49 +08:00
laodaming
82fc0f2b80 fix 2023-09-26 14:46:12 +08:00
laodaming
2747c9ddd9 fix 2023-09-26 14:38:34 +08:00
laodaming
d45a0eb680 fix 2023-09-26 14:23:09 +08:00
momo
4cd2e1ce65 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-26 13:54:51 +08:00
momo
00b3a974f9 fix:支付 2023-09-26 13:54:39 +08:00
eson
f9595aad3f info fix table 2023-09-26 13:31:42 +08:00
eson
85cd2bff8d Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-26 13:23:55 +08:00
eson
1e444ca616 info delete table 2023-09-26 13:23:49 +08:00
laodaming
1543e60301 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-26 13:06:59 +08:00
laodaming
600a6edd7b fix 2023-09-26 13:06:51 +08:00
eson
407ba29319 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-26 12:24:14 +08:00
eson
c42c37f65e info address 2023-09-26 12:24:09 +08:00
momo
cdeec5a4e1 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-26 12:21:30 +08:00
momo
94088b5aa4 fix:支付 2023-09-26 12:21:26 +08:00
laodaming
e23ee6518d fix 2023-09-26 12:12:50 +08:00
eson
79120e1fd9 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-26 12:08:57 +08:00
eson
6a41be4f3a info address 2023-09-26 12:08:51 +08:00
laodaming
f7992279e2 fix 2023-09-26 11:47:31 +08:00
laodaming
01cc115a60 fix 2023-09-26 11:40:27 +08:00
eson
47a1ecfc79 info address 2023-09-26 11:32:43 +08:00
eson
55a4526536 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-26 11:21:48 +08:00
eson
7eab65be87 info address 2023-09-26 11:21:43 +08:00
laodaming
fc302ad1be Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-26 11:11:58 +08:00
eson
87c2d7bf96 info address 2023-09-26 11:11:34 +08:00
laodaming
27f429cdec Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-26 11:11:27 +08:00
laodaming
f615e4fe77 fix 2023-09-26 11:10:41 +08:00
eson
87ff25a2e6 info address 2023-09-26 11:08:32 +08:00
eson
a832a6fa81 info address 2023-09-26 11:07:45 +08:00
eson
0e282e741b info address 2023-09-26 11:06:37 +08:00
eson
d0323646c5 info address 2023-09-26 11:05:31 +08:00
eson
2331979b65 info address 2023-09-26 11:04:12 +08:00
eson
c12675698b info address 2023-09-26 11:01:42 +08:00
eson
abdf8a43e7 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-26 10:58:28 +08:00
eson
3bba720f67 info address 2023-09-26 10:58:24 +08:00
momo
46f3b2ff0e Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-26 10:57:08 +08:00
momo
6c2fba2b3a fix:支付 2023-09-26 10:56:57 +08:00
laodaming
916e050585 fix 2023-09-26 10:54:11 +08:00
eson
5b3e3f047e info address 2023-09-26 10:45:53 +08:00
b03e2d020f info address 2023-09-26 00:02:50 +08:00
laodaming
cb9b8ed6fd Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-25 18:44:54 +08:00
laodaming
7490a3b324 fix 2023-09-25 18:44:47 +08:00
eson
3f4b341c33 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-25 18:42:53 +08:00
eson
cef9dfa34d info 2023-09-25 18:42:45 +08:00
momo
95cbaea69a fix:支付 2023-09-25 18:28:53 +08:00
momo
17b98f83ff fix:支付 2023-09-25 17:35:02 +08:00
momo
4261a5a97d fix:支付 2023-09-25 17:31:42 +08:00
laodaming
91acf4d2bc fix 2023-09-25 17:22:58 +08:00
laodaming
f713124154 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-25 17:21:37 +08:00
laodaming
4bbe9aaaa3 fix 2023-09-25 17:20:44 +08:00
momo
07185fdb46 fix:支付 2023-09-25 17:17:09 +08:00
momo
178cda5402 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-25 17:06:35 +08:00
momo
3c094cf201 fix:支付 2023-09-25 17:06:12 +08:00
eson
66084f9e96 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-25 16:01:34 +08:00
eson
c1203e8989 info 2023-09-25 16:01:28 +08:00
momo
5be1edfa71 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-25 16:01:03 +08:00
momo
6005f20c5e fix:支付 2023-09-25 16:00:50 +08:00
eson
8fe6e8be74 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-25 15:58:40 +08:00
eson
f2a0c7608e info 2023-09-25 15:58:33 +08:00
laodaming
29c7dc54e3 fix 2023-09-25 15:49:59 +08:00
laodaming
d8d91e9270 fix 2023-09-25 11:34:53 +08:00
laodaming
02b3788dc9 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-25 11:17:03 +08:00
laodaming
a7f21da8da fix 2023-09-25 11:16:55 +08:00
momo
287ee4db37 fix:支付 2023-09-22 17:39:20 +08:00
momo
0a4368ba7f Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-22 17:32:30 +08:00
momo
656d5038fe fix:支付 2023-09-22 17:32:23 +08:00
laodaming
c34811df83 fix 2023-09-22 17:21:40 +08:00
laodaming
98bc6294e6 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-22 17:04:08 +08:00
laodaming
2054b9ec97 fix 2023-09-22 17:04:01 +08:00
momo
b398da58e1 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-22 16:27:21 +08:00
momo
7e400ed761 fix:支付 2023-09-22 16:27:17 +08:00
laodaming
bea1fd230a Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-22 15:52:40 +08:00
laodaming
a2b7bfb253 fix 2023-09-22 15:52:32 +08:00
eson
646c04eba9 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-22 15:52:26 +08:00
eson
1bd2b83bca info 2023-09-22 15:52:20 +08:00
laodaming
d6134a7407 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-22 15:43:49 +08:00
laodaming
c3011e87eb fix 2023-09-22 15:43:42 +08:00
eson
e811bf3e4a Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-22 15:42:15 +08:00
eson
b3ed5703a8 info 2023-09-22 15:42:09 +08:00
laodaming
f6e073bb41 fix 2023-09-22 15:24:16 +08:00
laodaming
b6651c4bdc fix 2023-09-22 15:19:41 +08:00
laodaming
bfea40c643 fix 2023-09-22 15:12:44 +08:00
laodaming
c8a52321a5 fix 2023-09-22 15:00:08 +08:00
laodaming
129583d19a fix 2023-09-22 14:57:56 +08:00
laodaming
c2bb174574 fix 2023-09-22 14:44:55 +08:00
laodaming
551f9083e9 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-22 14:38:32 +08:00
laodaming
c36c8ab6f9 fix 2023-09-22 14:38:26 +08:00
eson
6fd3bc8a3b Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-22 14:34:46 +08:00
eson
4005af2040 info 2023-09-22 14:34:23 +08:00
laodaming
20150a81b5 fix 2023-09-22 14:33:16 +08:00
laodaming
e4c165cd18 fix 2023-09-22 14:29:21 +08:00
laodaming
366a441cf2 fix 2023-09-22 14:14:04 +08:00
eson
ec4fe76856 info 2023-09-22 13:37:23 +08:00
eson
173fa23e80 info 2023-09-22 13:35:05 +08:00
eson
b6e994844e info 2023-09-22 13:21:06 +08:00
eson
9a4899558e info 2023-09-22 13:18:31 +08:00
eson
b1675ae0bf info 2023-09-22 13:14:53 +08:00
eson
8b81308bd2 info 2023-09-22 12:31:24 +08:00
eson
cc7d7361d4 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-22 12:28:42 +08:00
eson
730491ffed info 2023-09-22 12:28:38 +08:00
laodaming
9753920595 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-22 12:15:23 +08:00
laodaming
2fc914214c fix 2023-09-22 12:15:16 +08:00
momo
ddb4ec944d Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-22 12:12:44 +08:00
momo
c2723861fa fix:支付 2023-09-22 12:12:33 +08:00
eson
c82ae399b7 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-22 12:09:47 +08:00
eson
c163cfe234 info 2023-09-22 12:09:41 +08:00
laodaming
72e75e7858 fix 2023-09-22 12:05:20 +08:00
laodaming
c9af4fb420 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-22 12:05:17 +08:00
laodaming
27ae48991c fix 2023-09-22 12:05:05 +08:00
eson
65a7d530cc Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-22 12:03:11 +08:00
eson
7866a5a369 proxyserver 2023-09-22 12:03:04 +08:00
laodaming
0dcaf2ce09 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-22 11:59:44 +08:00
laodaming
dd6b80ee71 fix 2023-09-22 11:59:37 +08:00
eson
4c944c8c72 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-22 11:55:45 +08:00
eson
e29e8d8049 proxyserver 2023-09-22 11:55:39 +08:00
laodaming
e1094b9be6 fix 2023-09-22 11:47:32 +08:00
eson
fc50bf587f Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-22 11:46:02 +08:00
eson
11cee190b0 nacos config 2023-09-22 11:45:56 +08:00
laodaming
21c4907e44 fix 2023-09-22 11:37:44 +08:00
laodaming
951635e7f8 fix 2023-09-22 11:36:38 +08:00
laodaming
2a849dde38 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-22 11:36:16 +08:00
laodaming
caf2f753a5 fix 2023-09-22 11:36:10 +08:00
eson
2d224c0d67 nacos config 2023-09-22 11:35:40 +08:00
eson
e925d8c684 nacos config 2023-09-22 11:32:16 +08:00
eson
a6a40a2ad5 nacos config 2023-09-22 11:31:39 +08:00
eson
baa0cc1644 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-22 11:27:24 +08:00
eson
db7d53532a nacos config 2023-09-22 11:27:19 +08:00
laodaming
6985b76e49 fix 2023-09-22 11:25:51 +08:00
laodaming
745cea9617 fix 2023-09-22 11:22:32 +08:00
momo
d00089c625 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-22 11:01:03 +08:00
momo
0f7514b5bd fix:支付 2023-09-22 11:00:54 +08:00
eson
95cd86d103 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-22 10:53:10 +08:00
eson
85b391a4d2 nacos config 2023-09-22 10:53:05 +08:00
laodaming
e2db17c326 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-22 10:49:15 +08:00
laodaming
741963275e fix 2023-09-22 10:49:07 +08:00
eson
541627183b Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-22 10:44:09 +08:00
eson
cd6a919145 nacos config 2023-09-22 10:44:04 +08:00
laodaming
bb645ce6f6 fix 2023-09-22 10:41:38 +08:00
momo
1040f21ca6 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-22 10:39:09 +08:00
momo
fead7c6ae9 fix:支付 2023-09-22 10:39:02 +08:00
eson
15f589c09d nacos config 2023-09-22 10:37:34 +08:00
c4b4b72947 fix 2023-09-22 00:46:05 +08:00
99f785a7c3 fix 2023-09-22 00:35:10 +08:00
c280a661a1 fix 2023-09-22 00:31:58 +08:00
b37c2094ed fix 2023-09-22 00:28:35 +08:00
e6470719bb fix 2023-09-22 00:22:53 +08:00
6260d29dc7 fix 2023-09-22 00:21:18 +08:00
7aa4a57257 fix 2023-09-22 00:18:04 +08:00
7324aabbd6 fix 2023-09-22 00:12:23 +08:00
0b8f6e69cf fix 2023-09-22 00:03:01 +08:00
bd1b6ee23e fix 2023-09-21 23:59:01 +08:00
58e2068170 fix 2023-09-21 23:47:34 +08:00
45ef0b8bc9 fix 2023-09-21 23:39:15 +08:00
ff011f6452 fix 2023-09-21 23:32:58 +08:00
d3c96184b8 fix 2023-09-21 23:21:57 +08:00
2aacbf1c3e fix 2023-09-21 23:14:28 +08:00
laodaming
aab8838ea5 fix 2023-09-21 19:07:09 +08:00
momo
bc4cf49b2d fix:支付 2023-09-21 19:05:31 +08:00
momo
046c31c898 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-21 19:02:05 +08:00
momo
be786a4d4c fix:支付 2023-09-21 19:01:48 +08:00
eson
edb1b0c0f2 nacos config 2023-09-21 18:59:47 +08:00
eson
822a2163a0 nacos config 2023-09-21 18:57:18 +08:00
eson
dc489b1ca3 nacos config 2023-09-21 18:53:04 +08:00
eson
f2fc0a35f6 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-21 18:36:50 +08:00
eson
3c4d50ed0a nacos config 2023-09-21 18:36:44 +08:00
laodaming
f227b55c3a Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-21 18:34:37 +08:00
laodaming
e8546d615b fix 2023-09-21 18:34:29 +08:00
eson
26c008b4da nacos config 2023-09-21 18:33:39 +08:00
eson
a566f61f23 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-21 18:26:19 +08:00
eson
68bd764c6e nacos config 2023-09-21 18:26:13 +08:00
laodaming
f767af9a7f fix 2023-09-21 18:22:55 +08:00
laodaming
949feb431c Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-21 18:21:37 +08:00
laodaming
584cb5d531 fix 2023-09-21 18:21:31 +08:00
eson
14f4f959d6 nacos config 2023-09-21 18:21:00 +08:00
eson
b110532a9a Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-21 18:12:26 +08:00
eson
11cdcefa4c nacos config 2023-09-21 18:12:22 +08:00
laodaming
5db1f3f09d fix 2023-09-21 17:56:48 +08:00
laodaming
0885c645c3 fix 2023-09-21 17:22:22 +08:00
laodaming
e86a8072a5 fix 2023-09-21 17:13:31 +08:00
laodaming
8a908a4438 fix 2023-09-21 17:10:56 +08:00
laodaming
bcbcf0a4b2 fix 2023-09-21 17:08:04 +08:00
laodaming
f7c0d90ab3 fix 2023-09-21 17:06:12 +08:00
laodaming
b230d764e0 fix 2023-09-21 16:58:37 +08:00
laodaming
93a6941432 fix 2023-09-21 16:54:49 +08:00
laodaming
c06e5da01c fix 2023-09-21 16:48:09 +08:00
laodaming
82e5101948 fix 2023-09-21 16:10:49 +08:00
laodaming
15b278f782 fix 2023-09-21 15:57:01 +08:00
laodaming
e87dd4f800 fix 2023-09-21 15:40:56 +08:00
laodaming
3aceed8200 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-21 14:55:31 +08:00
laodaming
c54f804ebf fix 2023-09-21 14:55:23 +08:00
eson
b5cdaab24c Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-21 14:53:26 +08:00
eson
6329c02b8e nacos config 2023-09-21 14:53:21 +08:00
laodaming
affd0dc9bb fix 2023-09-21 14:41:20 +08:00
laodaming
bdc5b6edb7 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-21 14:31:32 +08:00
laodaming
cca1ea711d fix 2023-09-21 14:31:24 +08:00
momo
f10e556a0a Merge branch 'feature/mhw-v1.01' into develop 2023-09-21 14:27:47 +08:00
momo
1605da27bf fix:基础信息 2023-09-21 14:26:14 +08:00
laodaming
3b91e25501 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-21 14:21:50 +08:00
laodaming
eb2f4b5717 fix 2023-09-21 14:21:40 +08:00
momo
1d356a391c Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-21 12:18:34 +08:00
momo
abb0f25350 fix:基础信息 2023-09-21 12:18:20 +08:00
laodaming
3f92a04acd fix 2023-09-21 12:16:51 +08:00
momo
e01884cce6 Merge branch 'feature/mhw-v1.01' of gitee.com:fusenpack/fusenapi into feature/mhw-v1.01 2023-09-21 12:11:21 +08:00
momo
30ae7eb814 fix:订单详情 2023-09-21 12:11:15 +08:00
laodaming
1dac38e5c5 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-21 12:06:04 +08:00
laodaming
0d8360b226 fix 2023-09-21 12:05:56 +08:00
eson
e7a1a569f7 nacos config 2023-09-21 11:57:31 +08:00
eson
f0f9ae287d Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-21 11:49:35 +08:00
eson
4fc9926cb9 nacos config 2023-09-21 11:49:29 +08:00
laodaming
7dbf909a9a fix 2023-09-21 11:42:31 +08:00
laodaming
c78f1bb238 Merge branch 'develop' into feature/mhw-v1.01 2023-09-21 11:35:27 +08:00
laodaming
5198ee0cda fix 2023-09-21 11:35:00 +08:00
eson
1f126b3817 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-21 11:29:44 +08:00
eson
7942910a39 nacos config 2023-09-21 11:28:15 +08:00
laodaming
37fc648025 Merge branch 'develop' into feature/mhw-v1.01 2023-09-21 11:15:56 +08:00
laodaming
4391b45024 fix 2023-09-21 11:14:14 +08:00
eson
009330a55e nacos config 2023-09-21 11:10:13 +08:00
eson
c4e4d1104f nacos config 2023-09-21 11:04:04 +08:00
eson
7ab3aa5dd0 nacos config 2023-09-21 10:55:42 +08:00
momo
43c667e6b0 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-21 10:51:18 +08:00
momo
e9f862e144 fix:优化 2023-09-21 10:51:04 +08:00
laodaming
4700548002 fix 2023-09-21 10:47:03 +08:00
momo
4f61702e14 fix:购物车下单 2023-09-21 10:30:36 +08:00
laodaming
8806dbb034 fix 2023-09-21 10:12:14 +08:00
laodaming
b992a052ce fix 2023-09-20 18:27:32 +08:00
laodaming
8273ded750 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-20 18:06:29 +08:00
laodaming
d4b1d78201 fix 2023-09-20 18:06:21 +08:00
momo
137919a4d7 fix:购物车下单 2023-09-20 18:04:33 +08:00
eson
1144f78673 nacos config 2023-09-20 18:00:46 +08:00
eson
c6afb3cc2d nacos config 2023-09-20 17:58:38 +08:00
eson
bc3cc55693 nacos config 2023-09-20 17:57:13 +08:00
eson
82a8dfa953 nacos config 2023-09-20 17:36:29 +08:00
eson
7383d60bfe Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-20 17:36:25 +08:00
laodaming
18aaef0e31 fix 2023-09-20 17:11:48 +08:00
eson
20932677ad Merge branch 'feature/mhw-v1.01' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-20 17:01:28 +08:00
laodaming
29f1122120 fix 2023-09-20 16:57:25 +08:00
laodaming
6699a64169 fix 2023-09-20 16:49:05 +08:00
laodaming
e1364838da 11 2023-09-20 16:47:59 +08:00
laodaming
be80525878 11 2023-09-20 16:46:30 +08:00
momo
4d3f1512ac fix:购物车下单 2023-09-20 16:37:37 +08:00
momo
71b6aaf014 Merge branch 'feature/mhw-v1.01' of gitee.com:fusenpack/fusenapi into feature/mhw-v1.01 2023-09-20 16:21:08 +08:00
momo
f67f8be823 fix:购物车下单 2023-09-20 16:21:06 +08:00
laodaming
5042971472 11 2023-09-20 15:52:34 +08:00
laodaming
591abd34e0 Merge branch 'feature/mhw-v1.01' of gitee.com:fusenpack/fusenapi into feature/mhw-v1.01 2023-09-20 15:39:54 +08:00
momo
d59142e017 fix:购物车下单 2023-09-20 15:39:23 +08:00
laodaming
0df2ccdf1d Merge branch 'feature/mhw-v1.01' of gitee.com:fusenpack/fusenapi into feature/mhw-v1.01 2023-09-20 15:39:18 +08:00
laodaming
b892e04d8a fix 2023-09-20 15:39:11 +08:00
momo
e8958599ac fix:购物车下单 2023-09-20 15:37:22 +08:00
momo
359e67e281 fix:购物车下单 2023-09-20 15:35:40 +08:00
laodaming
143421557f fix 2023-09-20 15:28:57 +08:00
laodaming
a5f5a83fe8 fix 2023-09-20 15:21:42 +08:00
momo
1bb6297dd7 fix:购物车下单 2023-09-20 15:10:18 +08:00
momo
6fd87890d0 fix:购物车下单 2023-09-20 15:08:26 +08:00
momo
572dfe1b96 Merge branch 'feature/mhw-v1.01' of gitee.com:fusenpack/fusenapi into feature/mhw-v1.01 2023-09-20 15:07:23 +08:00
momo
ed5dce9ff0 fix:购物车下单 2023-09-20 15:07:12 +08:00
laodaming
f0afda0f26 fix 2023-09-20 14:56:24 +08:00
laodaming
7bebadc517 11 2023-09-20 14:11:07 +08:00
laodaming
30fd11bb37 Merge branch 'develop' into feature/mhw-v1.01 2023-09-20 13:57:38 +08:00
laodaming
684c3b18e0 11 2023-09-20 12:27:40 +08:00
laodaming
039137ce23 11 2023-09-20 12:13:27 +08:00
momo
8768588a8f fix:购物车下单 2023-09-20 11:57:08 +08:00
momo
c004b927ad fix:购物车下单 2023-09-20 11:55:51 +08:00
momo
ca12242768 Merge branch 'feature/mhw-v1.01' of gitee.com:fusenpack/fusenapi into feature/mhw-v1.01 2023-09-20 11:40:06 +08:00
momo
b45da2b637 fix:购物车下单 2023-09-20 11:39:56 +08:00
laodaming
9342ab8c24 11 2023-09-20 11:17:00 +08:00
laodaming
f284702448 11 2023-09-20 11:05:59 +08:00
laodaming
d8707e3a4a 添加购物车新增灯光信息保存 2023-09-20 11:02:46 +08:00
laodaming
86c39263be 添加购物车新增灯光信息保存 2023-09-20 10:31:36 +08:00
momo
78558bb74d Merge branch 'feature/mhw-v1.01' of gitee.com:fusenpack/fusenapi into feature/mhw-v1.01 2023-09-19 19:17:32 +08:00
momo
f4f5a62270 fix:购物车下单 2023-09-19 19:17:04 +08:00
eson
fd4646ba11 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-19 19:16:30 +08:00
eson
d39633060b nacos config 2023-09-19 19:16:26 +08:00
laodaming
f5fd9188da fix 2023-09-19 18:24:51 +08:00
laodaming
6895ff2816 fix 2023-09-19 18:10:00 +08:00
laodaming
a897723a25 fix 2023-09-19 17:52:23 +08:00
eson
25903207dc Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-19 17:34:14 +08:00
eson
4f37274438 nacos config 2023-09-19 17:34:10 +08:00
momo
cde43f16db Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-19 17:28:24 +08:00
momo
75849f0ab8 fix:合图调整 2023-09-19 17:28:14 +08:00
laodaming
3f4d808fda 11 2023-09-19 17:24:47 +08:00
laodaming
40e04c70b8 11 2023-09-19 17:08:47 +08:00
laodaming
0dc1413988 11 2023-09-19 16:49:57 +08:00
laodaming
8ba604b3b9 11 2023-09-19 16:28:20 +08:00
laodaming
b41d6ffda5 11 2023-09-19 16:10:17 +08:00
laodaming
aa9b972ded 11 2023-09-19 16:03:11 +08:00
laodaming
81305717f4 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-19 16:01:31 +08:00
laodaming
bcf5d9d6d7 11 2023-09-19 16:01:23 +08:00
momo
ab5f908300 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-19 15:59:49 +08:00
momo
078b797c94 fix:合图调整 2023-09-19 15:59:44 +08:00
laodaming
fb359cfba5 11 2023-09-19 15:38:03 +08:00
laodaming
720a9ab78b 11 2023-09-19 15:34:52 +08:00
laodaming
9c8f37c43c 11 2023-09-19 15:10:44 +08:00
laodaming
55e1e5cb47 11 2023-09-19 15:09:48 +08:00
momo
f7c3ccd01d fix:合图调整 2023-09-19 14:55:26 +08:00
momo
640560acf6 fix:合图调整 2023-09-19 14:50:54 +08:00
laodaming
25b7334c30 合并develop 2023-09-19 14:39:33 +08:00
laodaming
b19a16e5a0 合并develop 2023-09-19 14:06:54 +08:00
momo
12085dca8f fix:购物车下单 2023-09-19 13:56:59 +08:00
momo
dbb1591cbb fix:合图调整 2023-09-19 12:04:51 +08:00
eson
7fd65d9ac7 更新新的加载依赖方式 2023-09-19 12:01:37 +08:00
eson
a9f6a26c40 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-19 11:48:42 +08:00
eson
3c33a96037 nacos config 2023-09-19 11:48:38 +08:00
laodaming
17117191f0 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-19 11:42:17 +08:00
laodaming
c0b773634a 合并develop 2023-09-19 11:42:10 +08:00
eson
b4672bbed7 nacos config 2023-09-19 11:41:38 +08:00
laodaming
d7f94f0da9 Merge branch 'develop' into feature/mhw-v1.01 2023-09-19 11:30:28 +08:00
laodaming
4e0a484e7f fix 2023-09-19 10:59:53 +08:00
laodaming
dc4f6dda50 fix 2023-09-19 10:56:30 +08:00
laodaming
88d06f68f6 fix 2023-09-19 10:53:48 +08:00
laodaming
93e95d1a15 fix 2023-09-19 10:41:15 +08:00
laodaming
19958a80de fix 2023-09-19 10:36:33 +08:00
laodaming
34befce2f3 fix 2023-09-19 10:18:17 +08:00
laodaming
498f4550f0 fix 2023-09-19 10:09:22 +08:00
laodaming
157f05e43d fix 2023-09-19 10:04:35 +08:00
laodaming
3de3d896e8 fix 2023-09-18 19:06:46 +08:00
laodaming
bdef106f09 fix 2023-09-18 19:03:52 +08:00
laodaming
389794500f fix 2023-09-18 18:59:29 +08:00
laodaming
573a199878 fix 2023-09-18 18:57:37 +08:00
laodaming
66f0f2dffa Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-18 18:46:26 +08:00
laodaming
f82f8b0d24 fix 2023-09-18 18:46:18 +08:00
eson
3ff55f671e Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-18 18:44:40 +08:00
eson
beaba9afa9 更新 config 最新配置服务上去 2023-09-18 18:44:12 +08:00
laodaming
c12c24d03b fix 2023-09-18 18:18:30 +08:00
laodaming
49785df983 fix 2023-09-18 17:53:05 +08:00
laodaming
49cc50ff4e fix 2023-09-18 15:57:36 +08:00
momo
832440a58e fix:购物车下单 2023-09-18 15:40:56 +08:00
eson
d51721dc35 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-18 15:40:19 +08:00
momo
eb49aa9f3e fix:购物车下单 2023-09-18 15:39:59 +08:00
momo
8265140148 fix:购物车下单 2023-09-18 15:39:12 +08:00
laodaming
990c7d3359 fix 2023-09-18 15:19:42 +08:00
laodaming
ceec00c528 fix 2023-09-18 15:18:55 +08:00
laodaming
9476414e68 fix 2023-09-18 14:53:15 +08:00
laodaming
464218ad62 Merge branch 'develop' into feature/mhw-v1.01 2023-09-18 14:44:28 +08:00
laodaming
43f3942508 fix 2023-09-18 14:27:55 +08:00
laodaming
5e2760849c fix 2023-09-18 14:23:57 +08:00
laodaming
1a7ce5013e fix 2023-09-18 12:31:51 +08:00
eson
7c3984c4b6 Merge branch 'feature/mhw-v1.01' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-18 12:18:02 +08:00
laodaming
b07473478b fix 2023-09-18 11:45:29 +08:00
532b35b864 Merge branch 'feature/mhw-v1.01' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-16 20:15:24 +08:00
momo
87347515d1 Merge branch 'feature/mhw-v1.01' of gitee.com:fusenpack/fusenapi into feature/mhw-v1.01 2023-09-15 18:30:50 +08:00
momo
95b826d8a6 fix:合并 2023-09-15 18:30:45 +08:00
laodaming
43c34159ce fix 2023-09-15 18:19:01 +08:00
momo
86450d3c9d Merge branch 'feature/mhw-v1.01' of gitee.com:fusenpack/fusenapi into feature/mhw-v1.01 2023-09-15 17:59:59 +08:00
laodaming
ab6f3249a2 fix 2023-09-15 17:59:33 +08:00
momo
751232c32e Merge branch 'feature/mhw-v1.01' of gitee.com:fusenpack/fusenapi into feature/mhw-v1.01 2023-09-15 17:59:04 +08:00
momo
ca7cf4c81e fix:合并 2023-09-15 17:58:45 +08:00
laodaming
da8f88b3e6 fix 2023-09-15 16:30:01 +08:00
laodaming
668db55e6b fix 2023-09-15 15:54:24 +08:00
laodaming
c94e59c907 fix 2023-09-15 15:54:12 +08:00
laodaming
33055bbb4c fix 2023-09-15 15:28:42 +08:00
laodaming
246e03d792 fix 2023-09-15 15:28:11 +08:00
laodaming
6987f2c2d1 fix 2023-09-15 15:27:39 +08:00
laodaming
ee92468392 fix 2023-09-15 14:52:36 +08:00
laodaming
f72a0b9f7d fix 2023-09-15 14:20:08 +08:00
laodaming
fd16d6ac67 fix 2023-09-15 14:19:14 +08:00
eson
c1991351cf 更新表结构 2023-09-15 11:20:49 +08:00
laodaming
dd13dcbf0d fix 2023-09-15 10:39:08 +08:00
momo
e4343eb2d6 Merge branch 'feature/mhw-v1.01' of gitee.com:fusenpack/fusenapi into feature/mhw-v1.01 2023-09-15 10:35:56 +08:00
momo
f3a29225e0 fix:合并 2023-09-15 10:35:13 +08:00
laodaming
6e89f318fd Merge branch 'ldm-v1.01' into feature/mhw-v1.01 2023-09-15 10:25:02 +08:00
laodaming
5df0a0f184 fix 2023-09-15 10:23:40 +08:00
momo
6606173050 feat:新增api 2023-09-14 18:43:10 +08:00
laodaming
440dd1cefc fix 2023-09-14 18:40:37 +08:00
laodaming
9c178b2add fix 2023-09-14 18:33:29 +08:00
laodaming
0bb11f975d 新增更新购物车购买数量接口 2023-09-14 15:46:37 +08:00
laodaming
b71141807b 新增添加购物车接口 2023-09-14 15:20:37 +08:00
laodaming
dff1ebe013 Merge branch 'develop' into ldm-v1.01 2023-09-14 15:04:16 +08:00
eson
e0a851ba25 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-14 14:59:48 +08:00
eson
0c3514d709 fix 2023-09-14 14:59:44 +08:00
laodaming
93795ed6d2 11 2023-09-14 14:57:16 +08:00
laodaming
794c416267 11 2023-09-14 14:41:18 +08:00
laodaming
46ee5a94bd fix 2023-09-14 14:17:19 +08:00
laodaming
13d5219e53 fix 2023-09-14 14:11:22 +08:00
laodaming
f56946fce9 新增添加购物车接口 2023-09-13 18:37:50 +08:00
laodaming
b8edd41e69 增加购物车服务 2023-09-13 17:33:58 +08:00
laodaming
fec2ea5789 fix 2023-09-13 17:27:36 +08:00
laodaming
a8b85fad02 fix 2023-09-13 17:27:16 +08:00
laodaming
0e4c37918a Merge branch 'develop' into ldm-v1.01 2023-09-13 17:22:26 +08:00
laodaming
f08c51e5bc fix 2023-09-13 17:21:56 +08:00
laodaming
417228ce05 fix 2023-09-13 17:20:39 +08:00
laodaming
9e4703bd1f fix 2023-09-13 16:44:23 +08:00
laodaming
6ec89bc13a 11 2023-09-13 16:06:05 +08:00
laodaming
63669fe466 11 2023-09-13 16:04:59 +08:00
laodaming
190ac0407e 11 2023-09-13 13:59:01 +08:00
laodaming
d34d72a5cc 11 2023-09-13 10:52:18 +08:00
laodaming
5c47a30347 11 2023-09-13 10:48:53 +08:00
laodaming
411aeb2762 11 2023-09-13 10:46:43 +08:00
laodaming
7e8f445169 11 2023-09-13 10:42:33 +08:00
laodaming
06b1ad1678 11 2023-09-13 10:29:59 +08:00
laodaming
921098650e Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-12 18:09:44 +08:00
laodaming
0aef122f1b 11 2023-09-12 18:09:38 +08:00
eson
66f82a44ea fix 2023-09-12 18:08:37 +08:00
laodaming
df73e8d5ce 11 2023-09-12 17:59:07 +08:00
laodaming
6e42d9d218 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-12 17:55:30 +08:00
laodaming
3f8fed2dd6 11 2023-09-12 17:55:23 +08:00
momo
59598fee13 fix:合图,参数调整 2023-09-12 17:54:31 +08:00
momo
3e0d97ffb3 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-12 17:49:45 +08:00
momo
c7f8bbfbcb fix:合图,参数调整 2023-09-12 17:49:40 +08:00
laodaming
77ba817569 11 2023-09-12 17:47:33 +08:00
laodaming
dd123cc446 11 2023-09-12 17:44:12 +08:00
laodaming
ef946ed0e8 11 2023-09-12 17:26:44 +08:00
laodaming
4a09fc3955 11 2023-09-12 17:05:41 +08:00
laodaming
ff656ba420 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-12 16:40:25 +08:00
laodaming
97947fed6c 11 2023-09-12 16:40:19 +08:00
momo
1699420c4a fix:合图,参数调整 2023-09-12 15:59:38 +08:00
laodaming
7c6f8c5594 11 2023-09-12 15:37:22 +08:00
laodaming
983492f7b1 11 2023-09-12 15:35:09 +08:00
laodaming
3e714a5db6 删除无用的服务 2023-09-12 15:23:41 +08:00
laodaming
a495e4e459 删除无用的服务 2023-09-12 14:31:04 +08:00
laodaming
8fc19e1fb2 删除无用的服务 2023-09-12 12:15:41 +08:00
laodaming
0a7e56f726 删除无用的服务 2023-09-12 11:57:58 +08:00
laodaming
7c3bc74186 fix 2023-09-12 11:14:06 +08:00
laodaming
0eaa357de5 fix 2023-09-12 11:05:52 +08:00
laodaming
0015ef7540 fix 2023-09-12 10:54:02 +08:00
laodaming
3fdf14c493 fix 2023-09-12 10:53:28 +08:00
laodaming
a63a473641 fix 2023-09-12 10:52:47 +08:00
laodaming
f9a53b9e36 fix 2023-09-11 18:11:53 +08:00
laodaming
e9a3b7b49c fix 2023-09-11 17:46:16 +08:00
laodaming
4eaf5b89d0 fix 2023-09-11 17:41:07 +08:00
laodaming
67c8c70feb Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-11 16:20:16 +08:00
laodaming
899581ba63 fix 2023-09-11 16:20:09 +08:00
eson
90c95fce51 fix 2023-09-11 15:30:14 +08:00
momo
21f90f3dd1 fix:合图,默认参数 2023-09-11 15:18:10 +08:00
laodaming
74f25d23cf fix 2023-09-11 15:15:38 +08:00
momo
ffc555ca76 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-11 15:02:47 +08:00
momo
e4fb6ca4a7 fix:合图,默认参数 2023-09-11 15:02:17 +08:00
laodaming
f353ad524b fix 2023-09-11 14:41:35 +08:00
momo
85f7dcdffb Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-11 13:59:36 +08:00
momo
1a6822da64 fix:调整支付方式 2023-09-11 13:59:16 +08:00
laodaming
cc7fcb2133 fix 2023-09-11 13:05:31 +08:00
laodaming
2553c6c821 fix 2023-09-11 12:24:10 +08:00
laodaming
e6f2651704 fix 2023-09-11 12:19:24 +08:00
laodaming
ce394848fd Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-11 12:17:13 +08:00
laodaming
ac11753274 fix 2023-09-11 12:17:07 +08:00
a043823045 fix 2023-09-10 23:58:17 +08:00
467cf3c5a3 fix 2023-09-10 23:54:02 +08:00
65ccfcb84e fix 2023-09-10 23:50:42 +08:00
71352cc5b9 fix 2023-09-10 03:11:35 +08:00
5bedfc9237 fix 2023-09-10 03:09:48 +08:00
14f0dd2b22 测试接口成功 2023-09-10 02:58:56 +08:00
laodaming
00be036e59 fix 2023-09-08 19:14:01 +08:00
eson
0d72ac98a0 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-08 19:11:09 +08:00
eson
b9069a8a16 fix 2023-09-08 19:11:04 +08:00
laodaming
48a6ae9888 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-08 19:03:13 +08:00
laodaming
bce88a3c27 fix 2023-09-08 19:03:05 +08:00
eson
c5c0479c72 fix 2023-09-08 19:02:37 +08:00
eson
692220b31b fix 2023-09-08 19:01:29 +08:00
eson
b85c7a019f Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-08 18:56:22 +08:00
eson
f213f1c85a fix 2023-09-08 18:56:17 +08:00
laodaming
e6c0558679 fix 2023-09-08 18:52:57 +08:00
laodaming
eb7235281f Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-08 18:50:04 +08:00
laodaming
1f28a64442 fix 2023-09-08 18:49:56 +08:00
momo
37e0d03de1 fix:设置当前logo 2023-09-08 18:26:23 +08:00
momo
bf9c6c9386 fix:设置当前logo 2023-09-08 18:22:44 +08:00
momo
7abcfadd93 fix:设置当前logo 2023-09-08 18:19:24 +08:00
momo
2ae8cde2ce Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-08 18:16:25 +08:00
momo
b329034cfc fix:设置当前logo 2023-09-08 18:16:19 +08:00
laodaming
1442b0cf64 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-08 17:55:04 +08:00
laodaming
a5b5dff4d2 fix 2023-09-08 17:54:57 +08:00
momo
dfd3720068 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-08 17:36:14 +08:00
momo
c006cdc9b9 fix:设置当前logo 2023-09-08 17:36:11 +08:00
laodaming
62256cdde9 fix 2023-09-08 16:57:32 +08:00
laodaming
b7882ef06f fix 2023-09-08 14:25:47 +08:00
laodaming
d6c43e3e94 fix 2023-09-08 14:23:34 +08:00
momo
ae020a8b78 fix:设置当前logo 2023-09-08 11:49:10 +08:00
momo
c61c8a4933 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-08 11:47:59 +08:00
momo
7543f99f8b fix:设置当前logo 2023-09-08 11:47:53 +08:00
eson
a4363d0a47 fix 2023-09-08 11:08:13 +08:00
eson
9ad045c8f4 fix 2023-09-08 10:52:51 +08:00
momo
6cc35e6198 feat:用户设置logo 2023-09-07 18:52:01 +08:00
eson
ac6a81dedd Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-07 18:51:31 +08:00
laodaming
ea58b2316d fix 2023-09-07 18:48:48 +08:00
laodaming
c874097804 fix 2023-09-07 18:47:00 +08:00
eson
bf35122c38 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-07 18:39:36 +08:00
eson
b61a6a48f7 fix 2023-09-07 18:39:31 +08:00
laodaming
172ec53785 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-07 18:28:27 +08:00
laodaming
cb682a7ac0 fix 2023-09-07 18:28:19 +08:00
momo
818eee78be fix:logo历史列表调整 2023-09-07 16:54:49 +08:00
momo
b48417eee0 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-07 16:25:57 +08:00
momo
751e0e6e6b fix:logo历史列表调整 2023-09-07 16:25:29 +08:00
laodaming
998975e413 fix 2023-09-07 16:03:56 +08:00
laodaming
35eb087b5a fix 2023-09-07 15:54:24 +08:00
laodaming
45d93b94b4 1 2023-09-07 14:06:29 +08:00
momo
d49e966bf0 fix:上传logo 2023-09-07 13:27:32 +08:00
momo
89b5111040 fix:上传logo 2023-09-07 13:26:20 +08:00
momo
acf3b9bacc fix:上传logo 2023-09-07 13:23:43 +08:00
momo
98851a41ea fix:上传logo 2023-09-07 13:10:02 +08:00
momo
b8cf209d24 fix:上传logo 2023-09-07 12:31:36 +08:00
momo
3bdc8f03d6 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-07 12:23:22 +08:00
momo
70bda7e02c fix:上传logo 2023-09-07 12:23:19 +08:00
laodaming
7075dfb223 1 2023-09-07 12:23:04 +08:00
laodaming
f64b6e8a43 1 2023-09-07 12:19:52 +08:00
laodaming
cd108c6055 1 2023-09-07 12:13:40 +08:00
momo
a1f170b1ff Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-07 11:28:15 +08:00
momo
ba0f1e1ba2 fix:资源管理 2023-09-07 11:28:06 +08:00
laodaming
ce223049c7 1 2023-09-07 11:16:01 +08:00
laodaming
9462856ff9 1 2023-09-07 10:17:41 +08:00
laodaming
6fe3c5148e 1 2023-09-07 10:16:52 +08:00
laodaming
bc3719065b fix 2023-09-07 10:10:10 +08:00
laodaming
e800b18325 fix 2023-09-07 09:59:57 +08:00
laodaming
c80cb7bc9b Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-07 09:58:37 +08:00
laodaming
648a19cb8c fix 2023-09-07 09:58:28 +08:00
eson
aa0f5c2507 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-06 18:52:57 +08:00
eson
84ea0bd6f6 fix 2023-09-06 18:52:51 +08:00
laodaming
b3e51d31c3 fix 2023-09-06 18:51:47 +08:00
eson
48de2c7513 fix 2023-09-06 18:51:02 +08:00
eson
23d608b96b Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-06 18:47:11 +08:00
eson
2a31906da4 fix 2023-09-06 18:47:07 +08:00
laodaming
78d878bc05 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-06 18:45:32 +08:00
laodaming
8d5a101826 fix 2023-09-06 18:45:27 +08:00
eson
d1d1b2ced0 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-06 18:36:01 +08:00
eson
88a8e73943 fix 2023-09-06 18:35:57 +08:00
momo
b7404a9529 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-06 18:29:35 +08:00
momo
6367907e79 fix:图片缩略调整 2023-09-06 18:28:54 +08:00
laodaming
1f075dfb4a fix 2023-09-06 18:20:01 +08:00
laodaming
1586848565 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-06 17:18:58 +08:00
laodaming
b4bc4ddcf7 fix 2023-09-06 17:18:52 +08:00
eson
6c7933794d Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-06 17:10:44 +08:00
eson
f84a677050 fix 2023-09-06 17:10:37 +08:00
laodaming
aa69cb2f4f fix 2023-09-06 16:53:04 +08:00
laodaming
229084ce04 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-06 16:48:27 +08:00
laodaming
18afbae41f fix 2023-09-06 16:48:19 +08:00
eson
866d9179a9 fix 2023-09-06 16:35:44 +08:00
eson
b23e907871 fix 2023-09-06 16:33:24 +08:00
eson
7bcdea36ce Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-06 16:21:25 +08:00
eson
dc7b590977 fix 2023-09-06 16:21:21 +08:00
laodaming
4399c2c02e fix 2023-09-06 15:24:51 +08:00
laodaming
6d20c95f0b fix 2023-09-06 15:06:50 +08:00
laodaming
60f74f2297 fix 2023-09-06 15:04:51 +08:00
laodaming
13d91699f0 fix 2023-09-06 14:35:42 +08:00
eson
310c3af9dc Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-06 12:29:38 +08:00
eson
67230a58bf fix 2023-09-06 12:29:34 +08:00
laodaming
2cc275d702 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-06 12:22:06 +08:00
laodaming
9dc6581a8c fix 2023-09-06 12:21:58 +08:00
eson
6bbaac287b fix 2023-09-06 12:20:25 +08:00
eson
bd5fdbdbd3 fix 2023-09-06 12:17:40 +08:00
eson
cc0752b352 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-06 12:09:42 +08:00
eson
729f085ed0 fix 2023-09-06 12:09:38 +08:00
laodaming
3cdfe3c38a 11 2023-09-06 12:04:03 +08:00
laodaming
1b92bb12ea 11 2023-09-06 12:00:36 +08:00
laodaming
4895c4c417 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-06 11:50:04 +08:00
laodaming
c9207a892c 11 2023-09-06 11:49:56 +08:00
eson
6d45293207 fix 2023-09-06 11:41:25 +08:00
eson
982b9580a6 fix 2023-09-06 11:30:20 +08:00
eson
944c81687a fix 2023-09-06 11:22:35 +08:00
eson
5a9a23eb9c fix 2023-09-06 11:14:49 +08:00
laodaming
4d0081b19c 11 2023-09-06 10:48:45 +08:00
laodaming
a39076d739 11 2023-09-06 10:14:45 +08:00
laodaming
ff0e9cf17d 11 2023-09-06 10:09:59 +08:00
laodaming
9110e2bb35 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-06 10:00:17 +08:00
laodaming
b9532ebe86 11 2023-09-06 10:00:09 +08:00
68f80e4ec9 fix 2023-09-06 00:15:24 +08:00
60494f0533 fix 2023-09-06 00:12:14 +08:00
8e84eb4d00 fix 2023-09-06 00:08:51 +08:00
7bf4c238c2 fix 2023-09-06 00:06:10 +08:00
laodaming
33a3c22b69 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-05 18:39:02 +08:00
laodaming
d717e46d78 fix 2023-09-05 18:38:55 +08:00
eson
5671ada373 fix 2023-09-05 18:38:15 +08:00
eson
67bd956b6e fix 2023-09-05 18:35:10 +08:00
eson
996243553a Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-05 18:32:24 +08:00
eson
8e95bfb987 fix 2023-09-05 18:32:19 +08:00
laodaming
9258d66372 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-05 18:29:52 +08:00
laodaming
d2bb801fb4 fix 2023-09-05 18:29:44 +08:00
eson
0a748dfab7 fix 2023-09-05 18:24:20 +08:00
eson
ee7d82e174 fix 2023-09-05 17:53:52 +08:00
eson
f7d6e82a5d fix 2023-09-05 17:46:17 +08:00
eson
019ead1059 fix 2023-09-05 17:44:14 +08:00
eson
e0f561c8b8 fix 2023-09-05 17:40:34 +08:00
eson
1d9b70aa18 fix 2023-09-05 17:35:33 +08:00
eson
4342e09699 fix 2023-09-05 17:24:46 +08:00
eson
ca6a10c373 fix 2023-09-05 17:11:59 +08:00
eson
3a6eeb316b fix 2023-09-05 17:07:42 +08:00
eson
358e33c6eb fix 2023-09-05 17:03:48 +08:00
eson
ed68e274e2 fix 2023-09-05 16:59:24 +08:00
eson
59d11b3d4e fix 2023-09-05 16:55:02 +08:00
eson
1e837a6a4b fix 2023-09-05 16:51:32 +08:00
eson
ff8d62399f Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-05 16:37:08 +08:00
eson
f3d9852f98 fix 2023-09-05 16:37:04 +08:00
laodaming
262c8dc1b5 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-05 16:35:10 +08:00
laodaming
4fbbbb27df fix 2023-09-05 16:35:02 +08:00
eson
9547dcc891 fix 2023-09-05 16:30:16 +08:00
eson
9dc0aa5131 fix 2023-09-05 16:26:51 +08:00
eson
0d19c8b4d1 fix 2023-09-05 16:23:19 +08:00
eson
1e266c3a56 fix 2023-09-05 16:20:16 +08:00
eson
d9de812728 fix 2023-09-05 16:16:57 +08:00
eson
b3fcf0c77c fix 2023-09-05 16:14:43 +08:00
eson
f0d0b563b2 fix 2023-09-05 16:10:15 +08:00
eson
ebdbd91874 fix 2023-09-05 16:08:01 +08:00
eson
1c107ab960 fix 2023-09-05 15:53:04 +08:00
eson
63937ea358 fix 2023-09-05 15:44:17 +08:00
eson
2019bce30e fix 2023-09-05 15:38:53 +08:00
eson
b160b11a78 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-05 15:23:47 +08:00
eson
3533a96b56 fix 2023-09-05 15:23:43 +08:00
laodaming
fe270ed8e3 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-05 15:08:11 +08:00
laodaming
e5ddc9e3dc 优化ws代码结构 2023-09-05 15:08:03 +08:00
eson
81ad6122a7 fix 2023-09-05 15:00:45 +08:00
laodaming
d9daae7829 优化ws代码结构 2023-09-05 14:58:37 +08:00
laodaming
34c8014c95 优化ws代码结构 2023-09-05 14:45:15 +08:00
momo
a3c1b12078 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-05 14:41:43 +08:00
momo
0d894a4269 fix:资源详情调整 2023-09-05 14:41:36 +08:00
laodaming
fdb4abce3d fix 2023-09-05 14:39:35 +08:00
momo
afe85433fd fix:资源详情调整 2023-09-05 14:32:33 +08:00
momo
bd2fc545c7 fix:资源详情调整 2023-09-05 14:26:31 +08:00
laodaming
7cd48778e5 fix 2023-09-05 14:11:21 +08:00
laodaming
f6e70d0386 fix 2023-09-05 14:10:46 +08:00
laodaming
af81ea10f0 fix 2023-09-05 14:08:55 +08:00
laodaming
1ba6a0ed64 fix 2023-09-05 14:07:33 +08:00
laodaming
290859eaa2 fix 2023-09-05 14:05:21 +08:00
laodaming
038ac93db4 fix 2023-09-05 12:22:32 +08:00
laodaming
29c509f658 fix 2023-09-05 12:21:03 +08:00
laodaming
d8686abc34 fix 2023-09-05 11:01:04 +08:00
laodaming
0c1b15468c fix 2023-09-05 10:58:48 +08:00
laodaming
2f839ac85b fix 2023-09-05 10:53:18 +08:00
laodaming
10f401066b fix 2023-09-05 10:32:40 +08:00
laodaming
7d50379b3d fix 2023-09-05 10:30:59 +08:00
laodaming
c3674bb7da fix 2023-09-05 10:20:39 +08:00
laodaming
a395d1972e fix 2023-09-05 10:00:01 +08:00
laodaming
3f9672af6f Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-04 18:54:09 +08:00
laodaming
2668c232b1 fix 2023-09-04 18:54:03 +08:00
eson
3984d68b70 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-04 18:43:35 +08:00
eson
af1f26b322 fix 2023-09-04 18:43:31 +08:00
laodaming
b77695305a fix 2023-09-04 18:31:06 +08:00
laodaming
10252aa8fe fix 2023-09-04 18:29:25 +08:00
laodaming
d1aab4ded8 fix 2023-09-04 18:25:45 +08:00
laodaming
baf5c887b4 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-04 18:17:38 +08:00
laodaming
04f0b0c01e fix 2023-09-04 18:17:31 +08:00
eson
4b7f0bceaf Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-04 17:46:03 +08:00
eson
0a8c323be5 fix 2023-09-04 17:45:58 +08:00
laodaming
2e9b107375 fix 2023-09-04 17:11:40 +08:00
laodaming
a7db21cde8 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-04 17:04:42 +08:00
laodaming
bffcc7ea44 fix 2023-09-04 17:04:36 +08:00
eson
19b10262b1 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-04 16:59:48 +08:00
eson
03bd7cd5eb fix 2023-09-04 16:59:43 +08:00
laodaming
9861475aa1 fix 2023-09-04 16:54:55 +08:00
laodaming
2eb552e303 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-04 16:43:42 +08:00
laodaming
c65db5fe94 fix 2023-09-04 16:43:32 +08:00
eson
397dda8ebf Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-04 16:23:16 +08:00
eson
dc21c51a0c fix 2023-09-04 16:23:11 +08:00
laodaming
5b88e97307 fix 2023-09-04 15:17:30 +08:00
laodaming
4c62b941a0 fix 2023-09-04 15:06:07 +08:00
laodaming
1da29bb715 fix 2023-09-04 15:00:11 +08:00
laodaming
f6e2edf3a8 fix 2023-09-04 14:46:25 +08:00
laodaming
d1b2b24fcf fix 2023-09-04 14:44:35 +08:00
laodaming
c518b5a68d fix 2023-09-04 14:36:32 +08:00
laodaming
030d9f8ab3 fix 2023-09-04 14:26:55 +08:00
eson
c062848a95 fix 2023-09-04 13:29:36 +08:00
eson
336e4708d1 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-04 12:30:28 +08:00
eson
b01fc28fa9 fix 2023-09-04 12:30:24 +08:00
laodaming
0eedcdb7c2 fix 2023-09-04 12:22:47 +08:00
laodaming
87ceda11c0 fix 2023-09-04 12:20:25 +08:00
laodaming
9a6fc2505a fix 2023-09-04 11:43:21 +08:00
laodaming
49a7261f24 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-04 11:37:12 +08:00
laodaming
1b091892a4 fix 2023-09-04 11:37:04 +08:00
eson
1724a78cd0 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-04 11:32:21 +08:00
eson
8a20bda390 fix 2023-09-04 11:32:17 +08:00
laodaming
1a1903c826 fix 2023-09-04 11:21:24 +08:00
laodaming
ae80cf12f3 fix 2023-09-04 11:17:12 +08:00
eson
88ae58c9d8 fix 2023-09-04 10:59:17 +08:00
eson
9c013ac494 fix 2023-09-04 10:50:21 +08:00
9c89f0fe4a TODO: password 2023-09-04 01:40:28 +08:00
31f46b64b5 fix 2023-09-04 00:06:55 +08:00
eson
b4a80bcf98 fix 2023-09-01 17:13:31 +08:00
eson
7d9435ca29 fix 2023-09-01 17:03:27 +08:00
eson
38d963b9a5 fix 2023-09-01 16:31:22 +08:00
eson
624681838c fix 2023-09-01 16:28:07 +08:00
eson
1b14e69f58 fix 2023-09-01 16:25:17 +08:00
eson
8756acb3b1 fix 2023-09-01 16:23:50 +08:00
eson
1bd70a19e7 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-01 16:20:24 +08:00
eson
e8542369c7 fix 2023-09-01 16:20:19 +08:00
laodaming
8bdd90c055 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-01 16:19:32 +08:00
laodaming
0b4b7b718d 优化查询渲染模板流程 2023-09-01 16:19:23 +08:00
eson
4d6ca1d291 fix 2023-09-01 16:17:40 +08:00
eson
9b4895992d Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-01 16:10:37 +08:00
eson
79ad0a8d11 fix 2023-09-01 16:10:32 +08:00
laodaming
4a2ce8b737 优化查询渲染模板流程 2023-09-01 16:10:02 +08:00
eson
b4df337687 fix 2023-09-01 16:06:48 +08:00
eson
f3f47d0ead fix 2023-09-01 16:05:01 +08:00
eson
b155e571ff fix 2023-09-01 16:01:55 +08:00
eson
75a409f0ee fix 2023-09-01 16:00:47 +08:00
eson
81028ac52f fix 2023-09-01 15:59:23 +08:00
eson
dd44b7c696 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-01 15:58:07 +08:00
eson
749ff9e9f9 fix 2023-09-01 15:58:03 +08:00
laodaming
a6bd0cc6dd fix 2023-09-01 15:55:22 +08:00
laodaming
41f6f60f87 fix 2023-09-01 15:51:56 +08:00
laodaming
5df734c546 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-01 15:48:55 +08:00
laodaming
b64131dfe5 fix 2023-09-01 15:48:47 +08:00
eson
89d9bf123f fix 2023-09-01 15:05:42 +08:00
laodaming
a095de178f fix 2023-09-01 15:05:22 +08:00
momo
372b98bcee fix:优化 2023-09-01 15:04:18 +08:00
eson
8bd52126fb fix 2023-09-01 14:42:11 +08:00
eson
7ad02deeb1 fix 2023-09-01 14:38:32 +08:00
eson
859a61fdc5 fix 2023-09-01 14:36:34 +08:00
eson
cf10effc10 fix 2023-09-01 14:34:40 +08:00
eson
3becece63c fix 2023-09-01 14:27:51 +08:00
eson
dca5011ec1 fix 2023-09-01 14:25:46 +08:00
eson
28366d263b fix 2023-09-01 14:24:17 +08:00
eson
d9ea10f541 fix 2023-09-01 14:21:29 +08:00
eson
94a2e8f129 fix 2023-09-01 14:19:13 +08:00
eson
8bd87c77e5 fix 2023-09-01 14:12:38 +08:00
eson
e8167e7a4c fix 2023-09-01 14:09:38 +08:00
eson
e73a262a6b fix 2023-09-01 14:08:46 +08:00
eson
c81b4c309a fix 2023-09-01 14:04:39 +08:00
eson
8cc21c1797 fix 2023-09-01 13:36:05 +08:00
eson
7c7bd49141 fix 2023-09-01 13:34:29 +08:00
eson
1003ccfe30 fix 2023-09-01 13:32:17 +08:00
eson
6245387899 fix 2023-09-01 13:30:34 +08:00
eson
8337900423 fix 2023-09-01 13:28:35 +08:00
eson
0855abae7f fix 2023-09-01 13:24:40 +08:00
eson
54ee174fbf fix 2023-09-01 12:32:17 +08:00
eson
4ddf97b475 fix 2023-09-01 12:22:05 +08:00
momo
4d443e9cc3 fix:优化图片缩放 2023-09-01 11:38:24 +08:00
eson
aa4a48b68a fix 2023-09-01 10:48:00 +08:00
momo
2d62681600 fix:修改用户素材表时间结构 2023-09-01 10:27:28 +08:00
eson
6381d258c0 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-08-31 16:17:36 +08:00
eson
41e935bc65 fix 2023-08-31 16:17:32 +08:00
laodaming
a289ea0b05 fix 2023-08-31 16:00:54 +08:00
laodaming
fc178ac8b4 fix 2023-08-31 14:54:35 +08:00
laodaming
4529e42876 fix 2023-08-31 14:38:34 +08:00
eson
046ecb0ffb Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-08-31 12:20:09 +08:00
eson
60fa5df1de fix 2023-08-31 12:20:05 +08:00
laodaming
474cc4ddb7 fix 2023-08-31 12:19:02 +08:00
momo
7030846e37 feat:合图调整 2023-08-31 11:57:38 +08:00
momo
8fbab52044 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-31 11:56:18 +08:00
momo
ad7a8858a2 feat:合图调整 2023-08-31 11:56:15 +08:00
laodaming
eccd674bc5 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-31 11:51:02 +08:00
laodaming
0cabd3d284 fix 2023-08-31 11:50:55 +08:00
eson
22d00bd069 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-08-31 11:12:53 +08:00
eson
9ce997b51b fix 2023-08-31 11:12:49 +08:00
laodaming
e2d6182f62 fix 2023-08-31 11:04:27 +08:00
laodaming
a94aab855a fix 2023-08-31 10:35:13 +08:00
laodaming
0efa99665e Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-31 10:15:49 +08:00
laodaming
3127be9b85 fix 2023-08-31 10:15:43 +08:00
eson
9a7bb842f7 fix 2023-08-31 10:10:46 +08:00
laodaming
cf3994d7de Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-31 10:04:10 +08:00
laodaming
cd46a88eaa fix 2023-08-31 10:04:03 +08:00
momo
2853d8599f Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-30 18:56:24 +08:00
momo
d299a2aa3a feat:图片缩放 2023-08-30 18:56:06 +08:00
laodaming
0a6192427f Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-30 18:51:31 +08:00
laodaming
983686d96c fix 2023-08-30 18:51:24 +08:00
eson
b73816e687 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-08-30 18:44:46 +08:00
eson
0135a17ef8 fix 2023-08-30 18:44:41 +08:00
laodaming
6a6f135b61 fix 2023-08-30 18:31:20 +08:00
laodaming
4ac4f7ee9d fix 2023-08-30 18:02:02 +08:00
laodaming
a9b8df41f7 fix 2023-08-30 18:00:26 +08:00
laodaming
b8dbda6a4c fix 2023-08-30 17:46:47 +08:00
laodaming
6c36817750 fix 2023-08-30 17:40:40 +08:00
laodaming
2ce9776255 fix 2023-08-30 17:07:14 +08:00
laodaming
a4f8649de0 fix 2023-08-30 17:00:30 +08:00
laodaming
ad8588cb24 fix 2023-08-30 17:00:04 +08:00
laodaming
250ac8c593 fix 2023-08-30 16:53:55 +08:00
laodaming
1f14430052 fix 2023-08-30 16:45:45 +08:00
laodaming
2e790cd255 fix 2023-08-30 16:42:49 +08:00
eson
b2c68a9dc1 fix 2023-08-30 16:38:36 +08:00
eson
b727372bf2 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-08-30 16:28:59 +08:00
eson
da40278e26 fix 2023-08-30 16:28:55 +08:00
laodaming
37d824a7d9 1 2023-08-30 14:32:44 +08:00
eson
4c45b2287a Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-08-30 14:25:01 +08:00
eson
cdabc35606 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-08-30 14:24:56 +08:00
laodaming
cc929a27db 1 2023-08-30 14:24:54 +08:00
eson
13aa62c1a5 fix 2023-08-30 14:24:51 +08:00
laodaming
eab5f47203 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-30 14:22:22 +08:00
laodaming
88b0e834f5 1 2023-08-30 14:22:16 +08:00
eson
01142adfcb Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-08-30 14:21:13 +08:00
eson
09fb6c3a36 fix 2023-08-30 14:21:09 +08:00
laodaming
4457eba47f 1 2023-08-30 14:18:55 +08:00
laodaming
dda3da13cd 1 2023-08-30 14:04:31 +08:00
laodaming
13ca107963 1 2023-08-30 14:02:29 +08:00
eson
fe6baf6e41 fix 2023-08-30 11:46:15 +08:00
eson
b493a2b149 fix 2023-08-30 11:44:21 +08:00
eson
0d07d3e988 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-08-30 11:37:56 +08:00
eson
898b783b1a fix 2023-08-30 11:37:51 +08:00
laodaming
15be521af9 1 2023-08-30 11:37:44 +08:00
laodaming
89e714d7d8 fix 2023-08-30 11:25:20 +08:00
laodaming
f04330c85d fix 2023-08-30 11:13:10 +08:00
eson
e5e51fc6d5 fix 2023-08-30 11:07:47 +08:00
eson
f52224024e Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-08-30 11:04:59 +08:00
eson
71109d964b fix 2023-08-30 11:04:54 +08:00
laodaming
ebb5846111 fix 2023-08-30 11:01:49 +08:00
laodaming
81e9ac861a fix 2023-08-30 10:55:27 +08:00
eson
9ecb04c98b fix 2023-08-30 10:54:55 +08:00
eson
ac834fa299 fix 2023-08-30 10:52:18 +08:00
eson
2372dab72b fix 2023-08-30 10:49:19 +08:00
eson
5a2d1953dc Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-08-30 10:45:52 +08:00
eson
3ab7ed28d4 fix 2023-08-30 10:45:48 +08:00
momo
f137edbe46 fix:调整合图 2023-08-30 10:43:05 +08:00
eson
5e6b5cbbbd Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-08-30 10:41:59 +08:00
eson
1221baec10 更新 2023-08-30 10:41:49 +08:00
laodaming
58041cf838 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-29 18:22:20 +08:00
laodaming
802803d1e9 fix 2023-08-29 18:22:15 +08:00
eson
fc96d181b3 fix 2023-08-29 18:13:49 +08:00
eson
a24b110214 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-08-29 18:06:45 +08:00
eson
15692d6075 fix 2023-08-29 18:06:39 +08:00
momo
edfa22711e Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-29 18:00:42 +08:00
momo
a560098b34 fix:调整合图 2023-08-29 18:00:37 +08:00
laodaming
6e887d44cb fix 2023-08-29 17:48:52 +08:00
laodaming
42b169f3df Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-29 17:40:13 +08:00
laodaming
c28888c121 fix 2023-08-29 17:40:09 +08:00
eson
7a2b66f5ab fix 2023-08-29 17:22:58 +08:00
eson
aeb8677239 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-08-29 17:14:25 +08:00
eson
f7f5d497d9 fix 2023-08-29 17:14:20 +08:00
laodaming
220e669eca fix 2023-08-29 17:10:58 +08:00
laodaming
64b25e4bce fix 2023-08-29 17:09:00 +08:00
eson
6ede8daee6 fix 2023-08-29 16:49:11 +08:00
eson
6edb2aafdb Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-08-29 16:37:17 +08:00
eson
a89a4ba5d5 fix 2023-08-29 16:37:12 +08:00
laodaming
2782d06b2c fix 2023-08-29 16:36:36 +08:00
eson
1ddbc4867a fix 2023-08-29 16:35:02 +08:00
eson
b67a96f1ae fix 2023-08-29 16:33:27 +08:00
eson
e24b9ceac9 fix 2023-08-29 16:31:54 +08:00
eson
b118357d54 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-08-29 16:26:30 +08:00
eson
a8c44f7206 fix 2023-08-29 16:26:06 +08:00
laodaming
7bc05d393e Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-29 16:25:03 +08:00
laodaming
20ebe02e4e fix 2023-08-29 16:24:59 +08:00
eson
631a87abf1 fix 2023-08-29 16:24:20 +08:00
eson
ff7bbe66a7 fix 2023-08-29 16:15:34 +08:00
eson
1ed2346303 fix 2023-08-29 16:07:47 +08:00
eson
7a845bb83f fix 2023-08-29 16:02:54 +08:00
eson
8776e485ed Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-08-29 15:44:06 +08:00
eson
d6630f4335 fix 2023-08-29 15:44:01 +08:00
laodaming
5d32139e09 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-29 15:39:23 +08:00
laodaming
6784c02769 fix 2023-08-29 15:39:16 +08:00
eson
7f84cb5173 fix 2023-08-29 15:39:05 +08:00
eson
a83486bdf3 fix 2023-08-29 15:34:38 +08:00
laodaming
03988243bf fix 2023-08-29 15:31:33 +08:00
laodaming
df6e4a0899 fix 2023-08-29 15:30:54 +08:00
eson
7337895773 fix 2023-08-29 15:29:29 +08:00
eson
f2c4dc97e7 fix 2023-08-29 15:28:03 +08:00
eson
9a11599bc1 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-08-29 15:23:38 +08:00
eson
d721708615 fix 2023-08-29 15:23:33 +08:00
laodaming
d0acec05fa Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-29 15:22:02 +08:00
laodaming
06e69fe2c8 fix 2023-08-29 15:21:55 +08:00
eson
6493e53ef5 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-08-29 15:21:24 +08:00
eson
88e68c3903 fix 2023-08-29 15:21:19 +08:00
laodaming
8ec3ec07f6 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-29 15:19:07 +08:00
laodaming
25d743d506 fix 2023-08-29 15:18:50 +08:00
eson
0977c8aed2 fix 2023-08-29 15:17:51 +08:00
eson
461772efc3 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-08-29 15:15:45 +08:00
eson
d884624aad fix 2023-08-29 15:15:39 +08:00
laodaming
f3b8d1e057 fix 2023-08-29 15:13:25 +08:00
eson
57d95e0ebe fix 2023-08-29 15:11:19 +08:00
eson
56e38355d3 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-08-29 15:06:56 +08:00
eson
53f9bbe0d5 fix 2023-08-29 15:06:48 +08:00
laodaming
60255b5c45 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-29 15:04:20 +08:00
laodaming
6e716e17f9 fix 2023-08-29 15:04:11 +08:00
eson
101e589fdd fix 2023-08-29 15:03:45 +08:00
eson
2789fad2f1 fix 2023-08-29 14:57:09 +08:00
eson
b9447dae4d fix 2023-08-29 14:54:53 +08:00
eson
122c850d2e fix 2023-08-29 14:49:59 +08:00
eson
6baf9cd19c fix 2023-08-29 14:44:59 +08:00
eson
db2c41f0ce fix 2023-08-29 14:40:08 +08:00
eson
31bb514b34 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-08-29 14:36:58 +08:00
eson
229fe8f2d8 fix 2023-08-29 14:36:53 +08:00
laodaming
d07b910e13 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-29 14:35:11 +08:00
laodaming
f8a89a7bc6 fix 2023-08-29 14:35:04 +08:00
eson
8908273af5 fix 2023-08-29 14:27:00 +08:00
eson
7559777df7 fix 2023-08-29 14:24:50 +08:00
eson
d0d1f6a0f1 fix 2023-08-29 14:22:35 +08:00
eson
75909fa9e4 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-08-29 14:19:55 +08:00
eson
3103d69bae fix 2023-08-29 14:19:47 +08:00
laodaming
e7496fcebb Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-29 11:39:23 +08:00
laodaming
a40e3f2555 11 2023-08-29 11:39:15 +08:00
momo
d241b8da6c fix:用户信息调整 2023-08-29 11:35:53 +08:00
laodaming
8f2fdb1d5f Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-29 11:34:10 +08:00
laodaming
cc6e2d1ce0 11 2023-08-29 11:34:02 +08:00
eson
79b6277332 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-08-29 10:56:41 +08:00
eson
5bab5ff21f fix 2023-08-29 10:56:35 +08:00
laodaming
770e410116 11 2023-08-29 10:56:06 +08:00
eson
ee6f74bfb5 fix 2023-08-29 10:53:03 +08:00
eson
74581a1a1a Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-08-29 10:34:23 +08:00
eson
e3cab5859f fix 2023-08-29 10:34:10 +08:00
laodaming
ddf64ba5b9 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-29 10:31:58 +08:00
eson
c2680da930 fix 2023-08-29 10:31:36 +08:00
laodaming
71c60a8283 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-29 10:31:34 +08:00
laodaming
629030085c fix 2023-08-29 10:31:25 +08:00
eson
59161ddab5 fix 2023-08-29 10:30:07 +08:00
eson
368ce4a604 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-08-29 10:22:04 +08:00
eson
da4110ae8e 测试 2023-08-29 10:21:50 +08:00
laodaming
458202ba6e fix 2023-08-29 10:21:11 +08:00
laodaming
72a26c07f2 fix 2023-08-28 19:00:08 +08:00
laodaming
312a3c0632 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-28 18:43:43 +08:00
laodaming
330eda9f9b fix 2023-08-28 18:43:36 +08:00
eson
5fcbd218a3 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-08-28 18:38:47 +08:00
eson
39b652ce58 good 2023-08-28 18:38:34 +08:00
laodaming
3dc230495a fix 2023-08-28 18:37:58 +08:00
laodaming
55fa50f087 fix 2023-08-28 18:21:04 +08:00
laodaming
27c7b34555 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-28 18:16:26 +08:00
laodaming
83b724d301 fix 2023-08-28 18:16:19 +08:00
eson
bc057ed73d fix 2023-08-28 17:32:59 +08:00
eson
7c42d644fa fix 2023-08-28 17:31:03 +08:00
eson
a4fe298420 fix 2023-08-28 17:25:27 +08:00
eson
8c30648d3e fix 2023-08-28 17:20:08 +08:00
eson
f41bea0201 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-08-28 17:01:44 +08:00
eson
004f7e20cb fix 2023-08-28 17:01:36 +08:00
eson
13663f6c40 fix 2023-08-28 16:58:53 +08:00
momo
496c97eff1 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-28 16:12:02 +08:00
momo
02090f6401 fix:新的解析jwtToken返回 2023-08-28 16:11:54 +08:00
laodaming
22e62e1e05 1 2023-08-28 15:50:18 +08:00
laodaming
bb8c80d7f7 1 2023-08-28 15:47:25 +08:00
laodaming
b03f87c919 1 2023-08-28 15:40:56 +08:00
laodaming
d4b6ef5d7c 1 2023-08-28 15:37:45 +08:00
laodaming
083781737a 1 2023-08-28 15:34:30 +08:00
momo
fed40e2aa8 fix:新的解析jwtToken返回 2023-08-28 15:25:29 +08:00
momo
7dc95e3cba fix:新的解析jwtToken返回 2023-08-28 15:20:46 +08:00
momo
2efc0af5e0 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-28 15:17:45 +08:00
momo
c3286e41fa fix:调整上传设置 2023-08-28 15:17:36 +08:00
laodaming
3cf1295373 1 2023-08-28 15:09:01 +08:00
laodaming
a3f8e0e250 1 2023-08-28 14:57:01 +08:00
laodaming
04c1d2cf0e Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-28 14:56:08 +08:00
laodaming
f9de30a838 1 2023-08-28 14:56:01 +08:00
momo
7af3d2b2aa fix:修复日志配置 2023-08-28 14:51:58 +08:00
laodaming
3698705975 1 2023-08-28 14:44:46 +08:00
eson
9aa51c221c Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-08-28 14:21:19 +08:00
eson
bde9e98f62 fix 2023-08-28 14:21:06 +08:00
laodaming
aa7af1f5c8 11 2023-08-28 14:09:58 +08:00
eson
2830ea8724 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-08-28 12:23:22 +08:00
eson
aa5b90e0d4 fix 2023-08-28 12:23:12 +08:00
eson
d139ea2cee fix 2023-08-28 12:16:49 +08:00
laodaming
85fcbec0c2 11 2023-08-28 12:16:34 +08:00
laodaming
d53a971fd6 11 2023-08-28 12:15:03 +08:00
eson
30abb2bb06 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-08-28 12:12:17 +08:00
eson
6e03ee8c1b 观测 2023-08-28 12:11:57 +08:00
laodaming
31153253e1 11 2023-08-28 11:33:25 +08:00
eson
f2ce121aac Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-08-28 11:28:19 +08:00
eson
1a45340882 fix 2023-08-28 11:28:09 +08:00
laodaming
1230eaf255 11 2023-08-28 10:54:18 +08:00
laodaming
6f89ea9391 11 2023-08-28 10:53:03 +08:00
laodaming
d0921a26b2 11 2023-08-28 10:46:08 +08:00
laodaming
447f84ec6d 11 2023-08-28 10:44:19 +08:00
laodaming
48ddc3eb98 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-28 10:34:36 +08:00
laodaming
be72b745f3 11 2023-08-28 10:34:30 +08:00
eson
9b6396dfae Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-08-28 10:30:44 +08:00
momo
5c58ad5edf fix:添加链路追踪 2023-08-28 10:25:47 +08:00
laodaming
b8a6351e72 11 2023-08-28 10:22:51 +08:00
laodaming
e0afbb209c Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-28 10:00:26 +08:00
laodaming
d130f1390f 11 2023-08-28 10:00:18 +08:00
1bb5d4518a fix 2023-08-27 23:54:28 +08:00
eson
5d2b7df900 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-08-25 17:28:22 +08:00
eson
e8295ceed6 用数字调试用户 2023-08-25 17:27:42 +08:00
momo
1120dec011 fix:上下文 2023-08-25 17:05:47 +08:00
momo
5cba35bdc7 fix:上下文 2023-08-25 16:53:33 +08:00
momo
bb77d8f9aa fix:上下2 2023-08-25 16:46:58 +08:00
eson
7a02b3242e 测试 2023-08-25 16:44:10 +08:00
eson
e780709629 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-08-25 16:20:30 +08:00
eson
fb071cf60b 测试登录验证 2023-08-25 16:19:47 +08:00
laodaming
c793dad556 fix 2023-08-25 16:16:14 +08:00
eson
7234b06745 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-08-25 15:37:58 +08:00
eson
f91f9d3230 修复 jwt payload解析的错误 2023-08-25 15:37:35 +08:00
laodaming
195ad7c37f fix 2023-08-25 15:15:00 +08:00
laodaming
5d926a287d fix 2023-08-25 15:06:09 +08:00
laodaming
a635a2f546 fix 2023-08-25 14:59:36 +08:00
laodaming
b5b3042226 fix 2023-08-25 14:52:42 +08:00
laodaming
826ba92b8e fix 2023-08-25 14:49:24 +08:00
laodaming
a68a060a06 fix 2023-08-25 14:00:16 +08:00
laodaming
a9d565aff9 fix 2023-08-25 12:21:02 +08:00
laodaming
25ee551ae8 fix 2023-08-25 12:02:07 +08:00
laodaming
c4f888a52f fix 2023-08-25 12:01:01 +08:00
laodaming
6dbb6391c1 fix 2023-08-25 11:50:49 +08:00
laodaming
66532c0d98 fix 2023-08-25 11:28:36 +08:00
laodaming
348f10413b Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-25 11:26:52 +08:00
laodaming
413b7c6863 fix 2023-08-25 11:26:44 +08:00
momo
318e210086 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-25 11:21:49 +08:00
momo
24384f6a61 fix:请求算法,添加错误提示 2023-08-25 11:21:43 +08:00
laodaming
c9f9f40c6c Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-25 11:06:39 +08:00
laodaming
e3aff09ede fix 2023-08-25 11:06:32 +08:00
momo
f807069c83 fix:请求算法,添加错误提示 2023-08-25 10:49:52 +08:00
momo
ed6326f07d fix:请求算法,添加错误提示 2023-08-25 10:48:54 +08:00
momo
e7de0c7842 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-25 10:37:14 +08:00
momo
12097036ba fix:请求算法,添加错误提示 2023-08-25 10:37:07 +08:00
laodaming
7985c677f4 fix 2023-08-25 10:28:11 +08:00
momo
4fb4def7d8 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-25 10:08:53 +08:00
momo
3cb5ccc937 fix:请求算法,添加错误提示 2023-08-25 10:08:45 +08:00
eson
ede181d6dd Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-08-24 18:28:17 +08:00
eson
6919d61ef5 完善一部分websocket的代码 2023-08-24 18:28:01 +08:00
laodaming
e5db342f2d fix 2023-08-24 18:11:21 +08:00
laodaming
31aab91654 fix 2023-08-24 18:09:00 +08:00
laodaming
04ffa3cf9c fix 2023-08-24 18:02:00 +08:00
laodaming
4a41cb77e9 fix 2023-08-24 17:23:41 +08:00
laodaming
190010a6fe fix 2023-08-24 15:59:55 +08:00
laodaming
991f3c5cd5 fix 2023-08-24 15:51:32 +08:00
laodaming
dcdc949a90 fix 2023-08-24 15:45:23 +08:00
momo
d003844efd fix:添加log时间 2023-08-24 15:35:31 +08:00
laodaming
dad56a677b fix 2023-08-24 14:24:04 +08:00
laodaming
6c3344b127 fix 2023-08-24 14:11:17 +08:00
laodaming
57c61e5921 fix 2023-08-24 12:24:24 +08:00
laodaming
dca54ee2b7 fix 2023-08-24 12:18:04 +08:00
laodaming
aa89a74c2b fix 2023-08-24 12:04:58 +08:00
laodaming
48fb3ec4aa Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-24 12:00:51 +08:00
laodaming
58f49dfd76 fix 2023-08-24 12:00:44 +08:00
eson
db1e99dee2 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-08-24 11:57:20 +08:00
eson
648cf5cb20 删除metakey 2023-08-24 11:57:01 +08:00
laodaming
98c50565e6 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-24 11:56:17 +08:00
laodaming
78ceb147c5 fix 2023-08-24 11:56:10 +08:00
eson
bcd79f828c Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-08-24 11:47:39 +08:00
eson
d8ddad6fe9 修复json的类型影响 2023-08-24 11:47:22 +08:00
laodaming
2c41f59064 fix 2023-08-24 11:43:16 +08:00
laodaming
724b842167 fix 2023-08-24 11:38:42 +08:00
laodaming
6a45b1e1e7 fix 2023-08-24 11:27:53 +08:00
laodaming
002444ff82 fix 2023-08-24 11:03:46 +08:00
laodaming
db315accee fix 2023-08-24 11:03:33 +08:00
momo
6d707fa9df Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-23 18:38:57 +08:00
momo
c92944f0dc fix:裁剪业务逻辑调整 2023-08-23 18:38:51 +08:00
laodaming
810949c9d8 fix 2023-08-23 18:34:01 +08:00
laodaming
41909b7def fix 2023-08-23 18:18:44 +08:00
laodaming
6babc1c5cd Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-23 18:16:19 +08:00
laodaming
d349fe3197 fix 2023-08-23 18:16:12 +08:00
momo
5443ad654c fix:裁剪业务逻辑调整 2023-08-23 17:51:51 +08:00
laodaming
b2460bbc87 fix 2023-08-23 17:35:43 +08:00
laodaming
2cca06789a fix 2023-08-23 17:03:04 +08:00
laodaming
500611236e fix 2023-08-23 16:57:18 +08:00
momo
b68da2e68a fix:裁剪业务逻辑调整 2023-08-23 16:53:43 +08:00
eson
d31e84c425 修改数据库字段 2023-08-23 16:51:47 +08:00
laodaming
2321c5be77 fix 2023-08-23 16:45:01 +08:00
laodaming
a8457b7dad fix 2023-08-23 16:13:14 +08:00
laodaming
25bf157977 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-23 15:54:09 +08:00
laodaming
70544827cd fix 2023-08-23 15:54:02 +08:00
momo
e5093c4c5d Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-23 15:45:07 +08:00
momo
47401c49bd fix:裁剪业务逻辑调整 2023-08-23 15:44:59 +08:00
laodaming
2ae6c0cf85 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-23 15:36:08 +08:00
laodaming
3defd9a145 fix 2023-08-23 15:35:58 +08:00
momo
de52fd3ad2 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-23 15:33:58 +08:00
momo
b1a1979f79 fix:裁剪业务逻辑调整 2023-08-23 15:33:31 +08:00
laodaming
dc7dc7e1b9 fix 2023-08-23 15:21:50 +08:00
laodaming
45a179fc16 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-23 15:20:44 +08:00
laodaming
ab5004885a fix 2023-08-23 15:20:37 +08:00
momo
038f5d84ed fix:裁剪业务逻辑调整 2023-08-23 15:19:49 +08:00
momo
cda4c42b37 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-23 15:14:43 +08:00
momo
cf33f2f179 fix:裁剪业务逻辑调整 2023-08-23 15:14:34 +08:00
laodaming
24db7eb68a fix 2023-08-23 15:12:52 +08:00
momo
dc0ea32662 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-23 15:10:31 +08:00
momo
3a2abde3b4 fix:裁剪业务逻辑调整 2023-08-23 15:10:22 +08:00
laodaming
b91c8d75f0 fix 2023-08-23 15:08:45 +08:00
laodaming
be6b6a5076 fix 2023-08-23 14:28:35 +08:00
laodaming
0457da48c4 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-23 14:24:31 +08:00
laodaming
d93a9da8e6 fix 2023-08-23 14:24:24 +08:00
momo
eb3828a86a Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-23 14:23:14 +08:00
momo
89d8a8963c fix:裁剪业务逻辑调整 2023-08-23 14:22:36 +08:00
laodaming
a1fdbcc392 fix 2023-08-23 14:05:49 +08:00
laodaming
a72aa2feca fix 2023-08-23 12:29:59 +08:00
laodaming
41caa6db64 fix 2023-08-23 12:29:02 +08:00
momo
c942855683 fix:裁剪业务逻辑调整 2023-08-23 11:55:52 +08:00
momo
bf36829760 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-23 11:41:14 +08:00
momo
1e25f79d4a fix:裁剪业务逻辑调整 2023-08-23 11:41:02 +08:00
laodaming
8a715aac26 fix 2023-08-23 11:24:33 +08:00
momo
7f23905e76 fix:裁剪业务逻辑调整 2023-08-23 11:24:02 +08:00
momo
9ccd84abdd fix:裁剪业务逻辑调整 2023-08-23 11:23:26 +08:00
momo
9460504488 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-23 11:09:26 +08:00
momo
2ef3547724 fix:裁剪业务逻辑调整 2023-08-23 11:09:14 +08:00
laodaming
3593d32fb3 fix 2023-08-23 11:03:45 +08:00
laodaming
d5f33433c3 fix 2023-08-23 10:49:54 +08:00
laodaming
79b06c6c7d fix 2023-08-23 10:42:09 +08:00
laodaming
d7ff6f24c2 fix 2023-08-23 10:39:23 +08:00
laodaming
0a635e5113 fix 2023-08-23 10:06:17 +08:00
laodaming
3e7b4e9c4b fix 2023-08-22 18:37:49 +08:00
laodaming
7682843f3e fix 2023-08-22 18:31:25 +08:00
laodaming
0fab87065b fix 2023-08-22 18:24:24 +08:00
laodaming
f3f1de9961 fix 2023-08-22 18:22:27 +08:00
laodaming
b373b7ed73 fix 2023-08-22 17:19:53 +08:00
laodaming
bc04dbe43e fix 2023-08-22 17:18:06 +08:00
laodaming
425ad8be2c fix 2023-08-22 17:14:43 +08:00
laodaming
0001ea89f2 fix 2023-08-22 17:12:30 +08:00
laodaming
dab3dd7d85 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-22 16:35:28 +08:00
laodaming
a073257723 fix 2023-08-22 16:35:22 +08:00
eson
6313c37ec0 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-08-22 16:27:20 +08:00
eson
c6eb43b513 fix 2023-08-22 16:27:05 +08:00
laodaming
09f1758ad5 fix 2023-08-22 16:20:45 +08:00
laodaming
4df65a3b55 fix 2023-08-22 16:07:05 +08:00
laodaming
e1cf3097f5 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-22 15:44:03 +08:00
laodaming
e86b26cc0b fix 2023-08-22 15:43:50 +08:00
eson
bfea775c0b fix 2023-08-22 14:34:13 +08:00
eson
98f9c4396d fix 2023-08-22 14:24:40 +08:00
eson
f5c9909d00 修改 正确的表 2023-08-22 14:20:30 +08:00
eson
c45ac99810 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-08-22 14:18:02 +08:00
eson
9a2ab110db fix 2023-08-22 14:17:29 +08:00
laodaming
07cbe1c8c2 fix 2023-08-22 14:15:49 +08:00
laodaming
d09c648068 fix 2023-08-22 14:15:25 +08:00
eson
37c2144725 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-08-22 13:43:41 +08:00
eson
2dee02b6c5 修改mysql连接 2023-08-22 13:43:13 +08:00
laodaming
4811b9e4c2 fix 2023-08-22 12:21:31 +08:00
laodaming
0fd64a27bd fix 2023-08-22 12:16:02 +08:00
laodaming
592690c531 fix 2023-08-22 12:01:36 +08:00
laodaming
adf934faa1 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-22 11:49:03 +08:00
laodaming
36c1773cdd fix 2023-08-22 11:48:57 +08:00
momo
462ac4915b fix:base上传强制更新 2023-08-22 10:54:33 +08:00
momo
0440bd02a4 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-22 10:48:23 +08:00
momo
80a9517a1f fix:base上传强制更新 2023-08-22 10:48:10 +08:00
laodaming
efe5f01bb5 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-22 10:36:44 +08:00
laodaming
bfa1d53b44 fix 2023-08-22 10:36:38 +08:00
eson
d35ffd793a Merge branch 'develop' into feature/auth 2023-08-22 10:34:21 +08:00
momo
5e00447da3 fix 2023-08-22 10:21:46 +08:00
momo
0857ecfd15 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-22 10:16:10 +08:00
momo
988f6c2537 fix 2023-08-22 10:16:03 +08:00
laodaming
f6d2cf3ee8 fix 2023-08-22 10:10:44 +08:00
momo
865bb55a86 fix 2023-08-22 10:02:50 +08:00
momo
6c798adc97 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-22 10:00:21 +08:00
momo
7cd2192135 fix 2023-08-22 10:00:12 +08:00
eson
6284fdad38 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-08-21 19:07:22 +08:00
eson
fd2ca28876 fix 2023-08-21 19:07:02 +08:00
momo
1dd0c78868 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-21 19:01:53 +08:00
momo
2ee1b53f22 fix 2023-08-21 19:01:33 +08:00
laodaming
4216f3906c fix 2023-08-21 18:10:23 +08:00
laodaming
a5dcc5e89c fix 2023-08-21 18:05:51 +08:00
laodaming
29dedd407d Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-21 18:01:18 +08:00
laodaming
1c0a537a09 fix 2023-08-21 18:01:12 +08:00
eson
880ffc2a58 fix 2023-08-21 17:49:32 +08:00
laodaming
c2caccd8e2 fix 2023-08-21 17:45:51 +08:00
eson
e2e8f59fc5 restore 2023-08-21 16:49:50 +08:00
eson
1a230252c7 fix 2023-08-21 16:38:11 +08:00
eson
8a4c41d518 fix 2023-08-21 16:29:15 +08:00
eson
81566894f7 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-08-21 16:26:43 +08:00
eson
f929bff4c1 fix 2023-08-21 16:26:33 +08:00
laodaming
f8bb4dff17 fix 2023-08-21 16:19:30 +08:00
eson
7eda3cdd51 fix 2023-08-21 16:03:13 +08:00
eson
a23edd3e7b fix 2023-08-21 16:01:36 +08:00
eson
ebbcc2050c https 2023-08-21 15:57:37 +08:00
laodaming
1b04ac57e5 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-21 15:30:59 +08:00
laodaming
abdd263c44 fix 2023-08-21 15:30:52 +08:00
eson
f60fe1db56 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-08-21 15:29:44 +08:00
laodaming
72f07745b6 fix 2023-08-21 15:27:53 +08:00
eson
71fa126480 fix 2023-08-21 15:27:24 +08:00
eson
787bc76868 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-08-21 15:26:56 +08:00
eson
1998b62ab9 fix 2023-08-21 15:26:25 +08:00
laodaming
373b71ddff Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-21 15:24:33 +08:00
laodaming
ec96c10706 fix 2023-08-21 15:24:24 +08:00
momo
09780dad6c Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-21 14:59:30 +08:00
momo
7e96383530 fix 2023-08-21 14:59:21 +08:00
laodaming
4523274443 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-21 14:46:46 +08:00
laodaming
c19f4ba6d2 fix 2023-08-21 14:46:39 +08:00
momo
5e251e9868 fix 2023-08-21 14:39:03 +08:00
momo
94d93bf390 fix 2023-08-21 14:06:24 +08:00
momo
23d68effd4 fix:文件上传大小限制 2023-08-21 13:42:11 +08:00
momo
bd092f44c8 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-21 13:35:40 +08:00
momo
0e3ac4cb77 fix:文件上传大小限制 2023-08-21 13:35:31 +08:00
laodaming
46ce6ded3c fix 2023-08-21 13:19:12 +08:00
laodaming
e2744a54f2 fix 2023-08-21 11:27:17 +08:00
laodaming
feae3ada33 fix 2023-08-21 11:25:56 +08:00
laodaming
0990644b4a fix 2023-08-21 10:53:21 +08:00
laodaming
346ffd1620 fix 2023-08-21 10:27:25 +08:00
laodaming
6a912a145e fix 2023-08-21 10:21:02 +08:00
momo
c47927d192 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-21 10:09:39 +08:00
momo
c62d5fd1d5 fix:hash优化 2023-08-21 10:09:26 +08:00
laodaming
bc6959bc9a fix 2023-08-21 09:57:57 +08:00
Hiven
c701236f1d Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-18 19:37:16 +08:00
Hiven
1b5e9623a0 fix:合图调整 2023-08-18 19:37:11 +08:00
eson
65dc3bf6ab Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-08-18 19:35:47 +08:00
laodaming
565b6909cf Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-18 19:34:26 +08:00
eson
3f9c050ca5 test 2023-08-18 19:34:23 +08:00
laodaming
65b2519f52 fix 2023-08-18 19:34:18 +08:00
Hiven
eb2012c5d1 fix:图片裁剪 2023-08-18 19:15:34 +08:00
Hiven
e11d777f18 fix:图片裁剪 2023-08-18 18:55:56 +08:00
Hiven
cefa83e1e2 fix:图片裁剪 2023-08-18 18:41:51 +08:00
Hiven
ca645368aa Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-18 18:27:18 +08:00
Hiven
e36f688c03 fix:图片裁剪 2023-08-18 18:27:10 +08:00
laodaming
ccaca2ae07 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-18 17:52:25 +08:00
laodaming
5c7d1bb6b0 fix 2023-08-18 17:52:19 +08:00
Hiven
0f576cc3c2 fix:图片裁剪 2023-08-18 17:51:51 +08:00
Hiven
588b07915b fix:图片裁剪 2023-08-18 17:41:21 +08:00
Hiven
2e3a431474 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-18 17:38:16 +08:00
Hiven
fa97e20ae1 fix:图片裁剪 2023-08-18 17:38:12 +08:00
laodaming
75aacbcc65 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-18 17:33:52 +08:00
laodaming
8da61f90e4 fix 2023-08-18 17:33:42 +08:00
Hiven
60e4713806 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-18 17:16:54 +08:00
Hiven
cba012a2b0 fix:上传大图限制 2023-08-18 17:16:49 +08:00
laodaming
4f1bb51d8f fix 2023-08-18 17:08:56 +08:00
laodaming
1bde6e5d53 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-18 16:58:36 +08:00
laodaming
5af797eeae fix 2023-08-18 16:58:30 +08:00
Hiven
7807033c1a Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-18 16:47:33 +08:00
Hiven
05137f3fe5 fix:上传大图限制 2023-08-18 16:47:22 +08:00
laodaming
1309473d7b fix 2023-08-18 16:23:04 +08:00
laodaming
2d498a06a0 fix 2023-08-18 16:21:45 +08:00
laodaming
62afaeda07 fix 2023-08-18 16:20:45 +08:00
laodaming
b8ca7360b1 fix 2023-08-18 16:15:44 +08:00
laodaming
04982bae18 fix 2023-08-18 16:03:29 +08:00
laodaming
a19d526e72 fix 2023-08-18 15:02:08 +08:00
laodaming
4060b5775b fix 2023-08-18 14:59:23 +08:00
laodaming
868f9a4192 fix 2023-08-18 14:57:21 +08:00
laodaming
f8c86b1f03 fix 2023-08-18 12:30:53 +08:00
laodaming
1f36e62727 fix 2023-08-18 12:18:56 +08:00
laodaming
d0692bbf88 fix 2023-08-18 12:06:59 +08:00
laodaming
6036b23386 fix 2023-08-18 11:43:50 +08:00
laodaming
21db59c507 fix 2023-08-18 11:42:24 +08:00
laodaming
f519e27719 fix 2023-08-18 11:41:36 +08:00
laodaming
530d711f75 fix 2023-08-18 11:05:18 +08:00
laodaming
37d32a26ab fix 2023-08-18 10:26:33 +08:00
laodaming
430cd22dc3 fix 2023-08-17 18:22:09 +08:00
laodaming
d760f4e28c fix 2023-08-17 18:22:00 +08:00
laodaming
72e9156e32 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-17 18:19:25 +08:00
laodaming
f892a216d6 fix 2023-08-17 18:19:15 +08:00
Hiven
ff6167e713 fix:上传模块调整 2023-08-17 17:20:43 +08:00
laodaming
68b125f5a6 fix 2023-08-17 17:05:42 +08:00
laodaming
a28fbd2aa6 fix 2023-08-17 16:50:44 +08:00
laodaming
7eea85e49d fix 2023-08-17 16:28:15 +08:00
laodaming
5ab2bb51e2 fix 2023-08-17 16:22:26 +08:00
laodaming
509e82db63 fix 2023-08-17 16:17:25 +08:00
laodaming
cda5c69f4f fix 2023-08-17 16:16:27 +08:00
laodaming
6dba8507a7 fix 2023-08-17 16:11:09 +08:00
laodaming
17556690ed fix 2023-08-17 16:07:27 +08:00
laodaming
1c2ab8c645 fix 2023-08-17 15:54:21 +08:00
laodaming
784d8f2624 fix 2023-08-17 15:54:03 +08:00
laodaming
5bde276c6d fix 2023-08-17 15:41:54 +08:00
laodaming
200680f85f fix 2023-08-17 15:39:37 +08:00
laodaming
3b757b0dab fix 2023-08-17 15:35:17 +08:00
laodaming
76fecbde7e fix 2023-08-17 15:29:54 +08:00
laodaming
6fdc784a9d fix 2023-08-17 15:22:09 +08:00
laodaming
666147cfe6 fix 2023-08-17 15:11:32 +08:00
laodaming
05f61fc8b2 fix 2023-08-17 14:48:27 +08:00
laodaming
ddfed4a2ef fix 2023-08-17 14:11:11 +08:00
eson
d012ef5f83 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/auth 2023-08-17 14:10:20 +08:00
laodaming
3f9ccaeea8 fix 2023-08-17 14:03:52 +08:00
laodaming
d59131af4b fix 2023-08-17 12:14:38 +08:00
Hiven
d2fbc5c29e Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-17 12:14:25 +08:00
Hiven
c1fddf2a14 fix:上传模块调整 2023-08-17 12:14:19 +08:00
laodaming
82c7fc96f5 fix 2023-08-17 11:56:37 +08:00
Hiven
8996424556 fix:上传模块调整 2023-08-17 11:51:05 +08:00
laodaming
d2c8fa9020 fix 2023-08-17 11:49:31 +08:00
Hiven
98c5eae6ee Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-17 11:46:31 +08:00
Hiven
c3cd57b7e5 fix:上传模块调整 2023-08-17 11:46:17 +08:00
laodaming
5b4dd9f360 fix 2023-08-17 11:44:18 +08:00
laodaming
3ed2e0e06c fix 2023-08-17 11:36:41 +08:00
Hiven
a80a71255a Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-17 11:29:38 +08:00
Hiven
69030d31de fix:重构合图模块 2023-08-17 11:29:32 +08:00
laodaming
f84644b406 fix 2023-08-17 11:28:56 +08:00
laodaming
8de81859d2 fix 2023-08-17 11:15:42 +08:00
laodaming
be95ff9d05 fix 2023-08-17 11:14:47 +08:00
laodaming
748b7e5b66 fix 2023-08-17 11:11:58 +08:00
laodaming
757a7fb0b4 fix 2023-08-17 11:09:59 +08:00
laodaming
b222579633 fix 2023-08-17 10:39:02 +08:00
laodaming
07dbf5eb6d fix 2023-08-16 17:48:03 +08:00
laodaming
2714ffd0d8 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-16 17:36:36 +08:00
laodaming
1a0286a1cb fix 2023-08-16 17:36:25 +08:00
Hiven
7afb089f0d Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-16 17:33:39 +08:00
Hiven
cb3e8d4db6 fix:重构合图模块 2023-08-16 17:33:34 +08:00
laodaming
a422979748 fix 2023-08-16 17:18:51 +08:00
laodaming
d3220e2461 fix 2023-08-16 17:10:22 +08:00
laodaming
5bafc6cc43 fix 2023-08-16 17:07:53 +08:00
laodaming
886e765d4b fix 2023-08-16 17:06:52 +08:00
laodaming
c692d74442 fix 2023-08-16 17:04:45 +08:00
laodaming
7f9edcca2e Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-16 16:55:38 +08:00
laodaming
4d215beabc fix 2023-08-16 16:55:31 +08:00
Hiven
9bcb95e540 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-16 16:33:34 +08:00
Hiven
1af3399a9d fix:重构合图模块 2023-08-16 16:33:25 +08:00
laodaming
c8ff11b633 fix 2023-08-16 16:26:44 +08:00
laodaming
29b5d59b05 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-16 16:20:23 +08:00
laodaming
d0bd037d7b fix 2023-08-16 16:20:16 +08:00
Hiven
09f081c1ad Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-16 16:08:52 +08:00
Hiven
4a8b245ffd fix:重构合图模块 2023-08-16 16:08:48 +08:00
laodaming
c5dd4866b9 fix 2023-08-16 15:46:10 +08:00
laodaming
2b05154fc4 fix 2023-08-16 15:42:46 +08:00
laodaming
ca1faa7ace fix 2023-08-16 15:39:14 +08:00
laodaming
dc4c87b323 fix 2023-08-16 15:38:17 +08:00
laodaming
6e78e4f209 fix 2023-08-16 14:29:25 +08:00
laodaming
7d2c2ab025 fix 2023-08-16 14:16:33 +08:00
laodaming
7bdd1f00af fix 2023-08-16 14:09:03 +08:00
laodaming
37b5cc0f30 fix 2023-08-16 12:33:01 +08:00
laodaming
a022e5a8d9 fix 2023-08-16 12:16:23 +08:00
laodaming
b11e768550 fix 2023-08-16 10:58:34 +08:00
eson
6fe706e9e7 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/auth 2023-08-16 10:43:33 +08:00
eson
66de41adbb fix 2023-08-16 10:41:21 +08:00
eson
e565565627 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/auth 2023-08-16 10:22:12 +08:00
laodaming
ac1800bb26 fix 2023-08-15 19:43:50 +08:00
laodaming
68ed14b373 fix 2023-08-15 18:38:33 +08:00
Hiven
b4a06dc66f Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-15 18:35:23 +08:00
Hiven
69f08415fc fix:重构合图模块 2023-08-15 18:35:16 +08:00
laodaming
d603cacd0b fix 2023-08-15 18:14:44 +08:00
laodaming
6502f241ab fix 2023-08-15 17:40:27 +08:00
laodaming
12b1905f11 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-15 17:36:23 +08:00
laodaming
8d0a675dd9 fix 2023-08-15 17:36:17 +08:00
Hiven
318f92b869 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-15 17:19:14 +08:00
Hiven
cebd92becd fix:重构合图模块 2023-08-15 17:19:05 +08:00
laodaming
35cb2ef1ce fix 2023-08-15 17:10:43 +08:00
laodaming
7542c35184 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-15 16:50:44 +08:00
laodaming
c4dc31493a fix 2023-08-15 16:50:35 +08:00
Hiven
bd8a74701e Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-15 16:14:54 +08:00
Hiven
ee92561769 fix:重构合图模块 2023-08-15 16:14:49 +08:00
Hiven
10b4b6656f fix:重构合图模块 2023-08-15 16:14:12 +08:00
laodaming
c9dfec717c fix 2023-08-15 15:47:39 +08:00
laodaming
a3015e9fdd fix 2023-08-15 15:09:53 +08:00
Hiven
e8f7bda7b2 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-15 14:52:04 +08:00
Hiven
98b0765363 fix:重构合图模块 2023-08-15 14:51:54 +08:00
laodaming
a58bd967e9 fix 2023-08-15 14:31:51 +08:00
laodaming
48cd4b2fea fix 2023-08-15 14:21:32 +08:00
laodaming
f4e3834d95 fix 2023-08-15 14:04:44 +08:00
laodaming
54568173af fix 2023-08-15 13:35:23 +08:00
laodaming
edf89ea301 fix 2023-08-15 12:34:41 +08:00
Hiven
3ce253b1e5 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-15 11:59:43 +08:00
Hiven
fa83f6c17f fix:重构合图模块 2023-08-15 11:59:35 +08:00
laodaming
913b529fa1 fix 2023-08-15 11:59:12 +08:00
Hiven
76e0884c11 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-15 11:20:19 +08:00
Hiven
90229ca23e fix:重构合图模块 2023-08-15 11:20:09 +08:00
laodaming
c5ef6cfa14 fix 2023-08-15 11:18:22 +08:00
Hiven
f65f5673f8 fix:重构合图模块 2023-08-15 10:58:58 +08:00
Hiven
aa3525c7ce Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-15 10:58:29 +08:00
Hiven
d1c6f5cdc5 fix:重构合图模块 2023-08-15 10:58:24 +08:00
laodaming
f652a98c0e fix 2023-08-14 18:40:34 +08:00
Hiven
b9a95cecf6 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-14 17:56:11 +08:00
Hiven
05e3853134 fix:重构合图模块 2023-08-14 17:56:06 +08:00
laodaming
24a5bf11a3 fix 2023-08-14 17:31:57 +08:00
laodaming
94a36bd98e fix 2023-08-14 15:58:31 +08:00
laodaming
63a7aa0a3d fix 2023-08-14 15:52:10 +08:00
laodaming
1c03e5bb01 fix 2023-08-14 15:49:24 +08:00
laodaming
50da55d7bb fix 2023-08-14 15:46:28 +08:00
laodaming
357f402031 fix 2023-08-14 15:18:07 +08:00
laodaming
13c6eea1a8 fix 2023-08-14 15:08:24 +08:00
laodaming
81bfb0dda8 fix 2023-08-14 15:07:12 +08:00
laodaming
b7849935a0 fix 2023-08-14 15:06:32 +08:00
Hiven
fde5ef8b25 feat:新增商户列表/保存用户信息 2023-08-14 14:41:54 +08:00
Hiven
57e635c26c feat:新增商户列表/保存用户信息 2023-08-14 14:40:50 +08:00
laodaming
bdd9a70a2d fix 2023-08-14 14:21:14 +08:00
eson
187cb48a41 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/auth 2023-08-14 14:12:33 +08:00
eson
117330ee16 基本完成重置密码和忘记密码 2023-08-14 14:09:38 +08:00
laodaming
6844142603 fix 2023-08-14 12:31:49 +08:00
laodaming
35b02302eb fix 2023-08-14 12:30:14 +08:00
laodaming
5bc6f411be fix 2023-08-14 12:05:22 +08:00
laodaming
06e32e6af9 fix 2023-08-14 11:53:16 +08:00
laodaming
aa895fda51 fix 2023-08-14 11:49:02 +08:00
laodaming
76b291c02a fix 2023-08-14 11:46:29 +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
538d9ff4cf fix 2023-08-14 10:51:39 +08:00
laodaming
f8792a9c2b Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-11 18:59:11 +08:00
laodaming
48afd3105f fix 2023-08-11 18:59:03 +08:00
eson
ae07370214 重置密码 2023-08-11 17:39:18 +08:00
Hiven
9b0a18fcd8 fix:更新测试环境 2023-08-11 17:22:14 +08:00
Hiven
a587a19dbf fix:更新测试环境 2023-08-11 15:30:55 +08:00
Hiven
2368b79fa9 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-11 15:28:24 +08:00
Hiven
94e15c1c19 fix:更新测试环境 2023-08-11 15:28:03 +08:00
laodaming
ed8904ca5e Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-11 14:52:23 +08:00
laodaming
dbe6e99f2d fix 2023-08-11 14:52:16 +08:00
Hiven
0edcf1e65f fix:更新测试环境 2023-08-11 14:38:57 +08:00
Hiven
1a35669b95 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-11 14:27:55 +08:00
Hiven
266ff9075f fix:更新测试环境 2023-08-11 14:27:46 +08:00
eson
9664271474 修改Wid为string 2023-08-11 12:07:26 +08:00
eson
c40cd1e180 Merge branch 'develop' into feature/auth 2023-08-11 11:31:34 +08:00
laodaming
84749f4d14 fix 2023-08-11 10:49:29 +08:00
laodaming
b0e534de8c fix 2023-08-11 10:12:25 +08:00
laodaming
df8772812a fix 2023-08-10 19:42:31 +08:00
laodaming
b085f3dbef fix 2023-08-10 19:41:25 +08:00
eson
c7cf72030a 删除多余文件 2023-08-10 19:18:54 +08:00
laodaming
d101d241f4 fix 2023-08-10 19:12:07 +08:00
Hiven
34a055aa05 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-10 19:08:20 +08:00
Hiven
83b0b7f5ab fix:修复上传 2023-08-10 19:08:06 +08:00
laodaming
53d63f2590 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-10 18:38:38 +08:00
laodaming
161ee4304b fix 2023-08-10 18:38:31 +08:00
eson
86024d69b3 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-08-10 18:30:17 +08:00
eson
4ec7bc6106 代理成功 2023-08-10 18:30:02 +08:00
laodaming
d85c39327c fix 2023-08-10 18:18:00 +08:00
laodaming
ea2fd732a2 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-10 18:12:15 +08:00
laodaming
0c4f33b486 fix 2023-08-10 18:12:07 +08:00
eson
42193df505 测试websocket 2023-08-10 17:41:36 +08:00
eson
f047419fcb Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-08-10 17:32:02 +08:00
eson
b9aa0e6d10 修复 代理错误 2023-08-10 17:31:45 +08:00
eson
432db5aec5 Merge branch 'develop' into feature/auth 2023-08-10 17:31:03 +08:00
laodaming
f8df7b55b3 fix 2023-08-10 16:53:50 +08:00
eson
2a2b5af0ca 修改 websocket的支持 2023-08-10 16:44:45 +08:00
eson
8c07a5f5d7 保存为了 websocket 2023-08-10 16:25:41 +08:00
Hiven
d10f404206 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-10 16:13:13 +08:00
Hiven
74cadf6e5b fix:修复上传 2023-08-10 16:13:06 +08:00
laodaming
5e0fc44855 fix 2023-08-10 15:44:42 +08:00
laodaming
6bb1acd7a2 fix 2023-08-10 15:42:58 +08:00
laodaming
2d9da17c58 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-10 15:24:37 +08:00
laodaming
22f34ec883 fix 2023-08-10 15:24:30 +08:00
Hiven
a2ee8327ac Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-10 15:23:35 +08:00
Hiven
13ad52d095 fix:修复上传 2023-08-10 15:23:28 +08:00
laodaming
979c5c9e14 fix 2023-08-10 15:21:28 +08:00
laodaming
6e38e0ac70 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-10 15:18:40 +08:00
laodaming
d91a7c0058 fix 2023-08-10 15:18:33 +08:00
Hiven
5f1a07f737 fix:修复上传 2023-08-10 14:58:33 +08:00
Hiven
db5b576799 fix:修复上传 2023-08-10 14:49:46 +08:00
Hiven
4fbc17d707 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-10 14:30:09 +08:00
Hiven
7f44f46336 fix:修复上传 2023-08-10 14:29:59 +08:00
laodaming
870f39ffc5 fix 2023-08-10 14:25:14 +08:00
laodaming
63093c6953 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-10 14:03:39 +08:00
laodaming
07f389aff8 fix 2023-08-10 14:03:31 +08:00
Hiven
a5a15664c9 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-10 14:01:28 +08:00
Hiven
5f9888ca84 fix:修复上传 2023-08-10 14:01:22 +08:00
laodaming
bd82008985 fix 2023-08-10 12:30:53 +08:00
eson
440f13bee8 感动中国 2023-08-10 12:04:36 +08:00
laodaming
3023c7d9dd fix 2023-08-10 11:39:57 +08:00
laodaming
0208110cbc fix 2023-08-10 11:34:04 +08:00
laodaming
2b5c8c9cd6 fix 2023-08-10 10:47:48 +08:00
eson
68488da99c Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/auth 2023-08-10 10:44:24 +08:00
laodaming
104a9db7ea fix 2023-08-10 10:19:37 +08:00
laodaming
5470f22e77 fix 2023-08-09 19:34:11 +08:00
eson
0d0a0c3607 开始登录 2023-08-09 19:02:50 +08:00
laodaming
583592b7d3 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-09 18:09:23 +08:00
laodaming
ea0804ad63 fix 2023-08-09 18:09:16 +08:00
Hiven
c004b06602 fix:上传logo 2023-08-09 18:05:39 +08:00
laodaming
3f73edae00 fix 2023-08-09 17:11:45 +08:00
laodaming
731cf006a6 fix 2023-08-09 17:08:50 +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
c51c9f228c fix 2023-08-09 16:08:58 +08:00
laodaming
64536beae6 fix 2023-08-09 16:06:40 +08:00
laodaming
84dc60be49 fix 2023-08-09 15:46:57 +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
laodaming
e11e321d86 fix 2023-08-09 10:59:17 +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
84ac7d92b2 fix 2023-08-07 18:37:33 +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
laodaming
d5a6f780a5 fix 2023-08-04 16:50:01 +08:00
laodaming
50ef8db377 fix 2023-08-04 16:09:05 +08:00
laodaming
8b88a78e4d fix 2023-08-04 13:25:51 +08:00
laodaming
c9d832ecde fix 2023-08-04 12:21:30 +08:00
laodaming
87ff8335bc fix 2023-08-04 10:35:26 +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
e00c813e72 fix 2023-08-03 17:49:17 +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
c49235b59d fix 2023-08-03 17:30:46 +08:00
laodaming
57af3338a2 fix 2023-08-03 17:12:58 +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
eson
b73f846b7f go 2023-08-02 19:08:44 +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
laodaming
c08c1e7eba fix 2023-08-02 11:42:03 +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
c7f3ca5ab4 fix 2023-07-31 10:40:54 +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
47ae46c46d 修复一部分fsm 2023-07-30 18:50:27 +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
b8c77f1db1 fix 2023-07-28 17:43:19 +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
ae717f932e 合并 2023-07-28 11:24:10 +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
64c6c19918 更新 新的表 2023-07-27 16:56:51 +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
4eb37c3820 fix 2023-07-27 16:14:27 +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
736f57c0c2 fix 2023-07-26 14:17:30 +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
bfa1872595 自动获取服务列表 2023-07-21 11:14:24 +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
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
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
eson
20a7149eb6 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-07-19 16:45:07 +08:00
eson
a3151acb70 修改fs_user的sub字段 2023-07-19 16:44:45 +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
52d3767256 尝试提交一个 兼容windows版本的 shell 2023-07-19 12:12:27 +08:00
eson
a62b8692f5 添加 其他服务的二进制忽略 2023-07-19 11:49:21 +08:00
eson
545192b8ac 添加proxyserver二进制文件忽略 2023-07-19 11:29:50 +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
eson
3c9fb417aa 提交api前缀修改 2023-07-12 11:09:43 +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
eson
d20a1b0354 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-07-11 18:48:31 +08:00
eson
3d60f7053e 修改 2023-07-11 18:48:22 +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
406d62a894 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-07-11 16:50:46 +08:00
eson
aabf8faca7 添加强制路由转发 配合vue的静态文件 2023-07-11 16:50:18 +08:00
laodaming
bb18b5effa fix 2023-07-11 15:01:08 +08:00
laodaming
8e207ef600 fix 2023-07-11 14:16:13 +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
f5b3fedee3 上传一些新的操作脚本 2023-07-10 14:59:03 +08:00
eson
2681c10b4c 删除一些冗余api文件 2023-07-10 14:00:23 +08:00
eson
0db491bc01 修复路径的问题 2023-07-10 13:10:43 +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
70fd711fa5 TODO 各种格式 2023-07-06 19:47:27 +08:00
eson
3b462edc89 删除配置文件夹 2023-07-06 18:25:04 +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
791121c574 fix 2023-07-06 17:55:59 +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
83bfa8977c fix 2023-07-05 17:00:03 +08:00
laodaming
2af55fb898 fix 2023-07-05 16:58:16 +08:00
laodaming
c45028b914 fix 2023-07-05 16:44:56 +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
eson
c6005983f8 upload file 2023-07-04 19:59:54 +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
7e9cdbfb57 fix 2023-07-03 17:57:41 +08:00
laodaming
88bd7798b8 fix 2023-07-03 17:35:36 +08:00
laodaming
22b27141a4 fix 2023-07-03 17:33:59 +08:00
eson
5934017dbf 修改 model 序列化提示, 防止空值传入 2023-07-03 14:47:10 +08:00
eson
07121d0294 序列化修复 2023-07-03 14:36:11 +08:00
eson
9a840f420e 最新版本 2023-07-03 14:34:16 +08:00
laodaming
c17ab5ae5c fix 2023-06-30 17:20:11 +08:00
laodaming
5ac62e7c55 fix 2023-06-30 12:00:53 +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
42314b9807 fix 2023-06-26 17:59:54 +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
0afaed5089 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-25 20:01:38 +08:00
eson
150ae1df77 TODO: backend 2023-06-25 20:00:27 +08:00
laodaming
acc756f9cc fix 2023-06-25 19:47:31 +08:00
laodaming
4d4996c6f4 fix 2023-06-25 19:43:17 +08:00
eson
8fae3400d3 可以了 2023-06-25 19:33:25 +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
edda375a53 fix 2023-06-25 18:08:30 +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
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
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
fe17a10eb8 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-06-20 17:28:39 +08:00
laodaming
7ef6f453dc fix 2023-06-20 17:28:28 +08:00
eson
d64998c16d 修复int64 2023-06-20 16:48:51 +08:00
eson
c870ab773a Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-20 16:47:14 +08:00
eson
2d3c394c73 Order 枚举 2023-06-20 16:46:56 +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
db954e88d4 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-19 20:10:52 +08:00
eson
db155a71a0 todo: add-address 2023-06-19 20:10:32 +08:00
laodaming
b9e00a72d0 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-06-19 18:44:49 +08:00
eson
640d3261e0 添加自增控制 2023-06-19 18:27:31 +08:00
laodaming
19984e2dba fix 2023-06-19 17:44:34 +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
56a3c05eae Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-06-19 10:34:25 +08:00
laodaming
eef4bb35c9 1 2023-06-19 10:34:21 +08:00
eson
19d325fb77 改配置名字 2023-06-19 10:33:51 +08:00
eson
33c7d27b3b 删除没必要的文件 2023-06-19 10:14:44 +08:00
eson
038d2d36a4 for save 2023-06-19 10:12:58 +08:00
laodaming
c5ecca3da2 fix 2023-06-19 09:53:35 +08:00
eson
de05b0a78b 所有uint64 -> int64 2023-06-16 19:51:41 +08:00
eson
2399c2deeb 修复gorm的默认值 2023-06-16 19:29:48 +08:00
eson
de4ef54384 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-16 19:27:15 +08:00
eson
363bd12575 测试 2023-06-16 19:27:08 +08:00
laodaming
30ecb70cd7 fix 2023-06-16 19:26:48 +08:00
laodaming
350c6a5548 fix 2023-06-16 19:05:38 +08:00
eson
90871c1ab0 解决冲突 2023-06-16 19:04:13 +08:00
eson
87c9246c34 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-16 19:00:18 +08:00
eson
8679ba1ba3 完成序列化 2023-06-16 18:52:24 +08:00
laodaming
c6292a97dd fix 2023-06-16 18:48:05 +08:00
laodaming
175583ca51 fix 2023-06-16 18:24:31 +08:00
laodaming
47bf9580da fix 2023-06-16 15:11:37 +08:00
laodaming
68c431bda2 fix 2023-06-16 14:52:45 +08:00
laodaming
3d7eef18d0 fix 2023-06-16 14:28:59 +08:00
laodaming
56f8e16463 fix 2023-06-16 12:28:14 +08:00
laodaming
186a30d429 fix 2023-06-16 11:43:11 +08:00
laodaming
86d8e19a97 fix 2023-06-16 11:15:52 +08:00
laodaming
748e707dfa fix 2023-06-16 11:15:38 +08:00
eson
169c167d4a Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-16 10:59:03 +08:00
eson
31111a5332 修改gorm序列化错误 2023-06-16 10:58:43 +08:00
laodaming
74474f6f16 fix 2023-06-16 10:27:42 +08:00
laodaming
9769698f22 fix 2023-06-16 10:10:50 +08:00
eson
78c886f057 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-15 19:56:39 +08:00
eson
1a0f2be95f 完成这个单元测试 2023-06-15 19:56:19 +08:00
laodaming
0af68d5f32 fix 2023-06-15 19:53:15 +08:00
laodaming
4a5d84fb22 fix 2023-06-15 19:14:19 +08:00
eson
51a33052d9 完成一些测试 2023-06-15 17:51:06 +08:00
eson
dfc411b9c6 修复一个logic代码不覆盖的逻辑 2023-06-15 16:17:42 +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
1f941b7c9d fixz 2023-06-15 15:28:17 +08:00
laodaming
1be5b970d1 1 2023-06-15 15:10:59 +08:00
laodaming
57dd04ea27 1 2023-06-15 15:10:22 +08:00
laodaming
200e821c85 1 2023-06-15 14:34:40 +08:00
laodaming
6a06a21c2a 1 2023-06-15 14:34:03 +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
f3be74e78c 修复一些序列化的细节 2023-06-15 11:05:33 +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
83e45f26b2 fix 2023-06-14 15:45:56 +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
50bca808f1 fix 2023-06-13 19:39:24 +08:00
laodaming
f1d20d061c fix 2023-06-13 19:38:32 +08:00
laodaming
dc41f400a1 fix 2023-06-13 19:31:35 +08:00
laodaming
ea60e5c07c fix 2023-06-13 19:11:30 +08:00
laodaming
d523d62abd fix 2023-06-13 19:07:57 +08:00
laodaming
8b85f3b6ce fix 2023-06-13 17:51:12 +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
fda7596bc1 fix 2023-06-13 14:13:56 +08:00
laodaming
147af8ae29 fix 2023-06-13 14:13:40 +08:00
laodaming
311ad581cc fix 2023-06-13 13:59:15 +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
346023593d fix 2023-06-13 10:03:09 +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
2cc13de3e2 jwt验证 2023-06-12 20:04:30 +08:00
eson
bdaa3bf48b 1. TODO: guest_id 2. jwt的封装 2023-06-12 19:52:11 +08:00
eson
b6095d67ad Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-12 18:09:00 +08:00
eson
fc806b71c6 最新可以跑单元测试 2023-06-12 18:08:34 +08:00
laodaming
7f4f8dddad fix 2023-06-12 18:06:47 +08:00
laodaming
973df7a901 fix 2023-06-12 17:47:20 +08:00
eson
e0b0e2aff8 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-12 17:36:49 +08:00
eson
2ed11613a1 添加配置Auth的相关自动生成 2023-06-12 17:35:43 +08:00
laodaming
51bd2ee53c fix 2023-06-12 17:35:37 +08:00
laodaming
48657f02a6 11 2023-06-12 17:30:48 +08:00
laodaming
718b8118bf 11 2023-06-12 17:29:32 +08:00
eson
0f31e298d4 修改公共方法为basic入口 2023-06-12 17:28:49 +08:00
laodaming
3d323594db fix 2023-06-12 17:18:43 +08:00
eson
15e423fb4e Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-12 17:18:18 +08:00
eson
9e62c87ea2 可以设置request为空 2023-06-12 17:17:57 +08:00
laodaming
acc6f9c2b4 fix 2023-06-12 17:16:06 +08:00
eson
c71fa6fc12 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-12 17:10:51 +08:00
eson
f4873d1720 修复handler.tpl没有return, 添加单元测试例子 2023-06-12 17:10:27 +08:00
laodaming
af984d9172 fix 2023-06-12 17:03:42 +08:00
laodaming
7f19e29bb3 fix 2023-06-12 17:00:37 +08:00
laodaming
b1393950f2 fix 2023-06-12 16:47:48 +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
9d7022ec11 fix 2023-06-12 14:35:36 +08:00
laodaming
53a3490837 fix 2023-06-12 14:05:35 +08:00
laodaming
7d21c9ebc8 fix 2023-06-12 11:15:58 +08:00
laodaming
6919d7c02f fix 2023-06-12 10:16:49 +08:00
laodaming
52df088b8c fix 2023-06-12 10:15:40 +08:00
laodaming
7fd80315b2 fix 2023-06-09 20:06:24 +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
laodaming
f3e9916b37 fix 2023-06-08 19:29:08 +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
20987b5e1b fix 2023-06-08 18:22:27 +08:00
laodaming
48879a8b29 fix 2023-06-08 17:13:11 +08:00
laodaming
c5dfda6f54 fix 2023-06-08 17:02:58 +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
laodaming
a9e0f6b98e fix 2023-06-08 11:03:20 +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
64f4b468c7 fix 2023-06-08 10:42:43 +08:00
laodaming
0ea48b53c8 fix 2023-06-08 10:41:57 +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
996874a253 fix 2023-06-07 18:09:54 +08:00
laodaming
9007cc8369 fix 2023-06-07 17:27:17 +08:00
laodaming
3d21e2491f fix 2023-06-07 12:21:07 +08:00
eson
51c7478b94 测试通过 2023-06-07 12:01:08 +08:00
eson
08b7a3aece 更新 2023-06-07 11:59:21 +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
ef50dbb6fe Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-06 20:09:06 +08:00
eson
48be41f64b jwt 认证 2023-06-06 20:08:32 +08:00
laodaming
548d49271f fix 2023-06-06 19:43:22 +08:00
laodaming
c8444d71f6 fix 2023-06-06 19:23:19 +08:00
laodaming
0915e98700 fix 2023-06-06 19:21:07 +08:00
laodaming
21b22a3409 增加产品推荐接口 2023-06-06 18:27:28 +08:00
laodaming
cf852c5a87 增加产品推荐接口 2023-06-06 18:17:03 +08:00
laodaming
4312d978fb fix 2023-06-06 17:39:10 +08:00
laodaming
cad7bdb2ef fix 2023-06-06 17:37:57 +08:00
laodaming
9a2f74fe64 fix 2023-06-06 17:36:11 +08:00
eson
ab9df9bc42 修改状态码 2023-06-06 17:36:10 +08:00
eson
b8790b7f79 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-06 17:31:45 +08:00
eson
50b7afd25a 添加 fsfont 的注释 2023-06-06 17:31:00 +08:00
eson
54cbe017b9 model 格式改变 2023-06-06 17:25:49 +08:00
laodaming
8ba0952cc5 fix 2023-06-06 17:18:01 +08:00
laodaming
29f6e2ddbf fix 2023-06-06 16:14:02 +08:00
laodaming
245155d10e fix 2023-06-06 15:52:41 +08:00
laodaming
d31f3a1e41 fix 2023-06-06 15:30:12 +08:00
laodaming
e8aabdb3cf fix 2023-06-06 15:09:34 +08:00
laodaming
045aa81899 fix 2023-06-06 15:08:17 +08:00
laodaming
cf3a02ae7e fix 2023-06-06 15:01:13 +08:00
laodaming
213665eb59 fix 2023-06-06 13:07:39 +08:00
eson
834a560451 可测试debug方案 2023-06-06 12:24:19 +08:00
laodaming
25418e7be5 1 2023-06-06 11:14:13 +08:00
eson
0ce9c3d8c2 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-05 19:27:46 +08:00
eson
3085ef46ed 分离model的自定义代码 2023-06-05 19:27:15 +08:00
laodaming
5aa656c502 fix 2023-06-05 19:07:18 +08:00
laodaming
a7977f9153 fix 2023-06-05 18:56:23 +08:00
laodaming
32cd46a14a fix 2023-06-05 18:32:14 +08:00
laodaming
b1dc8c7841 fix 2023-06-05 18:14:46 +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
laodaming
e6c88d83aa fix 2023-06-05 17:38:37 +08:00
laodaming
52cc2a3d30 fix 2023-06-05 17:13:05 +08:00
laodaming
dfe171ea94 fix 2023-06-05 12:27:57 +08:00
laodaming
19f988eccd fix 2023-06-05 12:21:15 +08:00
laodaming
f7e7e2d85c 新增产品详情api 2023-06-05 11:27:01 +08:00
laodaming
a933f0d763 fix 2023-06-05 10:26:25 +08:00
laodaming
94212b1003 finish product list api 2023-06-05 10:18:31 +08:00
laodaming
92b29d8006 fix 2023-06-02 19:24:58 +08:00
eson
6c717ce30e Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-02 14:05:12 +08:00
laodaming
cf4e70b8d1 fix 2023-06-02 12:29:13 +08:00
eson
7edd5ea122 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-02 12:17:17 +08:00
laodaming
f7a20f3670 fix 2023-06-02 12:15:32 +08:00
eson
e93a872500 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-02 12:13:14 +08:00
laodaming
efd0f28d51 fix 2023-06-02 12:12:51 +08:00
eson
271432953d Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-02 11:55:54 +08:00
laodaming
4df573bbc7 fix 2023-06-02 10:08:22 +08:00
laodaming
76573731c6 fix 2023-06-01 18:52:15 +08:00
eson
64b0e3eb3f Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-01 18:37:06 +08:00
eson
2f01aa24c4 更新一次 2023-06-01 18:35:09 +08:00
laodaming
2d7ea2e302 fixc 2023-06-01 18:34:41 +08:00
eson
08e6f00ff5 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-01 16:20:11 +08:00
eson
7ffbce7759 最新成果 2023-06-01 16:19:24 +08:00
laodaming
d26586c794 增加产品列表接口 2023-06-01 15:32:28 +08:00
eson
5446c4123a 完成 /user/fonts 功能 2023-06-01 13:05:57 +08:00
eson
e1e0e5ef21 mysql 跑通 2023-06-01 12:15:36 +08:00
eson
340c7966e0 使用ddl生成结构, 支持mysql连接使用 2023-06-01 11:27:34 +08:00
eson
f7d547de59 新设计 2023-05-31 18:33:02 +08:00
eson
12986049ef 修改markdown格式 2023-05-31 12:03:14 +08:00
eson
134503bcd2 更新 对应架构的信息命名 2023-05-31 11:58:10 +08:00
939 changed files with 56206 additions and 262 deletions

36
.gitignore vendored
View File

@ -4,7 +4,7 @@
*.dll
*.so
*.dylib
bin/
# Test binary, built with `go test -c`
*.test
@ -13,3 +13,37 @@
# Dependency directories (remove the comment below to include it)
# vendor/
#vscode
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
!.vscode/*.code-snippets
# Local History for Visual Studio Code
.history/
# Built Visual Studio Code Extensions
*.vsix
__debug_bin
__debug_bin*
.idea
.vscode
screenlog.*
*.txt
proxyserver/proxyserver
shared-state
*.zip
vendor
grpc_server/gen

View File

@ -3,9 +3,36 @@
#### 介绍
新版fusenapi,golang语言go-zero框架
#### 软件架构
软件架构说明
* 首页-登录-注册
+ Home 首页
+ Sign In 登录
+ Sign Up 注册
* 产品列表 - Products 产品列表
* 产品详情 - Product Details 产品详情
* 购物车-确认订单-支付成功:
+ Cart 购物车
+ Order Confirmation 确认订单
+ Payment Success 支付成功
* 设计存储 - saved designs 已保存设计
* 我的订单 - My Orders 我的订单
* 我的云仓 - My Cloud Storage 我的云仓
* 个人中心 - Profile 个人中心
* 关于我们 - About Us 关于我们
* 联系我们 - Contact Us 联系我们
* 常见问题 - FAQ 常见问题
#### 软件架构
* 首页-登录-注册: home-user-auth.api
* 产品列表-产品详情: product.api
* 购物车-确认订单-支付成功: shopping-cart-confirmation.api
* 设计存储 - designs.api
* 我的订单 - orders.api
* 我的云仓 - cloud-storage.api
* 个人中心 - profile.api
* 关于我们 - about-us.api
* 联系我们 - contact-us.api
* 常见问题 - faq.api
#### 安装教程
@ -15,9 +42,16 @@
#### 使用说明
1. xxxx
2. xxxx
3. xxxx
1. sh fs_gen_api.sh home-user-auth # 序列化api
2. sh fs_gen_mysql_model.sh fs_canteen_type # 根据ddl序列化mysql model
3. 生成后就是go-zero框架的实现. 主要在logic目录下实现代码.
4. Response.Data的结构体 在api文件下定义. 方便rpc以后的接入. 参考现有的例子
#### 规范
sql 的值只能用 ?, 传入. 不能自己拼接. 涉及到sql安全和防注入.
例子: QueryRow("SELECT * FROM userinfo WHERE username = ? AND password = ?", sename, partname).Scan(&uid, &username, &password)
#### 参与贡献

View File

@ -1,23 +0,0 @@
syntax = "v1"
info (
title: // TODO: add title
desc: // TODO: add description
author: ""
email: ""
)
type request {
// TODO: add members here and delete this comment
Name string `path:"name,options=you|me"` // parameters are auto validated
}
type response {
// TODO: add members here and delete this comment
Message string `json:"message"`
}
service user-auth {
@handler GreetHandler
get /greet/from/:name(request) returns (response);
}

29
change_port.sh Normal file
View File

@ -0,0 +1,29 @@
#!/bin/bash
# 定义一个函数来修改每个服务器的配置文件中的端口
change_port() {
server_name=$1
port=$2
config_file="server/${server_name}/etc/${server_name}.yaml"
echo "Changing port for $server_name to $port"
if [ -f "$config_file" ]; then
# 使用 sed 将 Port 替换为新的端口
sed -i "s/^Port: .*$/Port: $port/" "$config_file"
else
echo "Configuration file $config_file not found"
fi
}
# 列出所有服务器目录
server_dirs=("backend" "canteen" "data-transfer" "home-user-auth" "inventory" "map-library" "orders" "product" "product-model" "product-template" "shopping-cart-confirmation" "upload" "webset")
# 初始化端口为 9901
port=9901
# 遍历服务器目录,修改每个服务器的配置文件中的端口
for server_dir in "${server_dirs[@]}"; do
change_port $server_dir $port
port=$((port + 1))
done

View File

@ -1,23 +0,0 @@
syntax = "v1"
info (
title: // TODO: add title
desc: // TODO: add description
author: ""
email: ""
)
type request {
// TODO: add members here and delete this comment
Name string `path:"name,options=you|me"` // parameters are auto validated
}
type response {
// TODO: add members here and delete this comment
Message string `json:"message"`
}
service user-auth {
@handler GreetHandler
get /greet/from/:name(request) returns (response);
}

33
config_replica_id.sh Executable file
View File

@ -0,0 +1,33 @@
#!/bin/bash
replica_id=5
change_config(){
server_name=$1
config_file="server/${server_name}/etc/${server_name}.yaml"
# 无论ReplicaId存在与否,都重置replica_id
((replica_id+=5))
if ! grep -q "ReplicaId:" "$config_file"; then
sed -i "s/^Port:.*$/&\nReplicaId: $replica_id/" "$config_file"
echo "Added ReplicaId: $replica_id to $config_file"
else
exist_id=$(grep -oP "ReplicaId:\s*\K[0-9]+" "$config_file")
sed -i "s/^ReplicaId:.*$/ReplicaId: $replica_id/" "$config_file"
echo "Updated ReplicaId to $replica_id in $config_file"
fi
}
# 读取server目录,忽略指定的三个目录
server_dirs=($(cd server && ls | grep -vE "backend|product-model"))
for server_dir in "${server_dirs[@]}"; do
change_config $server_dir
done

13
constants/blm_service.go Normal file
View File

@ -0,0 +1,13 @@
package constants
const (
BLMServiceUrlLogoCombine string = "/LogoCombine"
BLMServiceUrlLogoRemovebg string = "/removebg"
BLMServiceUrlLogoFeatureExtraction string = "/FeatureExtraction"
)
type BLMServiceUrlResult struct {
Code string `json:"code"`
Msg string `json:"msg"`
Data interface{} `json:"data"`
}

3
constants/cart.go Normal file
View File

@ -0,0 +1,3 @@
package constants
const CART_EXPIRE_TIME = 60 //购物车过期时间

26
constants/cloud_order.go Normal file
View File

@ -0,0 +1,26 @@
package constants
type cloud int64
// 已下单
const STATUS_ORDERD cloud = 1
// 运输中
const STATUS_SHIPPING cloud = 2
// ups待提货
const STATUS_PICK_UP cloud = 3
// 已到达
const STATUS_ARRIVAL cloud = 4
/**
* 状态对应中文
* @var string[]
*/
var CloudOrderMap = map[cloud]string{
STATUS_ORDERD: "已下单",
STATUS_SHIPPING: "运输中",
STATUS_PICK_UP: "UPS已发货",
STATUS_ARRIVAL: "已到达",
}

View File

@ -0,0 +1,6 @@
package constants
type ConcactService string
const TYPE_DEFAULT ConcactService = "default"
const TYPE_ORDER ConcactService = "order"

9
constants/delivery.go Normal file
View File

@ -0,0 +1,9 @@
package constants
type DeliveryMethod int64
const (
// 配送方式
DELIVERY_METHOD_ADDRESS DeliveryMethod = 1 // 直接发货到收获地址
DELIVERY_METHOD_CLOUD DeliveryMethod = 2 // 云仓
)

19
constants/domain.go Normal file
View File

@ -0,0 +1,19 @@
package constants
// api域名
const API_URL = "https://fusenapi.kayue.cn:8010"
// 后台域名
const BACK_URL = "http://fusenadmin.kayue.cn:8009"
// h5域名
const H5_URL = "https://fusenh5.kayue.cn:8011"
// vue域名
const VUE_URL = "https://fusenh5.kayue.cn:8011"
// 后台v2域名
const BACKEND_URL = "https://fusenv2admin.kayue.cn:8014/#/"
// 二维码域名
const QRCODE_URL = "http://qrcode.fusenpack.com/site/go/"

14
constants/faq.go Normal file
View File

@ -0,0 +1,14 @@
package constants
type TypeFaq int64
const FAQ_STATUS_ON TypeFaq = 1
const FAQ_STATUS_OFF TypeFaq = 0
/**
* 定义类型
*/
const FAQ_TAG_ORDER TypeFaq = 1
const FAQ_TAG_SHIPPING TypeFaq = 2
const FAQ_TAG_PAYMENT TypeFaq = 3
const FAQ_TAG_RETURN TypeFaq = 4

View File

@ -0,0 +1,4 @@
package constants
// 裁剪尺寸阶梯
var IMAGE_CROPPING_STEP_SIZE = []int{200, 400, 600, 800}

301
constants/invoice_html.go Normal file
View File

@ -0,0 +1,301 @@
package constants
const INVOICE_TEMPLATE_01 = `
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Invoice</title>
<style>
@font-face {
font-family: "Montserrat-SemiBold";
src: url("https://s3.us-west-1.amazonaws.com/storage.fusenpack.com/b808164b4f7ecc19f560d235db5b1f5b99fe8ab218b606f15debab2b9c4230e2");
}
@font-face {
font-family: "Montserrat-Medium";
src: url("https://s3.us-west-1.amazonaws.com/storage.fusenpack.com/3d91bbd91ba6fac26b8460a078742b61bfd1e2976311c065f8ac9c5270be6901");
}
@font-face {
font-family: "Montserrat-Light";
src: url("https://s3.us-west-1.amazonaws.com/storage.fusenpack.com/24e580a4a5afebf94596ec7b6c8d9c8d57f75a5429ee757217da552d5f03e5d1");
}
@font-face {
font-family: "Montserrat-Regular";
src: url("https://s3.us-west-1.amazonaws.com/storage.fusenpack.com/78072d2cbce0a3f88c01ab2830ba3a453f0968b516388e45e9a6fb5e970450b8");
}
body {
margin: 0;
}
.header_warp {
background-color: #F8F8FA;
padding: 40px 5% 40px 6%;
}
.header_td {
width: 50%;
font-family: Montserrat-SemiBold;
}
.header_td.logo {
vertical-align: top;
}
.header_logo {
max-height: 30px;
max-width: 100%;
margin-top: 10px;
}
.header_td.title {
color: #212121;
font-weight: 600;
font-size: 72px;
}
.information_warp {
padding: 60px 5% 60px 6%;
}
.information_td {
width: 50%;
font-size: 26px;
line-height: 39px;
font-weight: 300;
font-family: Montserrat-Light;
}
.information_td.bill {
color: #212121;
font-weight: 500;
font-family: Montserrat-Medium;
}
.information_td.right {
color: #212121;
}
.information_td.info {
color: #666666;
line-height: 34px;
}
.bill_warp {
padding: 0 5% 0 6%;
}
.bill_td {
font-size: 26px;
}
.bill_td:first-child {
width: 47.59%;
}
.bill_td.title {
border-top: 4px solid #333;
padding: 26px 0 14px;
font-weight: 500;
color: #212121;
font-family: Montserrat-Medium;
}
.bill_td.info {
color: #666;
border-bottom: 2px solid #ccc;
padding: 16px 0;
font-weight: 400;
font-family: Montserrat-Light;
}
.bill_td.info:first-child {
font-family: Montserrat-Regular;
}
.bill_warp tr:last-child .bill_td.info {
border-bottom: none;
}
.total_warp {
padding: 28px 5% 48px 0;
}
.total_td {
color: #212121;
padding: 16px 0 14px;
font-size: 24px;
font-weight: 500;
font-family: Montserrat-Medium;
}
.total_td.info {
color: #666;
font-weight: 400;
font-family: Montserrat-Regular;
}
.total_td.border-dashed {
border-bottom: 2px dashed #ccc;
}
.total_td.border-solid {
border-bottom: 4px solid #333;
padding-bottom: 24px;
}
.total_td.total {
padding-top: 24px;
font-size: 26px;
font-weight: 600;
font-family: Montserrat-SemiBold;
}
.notes_warp {
padding: 0 5% 0 6%;
}
.notes_td {
font-size: 26px;
color: #666;
font-weight: 300;
width: 50%;
line-height: 42px;
font-family: Montserrat-Light;
}
.notes_td.title {
color: #212121;
font-weight: 500;
font-family: Montserrat-Medium;
}
.notes_td.notes {
vertical-align: top;
}
</style>
</head>
<body>
<!-- header -->
<table class="header_warp" border="0" align="center" cellpadding="0" cellspacing="0" width="100%">
<tr>
<td class="header_td logo" align="left">
<img class="header_logo" src="https://fusenapi.kayue.cn:8010/storage/email/logo.png" alt="logo">
</td>
<td class="header_td title" align="right">Invoice</td>
</tr>
</table>
`
const INVOICE_TEMPLATE_02 = `
<!-- information -->
<table class="information_warp width100" border="0" align="center" cellpadding="0" cellspacing="0">
<tr>
<td class="information_td bill" align="left">Bill To:</td>
<td class="information_td right" align="right">Invoice No. #%v</td>
</tr>
<tr>
<td class="information_td info" align="left">%v</td>
<td class="information_td right" align="right">Date: %v</td>
</tr>
<tr>
<td class="information_td info" align="left">%v</td>
<td class="information_td" align="right"></td>
</tr>
<tr>
<td class="information_td info" align="left">%v</td>
<td class="information_td" align="right"></td>
</tr>
<tr>
<td class="information_td info" align="left">%v</td>
<td class="information_td" align="right"></td>
</tr>
</table>
`
const INVOICE_TEMPLATE_03 = `
<!-- bill -->
<table class="bill_warp width100" border="0" align="center" cellpadding="0" cellspacing="0">
<tr>
<td class="bill_td title" align="left">Product Name</td>
<td class="bill_td title" align="right">Price</td>
<td class="bill_td title" align="right">Quantity</td>
<td class="bill_td title" align="right">Total</td>
</tr>
%v
</table>
`
const INVOICE_TEMPLATE_0301 = `
<tr>
<td class="bill_td info" align="left">%v</td>
<td class="bill_td info" align="right">%v</td>
<td class="bill_td info" align="right">%v %v</td>
<td class="bill_td info" align="right">%v</td>
</tr>
`
const INVOICE_TEMPLATE_04 = `
<!-- total -->
<table class="total_warp width50" border="0" align="right" cellpadding="0" cellspacing="0">
<tr>
<td class="total_td" align="right">Subtotal</td>
<td class="total_td info" align="right">%v</td>
</tr>
<tr>
<td class="total_td" align="right">Shipping Fee</td>
<td class="total_td info" align="right">Free</td>
</tr>
<tr>
<td class="total_td border-dashed" align="right">Tax</td>
<td class="total_td info border-dashed" align="right">%v</td>
</tr>
<tr>
<td class="total_td" align="right">Total</td>
<td class="total_td info" align="right">%v</td>
</tr>
<tr>
<td class="total_td border-solid" align="right">%v</td>
<td class="total_td info border-solid" align="right">%v</td>
</tr>
<tr>
<td class="total_td total" align="right">%v</td>
<td class="total_td total" align="right">%v</td>
</tr>
</table>
`
const INVOICE_TEMPLATE_05 = `
<!-- notes -->
<table class="notes_warp width100" border="0" align="center" cellpadding="0" cellspacing="0">
<tr>
<td class="notes_td title" align="left">Payment Method:</td>
<td class="notes_td title" align="left">Notes:</td>
</tr>
<tr>
<td class="notes_td" align="left">%v</td>
<td class="notes_td notes" align="left" rowspan="2">Thank you for your business !</td>
</tr>
<tr>
<td class="notes_td" align="left">Account No. :%v</td>
</tr>
</table>
`
const INVOICE_TEMPLATE_06 = `
</body>
<style>
.width50 {
width: 50%;
}
.width100 {
width: 100%;
}
</style>
</html>
`

16
constants/material.go Normal file
View File

@ -0,0 +1,16 @@
package constants
// 材料类型
var MAP_MATERIAL = map[int64]string{
1: "paper",
2: "glass",
3: "塑料",
4: "牛皮纸",
5: "单层牛皮纸",
6: "双层牛皮纸",
7: "PET",
8: "瓦楞纸",
9: "厚牛皮纸",
10: "卡纸",
11: "PP",
}

View File

@ -0,0 +1,6 @@
package constants
type Purchase int64
// 最低购买箱数
const MIN_PURCHASE_QUANTITY Purchase = 3

147
constants/order.go Normal file
View File

@ -0,0 +1,147 @@
package constants
// 新版订单状态-后台所有
// 未支付
// const STATUS_NEW_NOT_PAY = 0
// // 首款已付,尾款待付
// const STATUS_NEW_PART_PAY = 1
// // 全款已付
// const STATUS_NEW_PAY_COMPLETED = 2
// // 订单已确认
// const STATUS_NEW_SURE = 3
// // 订单生产中
// const STATUS_NEW_PRODUTING = 4
// // 订单生产完成
// const STATUS_NEW_PRODUT_COMPLETED = 5
// // 订单已到库
// const STATUS_NEW_ARRIVAL = 6
// // 已发货
// const STATUS_NEW_DELIVER = 7
// // UPS提货
// const STATUS_NEW_UPS = 8
// // 已完成
// const STATUS_NEW_COMPLETED = 9
// // 取消订单
// const STATUS_NEW_CANCEL = 10
// // 退款中
// const STATUS_NEW_REFUNDING = 11
// // 退款完成
// const STATUS_NEW_REFUNDED = 12
// // 订单删除
// const STATUS_NEW_DELETE = 13
// // 订单关闭
// const STATUS_NEW_CLOSE = 14
// // 前台订单
// // 已支付
// const STATUS_FONT_PAID = 1
// // 生产中
// const STATUS_FONT_PRODUCTION = 2
// // 运输中
// const STATUS_FONT_SHIPPED = 3
// // 到达云仓
// const STATUS_FONT_INVENTORY = 4
// // 订单完成
// const STATUS_FONT_COMPLETED = 5
// // 订单关闭
// const STATUS_FONT_CLOSED = 7
// // 云仓完成
// const STATUS_FONT_COMPLETED_CLOUD = 8
type Order int64
// 订单状态
const (
// 未支付
STATUS_NEW_NOT_PAY Order = 0
// 首款已付,尾款待付
STATUS_NEW_PART_PAY Order = 1
// 全款已付
STATUS_NEW_PAY_COMPLETED Order = 2
// 订单已确认
STATUS_NEW_SURE Order = 3
// 订单生产中
STATUS_NEW_PRODUTING Order = 4
// 订单生产完成
STATUS_NEW_PRODUT_COMPLETED Order = 5
// 订单已到库
STATUS_NEW_ARRIVAL Order = 6
// 已发货
STATUS_NEW_DELIVER Order = 7
// UPS提货
STATUS_NEW_UPS Order = 8
// 已完成
STATUS_NEW_COMPLETED Order = 9
// 取消订单
STATUS_NEW_CANCEL Order = 10
// 退款中
STATUS_NEW_REFUNDING Order = 11
// 退款完成
STATUS_NEW_REFUNDED Order = 12
// 订单删除
STATUS_NEW_DELETE Order = 13
// 订单关闭
STATUS_NEW_CLOSE Order = 14
)
// 前台订单状态
const (
// 已支付
STATUS_FONT_PAID Order = 1
// 生产中
STATUS_FONT_PRODUCTION Order = 2
// 运输中
STATUS_FONT_SHIPPED Order = 3
// 到达云仓
STATUS_FONT_INVENTORY Order = 4
// 订单完成
STATUS_FONT_COMPLETED Order = 5
// 订单关闭
STATUS_FONT_CLOSED Order = 7
// 云仓完成
STATUS_FONT_COMPLETED_CLOUD Order = 8
)
type Day int64
// 订单取消时间
const (
CANCLE_ORDER_EXPIRE Day = 48 * 3600
CANCLE_ORDER_EXPIRE_DAY Day = 2 // 2天
)
// 订单时间配置
const (
ORDER_PRODUCT_DAY Day = 25 //产品制作周期(天)
ORDER_FACTORY_DELIVER_DAY Day = 2 //厂家发货到货代周期(天)
ORDER_DELIVER_UPS_DAY Day = 35 //货代发货至UPS周期(天)
ORDER_UPS_TRANS_DAY Day = 5 //UPS运输周期(天)
)
const (
LOGISTICS_STATUS_DRAW Order = 1
LOGISTICS_STATUS_SHIPPING Order = 2
LOGISTICS_STATUS_UPS Order = 3
LOGISTICS_STATUS_UPS_ARRIVAL Order = 4
LOGISTICS_STATUS_ARRIVAL Order = 5
)

149
constants/orders.go Normal file
View File

@ -0,0 +1,149 @@
package constants
// 订单类型
const (
DELIVERYMETHODDIRECTMAIL int64 = 1 // 直邮
DELIVERYMETHODDSCLOUDSTORE int64 = 2 // 云仓
)
// 货币
type Currency string
const (
CURRENCYUSD Currency = "usd" // 美金
)
// 金额单位
type AmountUnit interface{}
// 汇率单位
type ExchangeRateUnit interface{}
// 交易方式
type PayMethods string
const (
PAY_METHOD_CARD PayMethods = "CARD" //card
PAY_METHOD_VISA PayMethods = "VISA" //visa
)
// 支付状态
type PayStatusCode int64
const (
PAY_STATUS_UNPAID PayStatusCode = 10 //10,未支付
PAY_STATUS_PAID PayStatusCode = 20 //20,已支付
PAY_STATUS_REFUNDED PayStatusCode = 30 //30,已退款
)
// 订单支付状态
type OrderPayStatusCode int64
// 0,未付首款
// 10,已付首款
// 20,已退首款
// 30,已付尾款
// 40,已退尾款
const (
ORDER_PAY_STATUS_UNPAIDDEPOSIT OrderPayStatusCode = 0 // 0,未付首款
ORDER_PAY_STATUS_PAIDDEPOSIT OrderPayStatusCode = 10 // 10,已付首款
ORDER_PAY_STATUS_REFUNDEDDEPOSIT OrderPayStatusCode = 20 // 20,已退首款
ORDER_PAY_STATUS_PAIDDREMAINING OrderPayStatusCode = 30 // 30,已付尾款
ORDER_PAY_STATUS_REFUNDEDREMAINING OrderPayStatusCode = 40 // 40,已退尾款
)
// 订单状态
type OrderStatusCode int64
const (
ORDER_STATUS_UNPAIDDEPOSIT OrderStatusCode = 0 // 0,未支付定金
ORDER_STATUS_CLOSE OrderStatusCode = 10 // 10,订单已关闭
ORDER_STATUS_COMPLETE OrderStatusCode = 20 // 20,订单已完成
ORDER_STATUS_DELETE OrderStatusCode = 30 // 20,订单已删除
ORDER_STATUS_DIRECTMAIL_ORDERED OrderStatusCode = 10100 // 10100,直邮单--已下单
ORDER_STATUS_DIRECTMAIL_ORDEREDMAINING OrderStatusCode = 10100001 // 10100001,直邮单--已下单--尾款
ORDER_STATUS_DIRECTMAIL_CANCEL OrderStatusCode = 10101 // 10101,直邮单--已取消
ORDER_STATUS_DIRECTMAIL_STARTPRODUCTION OrderStatusCode = 10200 // 10200,直邮单--开始生产
ORDER_STATUS_DIRECTMAIL_COMPLETEPRODUCTION OrderStatusCode = 10300 // 10300,直邮单--生产完成
ORDER_STATUS_DIRECTMAIL_SHIPPED OrderStatusCode = 10400 // 10400,直邮单--已发货
ORDER_STATUS_DIRECTMAIL_ARRIVED OrderStatusCode = 10500 // 10500,直邮单--已到达
ORDER_STATUS_CLOUDSTORE_ORDERED OrderStatusCode = 20100 // 20100,云仓单--已下单
ORDER_STATUS_CLOUDSTORE_ORDEREDMAINING OrderStatusCode = 20100001 // 20100001,云仓单--已下单-尾款
ORDER_STATUS_CLOUDSTORE_CANCEL OrderStatusCode = 20101 // 20101,云仓单--已取消
ORDER_STATUS_CLOUDSTORE_STARTPRODUCTION OrderStatusCode = 20200 // 20200,云仓单--开始生产
ORDER_STATUS_CLOUDSTORE_COMPLETEPRODUCTION OrderStatusCode = 20300 // 20300,云仓单--生产完成
ORDER_STATUS_CLOUDSTORE_ARRIVEDWAREHOUSE OrderStatusCode = 20400 // 20400,云仓单--直达仓库
)
// 订单状态名称
var OrderStatusMessage map[OrderStatusCode]string
// 支付状态名称
var PayStatusMessage map[PayStatusCode]string
// 支付状态名称
var OrderPayStatusMessage map[OrderPayStatusCode]string
// 订单状态--用户可见--直邮
var OrderStatusUserDIRECTMAIL []OrderStatusCode
// 订单状态--用户可见--云仓
var OrderStatusUserCLOUDSTORE []OrderStatusCode
// 订单货币
var OrderCurrencyMessage map[Currency]string
func init() {
// 订单货币
OrderCurrencyMessage = make(map[Currency]string, 1)
OrderCurrencyMessage[CURRENCYUSD] = "$"
// 订单状态名称
OrderPayStatusMessage = make(map[OrderPayStatusCode]string)
OrderPayStatusMessage[ORDER_PAY_STATUS_UNPAIDDEPOSIT] = "Deposit Payment Unpaid" // 未支付首款
OrderPayStatusMessage[ORDER_PAY_STATUS_PAIDDEPOSIT] = "Deposit Payment Paid" // 已支付首款
OrderPayStatusMessage[ORDER_PAY_STATUS_REFUNDEDDEPOSIT] = "Deposit Payment Refunded" // 首款已回退
OrderPayStatusMessage[ORDER_PAY_STATUS_PAIDDREMAINING] = "Final Payment Paid" // 尾款未支付
OrderPayStatusMessage[ORDER_PAY_STATUS_REFUNDEDREMAINING] = "Final Payment Refunded" // 已退款
// 订单状态名称
PayStatusMessage = make(map[PayStatusCode]string)
PayStatusMessage[PAY_STATUS_UNPAID] = "Unpaid" // 未支付
PayStatusMessage[PAY_STATUS_PAID] = "Paid" // 已支付
PayStatusMessage[PAY_STATUS_REFUNDED] = "Refunded" // 已退款
// 订单状态名称
OrderStatusMessage = make(map[OrderStatusCode]string)
OrderStatusMessage[ORDER_STATUS_UNPAIDDEPOSIT] = "Deposit Payment Unpaid" // 首款未支付
OrderStatusMessage[ORDER_STATUS_CLOSE] = "Closed" // 已关闭
OrderStatusMessage[ORDER_STATUS_COMPLETE] = "Completed" // 已完成
OrderStatusMessage[ORDER_STATUS_DELETE] = "Deleted" // 已删除
OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_ORDERED] = "Ordered" // 直邮单--已下单
OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_ORDEREDMAINING] = "Final Payment Paid" // 直邮单--已下单--尾款
OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_STARTPRODUCTION] = "Start Production" // 直邮单--开始生产
OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_COMPLETEPRODUCTION] = "Production Complete" // 直邮单--生产完成
OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_SHIPPED] = "Shipped" // 直邮单--已发货
OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_ARRIVED] = "Delivered" // 直邮单--已到达
OrderStatusMessage[ORDER_STATUS_CLOUDSTORE_ORDERED] = "Ordered" // 云仓单--已下单
OrderStatusMessage[ORDER_STATUS_CLOUDSTORE_ORDEREDMAINING] = "Final Payment Paid" // 云仓单--已下单-尾款
OrderStatusMessage[ORDER_STATUS_CLOUDSTORE_STARTPRODUCTION] = "Start Production" // 云仓单--开始生产
OrderStatusMessage[ORDER_STATUS_CLOUDSTORE_COMPLETEPRODUCTION] = "Production Complete" // 云仓单--生产完成
OrderStatusMessage[ORDER_STATUS_CLOUDSTORE_ARRIVEDWAREHOUSE] = "Arrived Inventory" // 云仓单--直达仓库
// 订单状态--用户可见--直邮
OrderStatusUserDIRECTMAIL = []OrderStatusCode{
ORDER_STATUS_UNPAIDDEPOSIT,
ORDER_STATUS_DIRECTMAIL_ORDERED, ORDER_STATUS_DIRECTMAIL_STARTPRODUCTION, ORDER_STATUS_DIRECTMAIL_COMPLETEPRODUCTION, ORDER_STATUS_DIRECTMAIL_SHIPPED, ORDER_STATUS_DIRECTMAIL_ARRIVED,
ORDER_STATUS_COMPLETE, ORDER_STATUS_CLOSE,
}
// 订单状态--用户可见--云仓
OrderStatusUserCLOUDSTORE = []OrderStatusCode{
ORDER_STATUS_UNPAIDDEPOSIT,
ORDER_STATUS_CLOUDSTORE_ORDERED, ORDER_STATUS_CLOUDSTORE_STARTPRODUCTION, ORDER_STATUS_CLOUDSTORE_COMPLETEPRODUCTION, ORDER_STATUS_CLOUDSTORE_ARRIVEDWAREHOUSE,
ORDER_STATUS_COMPLETE, ORDER_STATUS_CLOSE,
}
}

13
constants/paging.go Normal file
View File

@ -0,0 +1,13 @@
package constants
// 分页默认当前页
const DEFAULT_PAGE = 1
// 默认每页数量
const DEFAULT_PAGE_SIZE = 20
// 最大每页显示数量
const MAX_PAGE_SIZE = 300
// 最大分页
const MAX_PAGE = 100

22
constants/pay.go Normal file
View File

@ -0,0 +1,22 @@
package constants
type PayMethod int64
const (
PAYMETHOD_STRIPE PayMethod = 1
PAYMETHOD_PAYPAL PayMethod = 2
)
type PayStatus int64
const (
PAYSTATUS_SUCCESS PayStatus = 1
PAYSTATUS_UNSUCCESS PayStatus = 0
)
type PayStage int64
const (
PAYSTAGE_DEPOSIT PayStage = 1 // 首付
PAYSTAGE_REMAINING PayStage = 2 // 尾款
)

View File

@ -0,0 +1,271 @@
package constants
// 产品列表demo
const PRODUCT_LIST_DEMO = `{
"ob": {
"items": [
{
"id": 25,
"sn": "P1ELZGHU",
"title": "Packing box",
"cover": "/icon/icon_25_800.png",
"intro": "打包盒卡纸",
"cover_img": "/uploads/ognhdc6q_800.png",
"isEnv": 1,
"isMicro": 1,
"sizeNum": 5,
"miniPrice": 2
},
{
"id": 28,
"sn": "P9KVYAUS",
"title": "Pizza box",
"cover": "/icon/9dmom0g7_800.png",
"intro": "披萨盒 瓦楞纸",
"cover_img": "/uploads/9xf1olkl_800.png",
"isEnv": 1,
"isMicro": 1,
"sizeNum": 1,
"miniPrice": 2
},
{
"id": 30,
"sn": "PZWDSROX",
"title": "Paper bag with handle",
"cover": "/icon/iz44vraw_800.png",
"intro": "有提手纸袋牛皮纸",
"cover_img": "/uploads/rpwntxcq_800.png",
"isEnv": 1,
"isMicro": 1,
"sizeNum": 4,
"miniPrice": 2
},
{
"id": 20,
"sn": "PNACHNUK",
"title": "Four cups of milk tea cup",
"cover": "/icon/plz43wpo_800.png",
"intro": "卡纸",
"cover_img": "/uploads/9tqgsjqi_800.png",
"isEnv": 1,
"isMicro": 1,
"sizeNum": 2,
"miniPrice": 2
},
{
"id": 19,
"sn": "PHHVEXRW",
"title": "Milk tea cup holder double cup",
"cover": "/icon/ipohmmcj_800.png",
"intro": "奶茶杯托奶茶杯托两杯袋",
"cover_img": "/uploads/57ogzeq5_800.png",
"isEnv": 1,
"isMicro": 1,
"sizeNum": 5,
"miniPrice": 2
},
{
"id": 11,
"sn": "P7N4D0MK",
"title": "Cup double layer",
"cover": "/icon/nrmzz4du_800.png",
"intro": "牛皮纸双层",
"cover_img": "/uploads/oqjm5own_800.png",
"isEnv": 1,
"isMicro": 1,
"sizeNum": 5,
"miniPrice": 2
},
{
"id": 33,
"sn": "P0NFP19Y",
"title": "High paper bowl",
"cover": "/icon/cla4k6om_800.png",
"intro": "牛皮纸",
"cover_img": "/uploads/dt1qjkzg_800.png",
"isEnv": 1,
"isMicro": 1,
"sizeNum": 4,
"miniPrice": 2
},
{
"id": 32,
"sn": "PDZ3HIUL",
"title": "Flat paper bowl",
"cover": "/icon/jy14adqz_800.png",
"intro": "牛皮纸",
"cover_img": "/uploads/bzwbxduc_800.png",
"isEnv": 1,
"isMicro": 1,
"sizeNum": 3,
"miniPrice": 2
},
{
"id": 31,
"sn": "PEVSMU7I",
"title": "Paper bag without handle",
"cover": "/icon/osdsegor_800.png",
"intro": "牛皮纸",
"cover_img": "/uploads/ouvayny7_800.png",
"isEnv": 1,
"isMicro": 1,
"sizeNum": 2,
"miniPrice": 2
},
{
"id": 29,
"sn": "P58ZZOTI",
"title": "plastic bag",
"cover": "/icon/dvsvddks_800.png",
"intro": "塑料袋",
"cover_img": "/uploads/qvvuzkzx_800.png",
"isEnv": 1,
"isMicro": 1,
"sizeNum": 1,
"miniPrice": 2
},
{
"id": 24,
"sn": "PG7XIXII",
"title": "Hamburger box",
"cover": "/icon/icon_24_800.png",
"intro": "汉堡盒 卡纸",
"cover_img": "/uploads/fm1itgge_800.png",
"isEnv": 1,
"isMicro": 1,
"sizeNum": 4,
"miniPrice": 2
},
{
"id": 23,
"sn": "PIJ2OVUE",
"title": "Milk tea ring portable double cup",
"cover": "/icon/nxb6hjln_800.png",
"intro": "卡纸",
"cover_img": "/uploads/52fash1n_800.png",
"isEnv": 1,
"isMicro": 1,
"sizeNum": 4,
"miniPrice": 2
},
{
"id": 21,
"sn": "PMHXGUL6",
"title": "Milk tea ring portable single cup",
"cover": "/icon/qoaf5mtp_800.png",
"intro": "卡纸",
"cover_img": "/uploads/epvkzvyf_800.png",
"isEnv": 1,
"isMicro": 1,
"sizeNum": 5,
"miniPrice": 2
},
{
"id": 18,
"sn": "PFCM8KNF",
"title": "Tableware set chopsticks",
"cover": "/icon/tcspod4b_800.png",
"intro": "餐具套装筷子厚牛皮纸包装",
"cover_img": "/uploads/5jgrgzvh_800.png",
"isEnv": 1,
"isMicro": 1,
"sizeNum": 3,
"miniPrice": 2
},
{
"id": 17,
"sn": "PQKIQMIK",
"title": "Tableware set four piece set",
"cover": "/icon/mdo0vu1u_800.png",
"intro": "牛皮纸包装",
"cover_img": "/uploads/szsekvbw_800.png",
"isEnv": 1,
"isMicro": 1,
"sizeNum": 4,
"miniPrice": 2
},
{
"id": 16,
"sn": "PBFOIOFH",
"title": "Tableware set four piece set",
"cover": "/icon/dzrf59cp_800.png",
"intro": "餐具套装",
"cover_img": "/uploads/svfoebf1_800.png",
"isEnv": 1,
"isMicro": 1,
"sizeNum": 1,
"miniPrice": 2
},
{
"id": 15,
"sn": "P02V10AB",
"title": " Hot drink cup holder",
"cover": "/icon/icon_15_800.png",
"intro": "杯托、瓦楞纸",
"cover_img": "/uploads/4qbdid7i_800.png",
"isEnv": 1,
"isMicro": 1,
"sizeNum": 5,
"miniPrice": 2
},
{
"id": 13,
"sn": "PER6WLAV",
"title": " Cup pet",
"cover": "/icon/icon_13_800.png",
"intro": "pet",
"cover_img": "/uploads/kfxehwjd_800.png",
"isEnv": 1,
"isMicro": 1,
"sizeNum": 1,
"miniPrice": 2
},
{
"id": 12,
"sn": "PGFWRMAU",
"title": " Cup PP",
"cover": "/icon/icon_12_800.png",
"intro": "pp",
"cover_img": "/uploads/azp8uwhz_800.png",
"isEnv": 1,
"isMicro": 1,
"sizeNum": 2,
"miniPrice": 2
},
{
"id": 10,
"sn": "P4ZXDVHS",
"title": "Cup monolayer",
"cover": "/icon/icon_10_800.png",
"intro": "牛皮纸单层",
"cover_img": "/uploads/onuzax6l_800.png",
"isEnv": 1,
"isMicro": 1,
"sizeNum": 1,
"miniPrice": 2
}
],
"_links": {
"self": {
"href": "https://fusenapi.kayue.cn:8010/product/list?cid=13&size=620&page=1&is_demo=1"
},
"first": {
"href": "https://fusenapi.kayue.cn:8010/product/list?cid=13&size=620&page=1&is_demo=1"
},
"last": {
"href": "https://fusenapi.kayue.cn:8010/product/list?cid=13&size=620&page=2&is_demo=1"
},
"next": {
"href": "https://fusenapi.kayue.cn:8010/product/list?cid=13&size=620&page=2&is_demo=1"
}
},
"_meta": {
"totalCount": 21,
"pageCount": 2,
"currentPage": 1,
"perPage": 20
}
},
"typeName": "Boxes",
"description": ""
}`

View File

@ -0,0 +1,5 @@
package constants
const TAG_MODEL = 1 //模型
const TAG_PARTS = 2 //配件
const TAG_SCENE = 3 //场景

5
constants/queue.go Normal file
View File

@ -0,0 +1,5 @@
package constants
const (
QUEUE_NAME_ORDER = "queue_order"
)

19
constants/rabbitmq.go Normal file
View File

@ -0,0 +1,19 @@
package constants
type RABBIT_MQ string
// 消息队列队列名
const (
//组装渲染数据队列
/*RABBIT_MQ_ASSEMBLE_RENDER_DATA RABBIT_MQ = "RABBIT_MQ_ASSEMBLE_RENDER_DATA"
//渲染结果数据队列
RABBIT_MQ_RENDER_RESULT_DATA RABBIT_MQ = "RABBIT_MQ_RENDER_RESULT_DATA"*/
)
// 队列列表
var MqQueueArr = []RABBIT_MQ{
/*
RABBIT_MQ_ASSEMBLE_RENDER_DATA,
RABBIT_MQ_RENDER_RESULT_DATA,
*/
}

203
constants/render.go Normal file
View File

@ -0,0 +1,203 @@
package constants
// 渲染要用到的面片模板(以前的模板)
const RENDER_FACE_SLICE_TEMPLATE_JSON = `[
{
"id": "",
"tag": "MainColor",
"title": "",
"type": "color",
"text": "",
"fill": "{{MainColorFill}}",
"fontSize": 20,
"fontFamily": "Aqum2SmallCaps3",
"ifBr": false,
"ifShow": true,
"ifGroup": false,
"maxNum": 50,
"rotation": 0,
"lineHeight": 1,
"align": "center",
"verticalAlign": "middle",
"material": "",
"materialTime": "",
"materialName": "",
"QRcodeType": "",
"width": 1024,
"height": 1024,
"proportion": 60,
"x": 0,
"y": 0,
"opacity": 1,
"optionalColor": [
{
"color": "#000000",
"name": "Black",
"default": true
}
],
"zIndex": 1,
"svgPath": "",
"follow": {
"fill": "",
"ifShow": "",
"content": ""
},
"group": [],
"cameraStand": {
"x": 0,
"y": 0,
"z": 0
}
},
{
"id": "",
"tag": "SecondaryColor",
"title": "贴图3",
"type": "color",
"text": "",
"fill": "{{SecondaryColorFill}}",
"fontSize": 20,
"fontFamily": "Aqum2SmallCaps3",
"ifBr": false,
"ifShow": true,
"ifGroup": false,
"maxNum": 50,
"rotation": 0,
"lineHeight": 1,
"align": "center",
"verticalAlign": "middle",
"material": "",
"materialTime": "",
"materialName": "",
"QRcodeType": "",
"width": 1024,
"height": 1024,
"proportion": 60,
"x": 0,
"y": 0,
"opacity": 1,
"optionalColor": [
{
"color": "#000000",
"name": "Black",
"default": true
}
],
"zIndex": 2,
"svgPath": "",
"follow": {
"fill": "",
"ifShow": "",
"content": ""
},
"group": [],
"cameraStand": {
"x": 0,
"y": 0,
"z": 0
}
},
{
"id": "569d7981-25c3-3c03-0e7e-800c14800362",
"tag": "Slogan",
"title": "贴图4",
"type": "text",
"text": "",
"fill": "",
"fontSize": 13,
"fontFamily": "MontserratBold3",
"ifBr": false,
"ifShow": true,
"ifGroup": false,
"maxNum": 50,
"rotation": 0,
"lineHeight": 1,
"align": "center",
"verticalAlign": "middle",
"material": "",
"materialTime": "",
"materialName": "",
"QRcodeType": "",
"width": 309.9999999999993,
"height": 11.999265664648076,
"proportion": 60,
"x": 97.0015259021898,
"y": 575.300725990631,
"opacity": 1,
"optionalColor": [
{
"color": "#000000",
"name": "Black",
"default": true
}
],
"zIndex": 3,
"svgPath": "",
"follow": {
"fill": "38c09538-937d-510c-bf32-bfb1ce90cafa",
"ifShow": "",
"content": ""
},
"group": [],
"cameraStand": {
"x": 0,
"y": 0,
"z": 45
}
},
{
"id": "c466e27c-d48f-db86-b85f-3c4c51114046",
"tag": "Logo",
"title": "贴图8",
"type": "image",
"text": "",
"fill": "#0082ca",
"fontSize": 20,
"fontFamily": "Aqum2SmallCaps3",
"ifBr": false,
"ifShow": true,
"ifGroup": false,
"maxNum": 50,
"rotation": 0,
"lineHeight": 1,
"align": "center",
"verticalAlign": "middle",
"material": "{{LogoMaterial}}",
"materialTime": "",
"materialName": "",
"QRcodeType": "",
"width": 282.9999999999999,
"height": 95.99999999999933,
"proportion": 60,
"x": 110.99999999999982,
"y": 438.7192999999991,
"opacity": 1,
"optionalColor": [
{
"color": "#000000",
"name": "Black",
"default": false
},
{
"name": "MainColor",
"color": "#0082ca",
"default": true
}
],
"zIndex": 7,
"svgPath": "",
"follow": {
"fill": "",
"ifShow": "",
"content": ""
},
"group": [],
"cameraStand": {
"x": 0,
"y": 0,
"z": 0
}
}
]
`

14
constants/tag_level.go Normal file
View File

@ -0,0 +1,14 @@
package constants
// tag分类等级
const (
TYPE_QRCODE = iota + 1 //1
TYPE_WEBSITE //2
TYPE_DESIGN_TOOL //3
)
var MAP_TAG_LEVEL = map[int]string{
TYPE_QRCODE: "二维码分类",
TYPE_WEBSITE: "网站目录",
TYPE_DESIGN_TOOL: "设计工具",
}

28
constants/webset.go Normal file
View File

@ -0,0 +1,28 @@
package constants
type TypeWebSet string
const (
FONT_CONFIG TypeWebSet = "font_config" //字体
POLICY_CONFIG TypeWebSet = "policy" //政策
CLAUSE_CONFIG TypeWebSet = "clause" //条款
FAQ_CONFIG TypeWebSet = "faq" //问答
RECOMMEND_DETAIL_PRODUCT TypeWebSet = "recommend_detail_" //详情页推荐-后街pid
RENDER_DESIGN TypeWebSet = "render_design_" //云渲染 后接client_no
LAST_DESIGN TypeWebSet = "last_design_" //最后设计 后接uid
OTHER_LIST TypeWebSet = "other_list_" //列表页其他列表 后接type 分类id
PRODUCT_INFO TypeWebSet = "product_info_" //详情数据 后接sn
MODEL_DATA TypeWebSet = "model_data" //所有模型数据
TEMPLATE_PRODUCT TypeWebSet = "product_template_" //模板数据 后接产品id
CART_NUM TypeWebSet = "cart_num_" //购物车数量 后接uid
USER_ORDERNO TypeWebSet = "order_no_" //用户最新订单编号
WEBSET_TIME_INFO TypeWebSet = "time_info" //配置时间
WEBSET_TIME_INFO_PRODUCT_DAY TypeWebSet = "product_day" //配置时间--产品制作周期(天)
WEBSET_TIME_INFO_FACTORY_DELIVER_DAY TypeWebSet = "factory_deliver_day" //配置时间--厂家发货到货代周期(天)
WEBSET_TIME_INFO_DELIVER_UPS_DAY TypeWebSet = "deliver_ups_day" //配置时间--货代发货至UPS周期(天)
WEBSET_TIME_INFO_UPS_TRANS_DAY TypeWebSet = "ups_trans_day" //配置时间--UPS运输周期(天)
)

35
constants/websocket.go Normal file
View File

@ -0,0 +1,35 @@
package constants
type Websocket string
// websocket消息类型(主类别)
const (
WEBSOCKET_UNAUTH Websocket = "WEBSOCKET_UNAUTH" //鉴权失败 1级消息单向通信
WEBSOCKET_CONNECT_ERR Websocket = "WEBSOCKET_CONNECT_ERR" //ws连接错误 1级消息单向通信
WEBSOCKET_CONNECT_SUCCESS Websocket = "WEBSOCKET_CONNECT_SUCCESS" //ws连接成功 1级消息单向通信
)
// websocket消息类型(通用通知类别)
const (
WEBSOCKET_COMMON_NOTIFY Websocket = "WEBSOCKET_COMMON_NOTIFY" //通用回调通知1级消息单向通信
)
// websocket消息类型(基本传输结构类别)
const (
WEBSOCKET_ERR_DATA_FORMAT Websocket = "WEBSOCKET_ERR_DATA_FORMAT" //传入数据格式错误1级消息单向通信
)
// websocket消息类型(云渲染类别)
const (
WEBSOCKET_RENDER_IMAGE Websocket = "WEBSOCKET_RENDER_IMAGE" //图片渲染消息(1级消息双向通信)
WEBSOCKET_RENDER_IMAGE_ERR Websocket = "WEBSOCKET_RENDER_IMAGE_ERR" //图片渲染失败消息1级消息单向通信
WEBSOCKET_COMBINE_IMAGE Websocket = "WEBSOCKET_COMBINE_IMAGE" //反回合成刀版图消息2级消息单向通信属于 WEBSOCKET_RENDER_IMAGE 消息的子流程)
WEBSOCKET_ASSEMBLE_RENDER_DATA Websocket = "WEBSOCKET_ASSEMBLE_RENDER_DATA" //组装unity需要的数据 2级消息单向通信属于 WEBSOCKET_RENDER_IMAGE 消息的子流程)
WEBSOCKET_SEND_DATA_TO_UNITY Websocket = "WEBSOCKET_SEND_DATA_TO_UNITY" //发送到unity进行渲染 2级消息单向通信属于 WEBSOCKET_RENDER_IMAGE 消息的子流程)
WEBSOCKET_REQUIRE_BROWSER_RESEND_RENDER Websocket = "WEBSOCKET_REQUIRE_BROWSER_RESEND_RENDER" //后端请求前端去重发渲染任务事件2级消息单向通信属于 WEBSOCKET_RENDER_IMAGE 消息的子流程)
)
// websocket消息类型系统数据变更通知
const (
WEBSOCKET_SYSTEM_DATA_UPDATE_NOTIFY Websocket = "WEBSOCKET_SYSTEM_DATA_UPDATE_NOTIFY" //系统数据更新(1级消息单向通信)
)

View File

@ -1,23 +0,0 @@
syntax = "v1"
info (
title: // TODO: add title
desc: // TODO: add description
author: ""
email: ""
)
type request {
// TODO: add members here and delete this comment
Name string `path:"name,options=you|me"` // parameters are auto validated
}
type response {
// TODO: add members here and delete this comment
Message string `json:"message"`
}
service user-auth {
@handler GreetHandler
get /greet/from/:name(request) returns (response);
}

View File

@ -1,23 +0,0 @@
syntax = "v1"
info (
title: // 个人文件传输
desc: // 图片,pdf,设计logo等
author: ""
email: ""
)
type request {
// TODO: add members here and delete this comment
Name string `path:"name,options=you|me"` // parameters are auto validated
}
type response {
// TODO: add members here and delete this comment
Message string `json:"message"`
}
service user-auth {
@handler GreetHandler
get /greet/from/:name(request) returns (response);
}

View File

@ -1,23 +0,0 @@
syntax = "v1"
info (
title: // TODO: add title
desc: // TODO: add description
author: ""
email: ""
)
type request {
// TODO: add members here and delete this comment
Name string `path:"name,options=you|me"` // parameters are auto validated
}
type response {
// TODO: add members here and delete this comment
Message string `json:"message"`
}
service user-auth {
@handler GreetHandler
get /greet/from/:name(request) returns (response);
}

15
env.yaml Normal file
View File

@ -0,0 +1,15 @@
nacos:
- server.fusen.3718.cn:8848
- server.fusen.3718.cn:8849
username: ...
password: ...
namespace: fs_server_api_dev
group: FS-SERVER-API
proxyserver:
key: /opt/server.dev.fusenpack.com.key
pem: /opt/server.dev.fusenpack.com.pem
serverbackend:
key: /opt/serverbackend.dev.fusenpack.com.key
pem: /opt/serverbackend.dev.fusenpack.com.pem

23
faq.api
View File

@ -1,23 +0,0 @@
syntax = "v1"
info (
title: // TODO: add title
desc: // TODO: add description
author: ""
email: ""
)
type request {
// TODO: add members here and delete this comment
Name string `path:"name,options=you|me"` // parameters are auto validated
}
type response {
// TODO: add members here and delete this comment
Message string `json:"message"`
}
service user-auth {
@handler GreetHandler
get /greet/from/:name(request) returns (response);
}

36
fs_gen_api.sh Executable file
View File

@ -0,0 +1,36 @@
#!/bin/bash
name=${1%%\\*}
excluded_names=("backend" "product-template" "product-model" "basic")
for excluded_name in "${excluded_names[@]}"; do
if [ "$name" = "$excluded_name" ]; then
echo "不能在$name里使用"
exit
fi
done
echo $name
goctl api go -api server_api/$name.api -dir server/$name --home ./goctl_template/
# # List of API filenames without the '.api' extension
# api_names=("backend" "canteen" "home-user-auth" "map-library" "product" "product-template" "shopping-cart-confirmation" "webset" "data-transfer" "inventory" "orders" "product-model" "render" "upload" "assistant")
# # Iterate over API filenames and generate Go code, excluding certain names
# for api_name in "${api_names[@]}"; do
# skip=false
# for excluded_name in "${excluded_names[@]}"; do
# if [ "$api_name" = "$excluded_name" ]; then
# skip=true
# break
# fi
# done
# if [ "$skip" = true ]; then
# continue
# fi
# echo "Generating Go code for $api_name"
# goctl api go -api server_api/"$api_name".api -dir server/"$api_name" --home ./goctl_template/
# done

14
fs_gen_api_backend.sh Executable file
View File

@ -0,0 +1,14 @@
#! /bin/bash
name=${1%%\\*}
options=("backend" "product-template" "product-template-tag" "product-model")
for option in "${options[@]}"; do
if [ "$name" = "$option" ]; then
echo $name
goctl api go -api server_api/$name.api -dir server/$name --home ./goctl_template_backend/
exit
fi
done
for option in "${options[@]}"; do
echo "只支持 $option"
done

9
fs_gen_mysql_model.sh Executable file
View File

@ -0,0 +1,9 @@
#! /bin/bash
# goctl model mysql ddl --src ./ddl/$1.sql --dir model/ --home ./goctl_template
if [ $# -gt 0 ]
then
name=${1%%\\*}
go run generator/main.go -name $name
else
echo "输入: - 表示所有表. 或者 单表名"
fi

25
fs_nacos_etc_pack.sh Executable file
View File

@ -0,0 +1,25 @@
#!/bin/bash
CURRENT_DIR=`pwd`
SOURCE_DIR="server"
TEMP_DIR="/tmp"
DEST_DIR="FS-SERVER-API"
ZIP_FILE="FS-SERVER-API.zip"
mkdir -p $TEMP_DIR/$DEST_DIR
# 查找并复制文件
find "$SOURCE_DIR" -type d -name "etc" -exec sh -c 'cp "$0"/*.yaml "$1"' {} "$TEMP_DIR/$DEST_DIR" \;
cd $TEMP_DIR
# 打包目标文件夹
zip -r "$ZIP_FILE" "$DEST_DIR"
#返回当前目录
cd $CURRENT_DIR
# 移动到当前目录
mv "$TEMP_DIR/$ZIP_FILE" .
# 清理临时文件夹
rm "$TEMP_DIR/$DEST_DIR" -rf

23
fs_package_docker_image.sh Executable file
View File

@ -0,0 +1,23 @@
#!/bin/bash
name=${1%%\\*}
#进入对应服务目录
cd server/$name
#把https加密密钥对复制进来
cp /opt/env.yaml ./
cp /opt/server.fusen.3718.cn.pem ./
cp /opt/server.fusen.3718.cn.key ./
#构建二进制文件
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-s -w" -o ./bin/api-$name-srv ./$name.go
#打包docker镜像
docker build -t api-$name-srv:latest .
#删除临时复制进来的文件
rm ./env.yaml
rm ./server.fusen.3718.cn.pem
rm ./server.fusen.3718.cn.key
#打tag(测试环境正式把命名空间fusentest改成fusen)
docker tag api-$name-srv:latest registry.cn-hangzhou.aliyuncs.com/fusen-test/$name:latest
#推送到阿里云镜像库(测试环境正式把命名空间fusentest改成fusen)
docker push registry.cn-hangzhou.aliyuncs.com/fusen-test/$name:latest
#上传了的镜像
docker rmi -f api-$name-srv:latest
docker rmi -f registry.cn-hangzhou.aliyuncs.com/fusen-test/$name:latest

View File

@ -0,0 +1,29 @@
Subject: Please confirm your {{ .CompanyName }} account;
MIME-version: 1.0;
Content-Type: text/html; charset="UTF-8";
From: "Fusen Support";
<html>
<body>
<p>Dear <span style="color: red;">{{.UserName}}</span>,</p>
<p>Thank you for registering an account with {{ .CompanyName }}. We are thrilled to have you join our community!</p>
<p>Please take a moment to confirm your email address by clicking the button below so we can activate your account:</p>
<a href="{{ .ConfirmationLink }}" target="_blank" style="background-color: #008CBA; color: #FFFFFF; text-decoration: none; padding: 10px 15px; border-radius: 3px; display:inline-block; font-weight: bold;">Confirm Account: {{ .UserName }}</a>
<p>Confirming your email ensures your account is properly secured. This also lets you access member-only tools and content.</p>
<p>If you did not register for {{ .CompanyName }}, please disregard this email. Let us know if you have any other questions!</p>
Regards,
<p><span>{{.SenderName}}</span><br>
<span>{{.SenderTitle}}</span><br>
<span>{{.CompanyName}}</span></p>
<body>
<html>

View File

@ -0,0 +1,27 @@
Subject: Confirm Email Address for {{ .CompanyName }} Account
MIME-version: 1.0
Content-Type: text/html; charset="UTF-8"
From: "Fusen Support"
<html>
<body>
<p>Dear <span style="color: red;">{{.UserName}}</span>,</p>
<p>Thank you for choosing to associate your email address with your {{ .CompanyName }} account({{ .PlatformAndID }}). To complete the process, please click the button below to confirm your email:</p>
<a href="{{ .ConfirmationLink }}" target="_blank" style="background-color: #008CBA; color: #FFFFFF; text-decoration: none; padding: 10px 15px; border-radius: 3px; display:inline-block; font-weight: bold;">Confirm Email: {{ .Email }}</a>
<p>By confirming your email, you will be able to access additional features and receive important notifications related to your {{ .CompanyName }} account.</p>
<p>If you did not initiate this request or have any questions, please disregard this email. Your email address will not be associated with any account.</p>
Regards,
<p><span>{{.SenderName}}</span><br>
<span>{{.SenderTitle}}</span><br>
<span>{{.CompanyName}}</span></p>
</body>
</html>

View File

@ -0,0 +1,32 @@
Subject: Password Reset Request for Your {{ .CompanyName }} Account
MIME-version: 1.0;
Content-Type: text/html; charset="UTF-8";
From: "Fusen Support";
<html>
<body>
<p>Dear <span style="color: red;">{{.UserName}}</span>,</p>
<p>We have received your request to reset the password for your {{.CompanyName}} account.</p>
<p>To proceed with the password reset, please click the button below to open the Reset Password page:</p>
<div style="margin: 1em 0;">
<a href="{{.ConfirmationLink}}" target="_blank"
style="background-color: #008CBA; color: #FFFFFF; text-decoration: none; padding: 10px 15px; border-radius: 3px; display:inline-block;">
Reset Password
</a>
</div>
<p>Please note that this password reset confirmation link will expire in 60 minutes. If you have any further questions, feel free to reach out to us.</p>
<p>Regards,</p>
<p><span>{{.SenderName}}</span><br>
<span>{{.SenderTitle}}</span><br>
<span>{{.CompanyName}}</span></p>
</body>
</html>

View File

@ -0,0 +1,179 @@
<!DOCTYPE html>
<html>
<head>
<meta name="viewport" content="width=device-width, initial-scale=1">
<style>
body {
font-family: Arial, sans-serif;
background-color: #f5f5f5;
}
.container {
margin: 0 auto;
max-width: 400px;
margin: 50px auto;
background-color: #fff;
padding: 20px;
border-radius: 5px;
box-shadow: 0 2px 5px rgba(0, 0, 0, 0.3);
}
h2 {
text-align: center;
margin-bottom: 20px;
}
.form-group {
margin-bottom: 15px;
display: flex;
}
input[type="password"] {
flex: 1;
}
label {
display: block;
margin-bottom: 5px;
width: 9rem;
}
input[type="password"] {
padding: 1rem;
border: 1px solid #ccc;
border-radius: 3px;
}
button {
width: 100%;
padding: 10px;
background-color: #007bff;
color: #fff;
border: none;
border-radius: 5px;
cursor: pointer;
}
button:hover {
background-color: #0056b3;
}
/* Mobile */
@media screen and (max-width: 767px) {
.container {
padding: 10px;
}
h2 {
font-size: 1.5rem;
}
.form-group {
flex-direction: column;
box-sizing: border-box;
}
label {
margin-bottom: 10px;
}
}
/* Tablet */
@media screen and (min-width: 768px) and (max-width: 1023px) {
.container {
padding: 30px;
}
.form-group {
flex-direction: row;
}
}
/* Desktop */
@media screen and (min-width: 1024px) {
.container {
max-width: 600px;
}
}
</style>
</head>
<body>
<div class="container">
<h2>Reset Password</h2>
<form id="resetForm">
<div class="form-group">
<label for="new_password">New Password</label>
<input id="new_password" type="password" placeholder="New Password" required pattern="^(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}$" title="The password must be at least 8 characters in length, and contain at least 1 number, 1 lowercase letter and 1 uppercase letter."/>
</div>
<div class="form-group">
<label for="confirm_password">Confirm Password</label>
<input id="confirm_password" type="password" placeholder="Confirm Password" required pattern="^(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}$" title="The password must be at least 8 characters in length, and contain at least 1 number, 1 lowercase letter and 1 uppercase letter."/>
</div>
<button type="button" onclick="resetPassword()">Reset Password</button>
</form>
</div>
<script>
function resetPassword() {
const new_password = document.getElementById("new_password").value;
const confirm_password = document.getElementById("confirm_password").value;
if (!/^(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}$/.test(new_password)) {
alert("The password must be at least 8 characters in length, and contain at least 1 number, 1 lowercase letter and 1 uppercase letter.");
return;
}
if (new_password !== confirm_password) {
alert("Passwords do not match");
return;
}
sha256ToBase64(new_password).then((hash) => {
const data = {
new_password: hash,
reset_token: "{{.ResetToken}}",
};
fetch('{{.ResetPasswordLink}}', {
method: 'POST',
headers: {
'Content-Type': 'application/json'
},
body: JSON.stringify(data)
})
.then(response => response.json())
.then(data => {
if (data.code == 200 ) {
alert("reset password success");
window.location.href = "{{.HomePage}}";
{{/* setTimeout(function() {
window.location.href = "{{.HomePage}}";
}, 1000); */}}
} else {
alert(data.msg);
}
})
.catch(error => {
console.error('Error:', error);
});
});
}
function sha256ToBase64(message) {
const msgBuffer = new TextEncoder().encode(message);
return crypto.subtle.digest('SHA-256', msgBuffer).then((hashBuffer) => {
const hashArray = Array.from(new Uint8Array(hashBuffer));
const hashBase64 = btoa(hashArray.reduce((str, byte) => str + String.fromCharCode(byte), ''));
return hashBase64;
});
}
</script>
</body>
</html>

116
fs_template/test.tpl Normal file
View File

@ -0,0 +1,116 @@
Subject: Please confirm your {{ .CompanyName }} account;
MIME-version: 1.0;
Content-Type: text/html; charset="UTF-8";
From: "Fusen Support";
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>订单状态流转</title>
</head>
<style>
* {
margin: 0;
padding: 0;
}
</style>
<body>
<div style="
width: 50%;
max-width: 600px;
min-width: 350px;
margin: 0 auto;
background-color: #FFFFFF;">
<div>
<h1><img style="
width: 22%;
height: 6%;
padding: 50px 0 30px 8%;" src="https://fusenstorage.s3.us-east-2.amazonaws.com/2c3938702c52d46550fffae344f1619dd71c447f3b19882045205fcd8adbd6bf" alt=""></h1>
</div>
<div>
<h2 style="
width: 84%;
font-size: 47px;
font-family: Gotham-Bold, Gotham;
font-weight: bold;
color: #212121;
line-height: 58px;
padding-bottom: 24px;
padding-left: 8%;">The status of your order has changed!</h2>
<p style="
width: 84%;
font-size: 14px;
font-weight: normal;
color: #212121;
line-height: 21px;
padding-bottom: 40px;
padding-left: 8%;">
Your order has been changed from "原状态" to "现状态".</p>
<a href="" style="
display: block;
text-align: center;
width: 80%;
height: 24px;
font-size: 16px;
font-family: Gotham-Bold, Gotham;
font-weight: bold;
color: #FFFFFF;
line-height: 24px;
margin: 0 auto;
background-color: #FF7F00;
padding: 15px 12px;
margin-bottom: 60px;
border-radius: 200px;
text-decoration: none;">Check Your Order</a>
</div>
<div>
<div style="
width: 80%;
background-color: #F8F8F8;
padding: 20px 30px;
margin: 0 auto;">
<h3 style="
height: 28px;
font-size: 16px;
font-family: Gotham-Bold, Gotham;
font-weight: bold;
color: #212121;
line-height: 28px;">Search Logo, Get Design</h3>
<p style=" height: 21px;
font-size: 12px;
font-family: Gotham-Medium, Gotham;
font-weight: 500;
color: #212121;
line-height: 21px;">Our products</p>
<p style=" height: 21px;
font-size: 12px;
font-family: Gotham-Medium, Gotham;
font-weight: 500;
color: #212121;
line-height: 21px;">Try it out</p>
<div style="
width: 100%;
padding: 17px 0 10px 0 ;
border-bottom: 1px solid #CCCCCC;
margin-bottom: 10px;">
<img style="width: 14px;height: 14px;" src="https://fusenstorage.s3.us-east-2.amazonaws.com/7d6e04f8a90762210f8b8fc307198776b8dc42998adc90bab41e178053552b2c" alt="">
<span> support@fusenpack.com</span>
</div>
<span style="
width: 74px;
height: 21px;
font-size: 12px;
font-weight: normal;
color: #999999;
line-height: 21px;
display: block;
cursor: pointer;
text-decoration: none;">Unsubscribe</span>
</div>
</div>
</div>
</body>
</html>

39
generator/gen_test.go Normal file
View File

@ -0,0 +1,39 @@
package main
import (
"fmt"
"regexp"
"testing"
)
func TestA(t *testing.T) {
main3()
}
func main3() {
ddl := `CREATE TABLE fs_guest (
guest_id bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'ID',
auth_key varchar(512) NOT NULL DEFAULT '' COMMENT 'jwt token',
status tinyint(3) unsigned DEFAULT '1' COMMENT '1正常 0不正常',
is_del tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否删除 1删除',
created_at int(11) NOT NULL DEFAULT '0' COMMENT '添加时间',
updated_at int(11) NOT NULL DEFAULT '0' COMMENT '更新时间',
is_open_render tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否打开个性化渲染1开启0关闭',
is_thousand_face tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否已经存在千人千面1存在0不存在',
is_low_rendering tinyint(1) unsigned zerofill NOT NULL DEFAULT '0' COMMENT '是否开启低渲染模型渲染',
is_remove_bg tinyint(1) NOT NULL DEFAULT '1' COMMENT '用户上传logo是否去除背景',
guid decimal(10,2) NOT NULL,
PRIMARY KEY (guest_id) USING BTREE,
UNIQUE KEY fs_guest_guid_IDX (guid) USING BTREE,
KEY fs_guest_is_del_IDX (is_del) USING BTREE,
KEY fs_guest_status_IDX (status) USING BTREE,
KEY fs_guest_created_at_IDX (created_at) USING BTREE
) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='游客表'`
// 正则表达式匹配
r, _ := regexp.Compile(`CREATE TABLE (\S+) \..*COMMENT='(.*)'`)
matches := r.FindStringSubmatch(ddl)
// 输出结果
fmt.Println("表名:", matches[1])
fmt.Println("注释:", matches[2])
}

View File

@ -0,0 +1,25 @@
package main
import (
"log"
"regexp"
"testing"
_ "github.com/go-sql-driver/mysql"
)
func TestXMain(t *testing.T) {
a := " FsAddress *FsAddressModel // fs_address 用户地址表"
re := regexp.MustCompile(`([A-Za-z0-9_]+) [^/]+ // ([^ ]+) (.+)$`)
for _, line := range re.FindStringSubmatch(a) {
log.Println(line)
}
log.Println(re.FindStringSubmatch(a))
// testGenDir = "../" + testGenDir
// GenAllModels(testGenDir, TableNameComment{
// Name: "FsFont",
// Comment: "测试",
// })
// Now you can use the generated GORM model to interact with the database
}

571
generator/main.go Normal file
View File

@ -0,0 +1,571 @@
package main
import (
"database/sql"
"flag"
"fmt"
"log"
"os"
"os/exec"
"regexp"
"sort"
"strconv"
"strings"
"golang.org/x/text/cases"
"golang.org/x/text/language"
_ "github.com/go-sql-driver/mysql"
)
var testName = "fs_auth_item"
var testGenDir = "model/gmodel"
func toPascalCase(s string) string {
words := strings.Split(s, "_")
for i, word := range words {
words[i] = cases.Title(language.English).String(strings.ToLower(word))
}
return strings.Join(words, "")
}
func GetAllTableNames(uri string) []string {
db, err := sql.Open("mysql", uri)
if err != nil {
panic(err)
}
defer db.Close()
rows, err := db.Query("SHOW TABLES")
if err != nil {
panic(err)
}
var tableNames []string
for rows.Next() {
var tableName string
if err := rows.Scan(&tableName); err != nil {
panic(err)
}
tableNames = append(tableNames, tableName)
}
return tableNames
}
// "fsreaderwriter:XErSYmLELKMnf3Dh@tcp(fusen.cdmigcvz3rle.us-east-2.rds.amazonaws.com:3306)/fusen"
func GetColsFromTable(tname string, db *sql.DB) (result []Column, tableName, tableComment string) {
var a, ddl string
err := db.QueryRow("SHOW CREATE TABLE "+tname).Scan(&a, &ddl)
// log.Println(ddl)
if err != nil {
panic(err)
}
return ParserDDL(ddl)
}
var gmodelVarStr = `
package gmodel
import "gorm.io/gorm"
// AllModelsGen 所有Model集合,修改单行,只要不改字段名,不会根据新的内容修改,需要修改的话手动删除
type AllModelsGen struct {
}
func NewAllModels(gdb *gorm.DB) *AllModelsGen {
models := &AllModelsGen{
}
return models
}
`
var gmodelVarStrFormat = `
package gmodel
import "gorm.io/gorm"
// AllModelsGen 所有Model集合,修改单行,只要不改字段名,不会根据新的内容修改,需要修改的话手动删除
type AllModelsGen struct {
%s
}
func NewAllModels(gdb *gorm.DB) *AllModelsGen {
models := &AllModelsGen{
%s
}
return models
}
`
type TableNameComment struct {
Name string
GoName string
Comment string
}
type TMCS []TableNameComment
func (u TMCS) Len() int {
return len(u)
}
func (u TMCS) Less(i, j int) bool {
return u[i].Name < u[j].Name
}
func (u TMCS) Swap(i, j int) {
u[i], u[j] = u[j], u[i]
}
func GenAllModels(filedir string, tmcs ...TableNameComment) {
fileName := filedir + "/var_gen.go"
var dupMap map[string]TableNameComment = make(map[string]TableNameComment)
for _, tmc := range tmcs {
dupMap[tmc.Name] = tmc
}
if _, err := os.Stat(fileName); err == nil {
log.Printf("%s exists!", fileName)
data, err := os.ReadFile(fileName)
if err != nil {
panic(err)
}
filestr := string(data)
filelines := strings.Split(filestr, "\n")
re := regexp.MustCompile(`([A-Za-z0-9_]+) [^/]+ // ([^ ]+) (.+)$`)
for _, line := range filelines {
result := re.FindStringSubmatch(line)
if len(result) > 0 {
// key := result[0]
if len(result) != 4 {
log.Println(result)
}
log.Println(result)
tmc := TableNameComment{
Name: result[2],
GoName: result[1],
Comment: result[3],
}
if newTmc, ok := dupMap[tmc.Name]; ok {
log.Printf("not change: (old)%v -> (new)%v", tmc, newTmc)
}
dupMap[tmc.Name] = tmc
}
}
tmcs = nil
for _, tmc := range dupMap {
tmcs = append(tmcs, tmc)
}
sort.Sort(TMCS(tmcs))
structStr := ""
newModelsStr := ""
for _, tmc := range tmcs {
fsline := fmt.Sprintf("%s *%sModel // %s %s\n", tmc.GoName, tmc.GoName, tmc.Name, tmc.Comment)
structStr += fsline
nmline := fmt.Sprintf("%s: New%sModel(gdb),\n", tmc.GoName, tmc.GoName)
newModelsStr += nmline
}
content := fmt.Sprintf(gmodelVarStrFormat, structStr, newModelsStr)
f, err := os.OpenFile(fileName, os.O_TRUNC|os.O_CREATE|os.O_WRONLY, 0644)
if err != nil {
panic(err)
}
_, err = f.WriteString(content)
if err != nil {
panic(err)
}
} else if os.IsExist(err) {
f, err := os.Create(fileName)
if err != nil {
panic(err)
}
_, err = f.WriteString(gmodelVarStr)
if err != nil {
panic(err)
}
} else {
panic(err)
}
err := exec.Command("gofmt", "-w", fileName).Run()
if err != nil {
panic(err)
}
}
func main() {
var mysqluri string
var name string // 需要序列化的单独文件名
var mdir string // 需要修改的序列化路径 model
flag.StringVar(&mysqluri, "uri", "fsreaderwriter:XErSYmLELKMnf3Dh@tcp(fusen.cdmigcvz3rle.us-east-2.rds.amazonaws.com:3306)/fusen", "输入需要序列化的ddl文件名, 不需要后缀.ddl")
flag.StringVar(&name, "name", "", "输入需要序列化的ddl文件名, 不需要后缀.ddl")
flag.StringVar(&mdir, "mdir", "", "输入需要生成model的Go文件所在目录")
flag.Parse()
if mdir != "" {
testGenDir = mdir
}
db, err := sql.Open("mysql", mysqluri)
if err != nil {
panic(err)
}
defer db.Close()
var tmcs []TableNameComment
if name == "-" {
tablenames := GetAllTableNames(mysqluri)
for _, testName := range tablenames {
// if testName != "fs_user_info" {
// continue
// }
cols, tname, tcomment := GetColsFromTable(testName, db)
GenFromPath(testGenDir, cols, tname, tcomment)
tmcs = append(tmcs, TableNameComment{
Name: tname,
GoName: toPascalCase(tname),
Comment: tcomment,
})
}
} else {
if name != "" {
testName = name
}
// log.Println(testName)
cols, tname, tcomment := GetColsFromTable(testName, db)
GenFromPath(testGenDir, cols, tname, tcomment)
tmcs = append(tmcs, TableNameComment{
Name: tname,
GoName: toPascalCase(tname),
Comment: tcomment,
})
}
GenAllModels(testGenDir, tmcs...)
// tablenames := GetAllTableNames(mysqluri)
// log.Println(tablenames)
// name
}
func GenFromPath(mdir string, cols []Column, tableName string, tableComment string) {
var importstr = "import (\"gorm.io/gorm\"\n"
// 匹配到主键定义
fcontent := "package gmodel\n"
structstr := "// %s %s\ntype %s struct {%s\n}\n"
pTableName := toPascalCase(tableName)
fieldstr := ""
for _, col := range cols {
fieldName := toPascalCase(col.Name)
typeName := typeForMysqlToGo[col.GetType()]
var defaultString string
if col.DefaultValue != nil {
switch typeName {
case "*int64", "*uint64", "*float64", "*bool":
defaultString = "default:" + strings.Trim(*col.DefaultValue, "'") + ";"
default:
defaultString = "default:" + *col.DefaultValue + ";"
}
} else {
switch typeName {
case "*string":
defaultString = "default:'';"
case "*time.Time":
defaultString = "default:'0000-00-00 00:00:00';"
case "*[]byte":
defaultString = "default:'';"
case "*int64", "*uint64":
defaultString = "default:0;"
case "*float64":
defaultString = "default: 0.0;"
case "*bool":
defaultString = "default:0;"
default:
// if fieldName == "Metadata" {
// log.Println()
// }
fieldName = "// " + fieldName + " " + col.Type
}
}
if typeName == "*time.Time" {
importstr += "\"time\"\n"
}
if col.IndexType == "primary_key" {
typeName = typeName[1:]
}
tagstr := "`gorm:"
gormTag := ""
if col.IndexType != "" {
gormTag += col.IndexType + ";"
}
gormTag += defaultString
if col.AutoIncrement {
gormTag += "auto_increment;"
}
tagstr += fmt.Sprintf("\"%s\"", gormTag)
tagstr += fmt.Sprintf(" json:\"%s\"`", col.Name)
fieldColStr := fmt.Sprintf("\n%s %s %s// %s", fieldName, typeName, tagstr, col.Comment)
fieldstr += fieldColStr
}
fcontent += importstr + ")\n"
fcontent += fmt.Sprintf(structstr, tableName, tableComment, pTableName, fieldstr)
modelstr := fmt.Sprintf(`type %sModel struct {db *gorm.DB
name string}`, pTableName)
fcontent += modelstr
fcontent += "\n"
newfuncstr := fmt.Sprintf(`func New%sModel(db *gorm.DB) *%sModel {return &%sModel{db:db,name:"%s"}}`, pTableName, pTableName, pTableName, tableName)
fcontent += newfuncstr
fcontent += "\n"
genGoFileName := fmt.Sprintf("%s/%s_gen.go", mdir, tableName)
f, err := os.OpenFile(genGoFileName, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0644)
if err != nil {
panic(err)
}
f.WriteString(fcontent)
err = f.Close()
if err != nil {
panic(err)
}
err = exec.Command("gofmt", "-w", genGoFileName).Run()
if err != nil {
panic(err)
}
fcontent = "package gmodel\n// TODO: 使用model的属性做你想做的"
genGoLogicFileName := fmt.Sprintf("%s/%s_logic.go", mdir, tableName)
// 使用 os.Stat 函数获取文件信息
_, err = os.Stat(genGoLogicFileName)
// 判断文件是否存在并输出结果
if os.IsNotExist(err) {
f2, err := os.OpenFile(genGoLogicFileName, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0644)
if err != nil {
panic(err)
}
f2.WriteString(fcontent)
err = f2.Close()
if err != nil {
panic(err)
}
fmt.Println(genGoLogicFileName, "create!")
} else {
fmt.Println(genGoLogicFileName, "exists")
}
}
type Column struct {
Name string
Type string
DefaultValue *string
Length int
Decimal int
Unsigned bool
NotNull bool
AutoIncrement bool
Comment string
IndexType string
}
func (col *Column) GetType() string {
content := col.Type
if col.Unsigned {
return content + " unsigned"
}
return content
}
var typeForMysqlToGo = map[string]string{
// 整数
"int": "*int64",
"integer": "*int64",
"tinyint": "*int64",
"smallint": "*int64",
"mediumint": "*int64",
"bigint": "*int64",
"year": "*int64",
"int unsigned": "*int64",
"integer unsigned": "*int64",
"tinyint unsigned": "*int64",
"smallint unsigned": "*int64",
"mediumint unsigned": "*int64",
"bigint unsigned": "*int64",
"bit": "*int64",
// 布尔类型
"bool": "*bool",
// 字符串
"enum": "*string",
"set": "*string",
"varchar": "*string",
"char": "*string",
"tinytext": "*string",
"mediumtext": "*string",
"text": "*string",
"longtext": "*string",
// 二进制
"binary": "*[]byte",
"varbinary": "*[]byte",
"blob": "*[]byte",
"tinyblob": "*[]byte",
"mediumblob": "*[]byte",
"longblob": "*[]byte",
// 日期时间
"date": "*time.Time",
"datetime": "*time.Time",
"timestamp": "*time.Time",
"time": "*time.Time",
// 浮点数
"float": "*float64",
"double": "*float64",
"decimal": "*float64",
}
func ParserDDL(ddl string) (result []Column, tableName, tableComment string) {
reTable := regexp.MustCompile(`CREATE TABLE +([^ ]+) +\(`)
reTableComment := regexp.MustCompile(`.+COMMENT='(.+)'$`)
reField := regexp.MustCompile("`([^`]+)` +([^ \n\\(\\,]+)(?:\\(([^)]+)\\))?( +unsigned| +UNSIGNED)?( +not +null| +NOT +NULL)?( +default +\\'[^\\']*'| +DEFAULT +\\'[^\\']*')?( +auto_increment| +AUTO_INCREMENT)?( comment '[^']*'| COMMENT '[^']*')?(,)?")
reIndex := regexp.MustCompile(`(?i)(PRIMARY|UNIQUE)?\s*(INDEX|KEY)\s*(` + "`([^`]*)`" + `)?\s*\(([^)]+)\)`)
reValue := regexp.MustCompile(` '(.+)'$`)
reDefaultValue := regexp.MustCompile(` ('.+')$`)
var fieldmap map[string]string = make(map[string]string)
indexMatches := reIndex.FindAllStringSubmatch(ddl, -1)
for _, m := range indexMatches {
idxAttr := strings.Trim(m[5], "`")
PrefixName := strings.ToUpper(m[1])
if PrefixName == "PRIMARY" {
fieldmap[idxAttr] = "primary_key"
} else if PrefixName == "UNIQUE" {
fieldmap[idxAttr] = "unique_key"
} else if PrefixName == "" {
fieldmap[idxAttr] = "index"
} else {
log.Fatal(PrefixName)
}
}
tableMatches := reTable.FindStringSubmatch(ddl)
tableName = strings.Trim(tableMatches[1], "`")
tableCommentMatches := reTableComment.FindStringSubmatch(ddl)
if len(tableCommentMatches) > 0 {
tableComment = strings.Trim(tableCommentMatches[1], "`")
}
// log.Println(tableName, tableComment)
fieldMatches := reField.FindAllStringSubmatch(ddl, -1)
for _, m := range fieldMatches {
if m[0] == "" {
continue
}
col := Column{
Name: m[1],
Type: strings.ToLower(m[2]),
}
if col.Type == "json" {
col.Type = "blob"
}
col.IndexType = fieldmap[col.Name]
if m[3] != "" {
maylen := strings.Split(m[3], ",")
if len(maylen) >= 1 {
clen, err := strconv.ParseInt(maylen[0], 10, 64)
if err != nil {
panic(err)
}
col.Length = int(clen)
}
if len(maylen) >= 2 {
clen, err := strconv.ParseInt(maylen[1], 10, 64)
if err != nil {
panic(err)
}
col.Decimal = int(clen)
}
}
if len(m[4]) > 0 {
col.Unsigned = true
}
if len(m[5]) > 0 {
col.NotNull = true
}
if len(m[6]) > 0 {
v := reDefaultValue.FindStringSubmatch(m[6])
if len(v) > 0 {
dv := string(v[1])
col.DefaultValue = &dv
}
}
if len(m[7]) > 0 {
col.AutoIncrement = true
}
if len(m[8]) > 0 {
v := reValue.FindStringSubmatch(m[8])
if len(v) > 0 {
col.Comment = v[1]
}
}
result = append(result, col)
// fmt.Println(col)
}
return result, tableName, tableComment
}

14
generator/main_test.go Normal file
View File

@ -0,0 +1,14 @@
package main
import (
"os"
"testing"
)
func TestMain(t *testing.T) {
// args := []string{"-name", "fs_guest"}
testGenDir = "../" + testGenDir
os.Args = []string{"cmd", "-name=-"}
main()
}

145
go.mod Normal file
View File

@ -0,0 +1,145 @@
module fusenapi
go 1.20
require (
github.com/474420502/passer v0.0.1
github.com/SebastiaanKlippert/go-wkhtmltopdf v1.9.0
github.com/aliyun/aliyun-oss-go-sdk v3.0.1+incompatible
github.com/aws/aws-sdk-go v1.44.295
github.com/bwmarrin/snowflake v0.3.0
github.com/disintegration/imaging v1.6.2
github.com/go-ldap/ldap/v3 v3.4.6
github.com/go-resty/resty/v2 v2.7.0
github.com/golang-jwt/jwt v3.2.2+incompatible
github.com/google/uuid v1.3.1
github.com/gorilla/websocket v1.5.0
github.com/hashicorp/raft v1.5.0
github.com/lni/dragonboat/v4 v4.0.0-20230709075559-54497b9553be
github.com/mozillazg/go-pinyin v0.19.0
github.com/nacos-group/nacos-sdk-go/v2 v2.2.3
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646
github.com/patrickmn/go-cache v2.1.0+incompatible
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
github.com/streadway/amqp v1.1.0
github.com/stripe/stripe-go/v75 v75.7.0
github.com/zeromicro/go-zero v1.5.4
golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8
golang.org/x/oauth2 v0.10.0
gorm.io/driver/mysql v1.5.1
gorm.io/gorm v1.25.1
)
require (
cloud.google.com/go/compute v1.20.1 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect
github.com/BurntSushi/toml v1.1.0 // indirect
github.com/DataDog/zstd v1.4.5 // indirect
github.com/HdrHistogram/hdrhistogram-go v1.1.2 // indirect
github.com/VictoriaMetrics/metrics v1.18.1 // indirect
github.com/aliyun/alibaba-cloud-sdk-go v1.61.1704 // indirect
github.com/andybalholm/brotli v1.0.5 // indirect
github.com/armon/go-metrics v0.4.1 // indirect
github.com/buger/jsonparser v1.1.1 // indirect
github.com/cockroachdb/errors v1.9.0 // indirect
github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f // indirect
github.com/cockroachdb/pebble v0.0.0-20221207173255-0f086d933dac // indirect
github.com/cockroachdb/redact v1.1.3 // indirect
github.com/getsentry/sentry-go v0.12.0 // indirect
github.com/go-asn1-ber/asn1-ber v1.5.5 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/mock v1.6.0 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/btree v1.0.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-hclog v1.5.0 // indirect
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
github.com/hashicorp/go-msgpack v0.5.5 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/go-sockaddr v1.0.0 // indirect
github.com/hashicorp/golang-lru v0.5.4 // indirect
github.com/hashicorp/memberlist v0.3.1 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.15.15 // indirect
github.com/kr/pretty v0.3.1 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/lni/goutils v1.3.1-0.20220604063047-388d67b4dbc4 // indirect
github.com/lni/vfs v0.2.1-0.20220616104132-8852fd867376 // indirect
github.com/miekg/dns v1.1.26 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pierrec/lz4/v4 v4.1.17 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/rogpeppe/go-internal v1.9.0 // indirect
github.com/schollz/progressbar v1.0.0 // indirect
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect
github.com/valyala/fastrand v1.1.0 // indirect
github.com/valyala/histogram v1.2.0 // indirect
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.14.0 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/multierr v1.9.0 // indirect
go.uber.org/zap v1.24.0 // indirect
golang.org/x/crypto v0.13.0 // indirect
golang.org/x/exp v0.0.0-20230728194245-b0cb94b80691 // indirect
golang.org/x/sync v0.2.0 // indirect
golang.org/x/time v0.3.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect
gopkg.in/ini.v1 v1.66.4 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
)
require (
github.com/474420502/requests v1.42.0
github.com/jinzhu/inflection v1.0.0 // indirect
github.com/jinzhu/now v1.1.5 // indirect
github.com/tidwall/gjson v1.13.0
github.com/tidwall/match v1.1.1 // indirect
github.com/tidwall/pretty v1.2.0 // indirect
)
require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/cenkalti/backoff/v4 v4.2.0 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/fatih/color v1.15.0 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-sql-driver/mysql v1.7.1
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/gorilla/mux v1.8.0
github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.0 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.17 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/openzipkin/zipkin-go v0.4.1 // indirect
github.com/pelletier/go-toml/v2 v2.0.9 // indirect
github.com/prometheus/client_golang v1.16.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.42.0 // indirect
github.com/prometheus/procfs v0.10.1 // indirect
github.com/rs/cors v1.9.0
github.com/spaolacci/murmur3 v1.1.0 // indirect
go.opentelemetry.io/otel v1.14.0
go.opentelemetry.io/otel/exporters/jaeger v1.14.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.14.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.14.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.14.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.14.0 // indirect
go.opentelemetry.io/otel/exporters/zipkin v1.14.0 // indirect
go.opentelemetry.io/otel/sdk v1.14.0 // indirect
go.opentelemetry.io/otel/trace v1.14.0
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
go.uber.org/automaxprocs v1.5.2 // indirect
golang.org/x/net v0.12.0 // indirect
golang.org/x/sys v0.12.0 // indirect
golang.org/x/text v0.13.0
google.golang.org/genproto v0.0.0-20230530153820-e85fd2cbaebc // indirect
google.golang.org/grpc v1.56.2 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/yaml.v2 v2.4.0
)

1053
go.sum Normal file

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,12 @@
package config
import {{.authImport}}
type Config struct {
rest.RestConf
SourceMysql string
Auth types.Auth
SourceRabbitMq string
{{.auth}}
{{.jwtTrans}}
}

View File

@ -0,0 +1,38 @@
package svc
import (
{{.configImport}}
"errors"
"fmt"
"net/http"
"fusenapi/utils/autoconfig"
"fusenapi/initalize"
"fusenapi/model/gmodel"
"gorm.io/gorm"
"github.com/golang-jwt/jwt"
)
type ServiceContext struct {
Config {{.config}}
{{.middleware}}
SharedState *fsm.StateCluster
MysqlConn *gorm.DB
AllModels *gmodel.AllModelsGen
RabbitMq *initalize.RabbitMqHandle
}
func NewServiceContext(c {{.config}}) *ServiceContext {
conn := initalize.InitMysql(c.SourceMysql)
return &ServiceContext{
Config: c,
MysqlConn: conn,
SharedState: nil,
AllModels: gmodel.NewAllModels(initalize.InitMysql(c.SourceMysql)),
RabbitMq:initalize.InitRabbitMq(c.SourceRabbitMq, nil),
{{.middlewareAssignment}}
}
}

View File

@ -0,0 +1,10 @@
Name: {{.serviceName}}
Host: {{.host}}
Port: {{.port}}
Timeout: 15000 #服务超时时间(毫秒)
SourceMysql: fsreaderwriter:XErSYmLELKMnf3Dh@tcp(fusen.cdmigcvz3rle.us-east-2.rds.amazonaws.com:3306)/fusen
SourceRabbitMq: ""
Auth:
AccessSecret: fusen2023
AccessExpire: 2592000
RefreshAfter: 1592000

View File

@ -0,0 +1,33 @@
package {{.PkgName}}
import (
"net/http"
"reflect"
"fusenapi/utils/basic"
{{.ImportPackages}}
)
func {{.HandlerName}}(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
{{if .HasRequest}}var req types.{{.RequestType}}
userinfo, err := basic.RequestParse(w, r, svcCtx, &req)
if err != nil {
return
}
// 创建一个业务逻辑层实例
{{end}}l := {{.LogicName}}.New{{.LogicType}}(r.Context(), svcCtx)
rl := reflect.ValueOf(l)
basic.BeforeLogic(w, r, rl)
{{if .HasResp}}resp{{end}} := l.{{.Call}}({{if .HasRequest}}&req, {{end}}userinfo)
if !basic.AfterLogic(w, r, rl, resp) {
basic.NormalAfterLogic(w, r, resp)
}
}
}

View File

@ -0,0 +1,39 @@
package {{.pkgName}}
import (
"fusenapi/utils/auth"
"fusenapi/utils/basic"
{{.imports}}
)
type {{.logic}} struct {
logx.Logger
ctx context.Context
svcCtx *svc.ServiceContext
}
func New{{.logic}}(ctx context.Context, svcCtx *svc.ServiceContext) *{{.logic}} {
return &{{.logic}}{
Logger: logx.WithContext(ctx),
ctx: ctx,
svcCtx: svcCtx,
}
}
// 处理进入前逻辑w,r
// func (l *{{.logic}}) BeforeLogic(w http.ResponseWriter, r *http.Request) {
// }
func (l *{{.logic}}) {{.function}}({{.request}}, userinfo *auth.UserInfo) (resp *basic.Response) {
// 返回值必须调用Set重新返回, resp可以空指针调用 resp.SetStatus(basic.CodeOK, data)
// userinfo 传入值时, 一定不为null
{{.returnString}} resp.SetStatus(basic.CodeOK)
}
// 处理逻辑后 w,r 如:重定向, resp 必须重新处理
// func (l *{{.logic}}) AfterLogic(w http.ResponseWriter, r *http.Request, resp *basic.Response) {
// // httpx.OkJsonCtx(r.Context(), w, resp)
// }

View File

@ -0,0 +1,36 @@
package main
import (
"flag"
"fmt"
"net/http"
"time"
"fusenapi/utils/auth"
"fusenapi/utils/fsconfig"
{{.importPackages}}
)
var configFile = flag.String("f", "etc/{{.serviceName}}.yaml", "the config file")
func main() {
flag.Parse()
var c config.Config
fsconfig.StartNacosConfig(*configFile, &c, nil)
c.Timeout = int64(time.Second * 15)
server := rest.MustNewServer(c.RestConf, rest.WithCustomCors(auth.FsCors, func(w http.ResponseWriter) {
}))
defer server.Stop()
ctx := svc.NewServiceContext(c)
handler.RegisterHandlers(server, ctx)
fmt.Printf("Starting server at %s:%d...\n", c.Host, c.Port)
server.Start()
}

View File

@ -0,0 +1,19 @@
package middleware
import "net/http"
type {{.name}} struct {
}
func New{{.name}}() *{{.name}} {
return &{{.name}}{}
}
func (m *{{.name}})Handle(next http.HandlerFunc) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
// TODO generate middleware implement function, delete after code implementation
// Passthrough to next handler if need
next(w, r)
}
}

View File

@ -0,0 +1,4 @@
server.AddRoutes(
{{.routes}} {{.jwt}}{{.signature}} {{.prefix}} {{.timeout}} {{.maxBytes}}
)

View File

@ -0,0 +1,13 @@
// Code generated by goctl. DO NOT EDIT.
package handler
import (
"net/http"{{if .hasTimeout}}
"time"{{end}}
{{.importPackages}}
)
func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
{{.routesAdditions}}
}

View File

@ -0,0 +1,24 @@
syntax = "v1"
info (
title: // TODO: add title
desc: // TODO: add description
author: "{{.gitUser}}"
email: "{{.gitEmail}}"
)
type request {
// TODO: add members here and delete this comment
}
type response {
// TODO: add members here and delete this comment
}
service {{.serviceName}} {
@handler GetUser // TODO: set handler name and delete this comment
get /users/id/:userId(request) returns(response)
@handler CreateUser // TODO: set handler name and delete this comment
post /users/create(request)
}

View File

@ -0,0 +1,50 @@
// Code generated by goctl. DO NOT EDIT.
package types
import (
{{if .containsTime}}"time"{{end}}
"fusenapi/utils/basic"
)
{{.types}}
// Set 设置Response的Code和Message值
func (resp *Response) Set(Code int, Message string) *Response {
return &Response{
Code: Code,
Message: Message,
}
}
// Set 设置整个Response
func (resp *Response) SetWithData(Code int, Message string, Data interface{}) *Response {
return &Response{
Code: Code,
Message: Message,
Data: Data,
}
}
// SetStatus 设置默认StatusResponse(内部自定义) 默认msg, 可以带data, data只使用一个参数
func (resp *Response) SetStatus(sr *basic.StatusResponse, data ...interface{}) *Response {
newResp := &Response{
Code: sr.Code,
}
if len(data) == 1 {
newResp.Data = data[0]
}
return newResp
}
// SetStatusWithMessage 设置默认StatusResponse(内部自定义) 非默认msg, 可以带data, data只使用一个参数
func (resp *Response) SetStatusWithMessage(sr *basic.StatusResponse, msg string, data ...interface{}) *Response {
newResp := &Response{
Code: sr.Code,
Message: msg,
}
if len(data) == 1 {
newResp.Data = data[0]
}
return newResp
}

View File

@ -0,0 +1,33 @@
FROM golang:{{.Version}}alpine AS builder
LABEL stage=gobuilder
ENV CGO_ENABLED 0
{{if .Chinese}}ENV GOPROXY https://goproxy.cn,direct
RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
{{end}}{{if .HasTimezone}}
RUN apk update --no-cache && apk add --no-cache tzdata
{{end}}
WORKDIR /build
ADD go.mod .
ADD go.sum .
RUN go mod download
COPY . .
{{if .Argument}}COPY {{.GoRelPath}}/etc /app/etc
{{end}}RUN go build -ldflags="-s -w" -o /app/{{.ExeFile}} {{.GoMainFrom}}
FROM {{.BaseImage}}
COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
{{if .HasTimezone}}COPY --from=builder /usr/share/zoneinfo/{{.Timezone}} /usr/share/zoneinfo/{{.Timezone}}
ENV TZ {{.Timezone}}
{{end}}
WORKDIR /app
COPY --from=builder /app/{{.ExeFile}} /app/{{.ExeFile}}{{if .Argument}}
COPY --from=builder /app/etc /app/etc{{end}}
{{if .HasPort}}
EXPOSE {{.Port}}
{{end}}
CMD ["./{{.ExeFile}}"{{.Argument}}]

View File

@ -0,0 +1,18 @@
Name: gateway-example # gateway name
Host: localhost # gateway host
Port: 8888 # gateway port
Upstreams: # upstreams
- Grpc: # grpc upstream
Target: 0.0.0.0:8080 # grpc target,the direct grpc server address,for only one node
# Endpoints: [0.0.0.0:8080,192.168.120.1:8080] # grpc endpoints, the grpc server address list, for multiple nodes
# Etcd: # etcd config, if you want to use etcd to discover the grpc server address
# Hosts: [127.0.0.1:2378,127.0.0.1:2379] # etcd hosts
# Key: greet.grpc # the discovery key
# protoset mode
ProtoSets:
- hello.pb
# Mappings can also be written in proto options
# Mappings: # routes mapping
# - Method: get
# Path: /ping
# RpcPath: hello.Hello/Ping

View File

@ -0,0 +1,21 @@
package main
import (
"flag"
"github.com/zeromicro/go-zero/core/conf"
"github.com/zeromicro/go-zero/gateway"
)
var configFile = flag.String("f", "etc/gateway.yaml", "config file")
func main() {
flag.Parse()
var c gateway.GatewayConf
c.Timeout = int64(time.Second * 15)
gw := gateway.MustNewServer(c)
defer gw.Stop()
gw.Start()
}

View File

@ -0,0 +1,117 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{.Name}}
namespace: {{.Namespace}}
labels:
app: {{.Name}}
spec:
replicas: {{.Replicas}}
revisionHistoryLimit: {{.Revisions}}
selector:
matchLabels:
app: {{.Name}}
template:
metadata:
labels:
app: {{.Name}}
spec:{{if .ServiceAccount}}
serviceAccountName: {{.ServiceAccount}}{{end}}
containers:
- name: {{.Name}}
image: {{.Image}}
{{if .ImagePullPolicy}}imagePullPolicy: {{.ImagePullPolicy}}
{{end}}ports:
- containerPort: {{.Port}}
readinessProbe:
tcpSocket:
port: {{.Port}}
initialDelaySeconds: 5
periodSeconds: 10
livenessProbe:
tcpSocket:
port: {{.Port}}
initialDelaySeconds: 15
periodSeconds: 20
resources:
requests:
cpu: {{.RequestCpu}}m
memory: {{.RequestMem}}Mi
limits:
cpu: {{.LimitCpu}}m
memory: {{.LimitMem}}Mi
volumeMounts:
- name: timezone
mountPath: /etc/localtime
{{if .Secret}}imagePullSecrets:
- name: {{.Secret}}
{{end}}volumes:
- name: timezone
hostPath:
path: /usr/share/zoneinfo/Asia/Shanghai
---
apiVersion: v1
kind: Service
metadata:
name: {{.Name}}-svc
namespace: {{.Namespace}}
spec:
ports:
{{if .UseNodePort}}- nodePort: {{.NodePort}}
port: {{.Port}}
protocol: TCP
targetPort: {{.TargetPort}}
type: NodePort{{else}}- port: {{.Port}}
targetPort: {{.TargetPort}}{{end}}
selector:
app: {{.Name}}
---
apiVersion: autoscaling/v2beta2
kind: HorizontalPodAutoscaler
metadata:
name: {{.Name}}-hpa-c
namespace: {{.Namespace}}
labels:
app: {{.Name}}-hpa-c
spec:
scaleTargetRef:
apiVersion: apps/v1
kind: Deployment
name: {{.Name}}
minReplicas: {{.MinReplicas}}
maxReplicas: {{.MaxReplicas}}
metrics:
- type: Resource
resource:
name: cpu
target:
type: Utilization
averageUtilization: 80
---
apiVersion: autoscaling/v2beta2
kind: HorizontalPodAutoscaler
metadata:
name: {{.Name}}-hpa-m
namespace: {{.Namespace}}
labels:
app: {{.Name}}-hpa-m
spec:
scaleTargetRef:
apiVersion: apps/v1
kind: Deployment
name: {{.Name}}
minReplicas: {{.MinReplicas}}
maxReplicas: {{.MaxReplicas}}
metrics:
- type: Resource
resource:
name: memory
target:
type: Utilization
averageUtilization: 80

View File

@ -0,0 +1,37 @@
apiVersion: batch/v1
kind: CronJob
metadata:
name: {{.Name}}
namespace: {{.Namespace}}
spec:
successfulJobsHistoryLimit: {{.SuccessfulJobsHistoryLimit}}
schedule: "{{.Schedule}}"
jobTemplate:
spec:
template:
spec:{{if .ServiceAccount}}
serviceAccountName: {{.ServiceAccount}}{{end}}
{{end}}containers:
- name: {{.Name}}
image: # todo image url
resources:
requests:
cpu: {{.RequestCpu}}m
memory: {{.RequestMem}}Mi
limits:
cpu: {{.LimitCpu}}m
memory: {{.LimitMem}}Mi
command:
- ./{{.ServiceName}}
- -f
- ./{{.Name}}.yaml
volumeMounts:
- name: timezone
mountPath: /etc/localtime
imagePullSecrets:
- name: # registry secret, if no, remove this
restartPolicy: OnFailure
volumes:
- name: timezone
hostPath:
path: /usr/share/zoneinfo/Asia/Shanghai

View File

@ -0,0 +1,14 @@
func (m *default{{.upperStartCamelObject}}Model) Delete(ctx context.Context, {{.lowerStartCamelPrimaryKey}} {{.dataType}}) error {
{{if .withCache}}{{if .containsIndexCache}}data, err:=m.FindOne(ctx, {{.lowerStartCamelPrimaryKey}})
if err!=nil{
return err
}
{{end}} {{.keys}}
_, err {{if .containsIndexCache}}={{else}}:={{end}} m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) {
query := fmt.Sprintf("delete from %s where {{.originalPrimaryKey}} = {{if .postgreSql}}$1{{else}}?{{end}}", m.table)
return conn.ExecCtx(ctx, query, {{.lowerStartCamelPrimaryKey}})
}, {{.keyValues}}){{else}}query := fmt.Sprintf("delete from %s where {{.originalPrimaryKey}} = {{if .postgreSql}}$1{{else}}?{{end}}", m.table)
_,err:=m.conn.ExecCtx(ctx, query, {{.lowerStartCamelPrimaryKey}}){{end}}
return err
}

View File

@ -0,0 +1,5 @@
package {{.pkg}}
import "github.com/zeromicro/go-zero/core/stores/sqlx"
var ErrNotFound = sqlx.ErrNotFound

View File

@ -0,0 +1 @@
{{.name}} {{.type}} {{.tag}} {{if .hasComment}}// {{.comment}}{{end}}

View File

@ -0,0 +1,8 @@
func (m *default{{.upperStartCamelObject}}Model) formatPrimary(primary any) string {
return fmt.Sprintf("%s%v", {{.primaryKeyLeft}}, primary)
}
func (m *default{{.upperStartCamelObject}}Model) queryPrimary(ctx context.Context, conn sqlx.SqlConn, v, primary any) error {
query := fmt.Sprintf("select %s from %s where {{.originalPrimaryField}} = {{if .postgreSql}}$1{{else}}?{{end}} limit 1", {{.lowerStartCamelObject}}Rows, m.table )
return conn.QueryRowCtx(ctx, v, query, primary)
}

View File

@ -0,0 +1,30 @@
func (m *default{{.upperStartCamelObject}}Model) FindOneBy{{.upperField}}(ctx context.Context, {{.in}}) (*{{.upperStartCamelObject}}, error) {
{{if .withCache}}{{.cacheKey}}
var resp {{.upperStartCamelObject}}
err := m.QueryRowIndexCtx(ctx, &resp, {{.cacheKeyVariable}}, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v any) (i any, e error) {
query := fmt.Sprintf("select %s from %s where {{.originalField}} limit 1", {{.lowerStartCamelObject}}Rows, m.table)
if err := conn.QueryRowCtx(ctx, &resp, query, {{.lowerStartCamelField}}); err != nil {
return nil, err
}
return resp.{{.upperStartCamelPrimaryKey}}, nil
}, m.queryPrimary)
switch err {
case nil:
return &resp, nil
case sqlc.ErrNotFound:
return nil, ErrNotFound
default:
return nil, err
}
}{{else}}var resp {{.upperStartCamelObject}}
query := fmt.Sprintf("select %s from %s where {{.originalField}} limit 1", {{.lowerStartCamelObject}}Rows, m.table )
err := m.conn.QueryRowCtx(ctx, &resp, query, {{.lowerStartCamelField}})
switch err {
case nil:
return &resp, nil
case sqlc.ErrNotFound:
return nil, ErrNotFound
default:
return nil, err
}
}{{end}}

View File

@ -0,0 +1,26 @@
func (m *default{{.upperStartCamelObject}}Model) FindOne(ctx context.Context, {{.lowerStartCamelPrimaryKey}} {{.dataType}}) (*{{.upperStartCamelObject}}, error) {
{{if .withCache}}{{.cacheKey}}
var resp {{.upperStartCamelObject}}
err := m.QueryRowCtx(ctx, &resp, {{.cacheKeyVariable}}, func(ctx context.Context, conn sqlx.SqlConn, v any) error {
query := fmt.Sprintf("select %s from %s where {{.originalPrimaryKey}} = {{if .postgreSql}}$1{{else}}?{{end}} limit 1", {{.lowerStartCamelObject}}Rows, m.table)
return conn.QueryRowCtx(ctx, v, query, {{.lowerStartCamelPrimaryKey}})
})
switch err {
case nil:
return &resp, nil
case sqlc.ErrNotFound:
return nil, ErrNotFound
default:
return nil, err
}{{else}}query := fmt.Sprintf("select %s from %s where {{.originalPrimaryKey}} = {{if .postgreSql}}$1{{else}}?{{end}} limit 1", {{.lowerStartCamelObject}}Rows, m.table)
var resp {{.upperStartCamelObject}}
err := m.conn.QueryRowCtx(ctx, &resp, query, {{.lowerStartCamelPrimaryKey}})
switch err {
case nil:
return &resp, nil
case sqlc.ErrNotFound:
return nil, ErrNotFound
default:
return nil, err
}{{end}}
}

View File

@ -0,0 +1,13 @@
import (
"context"
"database/sql"
"fmt"
"strings"
{{if .time}}"time"{{end}}
{{if .containsPQ}}"github.com/lib/pq"{{end}}
"github.com/zeromicro/go-zero/core/stores/builder"
"github.com/zeromicro/go-zero/core/stores/sqlc"
"github.com/zeromicro/go-zero/core/stores/sqlx"
"github.com/zeromicro/go-zero/core/stringx"
)

View File

@ -0,0 +1,14 @@
import (
"context"
"database/sql"
"fmt"
"strings"
{{if .time}}"time"{{end}}
{{if .containsPQ}}"github.com/lib/pq"{{end}}
"github.com/zeromicro/go-zero/core/stores/builder"
"github.com/zeromicro/go-zero/core/stores/cache"
"github.com/zeromicro/go-zero/core/stores/sqlc"
"github.com/zeromicro/go-zero/core/stores/sqlx"
"github.com/zeromicro/go-zero/core/stringx"
)

View File

@ -0,0 +1,9 @@
func (m *default{{.upperStartCamelObject}}Model) Insert(ctx context.Context, data *{{.upperStartCamelObject}}) (sql.Result,error) {
{{if .withCache}}{{.keys}}
ret, err := m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) {
query := fmt.Sprintf("insert into %s (%s) values ({{.expression}})", m.table, {{.lowerStartCamelObject}}RowsExpectAutoSet)
return conn.ExecCtx(ctx, query, {{.expressionValues}})
}, {{.keyValues}}){{else}}query := fmt.Sprintf("insert into %s (%s) values ({{.expression}})", m.table, {{.lowerStartCamelObject}}RowsExpectAutoSet)
ret,err:=m.conn.ExecCtx(ctx, query, {{.expressionValues}}){{end}}
return ret,err
}

View File

@ -0,0 +1 @@
Delete(ctx context.Context, {{.lowerStartCamelPrimaryKey}} {{.dataType}}) error

View File

@ -0,0 +1 @@
FindOneBy{{.upperField}}(ctx context.Context, {{.in}}) (*{{.upperStartCamelObject}}, error)

View File

@ -0,0 +1 @@
FindOne(ctx context.Context, {{.lowerStartCamelPrimaryKey}} {{.dataType}}) (*{{.upperStartCamelObject}}, error)

View File

@ -0,0 +1 @@
Insert(ctx context.Context, data *{{.upperStartCamelObject}}) (sql.Result,error)

View File

@ -0,0 +1 @@
Update(ctx context.Context, {{if .containsIndexCache}}newData{{else}}data{{end}} *{{.upperStartCamelObject}}) error

View File

@ -0,0 +1,13 @@
// Code generated by goctl. DO NOT EDIT.
package {{.pkg}}
{{.imports}}
{{.vars}}
{{.types}}
{{.new}}
{{.delete}}
{{.find}}
{{.insert}}
{{.update}}
{{.extraMethod}}
{{.tableName}}

View File

@ -0,0 +1,6 @@
func new{{.upperStartCamelObject}}Model(conn sqlx.SqlConn{{if .withCache}}, c cache.CacheConf, opts ...cache.Option{{end}}) *default{{.upperStartCamelObject}}Model {
return &default{{.upperStartCamelObject}}Model{
{{if .withCache}}CachedConn: sqlc.NewConn(conn, c, opts...){{else}}conn:conn{{end}},
table: {{.table}},
}
}

View File

@ -0,0 +1,30 @@
package {{.pkg}}
{{if .withCache}}
import (
"github.com/zeromicro/go-zero/core/stores/cache"
"github.com/zeromicro/go-zero/core/stores/sqlx"
)
{{else}}
import "github.com/zeromicro/go-zero/core/stores/sqlx"
{{end}}
var _ {{.upperStartCamelObject}}Model = (*custom{{.upperStartCamelObject}}Model)(nil)
type (
// {{.upperStartCamelObject}}Model is an interface to be customized, add more methods here,
// and implement the added methods in custom{{.upperStartCamelObject}}Model.
{{.upperStartCamelObject}}Model interface {
{{.lowerStartCamelObject}}Model
}
custom{{.upperStartCamelObject}}Model struct {
*default{{.upperStartCamelObject}}Model
}
)
// New{{.upperStartCamelObject}}Model returns a model for the database table.
func New{{.upperStartCamelObject}}Model(conn sqlx.SqlConn{{if .withCache}}, c cache.CacheConf, opts ...cache.Option{{end}}) {{.upperStartCamelObject}}Model {
return &custom{{.upperStartCamelObject}}Model{
default{{.upperStartCamelObject}}Model: new{{.upperStartCamelObject}}Model(conn{{if .withCache}}, c, opts...{{end}}),
}
}

View File

@ -0,0 +1,3 @@
func (m *default{{.upperStartCamelObject}}Model) tableName() string {
return m.table
}

View File

@ -0,0 +1 @@
`db:"{{.field}}"`

View File

@ -0,0 +1,14 @@
type (
{{.lowerStartCamelObject}}Model interface{
{{.method}}
}
default{{.upperStartCamelObject}}Model struct {
{{if .withCache}}sqlc.CachedConn{{else}}conn sqlx.SqlConn{{end}}
table string
}
{{.upperStartCamelObject}} struct {
{{.fields}}
}
)

View File

@ -0,0 +1,14 @@
func (m *default{{.upperStartCamelObject}}Model) Update(ctx context.Context, {{if .containsIndexCache}}newData{{else}}data{{end}} *{{.upperStartCamelObject}}) error {
{{if .withCache}}{{if .containsIndexCache}}data, err:=m.FindOne(ctx, newData.{{.upperStartCamelPrimaryKey}})
if err!=nil{
return err
}
{{end}} {{.keys}}
_, {{if .containsIndexCache}}err{{else}}err:{{end}}= m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) {
query := fmt.Sprintf("update %s set %s where {{.originalPrimaryKey}} = {{if .postgreSql}}$1{{else}}?{{end}}", m.table, {{.lowerStartCamelObject}}RowsWithPlaceHolder)
return conn.ExecCtx(ctx, query, {{.expressionValues}})
}, {{.keyValues}}){{else}}query := fmt.Sprintf("update %s set %s where {{.originalPrimaryKey}} = {{if .postgreSql}}$1{{else}}?{{end}}", m.table, {{.lowerStartCamelObject}}RowsWithPlaceHolder)
_,err:=m.conn.ExecCtx(ctx, query, {{.expressionValues}}){{end}}
return err
}

View File

@ -0,0 +1,8 @@
var (
{{.lowerStartCamelObject}}FieldNames = builder.RawFieldNames(&{{.upperStartCamelObject}}{}{{if .postgreSql}}, true{{end}})
{{.lowerStartCamelObject}}Rows = strings.Join({{.lowerStartCamelObject}}FieldNames, ",")
{{.lowerStartCamelObject}}RowsExpectAutoSet = {{if .postgreSql}}strings.Join(stringx.Remove({{.lowerStartCamelObject}}FieldNames, {{if .autoIncrement}}"{{.originalPrimaryKey}}", {{end}} {{.ignoreColumns}}), ","){{else}}strings.Join(stringx.Remove({{.lowerStartCamelObject}}FieldNames, {{if .autoIncrement}}"{{.originalPrimaryKey}}", {{end}} {{.ignoreColumns}}), ","){{end}}
{{.lowerStartCamelObject}}RowsWithPlaceHolder = {{if .postgreSql}}builder.PostgreSqlJoin(stringx.Remove({{.lowerStartCamelObject}}FieldNames, "{{.originalPrimaryKey}}", {{.ignoreColumns}})){{else}}strings.Join(stringx.Remove({{.lowerStartCamelObject}}FieldNames, "{{.originalPrimaryKey}}", {{.ignoreColumns}}), "=?,") + "=?"{{end}}
{{if .withCache}}{{.cacheKeys}}{{end}}
)

View File

@ -0,0 +1,12 @@
package gmodel
import (
"errors"
"github.com/zeromicro/go-zero/core/stores/mon"
)
var (
ErrNotFound = mon.ErrNotFound
ErrInvalidObjectId = errors.New("invalid objectId")
)

View File

@ -0,0 +1,78 @@
// Code generated by goctl. DO NOT EDIT.
package gmodel
import (
"context"
"time"
{{if .Cache}}"github.com/zeromicro/go-zero/core/stores/monc"{{else}}"github.com/zeromicro/go-zero/core/stores/mon"{{end}}
"go.mongodb.org/mongo-driver/bson"
"go.mongodb.org/mongo-driver/bson/primitive"
"go.mongodb.org/mongo-driver/mongo"
)
{{if .Cache}}var prefix{{.Type}}CacheKey = "cache:{{.lowerType}}:"{{end}}
type {{.lowerType}}Model interface{
Insert(ctx context.Context,data *{{.Type}}) error
FindOne(ctx context.Context,id string) (*{{.Type}}, error)
Update(ctx context.Context,data *{{.Type}}) (*mongo.UpdateResult, error)
Delete(ctx context.Context,id string) (int64, error)
}
type default{{.Type}}Model struct {
conn {{if .Cache}}*monc.Model{{else}}*mon.Model{{end}}
}
func newDefault{{.Type}}Model(conn {{if .Cache}}*monc.Model{{else}}*mon.Model{{end}}) *default{{.Type}}Model {
return &default{{.Type}}Model{conn: conn}
}
func (m *default{{.Type}}Model) Insert(ctx context.Context, data *{{.Type}}) error {
if data.ID.IsZero() {
data.ID = primitive.NewObjectID()
data.CreateAt = time.Now()
data.UpdateAt = time.Now()
}
{{if .Cache}}key := prefix{{.Type}}CacheKey + data.ID.Hex(){{end}}
_, err := m.conn.InsertOne(ctx, {{if .Cache}}key, {{end}} data)
return err
}
func (m *default{{.Type}}Model) FindOne(ctx context.Context, id string) (*{{.Type}}, error) {
oid, err := primitive.ObjectIDFromHex(id)
if err != nil {
return nil, ErrInvalidObjectId
}
var data {{.Type}}
{{if .Cache}}key := prefix{{.Type}}CacheKey + id{{end}}
err = m.conn.FindOne(ctx, {{if .Cache}}key, {{end}}&data, bson.M{"_id": oid})
switch err {
case nil:
return &data, nil
case {{if .Cache}}monc{{else}}mon{{end}}.ErrNotFound:
return nil, ErrNotFound
default:
return nil, err
}
}
func (m *default{{.Type}}Model) Update(ctx context.Context, data *{{.Type}}) (*mongo.UpdateResult, error) {
data.UpdateAt = time.Now()
{{if .Cache}}key := prefix{{.Type}}CacheKey + data.ID.Hex(){{end}}
res, err := m.conn.UpdateOne(ctx, {{if .Cache}}key, {{end}}bson.M{"_id": data.ID}, bson.M{"$set": data})
return res, err
}
func (m *default{{.Type}}Model) Delete(ctx context.Context, id string) (int64, error) {
oid, err := primitive.ObjectIDFromHex(id)
if err != nil {
return 0, ErrInvalidObjectId
}
{{if .Cache}}key := prefix{{.Type}}CacheKey +id{{end}}
res, err := m.conn.DeleteOne(ctx, {{if .Cache}}key, {{end}}bson.M{"_id": oid})
return res, err
}

View File

@ -0,0 +1,38 @@
package gmodel
{{if .Cache}}import (
"github.com/zeromicro/go-zero/core/stores/cache"
"github.com/zeromicro/go-zero/core/stores/monc"
){{else}}import "github.com/zeromicro/go-zero/core/stores/mon"{{end}}
{{if .Easy}}
const {{.Type}}CollectionName = "{{.snakeType}}"
{{end}}
var _ {{.Type}}Model = (*custom{{.Type}}Model)(nil)
type (
// {{.Type}}Model is an interface to be customized, add more methods here,
// and implement the added methods in custom{{.Type}}Model.
{{.Type}}Model interface {
{{.lowerType}}Model
}
custom{{.Type}}Model struct {
*default{{.Type}}Model
}
)
// New{{.Type}}Model returns a model for the mongo.
{{if .Easy}}func New{{.Type}}Model(url, db string{{if .Cache}}, c cache.CacheConf{{end}}) {{.Type}}Model {
conn := {{if .Cache}}monc{{else}}mon{{end}}.MustNewModel(url, db, {{.Type}}CollectionName{{if .Cache}}, c{{end}})
return &custom{{.Type}}Model{
default{{.Type}}Model: newDefault{{.Type}}Model(conn),
}
}{{else}}func New{{.Type}}Model(url, db, collection string{{if .Cache}}, c cache.CacheConf{{end}}) {{.Type}}Model {
conn := {{if .Cache}}monc{{else}}mon{{end}}.MustNewModel(url, db, collection{{if .Cache}}, c{{end}})
return &custom{{.Type}}Model{
default{{.Type}}Model: newDefault{{.Type}}Model(conn),
}
}{{end}}

View File

@ -0,0 +1,14 @@
package gmodel
import (
"time"
"go.mongodb.org/mongo-driver/bson/primitive"
)
type {{.Type}} struct {
ID primitive.ObjectID `bson:"_id,omitempty" json:"id,omitempty"`
// TODO: Fill your own fields
UpdateAt time.Time `bson:"updateAt,omitempty" json:"updateAt,omitempty"`
CreateAt time.Time `bson:"createAt,omitempty" json:"createAt,omitempty"`
}

View File

@ -0,0 +1,12 @@
type Request {
Name string `path:"name,options=you|me"`
}
type Response {
Message string `json:"message"`
}
service {{.name}}-api {
@handler {{.handler}}Handler
get /from/:name(Request) returns (Response)
}

View File

@ -0,0 +1,33 @@
{{.head}}
package {{.filePackage}}
import (
"context"
{{.pbPackage}}
{{if ne .pbPackage .protoGoPackage}}{{.protoGoPackage}}{{end}}
"github.com/zeromicro/go-zero/zrpc"
"google.golang.org/grpc"
)
type (
{{.alias}}
{{.serviceName}} interface {
{{.interface}}
}
default{{.serviceName}} struct {
cli zrpc.Client
}
)
func New{{.serviceName}}(cli zrpc.Client) {{.serviceName}} {
return &default{{.serviceName}}{
cli: cli,
}
}
{{.functions}}

View File

@ -0,0 +1,7 @@
package config
import "github.com/zeromicro/go-zero/zrpc"
type Config struct {
zrpc.RpcServerConf
}

View File

@ -0,0 +1,6 @@
Name: {{.serviceName}}.rpc
ListenOn: 0.0.0.0:8080
Etcd:
Hosts:
- 127.0.0.1:2379
Key: {{.serviceName}}.rpc

View File

@ -0,0 +1,6 @@
{{if .hasComment}}{{.comment}}{{end}}
func (l *{{.logicName}}) {{.method}} ({{if .hasReq}}in {{.request}}{{if .stream}},stream {{.streamBody}}{{end}}{{else}}stream {{.streamBody}}{{end}}) ({{if .hasReply}}{{.response}},{{end}} error) {
// todo: add your logic here and delete this line
return {{if .hasReply}}&{{.responseType}}{},{{end}} nil
}

View File

@ -0,0 +1,24 @@
package {{.packageName}}
import (
"context"
{{.imports}}
"github.com/zeromicro/go-zero/core/logx"
)
type {{.logicName}} struct {
ctx context.Context
svcCtx *svc.ServiceContext
logx.Logger
}
func New{{.logicName}}(ctx context.Context,svcCtx *svc.ServiceContext) *{{.logicName}} {
return &{{.logicName}}{
ctx: ctx,
svcCtx: svcCtx,
Logger: logx.WithContext(ctx),
}
}
{{.functions}}

View File

@ -0,0 +1,38 @@
package main
import (
"flag"
"fmt"
{{.imports}}
"github.com/zeromicro/go-zero/core/conf"
"github.com/zeromicro/go-zero/core/service"
"github.com/zeromicro/go-zero/zrpc"
"google.golang.org/grpc"
"google.golang.org/grpc/reflection"
)
var configFile = flag.String("f", "etc/{{.serviceName}}.yaml", "the config file")
func main() {
flag.Parse()
var c config.Config
fsconfig.StartNacosConfig(*configFile, &c, nil)
c.Timeout = int64(time.Second * 15)
ctx := svc.NewServiceContext(c)
s := zrpc.MustNewServer(c.RpcServerConf, func(grpcServer *grpc.Server) {
{{range .serviceNames}} {{.Pkg}}.Register{{.Service}}Server(grpcServer, {{.ServerPkg}}.New{{.Service}}Server(ctx))
{{end}}
if c.Mode == service.DevMode || c.Mode == service.TestMode {
reflection.Register(grpcServer)
}
})
defer s.Stop()
fmt.Printf("Starting rpc server at %s...\n", c.ListenOn)
s.Start()
}

View File

@ -0,0 +1,6 @@
{{if .hasComment}}{{.comment}}{{end}}
func (s *{{.server}}Server) {{.method}} ({{if .notStream}}ctx context.Context,{{if .hasReq}} in {{.request}}{{end}}{{else}}{{if .hasReq}} in {{.request}},{{end}}stream {{.streamBody}}{{end}}) ({{if .notStream}}{{.response}},{{end}}error) {
l := {{.logicPkg}}.New{{.logicName}}({{if .notStream}}ctx,{{else}}stream.Context(),{{end}}s.svcCtx)
return l.{{.method}}({{if .hasReq}}in{{if .stream}} ,stream{{end}}{{else}}{{if .stream}}stream{{end}}{{end}})
}

Some files were not shown because too many files have changed in this diff Show More