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 |
|
momo
|
89d8a8963c
|
fix:裁剪业务逻辑调整
|
2023-08-23 14:22:36 +08:00 |
|
momo
|
1e25f79d4a
|
fix:裁剪业务逻辑调整
|
2023-08-23 11:41:02 +08:00 |
|
momo
|
2ef3547724
|
fix:裁剪业务逻辑调整
|
2023-08-23 11:09:14 +08:00 |
|
eson
|
bfea775c0b
|
fix
|
2023-08-22 14:34:13 +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 |
|
momo
|
462ac4915b
|
fix:base上传强制更新
|
2023-08-22 10:54:33 +08:00 |
|
momo
|
80a9517a1f
|
fix:base上传强制更新
|
2023-08-22 10:48:10 +08:00 |
|
eson
|
d35ffd793a
|
Merge branch 'develop' into feature/auth
|
2023-08-22 10:34:21 +08:00 |
|
laodaming
|
f8bb4dff17
|
fix
|
2023-08-21 16:19:30 +08:00 |
|
Hiven
|
1b5e9623a0
|
fix:合图调整
|
2023-08-18 19:37: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 |
|
Hiven
|
cb3e8d4db6
|
fix:重构合图模块
|
2023-08-16 17:33:34 +08:00 |
|
laodaming
|
a022e5a8d9
|
fix
|
2023-08-16 12:16:23 +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
|
e565565627
|
Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/auth
|
2023-08-16 10:22:12 +08:00 |
|
Hiven
|
69f08415fc
|
fix:重构合图模块
|
2023-08-15 18:35:16 +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
|
c5ef6cfa14
|
fix
|
2023-08-15 11:18:22 +08:00 |
|
laodaming
|
24a5bf11a3
|
fix
|
2023-08-14 17:31:57 +08:00 |
|
Hiven
|
fde5ef8b25
|
feat:新增商户列表/保存用户信息
|
2023-08-14 14:41:54 +08:00 |
|
Hiven
|
57e635c26c
|
feat:新增商户列表/保存用户信息
|
2023-08-14 14:40:50 +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
|
5bc6f411be
|
fix
|
2023-08-14 12:05:22 +08:00 |
|
eson
|
ae07370214
|
重置密码
|
2023-08-11 17:39:18 +08:00 |
|
eson
|
9664271474
|
修改Wid为string
|
2023-08-11 12:07:26 +08:00 |
|
eson
|
432db5aec5
|
Merge branch 'develop' into feature/auth
|
2023-08-10 17:31:03 +08:00 |
|
eson
|
8c07a5f5d7
|
保存为了 websocket
|
2023-08-10 16:25:41 +08:00 |
|
Hiven
|
74cadf6e5b
|
fix:修复上传
|
2023-08-10 16:13:06 +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
|
7f44f46336
|
fix:修复上传
|
2023-08-10 14:29:59 +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 |
|
eson
|
68488da99c
|
Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/auth
|
2023-08-10 10:44:24 +08:00 |
|
laodaming
|
5470f22e77
|
fix
|
2023-08-09 19:34:11 +08:00 |
|
laodaming
|
ea0804ad63
|
fix
|
2023-08-09 18:09:16 +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 |
|
laodaming
|
c51c9f228c
|
fix
|
2023-08-09 16:08:58 +08:00 |
|
laodaming
|
84dc60be49
|
fix
|
2023-08-09 15:46:57 +08:00 |
|
Hiven
|
29e42011a9
|
feat:获取资源详情
|
2023-08-09 15:15:12 +08:00 |
|
Hiven
|
7b32eb9154
|
feat:获取资源详情
|
2023-08-09 14:58:20 +08:00 |
|
eson
|
05e8def85a
|
Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/auth
|
2023-08-09 14:21:22 +08:00 |
|
laodaming
|
e185ae7458
|
fix
|
2023-08-09 12:28:06 +08:00 |
|
Hiven
|
d810b87c09
|
feat:合图功能,封装上传base64等等
|
2023-08-09 11:46:24 +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
|
93191d3beb
|
fix
|
2023-08-08 12:22:15 +08:00 |
|
Hiven
|
ff86cceb17
|
fix:调整
|
2023-08-08 10:53:28 +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
|
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
|
315ad19dd4
|
fix
|
2023-08-07 11:44:54 +08:00 |
|
laodaming
|
36efad44df
|
fix
|
2023-08-07 11:25:06 +08:00 |
|
Hiven
|
6158779a95
|
调整
|
2023-08-03 17:37:25 +08:00 |
|
Hiven
|
d06241b267
|
上传logo
|
2023-08-02 18:14:53 +08:00 |
|
Hiven
|
d75bc8f2be
|
上传完善
|
2023-08-02 11:13:52 +08:00 |
|
Hiven
|
4a2a7822b7
|
多文件上传--后端
|
2023-08-01 18:15:55 +08:00 |
|
Hiven
|
f2109eee9b
|
订单退款
|
2023-07-31 11:32:40 +08:00 |
|
|
|
fe51e85983
|
修改为龙舟
|
2023-07-31 00:41:04 +08:00 |
|
|
|
7fd48edef8
|
do
|
2023-07-30 23:17:02 +08:00 |
|
Hiven
|
1225a4efdc
|
退款
|
2023-07-28 19:03:36 +08:00 |
|
eson
|
719c41db00
|
Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/auth
|
2023-07-28 13:10:32 +08:00 |
|
eson
|
66808fc735
|
完成所有的加密和加密链接
|
2023-07-28 12:15:56 +08:00 |
|
Hiven
|
335ecc1f41
|
分支合并
|
2023-07-28 11:20:12 +08:00 |
|
Hiven
|
334ea4aa3f
|
支付成功回调
|
2023-07-28 11:15:42 +08:00 |
|
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
|
58c0580cad
|
fix
|
2023-07-27 16:27:42 +08:00 |
|
eson
|
19ad6625e6
|
合并
|
2023-07-27 10:18:49 +08:00 |
|
Hiven
|
dbf500813c
|
支付成功通知
|
2023-07-26 19:23:16 +08:00 |
|
eson
|
01cc7da3b4
|
大改jwt
|
2023-07-26 12:15:15 +08:00 |
|
Hiven
|
95baad761a
|
支付模块
|
2023-07-26 11:06:05 +08:00 |
|
eson
|
4c104b56ae
|
忽略掉后台
|
2023-07-26 10:52:33 +08:00 |
|
|
|
852c5e4a94
|
finish auto_config
|
2023-07-26 00:19:21 +08:00 |
|
eson
|
7200531c27
|
添加节点分布式
|
2023-07-25 19:32:51 +08:00 |
|
eson
|
b43b5dbd59
|
fix
|
2023-07-24 19:17:02 +08:00 |
|
Hiven
|
05e5842992
|
Merge branch 'develop' into orders
|
2023-07-24 19:15:33 +08:00 |
|
Hiven
|
fd9e30ea74
|
订单列表--完善
|
2023-07-24 18:04:24 +08:00 |
|
eson
|
a10e100364
|
save
|
2023-07-24 17:22:06 +08:00 |
|
eson
|
7ec78d1c35
|
重新调整w,r的入口
|
2023-07-24 13:17:02 +08:00 |
|
Hiven
|
f792215c2f
|
订单
|
2023-07-24 12:19:34 +08:00 |
|
Hiven
|
f4def7f8a0
|
修复
|
2023-07-24 10:26:24 +08:00 |
|
Hiven
|
a65efe5777
|
订单列表
|
2023-07-21 18:17:01 +08:00 |
|
eson
|
2825f8ae54
|
所有序列化, 都加入 BeforeLogic AfterLogic方法. 便于处理 w r的传递的参数
|
2023-07-21 15:20:18 +08:00 |
|
eson
|
44a3666d68
|
修改tpl的参数传入问题
|
2023-07-21 11:24:26 +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 |
|
Hiven
|
52d47f78ac
|
获取用户订单列表接口,以及工具方法
|
2023-07-20 14:43:59 +08:00 |
|
eson
|
6264440017
|
添加gorm的model结构一个表名的入口
|
2023-07-20 10:13:18 +08:00 |
|
eson
|
e837c745b1
|
注册
|
2023-07-14 19:26:00 +08:00 |
|
eson
|
a4f429a528
|
新增自定义的 Cors
|
2023-07-11 19:43:46 +08:00 |
|
laodaming
|
98c5727c7e
|
fix
|
2023-07-11 17:08:19 +08:00 |
|
laodaming
|
22d0f6a5b1
|
fix
|
2023-07-11 11:28:57 +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
|
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
|
c45028b914
|
fix
|
2023-07-05 16:44:56 +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
|
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
|
9b56d7ba51
|
TODO: render/ 相关模块
|
2023-06-29 18:04:59 +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
|
6abca6b271
|
fix
|
2023-06-28 17:05:31 +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
|
9050b4ab0e
|
fix
|
2023-06-27 15:26:23 +08:00 |
|
laodaming
|
c5bcf9d676
|
fix
|
2023-06-27 14:25:25 +08:00 |
|
eson
|
d336f757ed
|
报价单
|
2023-06-26 19:51:59 +08:00 |
|
eson
|
d74d27ab2d
|
backend
|
2023-06-26 18:19:51 +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
|
96c43325c0
|
添加后台用户表直接分离
|
2023-06-25 18:30:39 +08:00 |
|
eson
|
efe02a0355
|
修复 AuthKey为空的时候 也可以过.
|
2023-06-25 11:26:47 +08:00 |
|
eson
|
29d5c91736
|
修改api的request
|
2023-06-21 16:39:55 +08:00 |
|
eson
|
2c0cd12a15
|
修复SetStatus的bug
|
2023-06-21 14:26:29 +08:00 |
|
laodaming
|
db9c2f3cc7
|
fix
|
2023-06-21 12:11:43 +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
|
e50dac6b1c
|
Order订单待测试
|
2023-06-20 19:36:28 +08:00 |
|
eson
|
2d3c394c73
|
Order 枚举
|
2023-06-20 16:46:56 +08:00 |
|
eson
|
58547706c7
|
修改Order的命名域
|
2023-06-20 12:15:14 +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 |
|
eson
|
640d3261e0
|
添加自增控制
|
2023-06-19 18:27:31 +08:00 |
|
laodaming
|
19984e2dba
|
fix
|
2023-06-19 17:44:34 +08:00 |
|
laodaming
|
175583ca51
|
fix
|
2023-06-16 18:24:31 +08:00 |
|
laodaming
|
748e707dfa
|
fix
|
2023-06-16 11:15:38 +08:00 |
|
laodaming
|
74474f6f16
|
fix
|
2023-06-16 10:27:42 +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
|
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 |
|
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
|
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
|
d941402ef1
|
fix
|
2023-06-13 17:47:48 +08:00 |
|
laodaming
|
346023593d
|
fix
|
2023-06-13 10:03:09 +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
|
fc806b71c6
|
最新可以跑单元测试
|
2023-06-12 18:08:34 +08:00 |
|
eson
|
0f31e298d4
|
修改公共方法为basic入口
|
2023-06-12 17:28:49 +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
|
7d21c9ebc8
|
fix
|
2023-06-12 11:15:58 +08:00 |
|
laodaming
|
7fd80315b2
|
fix
|
2023-06-09 20:06:24 +08:00 |
|
eson
|
427c7cc817
|
Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop
|
2023-06-08 18:55:22 +08:00 |
|
laodaming
|
20987b5e1b
|
fix
|
2023-06-08 18:22:27 +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
|
dc73ff1679
|
完善logic.tpl的错误
|
2023-06-07 18:30:58 +08:00 |
|
laodaming
|
3d492ff720
|
fix
|
2023-06-07 11:35:04 +08:00 |
|
laodaming
|
0915e98700
|
fix
|
2023-06-06 19:21:07 +08:00 |
|
eson
|
ab9df9bc42
|
修改状态码
|
2023-06-06 17:36:10 +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
|
19f988eccd
|
fix
|
2023-06-05 12:21:15 +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 |
|
laodaming
|
cf4e70b8d1
|
fix
|
2023-06-02 12:29:13 +08:00 |
|
laodaming
|
f7a20f3670
|
fix
|
2023-06-02 12:15:32 +08:00 |
|
laodaming
|
efd0f28d51
|
fix
|
2023-06-02 12:12:51 +08:00 |
|
laodaming
|
4df573bbc7
|
fix
|
2023-06-02 10:08:22 +08:00 |
|
laodaming
|
2d7ea2e302
|
fixc
|
2023-06-01 18:34:41 +08:00 |
|
laodaming
|
d26586c794
|
增加产品列表接口
|
2023-06-01 15:32:28 +08:00 |
|
