wishpal_ironfan
/
service
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,214 Commits 89 Branches 0 Tags 39 MiB
Commit Graph

172 Commits

Author SHA1 Message Date
lwl0608 8423865176 Merge branch 'dev-lwl/fix' into test 2024-05-06 10:29:44 +08:00
lwl0608 d34f30c8b2 取消 response 日志 2024-05-06 10:29:35 +08:00
lwl0608 b8579e8147 Merge branch 'dev-lwl/fix' into test 2024-05-05 07:08:45 +08:00
lwl0608 75e55323b0 change to miyuantianshi 2024-05-05 07:07:36 +08:00
lwl0608 0f596d420d Merge branch 'dev-lwl/fix' into test 2024-05-04 22:16:05 +08:00
lwl0608 50c259249e fix is_moment_image_encrypt_enabled 2024-05-04 22:15:57 +08:00
lwl0608 ba6d14ccc5 wechat 2024-05-03 02:26:48 +08:00
Leufolium c82974fadf Merge remote-tracking branch 'origin/main' into conf 2024-05-01 03:27:04 +08:00
Leufolium aca9281087 by Robin at 20240501; fix upload fail video mod 2024-05-01 01:54:47 +08:00
chenhao 9c893d4a9c Merge pull request 'feat-IRONFANS-86-Robin' (#378) from feat-IRONFANS-86-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/378
 2024-04-29 22:20:05 +08:00
chenhao 1313f17fe0 Merge pull request 'by Robin at 20240429' (#376) from feat-IRONFANS-87-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/376
 2024-04-29 14:25:16 +08:00
Leufolium 29f4a72c32 by Robin at 20240429 2024-04-29 14:24:31 +08:00
chenhao 06624dc801 Merge pull request 'by Robin at 20240429' (#374) from feat-IRONFANS-87-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/374
 2024-04-29 14:18:23 +08:00
Leufolium f6c60cf574 by Robin at 20240429 2024-04-29 14:17:29 +08:00
chenhao d24b4380a4 Merge pull request 'by Robin at 20240428' (#371) from feat-IRONFANS-87-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/371
 2024-04-28 21:51:32 +08:00
Leufolium 58a238e9c9 by Robin at 20240428 2024-04-28 21:51:16 +08:00
chenhao e56dd98007 Merge pull request 'feat-IRONFANS-87-Robin' (#368) from feat-IRONFANS-87-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/368
 2024-04-28 21:27:24 +08:00
Leufolium e8649e1111 BY ROBIN AT 20240428 2024-04-28 21:16:18 +08:00
chenhao 0c86d4db01 Merge pull request 'feat-IRONFANS-86-Robin' (#365) from feat-IRONFANS-86-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/365
 2024-04-27 11:17:19 +08:00
Leufolium edb5caf001 by Robin at 20240427 2024-04-27 11:14:44 +08:00
Leufolium ddbba1f860 by Robin at 20240427 2024-04-27 00:18:31 +08:00
Leufolium 0630bd9a18 by Robin at 20240426 2024-04-26 10:46:37 +08:00
lwl0608 8b9bc15d2f 测试环境不加token 2024-04-22 21:11:08 +08:00
chenhao 6524a34a85 Merge pull request 'feat-IRONFANS-70' (#276) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/276
 2024-04-11 21:52:48 +08:00
Leufolium b4e04b8841 by Robin at 20240411 2024-04-11 21:51:46 +08:00
Leufolium e985e15ae1 Merge remote-tracking branch 'origin/feat-IRONFANS-70' into conf 2024-04-08 20:14:44 +08:00
Leufolium 8927d22bba by Robin at 20240408 2024-04-08 20:05:13 +08:00
Leufolium 5a333382ff Merge remote-tracking branch 'origin/feat-IRONFANS-70' into cf 2024-04-05 17:11:18 +08:00
Leufolium 4820bd9503 by Robin at 20240404 2024-04-04 20:48:42 +08:00
Leufolium be27160261 Merge remote-tracking branch 'origin/feat-IRONFANS-70' into conflict 2024-04-03 16:55:08 +08:00
Leufolium 50f7e16608 by Robin at 20240403 2024-04-03 04:56:21 +08:00
Leufolium a31e57c806 by Robin at 20240402 2024-04-02 18:53:26 +08:00
Leufolium a69bcdb6a2 Merge branch 'feat-IRONFANS-70' into dev-feat-IRONFANS-70-Robin 2024-04-01 11:19:10 +08:00
Leufolium 113cf31495 Merge remote-tracking branch 'origin/main' into test 2024-03-28 12:12:05 +08:00
Leufolium d96a03b02c by Robin at 20240326; fix high concurrency problem 2024-03-26 18:26:47 +08:00
Leufolium 7b2d360274 by Robin at 20240325; nil 2024-03-25 19:37:01 +08:00
Leufolium 1ab2b556a1 Merge branch 'BUG-20240322-0001-Robin' into mainconflict 2024-03-25 12:13:49 +08:00
Leufolium 294bea59e4 By Robin at 20240325; fix bug 2024-03-25 12:11:29 +08:00
lwl0608 7bb527c1dc fix panic 2024-03-25 11:25:37 +08:00
Leufolium 5344a54888 Merge remote-tracking branch 'origin/feat-IRONFANS-58-Robin' into mainconflict 2024-03-22 13:54:11 +08:00
Leufolium 407292fe8d by Robin at 20240321 2024-03-21 23:26:23 +08:00
lwl0608 53086cde6c fix recover 2024-03-21 20:27:42 +08:00
lwl0608 f5cc4e4891 fix recovery 2024-03-21 20:22:10 +08:00
lwl0608 ad95c1be67 recover 2024-03-21 20:18:22 +08:00
lwl0608 1255e0f916 fix 退款理由 2024-03-21 19:54:20 +08:00
Leufolium 37c3929e9d Merge remote-tracking branch 'origin/feat-IRONFANS-62-Robin' into mainconflict 2024-03-19 00:01:43 +08:00
Leufolium 67e27e04db Merge branch 'BUG-20240316-0001-Robin' into conflict 2024-03-16 22:36:05 +08:00
Leufolium 1954e80ab3 Merge branch 'feat-IRONFANS-58-Robin' into conflict 2024-03-14 07:55:43 +08:00
Leufolium a2f70a63d9 by Robin at 20240314; add newly-created moment 2024-03-14 07:53:25 +08:00
lwl0608 371cf04c5f ch log 2024-03-13 20:51:29 +08:00
lwl0608 779e47996e Merge branch 'dev-lwl/refund' 2024-03-13 20:35:32 +08:00
lwl0608 b833ecdc9e refund 2024-03-13 20:35:18 +08:00
lwl0608 f781786e13 fix cdn 2024-03-12 21:21:46 +08:00
Leufolium f990dd0be0 Merge branch 'feat-IRONFANS-66-Robin' into conflict 2024-03-12 12:10:16 +08:00
lwl0608 19f60097ff cdn test 2024-03-08 15:49:57 +08:00
lwl0608 93048a1a4b cdn test 2024-03-08 15:49:32 +08:00
Leufolium 51d3e5e568 By Robin at 20240307 2024-03-07 01:18:41 +08:00
Leufolium b2b29d7466 by Robin at 20240302 2024-03-02 08:29:20 +08:00
Leufolium b2c8a76e37 by Robin at 20240229; add robot 2024-02-29 09:55:56 +08:00
chenhao a1f3e5b4ff Merge pull request 'by Robin at 20240229; fix' (#149) from feat-20240117-001-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/149
 2024-02-29 01:50:14 +08:00
Leufolium 42f56872b9 by Robin at 20240229; fix 2024-02-29 01:48:51 +08:00
chenhao c2a010ff26 Merge pull request 'by Robin at 20240227;' (#141) from feat-20240117-001-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/141
 2024-02-27 02:21:40 +08:00
Leufolium 9e935ee8df by Robin at 20240227; 2024-02-27 02:21:24 +08:00
chenhao baead8176e Merge pull request 'by Robin at 20240227;fix' (#138) from feat-20240117-001-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/138
 2024-02-27 01:05:56 +08:00
Leufolium c3db97077b by Robin at 20240227;fix 2024-02-27 01:05:14 +08:00
chenhao 4903267633 Merge pull request 'feat-20240117-001-Robin' (#137) from feat-20240117-001-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/137
 2024-02-27 00:55:59 +08:00
lwl0608 48d058610d add wxpayh5 2024-02-26 19:28:03 +08:00
lwl0608 9b9b84c89f alipay change myts 2024-02-24 23:20:27 +08:00
Leufolium 86be2a9a84 Merge remote-tracking branch 'origin/main' into feat-20240117-001-Robin 2024-02-22 22:31:20 +08:00
Leufolium cd07846804 by Robin at 20240222; fix 2024-02-22 21:50:34 +08:00
Leufolium 19de07fbe4 by Robin at 20240221; change moment audit logic 2024-02-21 18:04:01 +08:00
lwl0608 59f206a612 recover apply 2024-02-21 11:36:21 +08:00
lwl0608 201e1f4c5c wx jsapi 2024-02-20 23:05:24 +08:00
lwl0608 da9203fe64 fix 2024-02-19 21:04:45 +08:00
lwl0608 be2eaa5744 add oid3 2024-02-19 09:05:49 +08:00
lwl0608 c61abde23b fff 2024-02-18 23:47:58 +08:00
lwl0608 ef6538528d 支付宝优化 2024-02-18 23:24:52 +08:00
lwl0608 1ce92ce589 fix 2024-02-12 20:31:18 +04:00
lwl0608 13261a3f8d add alipay ymkj 2024-02-12 19:41:41 +04:00
Leufolium 1f44a063f7 by Robin at 20240207; 2024-02-07 15:15:57 +08:00
Leufolium 5079d25bb3 Merge remote-tracking branch 'origin/main' into feat-20240117-001-Robin 2024-02-07 13:51:00 +08:00
Leufolium 12870ef2fd by Robin at 20240207; add aligned 2024-02-07 12:07:28 +08:00
lwl0608 632ce1228e SelectMinSizeOssId 2024-02-06 02:51:24 +08:00
lwl0608 ccf4417659 Merge branch 'dev-lwl/wechat' 2024-02-05 23:25:47 +08:00
lwl0608 f0050a938e add 2024-02-05 21:55:44 +08:00
Leufolium eeccbf6315 Merge branch 'feat-IRONFANS-53-20240205-Robin' into feat-20240117-001-Robin 2024-02-05 21:26:22 +08:00
lwl0608 2261c021fa add config 2024-02-05 21:16:49 +08:00
lwl0608 87ece44a9a wechat 2024-02-05 01:15:29 +08:00
chenhao 4346b953d6 Merge pull request 'feat-IRONFANS-46-20240201-Robin' (#92) from feat-IRONFANS-46-20240201-Robin into main 
Reviewed-on: #92
 2024-02-04 17:01:34 +08:00
lwl0608 332bcc87fc wx 2024-02-03 17:58:40 +08:00
lwl0608 9aff51c92b fix 2024-02-03 17:27:10 +08:00
lwl0608 d4011adb92 deal_one_order 2024-02-03 17:23:08 +08:00
Leufolium b3809eddf5 Merge remote-tracking branch 'origin/main' into feat-20240117-001-Robin 2024-02-01 20:10:02 +08:00
Leufolium c71c996afd by Robin at 20240201; 2024-02-01 09:52:45 +08:00
Leufolium f1ffbf473a by Robin at 20240201; 2024-02-01 09:02:11 +08:00
Leufolium 9430918b7b by Robin at 20240120; fix 2024-01-20 18:48:38 +08:00
Leufolium a52ac4dfa7 by Robin at 20240120;l fix 2024-01-20 06:33:10 +08:00
Leufolium 04b65a72d2 by Robin at 20240119; fix 2024-01-19 17:31:38 +08:00
Leufolium 1602de1156 by Robin at 20240118; 2024-01-18 18:19:31 +08:00
Leufolium a7c7d5f99e by Robin at 20240116; fix 2024-01-16 21:44:58 +08:00