Commit Graph

1107 Commits

Author SHA1 Message Date
lwl0608 79e80ac082 Merge branch 'dev-lwl/fix' into test 2024-05-06 18:02:13 +08:00
lwl0608 5ef25b96f4 fix zone VIP 2024-05-06 18:02:06 +08:00
lwl0608 42157b2ee4 Merge branch 'dev-lwl/fix' into test 2024-05-06 17:56:48 +08:00
lwl0608 4bc9900fbd fix zone VIP 2024-05-06 17:56:39 +08:00
lwl0608 d2d15c143d merge 2024-05-06 17:37:03 +08:00
lwl0608 2883756d73 add hwcdn01 2024-05-06 17:36:16 +08:00
lwl0608 a0f5d94499 Merge branch 'dev-lwl/fix' 2024-05-06 14:21:00 +08:00
lwl0608 6d7802a2a1 Merge branch 'dev-lwl/fix' into test 2024-05-06 14:20:52 +08:00
lwl0608 7825f3bbf4 isvip logic 2024-05-06 14:20:43 +08:00
lwl0608 3561769427 Merge branch 'dev-lwl/fix' 2024-05-06 14:15:13 +08:00
lwl0608 0768ac950c Merge branch 'dev-lwl/fix' into test 2024-05-06 14:15:07 +08:00
lwl0608 6cf683249f unlock vip 2024-05-06 14:15:00 +08:00
lwl0608 11a104ce38 Merge branch 'dev-lwl/fix' 2024-05-06 10:43:14 +08:00
lwl0608 c13231a1d4 Merge branch 'dev-lwl/fix' into test 2024-05-06 10:43:03 +08:00
lwl0608 7aff32ca0f 日志分割,500mb 2024-05-06 10:42:54 +08:00
lwl0608 0dee9165ef Merge branch 'dev-lwl/fix' 2024-05-06 10:29:54 +08:00
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
chenhao 003ffda209 Merge pull request 'by Robin at 2024' (#404) from feat-IRONFANS-70 into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/404
2024-05-05 22:28:51 +08:00
Leufolium 003b669642 by Robin at 2024 2024-05-05 22:28:22 +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 3c3c849213 Merge branch 'dev-lwl/fix' into test 2024-05-03 19:39:38 +08:00
lwl0608 affc815e8e fix is_moment_image_encrypt_enabled 2024-05-03 19:39:29 +08:00
lwl0608 7e197f34a6 Merge branch 'dev-lwl/fix' into test 2024-05-03 02:56:55 +08:00
lwl0608 bb90fafef6 req.WechatCoinPrice 兜底 2024-05-03 02:56:32 +08:00
lwl0608 ba6d14ccc5 wechat 2024-05-03 02:26:48 +08:00
chenhao d069414106 Merge pull request 'by Robin at 20240501' (#403) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/403
2024-05-01 05:26:33 +08:00
chenhao d09aca140d Merge pull request 'by Robin at 20240501' (#402) from feat-IRONFANS-70 into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/402
2024-05-01 05:25:58 +08:00
Leufolium 1f394794ed by Robin at 20240501 2024-05-01 05:25:45 +08:00
chenhao 76a9e41413 Merge pull request 'by Robin at 20240501' (#401) from feat-IRONFANS-70 into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/401
2024-05-01 05:12:04 +08:00
chenhao e3ae837488 Merge pull request 'by Robin at 20240501' (#400) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/400
2024-05-01 05:04:34 +08:00
Leufolium 2b8d9bf4bf by Robin at 20240501 2024-05-01 05:04:08 +08:00
chenhao e7ade6e7cf Merge pull request 'by Robin at 20240501' (#399) from feat-IRONFANS-104-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/399
2024-05-01 04:32:30 +08:00
Leufolium 7317ea2a65 by Robin at 20240501 2024-05-01 04:32:09 +08:00
chenhao f0c60326b8 Merge pull request 'feat-IRONFANS-70' (#398) from feat-IRONFANS-70 into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/398
2024-05-01 04:19:24 +08:00
chenhao 8e53a7ec84 Merge pull request 'feat-IRONFANS-70' (#397) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/397
2024-05-01 04:09:53 +08:00
Leufolium d8527b01b1 BY 2024-05-01 04:09:27 +08:00
Leufolium 138a8da41d by RObin at 2024-05-01 04:01:58 +08:00
chenhao 83b4ed0320 Merge pull request 'by Robin at 20240501' (#396) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/396
2024-05-01 03:53:15 +08:00
Leufolium 74e6f9a9f5 by Robin at 20240501 2024-05-01 03:52:59 +08:00
chenhao a0dac18ede Merge pull request 'feat-IRONFANS-70' (#395) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/395
2024-05-01 03:28:28 +08:00
chenhao 4019cf0dd1 Merge pull request 'conf' (#394) from conf into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/394
2024-05-01 03:28:07 +08:00
Leufolium c82974fadf Merge remote-tracking branch 'origin/main' into conf 2024-05-01 03:27:04 +08:00
Leufolium 6824e26e90 by Robin at 20240501 2024-05-01 03:22:06 +08:00
Leufolium d494eb921b by Robin at 20240501 2024-05-01 02:51:47 +08:00
chenhao cf4068ddca Merge pull request 'feat-IRONFANS-70' (#391) from feat-IRONFANS-70 into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/391
2024-05-01 02:35:47 +08:00
Leufolium aca9281087 by Robin at 20240501; fix upload fail video mod 2024-05-01 01:54:47 +08:00