Commit Graph

1170 Commits

Author SHA1 Message Date
laodaming
e0de8bfcf2 fix 2023-07-11 19:29:20 +08:00
laodaming
ccf1ae19b2 fix 2023-07-11 18:37:36 +08:00
laodaming
d2766d5bd3 fix 2023-07-11 17:45:34 +08:00
laodaming
98c5727c7e fix 2023-07-11 17:08:19 +08:00
eson
43e2e835eb Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-07-11 13:08:11 +08:00
eson
fb06995b26 q! 2023-07-11 13:07:44 +08:00
laodaming
f0277f6a40 fix 2023-07-11 12:05:33 +08:00
laodaming
8c2cfcb37b fix 2023-07-11 11:53:15 +08:00
laodaming
dea09094b7 fix 2023-07-11 11:36:01 +08:00
laodaming
9bcb1d9377 fix 2023-07-11 11:33:43 +08:00
laodaming
22d0f6a5b1 fix 2023-07-11 11:28:57 +08:00
eson
5f3d6eb120 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-07-11 10:16:41 +08:00
eson
b06a8e8da2 修改过期时间 2023-07-11 10:16:22 +08:00
laodaming
f07e4a2084 fix 2023-07-10 19:42:55 +08:00
laodaming
f9bfbf28ae fix 2023-07-10 18:32:54 +08:00
laodaming
852fca2afa fix 2023-07-10 18:28:37 +08:00
laodaming
6b96a3ecbe fix 2023-07-10 17:54:43 +08:00
eson
fb4414fab6 转成 标准的jwt Token 2023-07-10 17:54:10 +08:00
eson
8f95be2ba5 测试登录成功 2023-07-10 17:38:44 +08:00
eson
53175d539c 改动json email名字 2023-07-10 17:24:06 +08:00
eson
e16222849c 添加跨域名 2023-07-10 17:07:29 +08:00
eson
d8b43a7f83 修改了所有端口 不冲突 2023-07-10 13:07:59 +08:00
eson
53c349413c 启动 停止脚本 2023-07-10 13:05:49 +08:00
eson
00e2d4b16b 修改端口到后端正确 2023-07-10 12:15:32 +08:00
eson
27dfa0a2bf 更新好 requests版本 2023-07-07 18:44:34 +08:00
eson
7818b88b70 upload 上传 签名 直接上传都可以 2023-07-07 17:49:12 +08:00
eson
975fe89eca 生命周期的指令上传 2023-07-07 14:49:02 +08:00
eson
0a5da30062 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-07-06 18:23:50 +08:00
eson
d64eb320ed Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-07-06 18:23:43 +08:00
laodaming
2b1728aac5 fix 2023-07-06 17:43:07 +08:00
eson
1c74c0ea4b 添加s3 2023-07-05 19:00:33 +08:00
laodaming
c1de53c098 fix 2023-07-05 18:08:18 +08:00
laodaming
2af55fb898 fix 2023-07-05 16:58:16 +08:00
laodaming
f7ed913470 fix 2023-07-05 16:21:26 +08:00
laodaming
78c09f1b40 fix 2023-07-05 16:08:25 +08:00
laodaming
6337371cd1 fix 2023-07-05 16:03:16 +08:00
laodaming
3614e90e99 fix 2023-07-04 17:17:37 +08:00
laodaming
31d22cda63 fix 2023-07-04 16:48:56 +08:00
laodaming
22b27141a4 fix 2023-07-03 17:33:59 +08:00
eson
9a840f420e 最新版本 2023-07-03 14:34:16 +08:00
laodaming
c17ab5ae5c fix 2023-06-30 17:20:11 +08:00
eson
7d386237fb Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-29 18:05:38 +08:00
eson
9b56d7ba51 TODO: render/ 相关模块 2023-06-29 18:04:59 +08:00
laodaming
9f865eb1c5 fix 2023-06-29 17:48:07 +08:00
laodaming
81a64b2129 fix 2023-06-29 17:25:34 +08:00
laodaming
f09e1b8f93 fix 2023-06-29 13:59:55 +08:00
laodaming
543308ddbc fix 2023-06-29 11:46:04 +08:00
laodaming
519d9952e0 fix 2023-06-29 11:43:07 +08:00
laodaming
02c41a5069 fix 2023-06-29 11:38:38 +08:00
laodaming
c422f493f4 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-06-29 11:15:51 +08:00
laodaming
58d02d0d50 fix 2023-06-29 11:15:42 +08:00
eson
8ba8a67dfb Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-28 19:33:00 +08:00
eson
d4e75b1efc TODO: 反射 2023-06-28 19:32:41 +08:00
laodaming
d5b829c212 fix 2023-06-28 17:08:43 +08:00
laodaming
979df28ae2 fix 2023-06-28 17:06:26 +08:00
laodaming
6abca6b271 fix 2023-06-28 17:05:31 +08:00
laodaming
b012db8e4e fix 2023-06-28 14:55:13 +08:00
laodaming
5b9a814fbb fix 2023-06-28 12:25:40 +08:00
laodaming
19f41f6dbc fix 2023-06-27 18:35:26 +08:00
eson
0851c922ef Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-27 18:10:18 +08:00
eson
13c5a45a5e 报价单接近完成 2023-06-27 18:09:56 +08:00
laodaming
84088a7a12 fix 2023-06-27 17:47:44 +08:00
laodaming
66ed487249 fix 2023-06-27 17:04:58 +08:00
laodaming
9050b4ab0e fix 2023-06-27 15:26:23 +08:00
laodaming
3a2fb3bc5d fix 2023-06-27 14:28:52 +08:00
laodaming
c5bcf9d676 fix 2023-06-27 14:25:25 +08:00
eson
116171dddd Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-26 19:52:18 +08:00
eson
d336f757ed 报价单 2023-06-26 19:51:59 +08:00
laodaming
6d8bdcb2a6 fix 2023-06-26 18:32:28 +08:00
laodaming
00873a7654 fix 2023-06-26 18:27:38 +08:00
laodaming
17d1522655 fix 2023-06-26 18:22:59 +08:00
laodaming
6d842cfc64 11 2023-06-26 18:21:50 +08:00
eson
a101764dcb Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-26 18:20:04 +08:00
eson
d74d27ab2d backend 2023-06-26 18:19:51 +08:00
laodaming
f3eea7f664 fix 2023-06-26 16:54:54 +08:00
laodaming
7f71afd8b0 fix 2023-06-26 16:53:36 +08:00
eson
1a0156c686 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-25 18:30:58 +08:00
eson
96c43325c0 添加后台用户表直接分离 2023-06-25 18:30:39 +08:00
laodaming
5116b06f2f fix 2023-06-25 18:05:29 +08:00
laodaming
15eb99d975 fix 2023-06-25 17:51:37 +08:00
laodaming
d876884397 fix 2023-06-25 17:11:42 +08:00
laodaming
002ec9d292 fix 2023-06-25 14:11:47 +08:00
eson
a5ea734eb0 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-25 13:16:17 +08:00
eson
6bfa46e990 webset 单元测试完成, 缺少font_config的测试例子 2023-06-25 13:15:55 +08:00
laodaming
305bf83d4e fix 2023-06-25 12:28:06 +08:00
laodaming
4d4381b196 fix 2023-06-25 12:16:40 +08:00
laodaming
81b315b12b fix 2023-06-25 12:16:01 +08:00
laodaming
cd8a578dfe fix 2023-06-25 11:31:37 +08:00
laodaming
1a48387e92 fix 2023-06-25 11:28:37 +08:00
eson
efe02a0355 修复 AuthKey为空的时候 也可以过. 2023-06-25 11:26:47 +08:00
eson
8bd6f019ba Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-21 18:59:44 +08:00
eson
d987601afd faq 2023-06-21 18:59:27 +08:00
laodaming
cac0161585 fix 2023-06-21 18:06:39 +08:00
eson
28cc8a19ba 添加了通用的config.tpl 2023-06-21 16:46:25 +08:00
eson
b27aaab6b6 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-21 16:40:20 +08:00
eson
29d5c91736 修改api的request 2023-06-21 16:39:55 +08:00
laodaming
dfcceaea8e fix 2023-06-21 16:35:43 +08:00
laodaming
89dfd58e1c fix 2023-06-21 15:06:09 +08:00
eson
8857f84bf6 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-21 14:26:51 +08:00
eson
2c0cd12a15 修复SetStatus的bug 2023-06-21 14:26:29 +08:00
laodaming
619ca1fde0 fix 2023-06-21 14:12:50 +08:00
laodaming
41386fca3b fix 2023-06-21 12:34:57 +08:00
eson
152e18b0e5 修复验证错误的问题, 验证allmodels的使用 2023-06-21 12:29:28 +08:00
eson
4fb57e1c39 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-21 12:22:18 +08:00
eson
7fe53f749e 完成AllModels序列化 2023-06-21 12:21:56 +08:00
laodaming
db9c2f3cc7 fix 2023-06-21 12:11:43 +08:00
eson
389f12b8c5 添加AllModels 2023-06-21 11:29:09 +08:00
laodaming
edeb2bb5f1 fix 2023-06-20 19:56:18 +08:00
eson
b2062d6448 修复SetStatus错误 2023-06-20 19:52:38 +08:00
eson
37f2326b21 修复了Code码重复的问题 2023-06-20 19:44:31 +08:00
eson
e6971575f1 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-20 19:37:08 +08:00
eson
e50dac6b1c Order订单待测试 2023-06-20 19:36:28 +08:00
laodaming
f6cee27c3f fix 2023-06-20 18:37:56 +08:00
laodaming
313e8a9457 fix 2023-06-20 18:05:29 +08:00
eson
d4d11db732 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-20 17:29:18 +08:00
eson
6c6066cea1 更新合并 2023-06-20 17:29:02 +08:00
laodaming
7ef6f453dc fix 2023-06-20 17:28:28 +08:00
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
db155a71a0 todo: add-address 2023-06-19 20:10:32 +08:00
eson
640d3261e0 添加自增控制 2023-06-19 18:27:31 +08:00
eson
05363b1849 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-19 15:52:37 +08:00
eson
4e8d0f3ceb 完成单元测试 2023-06-19 15:52:14 +08:00
laodaming
7a19292ae2 fix 2023-06-19 14:53:21 +08:00
laodaming
6a9650b9d1 fix 2023-06-19 14:47:54 +08:00
laodaming
bbb1a845ad fix 2023-06-19 12:23:02 +08:00
laodaming
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
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
175583ca51 fix 2023-06-16 18:24:31 +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
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
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
57dd04ea27 1 2023-06-15 15:10:22 +08:00
laodaming
33600c48eb fix 2023-06-15 12:00:32 +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
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
ea60e5c07c fix 2023-06-13 19:11:30 +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
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
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
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
53a3490837 fix 2023-06-12 14:05:35 +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
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