Commit Graph

462 Commits

Author SHA1 Message Date
laodaming
27ae48991c fix 2023-09-22 12:05:05 +08:00
laodaming
dd6b80ee71 fix 2023-09-22 11:59:37 +08:00
momo
0f7514b5bd fix:支付 2023-09-22 11:00:54 +08:00
momo
fead7c6ae9 fix:支付 2023-09-22 10:39:02 +08:00
58e2068170 fix 2023-09-21 23:47:34 +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
laodaming
e8546d615b fix 2023-09-21 18:34:29 +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
11cdcefa4c nacos config 2023-09-21 18:12:22 +08:00
momo
1605da27bf fix:基础信息 2023-09-21 14:26:14 +08:00
momo
30ae7eb814 fix:订单详情 2023-09-21 12:11: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
momo
4f61702e14 fix:购物车下单 2023-09-21 10:30:36 +08:00
momo
137919a4d7 fix:购物车下单 2023-09-20 18:04:33 +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
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
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
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
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
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
laodaming
b41d6ffda5 11 2023-09-19 16:10:17 +08:00
laodaming
bcf5d9d6d7 11 2023-09-19 16:01:23 +08:00
laodaming
fb359cfba5 11 2023-09-19 15:38:03 +08:00
momo
f7c3ccd01d fix:合图调整 2023-09-19 14:55:26 +08:00
laodaming
25b7334c30 合并develop 2023-09-19 14:39:33 +08:00
momo
dbb1591cbb fix:合图调整 2023-09-19 12:04:51 +08:00
eson
3c33a96037 nacos config 2023-09-19 11:48:38 +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
93e95d1a15 fix 2023-09-19 10:41:15 +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
beaba9afa9 更新 config 最新配置服务上去 2023-09-18 18:44:12 +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
b07473478b fix 2023-09-18 11:45:29 +08:00
momo
95b826d8a6 fix:合并 2023-09-15 18:30:45 +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
ee92468392 fix 2023-09-15 14:52:36 +08:00
laodaming
fd16d6ac67 fix 2023-09-15 14:19:14 +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
5df0a0f184 fix 2023-09-15 10:23:40 +08:00
laodaming
9c178b2add fix 2023-09-14 18:33:29 +08:00
laodaming
b71141807b 新增添加购物车接口 2023-09-14 15:20:37 +08:00
laodaming
13d5219e53 fix 2023-09-14 14:11:22 +08:00
laodaming
190ac0407e 11 2023-09-13 13:59:01 +08:00
eson
66f82a44ea fix 2023-09-12 18:08:37 +08:00
laodaming
3f8fed2dd6 11 2023-09-12 17:55:23 +08:00
laodaming
77ba817569 11 2023-09-12 17:47:33 +08:00
laodaming
dd123cc446 11 2023-09-12 17:44:12 +08:00
momo
1699420c4a fix:合图,参数调整 2023-09-12 15:59:38 +08:00
eson
90c95fce51 fix 2023-09-11 15:30:14 +08:00
laodaming
74f25d23cf fix 2023-09-11 15:15:38 +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
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
5bedfc9237 fix 2023-09-10 03:09:48 +08:00
14f0dd2b22 测试接口成功 2023-09-10 02:58:56 +08:00
eson
b9069a8a16 fix 2023-09-08 19:11:04 +08:00
momo
7543f99f8b fix:设置当前logo 2023-09-08 11:47:53 +08:00
momo
70bda7e02c fix:上传logo 2023-09-07 12:23:19 +08:00
momo
ba0f1e1ba2 fix:资源管理 2023-09-07 11:28:06 +08:00
laodaming
18afbae41f fix 2023-09-06 16:48:19 +08:00
laodaming
13d91699f0 fix 2023-09-06 14:35:42 +08:00
laodaming
4d0081b19c 11 2023-09-06 10:48:45 +08:00
laodaming
a39076d739 11 2023-09-06 10:14:45 +08:00
eson
0a748dfab7 fix 2023-09-05 18:24:20 +08:00
laodaming
d9daae7829 优化ws代码结构 2023-09-05 14:58:37 +08:00
eson
0a8c323be5 fix 2023-09-04 17:45:58 +08:00
eson
b01fc28fa9 fix 2023-09-04 12:30:24 +08:00
eson
8a20bda390 fix 2023-09-04 11:32:17 +08:00
9c89f0fe4a TODO: password 2023-09-04 01:40:28 +08:00
eson
aa4a48b68a fix 2023-09-01 10:48:00 +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
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
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
0135a17ef8 fix 2023-08-30 18:44:41 +08:00
eson
09fb6c3a36 fix 2023-08-30 14:21:09 +08:00
eson
ac834fa299 fix 2023-08-30 10:52:18 +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
laodaming
6e887d44cb fix 2023-08-29 17:48:52 +08:00
laodaming
c28888c121 fix 2023-08-29 17:40:09 +08:00
laodaming
64b25e4bce fix 2023-08-29 17:09:00 +08:00
laodaming
20ebe02e4e fix 2023-08-29 16:24:59 +08:00
laodaming
f3b8d1e057 fix 2023-08-29 15:13:25 +08:00
laodaming
6e716e17f9 fix 2023-08-29 15:04:11 +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
3103d69bae fix 2023-08-29 14:19:47 +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
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
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
02090f6401 fix:新的解析jwtToken返回 2023-08-28 16:11:54 +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
c3286e41fa fix:调整上传设置 2023-08-28 15:17:36 +08:00
eson
bde9e98f62 fix 2023-08-28 14:21:06 +08:00
eson
aa5b90e0d4 fix 2023-08-28 12:23:12 +08:00
eson
d139ea2cee fix 2023-08-28 12:16:49 +08:00
eson
6e03ee8c1b 观测 2023-08-28 12:11:57 +08:00
eson
1a45340882 fix 2023-08-28 11:28:09 +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
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
fb071cf60b 测试登录验证 2023-08-25 16:19:47 +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
c4f888a52f fix 2023-08-25 12:01:01 +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