Commit Graph

419 Commits

Author SHA1 Message Date
Leufolium ea6eea1ccf by Robin at 20240403 2024-04-03 00:25:14 +08:00
Leufolium 15bb43afdf by Robin at 20240402 2024-04-02 22:47:41 +08:00
Leufolium 5582a324b3 Merge branch 'feat-IRONFANS-70' into dev-feat-IRONFANS-70-Robin 2024-04-02 18:55:38 +08:00
Leufolium a8726adf79 by Robin at 20240402 2024-04-02 18:55:05 +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 dc65d4f32e Merge remote-tracking branch 'origin/main' into feat-IRONFANS-70 2024-04-01 11:18:03 +08:00
chenhao 77a336bfa8 Merge pull request 'feat-IRONFANS-76-Robin' (#222) from feat-IRONFANS-76-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/222
2024-03-29 23:19:33 +08:00
Leufolium cd7a9275aa by Robin at 20240329 2024-03-29 23:07:36 +08:00
Leufolium 8cc83fc70c by Robin at 20240329 2024-03-29 22:55:58 +08:00
Leufolium f08bd346c9 by Robin at 20240329 2024-03-29 14:03:59 +08:00
Leufolium 12549d2de5 by Robin at 20240329; alter moment audit procedure 2024-03-29 00:16:42 +08:00
chenhao 114939f340 Merge pull request 'by Robin at 20240328' (#217) from feat-IRONFANS-ALTER-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/217
2024-03-28 13:00:25 +08:00
Leufolium df9defb44f by Robin at 20240328 2024-03-28 13:00:07 +08:00
chenhao 415a909023 Merge pull request 'by Robin at 20240327;' (#215) from feat-IRONFANS-74-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/215
2024-03-27 20:51:10 +08:00
Leufolium 1bd0784227 by Robin at 20240327; 2024-03-27 20:50:40 +08:00
chenhao bb75c04c2b Merge pull request 'by Robin at 20240327; op list deleted' (#214) from feat-IRONFANS-74-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/214
2024-03-27 20:49:48 +08:00
Leufolium fd1706dd51 by Robin at 20240327; op list deleted 2024-03-27 20:29:22 +08:00
chenhao 4aff0176cc Merge pull request 'by Robin at 20240327' (#210) from feat-IRONFANS-ALTER-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/210
2024-03-27 19:34:31 +08:00
Leufolium b67808caca by Robin at 20240327 2024-03-27 19:34:16 +08:00
chenhao 74088bd168 Merge pull request 'by Robin at 20240327; alter down' (#209) from feat-IRONFANS-ALTER-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/209
2024-03-27 15:45:29 +08:00
Leufolium 3cc6f0a322 by Robin at 20240327; alter down 2024-03-27 15:45:01 +08:00
chenhao 43e2d412fa Merge pull request 'by Robin at 20240326; fix high concurrency problem' (#208) from feat-IRONFANS-ALTER-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/208
2024-03-26 18:27:06 +08:00
Leufolium d96a03b02c by Robin at 20240326; fix high concurrency problem 2024-03-26 18:26:47 +08:00
chenhao 567dba88e8 Merge pull request 'by Robin at 20240326; alter streamer recomm' (#207) from feat-IRONFANS-ALTER-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/207
2024-03-26 18:12:02 +08:00
Leufolium 8dcd0562e4 by Robin at 20240326; alter streamer recomm 2024-03-26 18:11:38 +08:00
chenhao d56c0e9f94 Merge pull request 'by' (#206) from feat-IRONFANS-ALTER-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/206
2024-03-26 13:17:25 +08:00
Leufolium dc3432ee72 by 2024-03-26 13:17:10 +08:00
chenhao 4f8ed5742e Merge pull request 'by Robin at 20240326' (#205) from feat-IRONFANS-ALTER-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/205
2024-03-26 13:12:26 +08:00
Leufolium ed6b2e356b by Robin at 20240326 2024-03-26 13:12:15 +08:00
chenhao 86110ac90e Merge pull request 'by Robin at 20240326' (#204) from feat-IRONFANS-ALTER-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/204
2024-03-26 12:31:12 +08:00
Leufolium f7472ea634 by Robin at 20240326 2024-03-26 12:31:00 +08:00
chenhao d5a151013b Merge pull request 'by Robin at 20240326; alter' (#203) from feat-IRONFANS-ALTER-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/203
2024-03-26 12:30:05 +08:00
Leufolium 594987f8ac by Robin at 20240326; alter 2024-03-26 12:29:53 +08:00
lwl0608 faba1b1f96 替换新apollo 2024-03-25 20:00:02 +08:00
chenhao 7c490e1a50 Merge pull request 'by Robin at 20240325; nil' (#202) from BUG-20240322-0001-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/202
2024-03-25 19:37:25 +08:00
Leufolium 7b2d360274 by Robin at 20240325; nil 2024-03-25 19:37:01 +08:00
chenhao 83927db1f3 Merge pull request 'by Robin at 20240325; alter xxl-job' (#201) from BUG-20240322-0001-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/201
2024-03-25 13:23:23 +08:00
Leufolium a4332f706a by Robin at 20240325; alter xxl-job 2024-03-25 13:23:04 +08:00
chenhao bf2605738c Merge pull request 'by Robin at 20240325; fix bug' (#200) from BUG-20240322-0001-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/200
2024-03-25 12:27:53 +08:00
Leufolium 7df6e1862c by Robin at 20240325; fix bug 2024-03-25 12:27:37 +08:00
chenhao 7af89f7d42 Merge pull request 'mainconflict' (#199) from mainconflict into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/199
2024-03-25 12:14:21 +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
chenhao a934f070d7 Merge pull request 'by Robin at 20240322; -fans' (#196) from feat-IRONFANS-58-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/196
2024-03-22 14:08:44 +08:00
Leufolium dacc31cb31 by Robin at 20240322; -fans 2024-03-22 14:08:30 +08:00
chenhao c9c66aba94 Merge pull request 'mainconflict' (#195) from mainconflict into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/195
2024-03-22 13:56:21 +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