Commit Graph

1391 Commits

Author SHA1 Message Date
lwl0608 5cc1fb426b fix log 2024-05-21 19:57:19 +08:00
lwl0608 873e2dbe55 port 2024-05-21 19:57:19 +08:00
lwl0608 50faecc4be fix yaml 2024-05-21 19:57:19 +08:00
lwl0608 0ec33fa81b consul 2024-05-21 19:57:19 +08:00
lwl0608 b57a826749 fix alipay notify url 2024-05-21 19:57:19 +08:00
lwl0608 c03854b6d1 fix 2024-05-21 19:57:19 +08:00
lwl0608 dc1feac378 vendor 2024-05-21 19:57:17 +08:00
lwl0608 b3836120e2 consul 2024-05-21 19:56:54 +08:00
lwl0608 2ae1c452b3 add 2024-05-21 19:56:53 +08:00
lwl0608 ee5585daf7 consul 2024-05-21 19:55:58 +08:00
chenhao b78128b436 Merge pull request 'conf' (#463) from conf into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/463
2024-05-21 18:37:47 +08:00
Leufolium 9eb02d2788 Merge remote-tracking branch 'origin/feat-IRONFANS-118-Robin' into conf 2024-05-21 18:37:01 +08:00
chenhao d5f5e3f25b Merge pull request 'main' (#461) from main into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/461
2024-05-21 18:27:41 +08:00
Leufolium 169a34247f by Robin at 20240521 2024-05-21 18:26:30 +08:00
lwl0608 ce46abfdca Merge branch 'dev-lwl/consul' into test 2024-05-21 17:36:39 +08:00
lwl0608 0cf3101f93 ip 2024-05-21 17:36:33 +08:00
lwl0608 bcd57636ec Merge branch 'dev-lwl/consul' into test 2024-05-21 17:29:52 +08:00
lwl0608 44c1f15b1e port 2024-05-21 17:29:43 +08:00
lwl0608 38b3d67908 Merge branch 'dev-lwl/consul' into test 2024-05-21 17:18:35 +08:00
lwl0608 acf915b387 fix 2024-05-21 17:18:30 +08:00
lwl0608 26c86ccc49 merge 2024-05-21 17:17:20 +08:00
lwl0608 edd86f2bb8 log fix 2024-05-21 17:16:39 +08:00
lwl0608 bf987fe8da Merge branch 'dev-lwl/consul' into test 2024-05-21 17:08:13 +08:00
lwl0608 ad7a42a0f5 fix 2024-05-21 17:08:05 +08:00
Leufolium 62ae8742ba by Robin at 20240520 2024-05-20 18:16:17 +08:00
Leufolium 5eb15ae3a1 by Robin at 20240520 2024-05-20 18:12:22 +08:00
chenhao 90d11b400e Merge pull request 'feat-IRONFANS-129-Robin' (#460) from feat-IRONFANS-129-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/460
2024-05-20 17:42:31 +08:00
chenhao bc30b6a7f7 Merge pull request 'by Robin at 20240520' (#459) from feat-IRONFANS-129-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/459
2024-05-20 17:32:40 +08:00
Leufolium d1b1a62b8a by Robin at 20240520 2024-05-20 17:32:12 +08:00
chenhao 0fdf2e76c0 Merge pull request 'by Robin at 20240520' (#458) from feat-IRONFANS-129-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/458
2024-05-20 16:15:24 +08:00
Leufolium b1b95821e1 by Robin at 20240520 2024-05-20 16:15:01 +08:00
chenhao 767d63844f Merge pull request 'conflict' (#457) from conflict into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/457
2024-05-20 15:33:17 +08:00
Leufolium 112125e003 Merge remote-tracking branch 'origin/feat-IRONFANS-125-Robin' into conflict 2024-05-20 15:32:57 +08:00
Leufolium 6dc26aeb1b Merge remote-tracking branch 'origin/main' into test 2024-05-20 15:31:38 +08:00
Leufolium 1f5f5b57e0 by Robin at 20240520 2024-05-20 15:29:07 +08:00
chenhao 568d7661f7 Merge pull request 'by Robin at 20240518' (#454) from feat-IRONFANS-120-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/454
2024-05-18 00:34:39 +08:00
Leufolium 6ff619e386 1 2024-05-18 00:34:20 +08:00
chenhao 73be110ca6 Merge pull request 'by Robin at 20240518' (#454) from feat-IRONFANS-120-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/454
2024-05-18 00:13:38 +08:00
Leufolium 853d231a9f by Robin at 20240518 2024-05-18 00:12:54 +08:00
chenhao 3bbbeee0ab Merge pull request 'by Robin at 20240517' (#453) from feat-IRONFANS-120-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/453
2024-05-17 18:58:13 +08:00
Leufolium f0198e6e71 by Robin at 20240517 2024-05-17 18:57:41 +08:00
chenhao 24a9e2236f Merge pull request 'by Robin at 20240517' (#452) from feat-IRONFANS-120-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/452
2024-05-17 18:42:19 +08:00
Leufolium 52e8d60715 by Robin at 20240517 2024-05-17 18:42:03 +08:00
chenhao 4235ebb73a Merge pull request 'release-20240517' (#451) from release-20240517 into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/451
2024-05-17 17:22:11 +08:00
Leufolium d089f30fb4 Merge remote-tracking branch 'origin/feat-IRONFANS-117-Robin' into release-20240517 2024-05-17 16:17:46 +08:00
lwl0608 bb825aa93a fix 2024-05-17 16:14:23 +08:00
lwl0608 dfbc547781 fix 2024-05-17 16:13:50 +08:00
Leufolium f7c25ae1cc Merge remote-tracking branch 'origin/feat-IRONFANS-120-Robin' into release-20240517 2024-05-17 16:12:41 +08:00
chenhao f8775c6d17 Merge pull request 'feat-IRONFANS-112-Robin' (#448) from feat-IRONFANS-112-Robin into release-20240517
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/448
2024-05-17 16:10:50 +08:00
lwl0608 8fbbcc803e t 2024-05-17 15:46:08 +08:00