Commit Graph

952 Commits

Author SHA1 Message Date
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
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
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
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
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
161ee4304b fix 2023-08-10 18:38:31 +08:00
laodaming
d85c39327c fix 2023-08-10 18:18:00 +08:00
laodaming
0c4f33b486 fix 2023-08-10 18:12:07 +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
8c07a5f5d7 保存为了 websocket 2023-08-10 16:25:41 +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
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
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
28b9d1ac1f fix 2023-08-09 16:58:08 +08:00
eson
1913beb3f7 修改状态机的写法 2023-08-09 16:54:52 +08:00
eson
ca80a94f72 新改动 2023-08-09 16:17:24 +08:00
laodaming
64536beae6 fix 2023-08-09 16:06:40 +08:00
laodaming
fcf7c909a3 fix 2023-08-09 15:29:27 +08:00
Hiven
2d0d410c40 feat:获取资源详情 2023-08-09 15:17:02 +08:00
Hiven
29e42011a9 feat:获取资源详情 2023-08-09 15:15:12 +08:00
Hiven
aa96a52a5b Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-09 14:58:26 +08:00
Hiven
7b32eb9154 feat:获取资源详情 2023-08-09 14:58:20 +08:00
laodaming
f92bf8bfee fix 2023-08-09 14:49:15 +08:00
eson
05e8def85a Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/auth 2023-08-09 14:21:22 +08:00
Hiven
d5e5cdc8f0 feat:获取资源详情 2023-08-09 14:18:27 +08:00
laodaming
2ed06a6df0 fix 2023-08-09 14:12:58 +08:00
laodaming
e185ae7458 fix 2023-08-09 12:28:06 +08:00
Hiven
b1abc92b16 Merge branch 'feature/resource' into develop 2023-08-09 11:47:03 +08:00
Hiven
d810b87c09 feat:合图功能,封装上传base64等等 2023-08-09 11:46:24 +08:00
laodaming
cdeb7be118 fix 2023-08-09 11:16:36 +08:00
eson
056101121b Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/auth 2023-08-09 10:29:53 +08:00
laodaming
cce3c7f2f2 fix 2023-08-09 10:23:58 +08:00
laodaming
a23983b57c fix 2023-08-09 10:15:22 +08:00
laodaming
a50a183b74 fix 2023-08-08 19:17:21 +08:00
laodaming
5faeacd472 fix 2023-08-08 18:35:29 +08:00
laodaming
2f1ef81263 fix 2023-08-08 17:03:54 +08:00
laodaming
584498f556 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-08 16:27:53 +08:00
laodaming
6d58e6bb22 fix 2023-08-08 16:27:42 +08:00
eson
d7345b577c Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/auth 2023-08-08 15:21:56 +08:00
Hiven
399d3b9157 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-08 14:55:28 +08:00
Hiven
1887b6e7b6 =fix:修复 2023-08-08 14:55:17 +08:00
laodaming
3c0d1a8d7a fix 2023-08-08 14:31:40 +08:00
eson
0adaa00a4c 合并 2023-08-08 14:20:57 +08:00
eson
8bea89754b Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/auth 2023-08-08 14:18:45 +08:00
laodaming
9e5b08b9eb fix 2023-08-08 12:56:53 +08:00
laodaming
93191d3beb fix 2023-08-08 12:22:15 +08:00
Hiven
ff86cceb17 fix:调整 2023-08-08 10:53:28 +08:00
Hiven
dcc3cc4a7d fix:修复 2023-08-07 19:51:12 +08:00
Hiven
2cd24098df Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-07 19:41:50 +08:00
Hiven
f87842deb4 fix:修复 2023-08-07 19:41:44 +08:00
laodaming
31a3966e39 fix 2023-08-07 19:13:16 +08:00
laodaming
2c27b85c33 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-07 17:20:03 +08:00
laodaming
74708d3b21 fix 2023-08-07 17:19:55 +08:00
Hiven
8b42c41bc5 fix:调整 2023-08-07 17:12:01 +08:00
Hiven
e2e2880514 fix:调整 2023-08-07 17:10:09 +08:00
Hiven
55d39ab303 fix:调整 2023-08-07 16:45:46 +08:00
Hiven
ee2bc46b92 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-07 16:20:01 +08:00
Hiven
b13fb6d1e6 fix:调整 2023-08-07 16:19:54 +08:00
laodaming
156ec586f0 fix 2023-08-07 14:16:09 +08:00
laodaming
956b18a72e fix 2023-08-07 13:20:18 +08:00
laodaming
48e1093469 fix 2023-08-07 13:18:20 +08:00
laodaming
e9c5e96c52 fix 2023-08-07 13:17:23 +08:00
laodaming
7510b363d6 fix 2023-08-07 12:31:31 +08:00
Hiven
0900329979 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-07 12:02:22 +08:00
Hiven
3d82709b7e fix:文件上传--base64 2023-08-07 12:02:11 +08:00
laodaming
31eb49efa3 fix 2023-08-07 11:49:17 +08:00
laodaming
00bbe2b4e9 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-07 11:45:02 +08:00
laodaming
315ad19dd4 fix 2023-08-07 11:44:54 +08:00
Hiven
869873deda Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-07 11:34:28 +08:00
Hiven
39fe427f8e fix:文件上传--base64 2023-08-07 11:34:22 +08:00
laodaming
36efad44df fix 2023-08-07 11:25:06 +08:00
laodaming
8e4e1c1cfd fix 2023-08-07 11:15:51 +08:00
laodaming
a106082364 fix 2023-08-07 10:48:14 +08:00
laodaming
624b90260f fix 2023-08-04 17:45:36 +08:00
Hiven
8adf1d6360 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-03 18:27:58 +08:00
Hiven
56acf68393 fix:接口调整 2023-08-03 18:27:52 +08:00
laodaming
a9d646c180 fix 2023-08-03 17:40:13 +08:00
Hiven
2c427662a8 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-03 17:37:52 +08:00
laodaming
7966077838 fix 2023-08-03 17:37:35 +08:00
Hiven
87803a6e44 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-03 17:37:32 +08:00
Hiven
6158779a95 调整 2023-08-03 17:37:25 +08:00
laodaming
07dae70930 fix 2023-08-03 17:37:21 +08:00
laodaming
ae9bad0baa fix 2023-08-03 17:36:11 +08:00
laodaming
9f01ecaf80 fix 2023-08-03 16:49:25 +08:00
laodaming
b40293fdd9 fix 2023-08-03 15:54:50 +08:00
Hiven
a864335c0e 用户模块--logo列表调整返回 2023-08-03 14:55:56 +08:00
Hiven
ddb93bae41 用户模块--logo列表完善 2023-08-03 14:50:07 +08:00
Hiven
bf84286ebb Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-03 14:38:23 +08:00
Hiven
39ffc78d6d 用户模块--logo列表 2023-08-03 14:38:17 +08:00
laodaming
1658238ff2 fix 2023-08-03 14:26:40 +08:00
Hiven
464133be97 上传logo 2023-08-02 18:19:21 +08:00
Hiven
d06241b267 上传logo 2023-08-02 18:14:53 +08:00
laodaming
786fc59b0d fixz 2023-08-02 15:10:16 +08:00
laodaming
1f8d9029eb Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-02 15:06:12 +08:00
laodaming
4aaa5c169d fix 2023-08-02 15:06:04 +08:00
Hiven
9363ca68b6 上传完善 2023-08-02 11:50:53 +08:00
Hiven
3388b446fd 上传完善 2023-08-02 11:30:27 +08:00
Hiven
d75bc8f2be 上传完善 2023-08-02 11:13:52 +08:00
laodaming
dab5320444 fix 2023-08-02 10:08:14 +08:00
Hiven
a0ed98d2d1 多文件上传--前端 2023-08-01 19:49:56 +08:00
Hiven
4a2a7822b7 多文件上传--后端 2023-08-01 18:15:55 +08:00
laodaming
c75e55a5cf fix 2023-08-01 10:30:57 +08:00
laodaming
87bb0f34f0 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-07-31 16:45:56 +08:00
laodaming
c86a6bbe75 fix 2023-07-31 16:45:48 +08:00
Hiven
034f479408 Merge branch 'orders' into develop 2023-07-31 11:33:41 +08:00
Hiven
f2109eee9b 订单退款 2023-07-31 11:32:40 +08:00
laodaming
5a713d4d9d fix 2023-07-31 10:08:56 +08:00
fe51e85983 修改为龙舟 2023-07-31 00:41:04 +08:00
7fd48edef8 do 2023-07-30 23:17:02 +08:00
049aedf115 完成配置replica_id 2023-07-30 19:25:59 +08:00
12f85aecd7 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/auth 2023-07-30 15:54:34 +08:00
Hiven
1225a4efdc 退款 2023-07-28 19:03:36 +08:00
laodaming
297c65776b fix 2023-07-28 17:39:28 +08:00
laodaming
1fd7721e99 fix 2023-07-28 17:38:21 +08:00
laodaming
3a9c1fb8d9 fix 2023-07-28 17:36:49 +08:00
laodaming
fef9f8d390 fix 2023-07-28 17:15:37 +08:00
laodaming
5871da7b54 fix 2023-07-28 15:44:42 +08:00
laodaming
a33f39df5c fix 2023-07-28 15:44:29 +08:00
laodaming
8be93b9d5c fix 2023-07-28 15:40:45 +08:00
laodaming
b3f28c3cb8 fix 2023-07-28 15:39:57 +08:00
laodaming
a3e0f4b7d7 fix 2023-07-28 15:39:15 +08:00
laodaming
9c3d9c06b3 fix 2023-07-28 15:19:48 +08:00
laodaming
3e703cf85a Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-07-28 15:10:15 +08:00
laodaming
f316a340c8 fix 2023-07-28 15:10:06 +08:00
eson
648ef75a2e fix 2023-07-28 13:10:43 +08:00
eson
719c41db00 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/auth 2023-07-28 13:10:32 +08:00
eson
11cc2547c9 修复 引用的错误 2023-07-28 12:17:08 +08:00
eson
66808fc735 完成所有的加密和加密链接 2023-07-28 12:15:56 +08:00
Hiven
335ecc1f41 分支合并 2023-07-28 11:20:12 +08:00
Hiven
334ea4aa3f 支付成功回调 2023-07-28 11:15:42 +08:00
laodaming
8f5bcc76ec fix 2023-07-28 11:13:47 +08:00
laodaming
15b2a80f58 fix 2023-07-28 10:42:04 +08:00
laodaming
a158f562b6 fix 2023-07-28 10:37:23 +08:00
laodaming
aa39146cfb fix 2023-07-28 10:22:01 +08:00
laodaming
164c737dd3 fix 2023-07-28 10:20:35 +08:00
laodaming
64e7361d50 fix 2023-07-28 10:02:40 +08:00
eson
3be161a011 tijiao 2023-07-27 19:47:52 +08:00
laodaming
2c537bf823 fix 2023-07-27 19:33:29 +08:00
laodaming
18bbc6788f fix 2023-07-27 19:30:40 +08:00
laodaming
687c18641f fix 2023-07-27 17:41:36 +08:00
laodaming
64a284bd77 fix 2023-07-27 17:37:56 +08:00
laodaming
9f9f7d3fd6 fix 2023-07-27 17:33:50 +08:00
laodaming
cf30fc2b88 fix 2023-07-27 17:07:54 +08:00
eson
42a965ab39 解决冲突 2023-07-27 16:54:57 +08:00
eson
d635811b5f Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/auth 2023-07-27 16:49:25 +08:00
eson
0ce35645b2 for save 2023-07-27 16:48:43 +08:00
laodaming
d843fff73d fix 2023-07-27 16:29:09 +08:00
laodaming
58c0580cad fix 2023-07-27 16:27:42 +08:00
laodaming
5532cd1a11 fix 2023-07-27 16:13:06 +08:00
laodaming
7297a1ef02 fix 2023-07-27 15:46:07 +08:00
laodaming
55a879ada8 fix 2023-07-27 14:31:53 +08:00
laodaming
c375d17c07 fix 2023-07-27 14:10:41 +08:00
laodaming
8469253131 fix 2023-07-27 12:32:03 +08:00
laodaming
2a06a28ad6 fix 2023-07-27 10:46:08 +08:00
eson
abc315a39b Merge branch 'feature/auth' of https://gitee.com/fusenpack/fusenapi into feature/auth 2023-07-27 10:20:05 +08:00
eson
19ad6625e6 合并 2023-07-27 10:18:49 +08:00
laodaming
2cb4549f00 fix 2023-07-27 10:08:30 +08:00
laodaming
2b30911ec6 fix 2023-07-27 10:06:27 +08:00
529a02ac75 需要合并新代码 2023-07-27 00:03:38 +08:00
laodaming
72543d519f fix 2023-07-26 19:29:23 +08:00
Hiven
dbf500813c 支付成功通知 2023-07-26 19:23:16 +08:00
laodaming
f609fa364d fix 2023-07-26 19:19:20 +08:00
laodaming
636bc0aee7 fix 2023-07-26 18:32:39 +08:00
laodaming
857a632cea fix 2023-07-26 18:20:15 +08:00
laodaming
9255a0073f fix 2023-07-26 18:14:04 +08:00
laodaming
32e954ccc8 fix 2023-07-26 18:09:09 +08:00
laodaming
265fd81b27 fix 2023-07-26 18:03:27 +08:00
laodaming
fdaddf9184 fix 2023-07-26 18:00:46 +08:00
laodaming
9a8bdcb5ba fix 2023-07-26 17:55:14 +08:00
laodaming
fcd20e7fc2 fix 2023-07-26 17:48:51 +08:00
laodaming
06e4f1f96e fix 2023-07-26 17:47:02 +08:00
laodaming
7280c38b16 fix 2023-07-26 17:39:56 +08:00
laodaming
0142e04ef5 fix 2023-07-26 17:30:35 +08:00
laodaming
be045b2615 fix 2023-07-26 17:13:14 +08:00
laodaming
3c5b0d7e42 fix 2023-07-26 17:09:04 +08:00
laodaming
d5ff15849d fix 2023-07-26 17:06:53 +08:00
laodaming
436ed9ae4f fix 2023-07-26 16:58:14 +08:00
laodaming
5a92db70eb fix 2023-07-26 16:50:06 +08:00
laodaming
3deda93e7e fix 2023-07-26 16:47:53 +08:00
laodaming
7dc9760d94 fix 2023-07-26 16:27:24 +08:00
laodaming
e25cc97ea0 fix 2023-07-26 16:23:38 +08:00
laodaming
88a59bbdea fix 2023-07-26 16:00:19 +08:00
laodaming
36aad6a088 fix 2023-07-26 15:15:37 +08:00
laodaming
a896d42bc1 fix 2023-07-26 15:12:24 +08:00
laodaming
e07d55efca fix 2023-07-26 15:08:43 +08:00
laodaming
34d5e62824 fix 2023-07-26 15:06:29 +08:00
laodaming
ae58ebe35a fix 2023-07-26 15:05:53 +08:00
laodaming
918b5903d7 fix 2023-07-26 15:01:59 +08:00
laodaming
e40a4d43f4 fix 2023-07-26 14:35:29 +08:00
laodaming
16feddfe3e fix 2023-07-26 12:27:34 +08:00
eson
01cc7da3b4 大改jwt 2023-07-26 12:15:15 +08:00
laodaming
b9afdf1dda fix 2023-07-26 11:53:57 +08:00
laodaming
999dc36e76 fix 2023-07-26 11:53:06 +08:00
Hiven
e05fcd8248 合并代码 2023-07-26 11:09:18 +08:00
Hiven
95baad761a 支付模块 2023-07-26 11:06:05 +08:00
laodaming
c7536d0fdb fix 2023-07-26 11:02:30 +08:00
eson
4c104b56ae 忽略掉后台 2023-07-26 10:52:33 +08:00
laodaming
c378c6d8da fix 2023-07-26 10:03:15 +08:00
852c5e4a94 finish auto_config 2023-07-26 00:19:21 +08:00
laodaming
0657307265 fix 2023-07-25 19:43:28 +08:00
eson
38375ffdda Join集群 2023-07-25 19:42:26 +08:00
laodaming
59edb394fa fix 2023-07-25 19:37:56 +08:00
laodaming
3be83ed424 fix 2023-07-25 19:35:52 +08:00
laodaming
743ea96157 fix 2023-07-25 19:33:59 +08:00
eson
7200531c27 添加节点分布式 2023-07-25 19:32:51 +08:00
laodaming
222b9ec155 fix 2023-07-25 18:34:56 +08:00
laodaming
932ee1a578 fix 2023-07-25 18:21:30 +08:00
laodaming
b0f598af68 fix 2023-07-25 18:04:01 +08:00
laodaming
d0fc91b61b fix 2023-07-25 17:41:38 +08:00
laodaming
17aac7ad66 fix 2023-07-25 17:12:37 +08:00
laodaming
9c72a8a4c9 fix 2023-07-25 17:10:50 +08:00
laodaming
a4164dbdf6 fix 2023-07-25 12:06:19 +08:00
laodaming
5fadf0697d fix 2023-07-24 19:44:28 +08:00
eson
a248c6cbeb TODO: Email Valid Url 2023-07-24 19:43:56 +08:00
Hiven
03627b93e9 Merge branch 'develop' into orders 2023-07-24 19:17:07 +08:00
eson
b43b5dbd59 fix 2023-07-24 19:17:02 +08:00
laodaming
25c3de6b99 fix 2023-07-24 19:16:38 +08:00
Hiven
05e5842992 Merge branch 'develop' into orders 2023-07-24 19:15:33 +08:00
laodaming
b28fefdb0e fix 2023-07-24 18:39:27 +08:00
laodaming
148e0681ec fix 2023-07-24 18:28:58 +08:00
laodaming
fc59840235 fix 2023-07-24 18:08:19 +08:00
Hiven
fd9e30ea74 订单列表--完善 2023-07-24 18:04:24 +08:00
laodaming
9d4bbbf80b fix 2023-07-24 18:02:30 +08:00
eson
a10e100364 save 2023-07-24 17:22:06 +08:00
laodaming
7e22f47a0d fix 2023-07-24 16:07:05 +08:00
eson
7ec78d1c35 重新调整w,r的入口 2023-07-24 13:17:02 +08:00
Hiven
95e6491de5 Merge branch 'develop' into orders 2023-07-24 13:07:04 +08:00
Hiven
f5cfed20d3 调整 2023-07-24 13:03:43 +08:00
eson
4c2f823178 可以登录 2023-07-24 12:32:05 +08:00
Hiven
5b4c43978e Merge branch 'develop' into orders 2023-07-24 12:20:38 +08:00
Hiven
f792215c2f 订单 2023-07-24 12:19:34 +08:00
eson
98ae3e2106 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-07-24 12:18:43 +08:00
eson
900d5bf24b 修改表单 2023-07-24 12:18:27 +08:00
laodaming
b0c9c8d310 fix 2023-07-24 10:37:11 +08:00
laodaming
1e2f6d8b7f fix 2023-07-24 10:30:08 +08:00
eson
72a6412eed fix 2023-07-24 10:27:06 +08:00
Hiven
f4def7f8a0 修复 2023-07-24 10:26:24 +08:00
Hiven
3201f4d26d 修复 2023-07-24 10:10:26 +08:00
Hiven
6b3ad339c6 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-07-21 18:17:43 +08:00
Hiven
a65efe5777 订单列表 2023-07-21 18:17:01 +08:00
laodaming
80a94de6df fix 2023-07-21 17:49:02 +08:00
laodaming
9400fcfaeb fix 2023-07-21 17:32:15 +08:00
laodaming
91131161c9 fix 2023-07-21 17:31:28 +08:00
laodaming
001716785d fix 2023-07-21 17:27:31 +08:00
laodaming
fef5d33f08 fix 2023-07-21 17:23:48 +08:00
laodaming
83fc1b30c7 fix 2023-07-21 17:21:31 +08:00
laodaming
133af63064 fix 2023-07-21 17:20:46 +08:00
laodaming
53a4df065c fix 2023-07-21 16:19:59 +08:00
laodaming
0b5270f3b7 fix 2023-07-21 16:14:42 +08:00
eson
efde0005f9 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-07-21 15:20:56 +08:00
eson
2825f8ae54 所有序列化, 都加入 BeforeLogic AfterLogic方法. 便于处理 w r的传递的参数 2023-07-21 15:20:18 +08:00
eson
373d5dca45 处理 有问题的handler 2023-07-21 14:20:21 +08:00
laodaming
0311bf82fc fix 2023-07-21 14:15:43 +08:00
laodaming
7e4708e8d8 fix 2023-07-21 14:07:42 +08:00
laodaming
50817d7ae2 fix 2023-07-21 12:27:37 +08:00
laodaming
eb25e5bfcc fix 2023-07-21 12:14:19 +08:00
laodaming
4e13550044 fix 2023-07-21 12:08:32 +08:00
laodaming
b36ad4bd25 fix 2023-07-21 11:59:01 +08:00
laodaming
985fc93d00 fix 2023-07-21 11:34:36 +08:00
eson
44a3666d68 修改tpl的参数传入问题 2023-07-21 11:24:26 +08:00
eson
d7dc0406f6 完整的模板 2023-07-21 11:03:14 +08:00
eson
3d678dc243 添加测试main 2023-07-21 10:47:54 +08:00
eson
8a4f990214 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-07-21 10:46:48 +08:00