wishpal_ironfan
/
service
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,949 Commits 94 Branches 0 Tags 43 MiB
Commit Graph

1384 Commits

Author SHA1 Message Date
Leufolium 70febfc421 by Robin at 20240731 2024-07-31 16:08:51 +08:00
chenhao f6babbff70 Merge pull request '1' (#664) from feat-IRONFANS-173-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/664
 2024-07-31 15:58:29 +08:00
lwl0608 2091ac23c8 fix 2024-07-31 14:55:46 +08:00
lwl0608 96325994ea fix code 2024-07-31 14:55:16 +08:00
chenhao d24ed470b0 Merge pull request 'by Robin at 20240729' (#662) from BUG-20240729 into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/662
 2024-07-30 19:10:58 +08:00
Leufolium 44b37b1ad0 Merge branch 'feat-IRONFANS-176-Robin' into conflict 2024-07-30 18:58:16 +08:00
Leufolium 7af7d2d6f1 by Robin at 20240730 2024-07-30 18:40:15 +08:00
Leufolium d9ef34138b 1 2024-07-30 15:35:27 +08:00
chenhao 3d89cdb07c Merge pull request 'by Robin at 20240730; add delay' (#657) from feat-IRONFANS-166-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/657
 2024-07-30 12:15:35 +08:00
Leufolium c6e1a41288 by Robin at 20240730; add delay 2024-07-30 12:15:01 +08:00
Leufolium 2e08c98384 1 2024-07-30 12:08:21 +08:00
lwl0608 e1d63b08d6 Merge branch 'add_raven' into test 2024-07-29 19:29:40 +08:00
lwl0608 739cc1dd11 fix outer raven 2024-07-29 19:29:34 +08:00
Leufolium 8fcef422bb by Robin at 20240729 2024-07-29 15:48:39 +08:00
lwl0608 940b5d7400 Merge branch 'add_raven' into test 2024-07-29 15:33:48 +08:00
lwl0608 759a138d06 outer raven 2024-07-29 15:33:42 +08:00
chenhao acf3e96a9d Merge pull request 'BUG-20240729' (#656) from BUG-20240729 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/656
 2024-07-29 13:15:38 +08:00
Leufolium 5eeebd4206 by Robin at 20240729 2024-07-29 13:15:11 +08:00
chenhao a7f3d8f813 Merge pull request 'by Robin at 20240726' (#655) from feat-IRONFANS-166-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/655
 2024-07-26 12:59:23 +08:00
Leufolium ae595246be by Robin at 20240726 2024-07-26 12:58:48 +08:00
Leufolium c2f89ac8e9 Merge branch 'feat-IRONFANS-166-Robin' into conf 2024-07-25 21:38:19 +08:00
Leufolium 34bbcdf627 1 2024-07-25 21:37:50 +08:00
Leufolium 6310092360 Merge remote-tracking branch 'origin/feat-IRONFANS-166-Robin' into conf 2024-07-25 21:37:08 +08:00
Leufolium 8eec2ba0ee by Robin at 20240725 2024-07-25 21:35:25 +08:00
Leufolium 4caefe3025 1 2024-07-25 20:29:08 +08:00
chenhao c137fd38bc Merge pull request 'feat-IRONFANS-173-Robin' (#650) from feat-IRONFANS-173-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/650
 2024-07-25 20:28:48 +08:00
Leufolium bb2c18fa4b 1 2024-07-25 20:11:38 +08:00
Leufolium 2ea3ebb6aa by Robin at 20240725 2024-07-25 19:59:35 +08:00
Leufolium 2a7c04d4ea 1 2024-07-25 17:49:13 +08:00
lwl0608 091a9b24a1 merg 2024-07-25 10:29:06 +08:00
lwl0608 cfdcc67c8f fix ch 2024-07-25 10:28:43 +08:00
lwl0608 fc37a1595f Merge branch 'fix_panicc' into test 2024-07-24 16:42:57 +08:00
lwl0608 33e8d70e24 fix panic 2024-07-24 16:42:49 +08:00
chenhao ac6ee62ac6 Merge pull request 'By Robin at 20240724' (#649) from feat-IRONFANS-173-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/649
 2024-07-24 14:19:56 +08:00
Leufolium d74af2c693 By Robin at 20240724 2024-07-24 14:14:26 +08:00
Leufolium 9467b15d29 Merge branch 'feat-IRONFANS-163-Robin' into mainconf 2024-07-23 17:38:33 +08:00
chenhao 0defd56c6b Merge pull request '1' (#643) from feat-IRONFANS-163-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/643
 2024-07-23 17:04:23 +08:00
Leufolium c5343564e3 1 2024-07-23 17:04:07 +08:00
Leufolium a491dff03a Merge branch 'feat-IRONFANS-163-Robin' into conf 2024-07-23 16:41:47 +08:00
Leufolium 24b52988f2 by Robin at 20240723 2024-07-23 16:37:16 +08:00
Leufolium f83058dc25 Merge branch 'feat-IRONFANS-148-Robin' into mainconf 2024-07-22 19:11:15 +08:00
chenhao b87106fa8f Merge pull request '1' (#637) from feat-IRONFANS-173-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/637
 2024-07-22 16:12:37 +08:00
Leufolium 6b800705c5 1 2024-07-22 16:12:22 +08:00
Leufolium 4540f29515 Merge branch 'feat-IRONFANS-173-Robin' into conflict 2024-07-22 16:02:15 +08:00
Leufolium de7adf04e8 1 2024-07-22 15:57:56 +08:00
Leufolium 62efdad5c0 1 2024-07-22 13:45:57 +08:00
Leufolium b283c34f44 by Robin at 20240722 2024-07-22 09:17:49 +08:00
lwl0608 9808ff020f Merge branch 'dev-lwl/rollback_zone_status' 2024-07-19 20:37:20 +08:00
lwl0608 ebd161ba90 Merge branch 'dev-lwl/rollback_zone_status' into test 2024-07-19 20:37:13 +08:00
lwl0608 bf994af7ab fix errmsg 2024-07-19 20:37:08 +08:00
Leufolium 2167befc4d 1 2024-07-19 18:31:15 +08:00
chenhao 2738a1393b Merge pull request 'feat-IRONFANS-163-Robin' (#632) from feat-IRONFANS-163-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/632
 2024-07-19 18:12:01 +08:00
Leufolium 8ac99776b2 by Robin at 20240719 2024-07-19 18:11:32 +08:00
lwl0608 34c0a92991 Merge branch 'dev-lwl/rollback_zone_status' into test 2024-07-19 17:54:07 +08:00
lwl0608 4211c887cf fix 2024-07-19 17:53:54 +08:00
Leufolium de756dab19 1 2024-07-19 17:46:58 +08:00
lwl0608 ab6422c107 Merge branch 'dev-lwl/rollback_zone_status' into test 2024-07-19 17:46:37 +08:00
lwl0608 9157c5fa08 fix 2024-07-19 17:46:33 +08:00
lwl0608 53ae309348 merge 2024-07-19 11:03:20 +08:00
lwl0608 9c2ba123a2 rollback_zone_exit_status 2024-07-19 11:02:34 +08:00
Leufolium 98c6ef4f36 1 2024-07-19 08:43:30 +08:00
Leufolium ea7d25b0a9 by Robin at 20240719 2024-07-19 08:32:59 +08:00
Leufolium 0665b22b3f Merge branch 'main' into feat-IRONFANS-163-Robin 2024-07-18 22:27:10 +08:00
Leufolium 9b0b943691 1 2024-07-18 22:02:31 +08:00
chenhao ca89e8711a Merge pull request 'by Robin at 20240718' (#626) from feat-IRONFANS-163-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/626
 2024-07-18 19:31:19 +08:00
Leufolium b96a1eaefd by Robin at 20240718 2024-07-18 19:30:59 +08:00
Leufolium 74183a0331 by Robin at 20240718 2024-07-18 19:29:11 +08:00
chenhao 2978432789 Merge pull request '1' (#625) from feat-IRONFANS-148-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/625
 2024-07-17 18:32:31 +08:00
Leufolium 7c24f50709 1 2024-07-17 18:32:14 +08:00
lwl0608 6372e444a8 Merge branch 'dev-lwl/wx_tiefan' into test 2024-07-17 18:06:46 +08:00
lwl0608 2ecaa31ad2 add tiefanzone wxpay 2024-07-17 18:06:39 +08:00
Leufolium c6aa6c3c53 Merge branch 'feat-IRONFANS-163-Robin' into conf 2024-07-17 18:02:30 +08:00
Leufolium 02e9883ffe by Robin at 20240717 2024-07-17 17:55:46 +08:00
lwl0608 f01f9a3ecb 1 2024-07-17 17:51:08 +08:00
chenhao 4b023d0fc5 Merge pull request '1' (#622) from feat-IRONFANS-163-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/622
 2024-07-17 17:13:17 +08:00
chenhao e2ee45e1d1 Merge pull request 'by Robin at 20240717' (#621) from feat-IRONFANS-148-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/621
 2024-07-17 17:13:03 +08:00
Leufolium 7d22149037 1 2024-07-17 17:12:37 +08:00
Leufolium 441433e65c by Robin at 20240717 2024-07-17 17:10:04 +08:00
Leufolium 36f7b60923 Merge branch 'feat-IRONFANS-163-Robin' into conf 2024-07-17 13:00:51 +08:00
Leufolium 8fc078e3c9 by Robin at 20240717 2024-07-17 12:53:42 +08:00
Leufolium ca8536855c 1 2024-07-17 12:02:39 +08:00
Leufolium 9663b7121e by Robin at 20240717 2024-07-17 12:01:56 +08:00
Leufolium 88074a9b19 1 2024-07-17 08:44:26 +08:00
chenhao e0bcac5804 Merge pull request 'by Robin at 20240715' (#617) from BUG-20240715 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/617
 2024-07-15 19:27:02 +08:00
Leufolium 08ddd0419b by Robin at 20240715 2024-07-15 19:26:47 +08:00
chenhao 395d72a4b6 Merge pull request '1' (#616) from feat-IRONFANS-148-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/616
 2024-07-15 18:17:13 +08:00
Leufolium 30542411c4 1 2024-07-15 18:12:20 +08:00
chenhao 1f4bf29eb2 Merge pull request 'feat-IRONFANS-163-Robin' (#615) from feat-IRONFANS-163-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/615
 2024-07-11 15:45:57 +08:00
Leufolium 3af5833d73 by Robin at 20240711 2024-07-11 15:43:23 +08:00
chenhao 13b1a9972f Merge pull request 'feat-IRONFANS-148-Robin' (#614) from feat-IRONFANS-148-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/614
 2024-07-11 15:38:45 +08:00
Leufolium f9924cb7cb 1 2024-07-11 15:37:39 +08:00
Leufolium b4418e23bb 1 2024-07-11 15:36:55 +08:00
lwl0608 7c510f0e3f Merge branch 'dev-lwl/add_alipay_clients' 2024-07-11 15:13:12 +08:00
Leufolium 2af8e89b0d 1 2024-07-11 15:07:10 +08:00
Leufolium b2b2f9df38 1 2024-07-11 15:01:02 +08:00
chenhao 2298b4f4e1 Merge pull request 'by Robin at 20240711' (#612) from feat-IRONFANS-148-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/612
 2024-07-11 14:56:00 +08:00
Leufolium f03f172a8d by Robin at 20240711 2024-07-11 14:53:43 +08:00
chenhao 2819f588f4 Merge pull request 'by Robin at 20240710' (#611) from feat-IRONFANS-157-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/611
 2024-07-11 13:09:08 +08:00
lwl0608 ae43a7baa5 Merge branch 'dev-lwl/add_alipay_clients' into test 2024-07-11 11:17:17 +08:00
lwl0608 3bd6b9352d fix lanxing 02 2024-07-11 11:17:13 +08:00
Leufolium cd6b6de15b by Robin at 20240711 2024-07-11 11:10:25 +08:00
lwl0608 24ff2b0a75 fix 2024-07-11 10:04:10 +08:00
lwl0608 e3adc95d15 add random pay 2024-07-11 10:03:25 +08:00
chenhao eb9225fe36 Merge pull request 'by Robin at 20240711' (#609) from BUG-20240711 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/609
 2024-07-11 08:15:01 +08:00
Leufolium 87fc79d62a by Robin at 20240711 2024-07-11 08:14:34 +08:00
Leufolium 89d3db64e3 Merge branch 'feat-IRONFANS-157-Robin' into conf 2024-07-10 05:50:35 +08:00
Leufolium e47ed25ed0 by Robin at 20240710 2024-07-10 05:47:56 +08:00
chenhao 75cf6fb68d Merge pull request 'by Robin at 20240710' (#605) from feat-IRONFANS-148-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/605
 2024-07-10 05:18:33 +08:00
Leufolium 739b47f032 by Robin at 20240710 2024-07-10 05:18:02 +08:00
chenhao 81dda7dd72 Merge pull request '1' (#604) from feat-IRONFANS-148-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/604
 2024-07-09 21:54:27 +08:00
Leufolium 883db65ea4 1 2024-07-09 21:54:04 +08:00
Leufolium 4b3aef5cba Merge branch 'feat-IRONFANS-148-Robin' into conflict 2024-07-09 21:04:52 +08:00
Leufolium 8990758254 by Robin at 20240709 2024-07-09 21:02:18 +08:00
lwl0608 bfc5c9f810 black 2024-07-09 09:47:28 +08:00
lwl0608 f45ec3e11e fix 2024-07-08 02:00:53 +08:00
lwl0608 72d2521a3b fix 2024-07-08 01:56:50 +08:00
chenhao b5e5e891cf Merge pull request '1' (#600) from feat-IRONFANS-148-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/600
 2024-07-05 16:59:54 +08:00
Leufolium 518b494873 1 2024-07-05 16:59:39 +08:00
chenhao 8356d54b3e Merge pull request '1' (#599) from feat-IRONFANS-148-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/599
 2024-07-05 16:55:24 +08:00
Leufolium cdcf23db57 1 2024-07-05 16:55:10 +08:00
chenhao 3077203546 Merge pull request 'by Robin at 20240705' (#598) from feat-IRONFANS-148-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/598
 2024-07-05 16:50:45 +08:00
Leufolium 080c9749b7 by Robin at 20240705 2024-07-05 16:50:29 +08:00
chenhao adad3942a0 Merge pull request 'feat-IRONFANS-148-Robin' (#597) from feat-IRONFANS-148-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/597
 2024-07-05 16:48:13 +08:00
Leufolium ffcd559825 by Robin at 20240705 2024-07-05 16:47:36 +08:00
Leufolium c2567cbab4 by Robin at 20240705 2024-07-05 16:26:36 +08:00
lwl0608 8a13ba05de Merge branch 'dev-lwl/add_withdraw_log' into test 2024-07-04 14:12:09 +08:00
lwl0608 655eb0368d create order blacklist 2024-07-04 14:11:57 +08:00
Leufolium 7900eed8d9 1 2024-07-04 13:34:52 +08:00
lwl0608 425c0eddc9 优化 parse notify 2024-07-04 11:39:10 +08:00
Leufolium 876c0ccfbc Merge branch 'feat-IRONFANS-148-Robin' into conf 2024-07-04 10:08:28 +08:00
Leufolium 57d6fb8fdf Merge remote-tracking branch 'origin/main' into feat-IRONFANS-148-Robin 2024-07-04 10:06:48 +08:00
Leufolium f0f8eff7af Merge remote-tracking branch 'origin/main' into test 2024-07-04 10:03:51 +08:00
Leufolium 3e2812dd15 by Robin at 20240704 2024-07-04 09:51:42 +08:00
Leufolium eec64155c0 by Robin at 20240704 2024-07-04 09:34:42 +08:00
Leufolium ee862c8a2d by Robin at 20240704 2024-07-04 09:26:52 +08:00
chenhao 9a659d9b74 Merge pull request 'by Robin at 20240701' (#592) from feat-pay_add_token into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/592
 2024-07-03 17:15:54 +08:00
Leufolium d33813ee61 Merge remote-tracking branch 'origin/main' into feat-IRONFANS-139-Robin 2024-07-03 16:53:02 +08:00
Leufolium 8822343f44 by Robin at 20240703 2024-07-03 16:43:58 +08:00
Leufolium 6979bbc09f by Robin at 20240703 2024-07-03 16:36:31 +08:00
lwl0608 0dc67b4291 lanxing 01 2024-07-03 16:05:46 +08:00
lwl0608 b035e3430f Merge branch 'dev-lwl/add_alipay_clients' into test 2024-07-03 15:54:50 +08:00
lwl0608 6f6cf0c7cf add xl01 2024-07-03 15:54:41 +08:00
Leufolium 1323aef6db Merge branch 'feat-IRONFANS-139-Robin' into conflict 2024-07-03 15:15:29 +08:00
Leufolium 551d420c3f by Robin at 20240703 2024-07-03 15:13:04 +08:00
chenhao 688470d37a Merge pull request 'feat-IRONFANS-160-Robin' (#586) from feat-IRONFANS-160-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/586
 2024-07-02 21:12:59 +08:00
chenhao 963ae63c08 Merge pull request '1' (#585) from feat-IRONFANS-139-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/585
 2024-07-02 19:57:58 +08:00
Leufolium 561df91f82 1 2024-07-02 19:57:28 +08:00
Leufolium 9585090251 Merge branch 'feat-IRONFANS-139-Robin' into test 2024-07-02 19:55:25 +08:00
Leufolium 0836a4baea by Robin at 20240702 2024-07-02 19:53:29 +08:00
chenhao 1bdbf9d2f7 Merge pull request '1' (#583) from feat-IRONFANS-160-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/583
 2024-07-02 18:42:53 +08:00