Commit Graph

2242 Commits

Author SHA1 Message Date
lwl0608 0a26b2d2a1 mod 2024-09-24 14:07:56 +08:00
lwl0608 b555fb50fb fix cdn tx 2024-09-24 14:07:36 +08:00
lwl0608 524296fbf1 Merge branch 'dev_lwl' 2024-09-18 22:29:27 +08:00
lwl0608 d5fc511403 Merge branch 'dev_lwl' into test 2024-09-18 22:29:20 +08:00
lwl0608 c80d1575f1 fix SrcVidMap 2024-09-18 22:29:12 +08:00
lwl0608 80eabf0a5e Merge branch 'dev_PF' into test 2024-09-14 16:25:32 +08:00
lwl0608 dc5da5a647 add update pf 2024-09-14 16:25:14 +08:00
chenhao 5d25fb345a Merge pull request 'feat-IRONFANS-212-Robin' (#737) from feat-IRONFANS-212-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/737
2024-09-12 16:32:21 +08:00
Leufolium 857679c1fc 1 2024-09-12 16:32:04 +08:00
Leufolium 84e28cb08b by Robin at 20240912; read all 2024-09-12 16:29:24 +08:00
chenhao f202adbb5f Merge pull request 'by Robin at 20240912;' (#736) from feat-IRONFANS-212-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/736
2024-09-12 16:19:11 +08:00
Leufolium 4038b87864 by Robin at 20240912; 2024-09-12 16:18:48 +08:00
chenhao 7b807a421c Merge pull request 'by Robin at 20240912' (#735) from feat-IRONFANS-212-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/735
2024-09-12 16:07:11 +08:00
Leufolium 321988d149 by Robin at 20240912 2024-09-12 16:06:31 +08:00
chenhao 6b91c35199 Merge pull request 'feat-IRONFANS-212-Robin' (#734) from feat-IRONFANS-212-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/734
2024-09-12 15:51:32 +08:00
Leufolium 047178782e by Robin at 20240912 2024-09-12 15:50:34 +08:00
lwl0608 c935cc2400 Merge branch 'dev_lwl' into test 2024-09-12 15:46:32 +08:00
lwl0608 ae710ffbc9 fix alipay rate 2024-09-12 15:46:22 +08:00
chenhao 83f4ca3dfd Merge pull request '1' (#733) from feat-IRONFANS-213-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/733
2024-09-12 15:23:46 +08:00
Leufolium 06444e01c9 1 2024-09-12 15:23:24 +08:00
chenhao 5c795206d0 Merge pull request 'by Robin at 20240912; add streamer cancel proc' (#732) from feat-IRONFANS-213-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/732
2024-09-12 15:19:39 +08:00
chenhao 048669f8fb Merge pull request 'feat-IRONFANS-213-Robin' (#731) from feat-IRONFANS-213-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/731
2024-09-12 15:19:28 +08:00
Leufolium 73f634279e by Robin at 20240912; add streamer cancel proc 2024-09-12 15:18:13 +08:00
chenhao 42cb2fb2ea Merge pull request 'by Robin at 20240911;' (#730) from feat-IRONFANS-205-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/730
2024-09-12 11:59:04 +08:00
Leufolium cdb1f9a24a by Robin at 20240912 2024-09-12 11:54:16 +08:00
Leufolium b5f0159358 by Robin at 20240911; notificaton 2024-09-11 15:44:49 +08:00
chenhao 56fe389cd4 Merge pull request 'feat-IRONFANS-205-Robin' (#729) from feat-IRONFANS-205-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/729
2024-09-11 11:29:30 +08:00
chenhao 7fa78ee5d9 Merge pull request 'feat-IRONFANS-210-Robin' (#728) from feat-IRONFANS-210-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/728
2024-09-11 11:29:13 +08:00
Leufolium 46130b15fc by Robin at 20240911; 2024-09-11 11:27:39 +08:00
Leufolium 63cf9f1b21 by Robin at 20240911; separate 2024-09-11 11:26:43 +08:00
Leufolium f18a483d39 by Robin at 20240911; separate 2024-09-11 11:23:40 +08:00
chenhao 1d7422d735 Merge pull request 'by Robin at 20240911; vdmdbug' (#727) from BUG-20240911-vd into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/727
2024-09-11 11:01:21 +08:00
chenhao 062f6473ac Merge pull request 'by Robin at 20240911; vdmdbug' (#726) from BUG-20240911-vd into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/726
2024-09-11 11:01:09 +08:00
Leufolium 13716f6bad by Robin at 20240911; vdmdbug 2024-09-11 11:00:47 +08:00
lwl0608 e06fe1ba36 Merge branch 'dev_fix_fill' into test 2024-09-10 18:50:14 +08:00
lwl0608 53d01fb04d fix xreponse 2024-09-10 18:50:09 +08:00
lwl0608 f94dec8f98 Merge branch 'dev_fix_fill' into test 2024-09-10 18:44:00 +08:00
lwl0608 2421f038e6 fix fill media 2024-09-10 18:43:55 +08:00
lwl0608 eea29e86ec Merge branch 'dev_search_zmember' 2024-09-10 18:13:25 +08:00
lwl0608 49f045202d Merge branch 'dev_search_zmember' into test 2024-09-10 18:13:04 +08:00
lwl0608 d30cac1c02 fix media 2024-09-10 18:12:57 +08:00
lwl0608 152918b754 Merge branch 'dev_search_zmember' 2024-09-10 17:50:09 +08:00
lwl0608 60518261db Merge branch 'dev_search_zmember' into test 2024-09-10 17:50:02 +08:00
lwl0608 67debe2845 fix 2024-09-10 17:49:51 +08:00
chenhao 95e5da50d5 Merge pull request 'by Robin at 20240819' (#725) from feat-IRONFANS-201-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/725
2024-09-10 15:20:58 +08:00
chenhao 08324bcdfe Merge pull request 'by Robin at 20240910, remove token auth' (#724) from feat-IRONFANS-210-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/724
2024-09-10 14:24:55 +08:00
Leufolium fe902eac77 by Robin at 20240910, remove token auth 2024-09-10 14:24:03 +08:00
lwl0608 9eb33012fd Merge branch 'dev_search_zmember' into test 2024-09-10 12:58:06 +08:00
lwl0608 2c1c31d275 fix recover 2024-09-10 12:58:01 +08:00
lwl0608 b53667b975 Merge branch 'dev_search_zmember' into test 2024-09-10 12:50:43 +08:00