wishpal_ironfan
/
service
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,089 Commits 107 Branches 0 Tags 48 MiB
Commit Graph

340 Commits

Author SHA1 Message Date
lwl0608 aa0794287a fix 2024-07-31 14:32:25 +08:00
chenhao 2cc632574b Merge pull request 'by Robin at 20240730' (#658) from feat-IRONFANS-181-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/658
 2024-07-30 15:40:27 +08:00
Leufolium ef320f6b20 by Robin at 20240730 2024-07-30 15:36:58 +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 2ea3ebb6aa by Robin at 20240725 2024-07-25 19:59:35 +08:00
lwl0608 53d7181cae change cdn 2024-07-24 19:16:03 +08:00
Leufolium 9467b15d29 Merge branch 'feat-IRONFANS-163-Robin' into mainconf 2024-07-23 17:38:33 +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 b72f2b19f8 Merge pull request '1' (#634) from feat-IRONFANS-163-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/634
 2024-07-20 10:22:21 +08:00
Leufolium 4df038ad9e 1 2024-07-20 10:21:45 +08:00
Leufolium 8ce679e746 1 2024-07-19 22:54:22 +08:00
chenhao f26bf91807 Merge pull request '1' (#633) from feat-IRONFANS-163-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/633
 2024-07-19 19:13:40 +08:00
Leufolium 3b8ed9a4e1 1 2024-07-19 19:13:02 +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 92a44fb645 fix token 2024-07-19 15:16:45 +08:00
chenhao 1dd0fdcf08 Merge pull request '1:20 lanxing:miyuan' (#630) from main into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/630
 2024-07-18 22:28:10 +08:00
lwl0608 d5af0d750d 1:20 lanxing:miyuan 2024-07-18 22:12:43 +08:00
lwl0608 3bfb560663 Merge branch 'dev-lwl/wx_tiefan' into test 2024-07-17 21:51:28 +08:00
lwl0608 c2973b553f add tiefanzone h5pay 2024-07-17 21:51:24 +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
lwl0608 abf1a9ff56 Merge branch 'dev-lwl/video' into test 2024-07-13 13:12:40 +08:00
lwl0608 7c36b8c16f fix 2024-07-13 13:12:34 +08:00
lwl0608 07dd2bcff2 fix 1/50 2024-07-12 09:51:23 +08:00
lwl0608 2b2409f009 lanxing 千分之无 2024-07-11 15:14:27 +08:00
lwl0608 7c510f0e3f Merge branch 'dev-lwl/add_alipay_clients' 2024-07-11 15:13:12 +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 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
lwl0608 425c0eddc9 优化 parse notify 2024-07-04 11:39:10 +08:00
Leufolium d33813ee61 Merge remote-tracking branch 'origin/main' into feat-IRONFANS-139-Robin 2024-07-03 16:53:02 +08:00
lwl0608 0dc67b4291 lanxing 01 2024-07-03 16:05:46 +08:00
lwl0608 f75e9a9377 test xl01 2024-07-03 15:59:47 +08:00
lwl0608 661db0acc4 Merge branch 'dev-lwl/add_alipay_clients' into test 2024-07-03 15:59:33 +08:00
lwl0608 8702c44a2c fix config 2024-07-03 15:59:27 +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 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
Leufolium 361c7b33b8 Merge remote-tracking branch 'origin/main' into feat-IRONFANS-148-Robin 2024-06-28 14:35:10 +08:00
Leufolium fd19b615b7 Merge branch 'feat-IRONFANS-148-Robin' into conflict 2024-06-25 18:31:54 +08:00
Leufolium 813636ca8f by Robin at 20240624 2024-06-24 19:14:31 +08:00
chenhao 606c7030a9 Merge pull request 'by Robin at 20240619' (#542) from feat-IRONFANS-148-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/542
 2024-06-19 13:59:36 +08:00
Leufolium e6d1b90338 by Robin at 20240619 2024-06-19 13:58:47 +08:00
Leufolium 4f2d33e674 Merge branch 'feat-IRONFANS-148-Robin' into cfl 2024-06-18 19:46:31 +08:00
Leufolium ae4b8558f3 by Robin at 20240618 2024-06-18 19:40:09 +08:00
Leufolium 324d4bc523 by Robin at 20240618 2024-06-18 17:10:42 +08:00
Leufolium 400cda2cc3 by Robin at 20240615 2024-06-15 13:41:03 +08:00
lwl0608 591238f896 merge 2024-06-15 13:24:23 +08:00
lwl0608 28d31a6500 fix refund 2024-06-14 18:39:52 +08:00
lwl0608 d73163a37f merge 2024-06-14 17:58:43 +08:00
lwl0608 d28f58a733 f 2024-06-13 16:43:31 +08:00
lwl0608 571a961151 apple 2024-06-13 16:40:22 +08:00
chenhao a614e015a4 Merge pull request 'feat-IRONFANS-147-Robin' (#529) from feat-IRONFANS-147-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/529
 2024-06-13 12:32:16 +08:00
Leufolium 559976b33a by Robin at 20240611 2024-06-11 19:40:35 +08:00
lwl0608 7df284d010 f 2024-06-09 00:02:37 +08:00
Leufolium 192b5c180e Merge remote-tracking branch 'origin/main' into test 2024-06-04 17:21:52 +08:00
lwl0608 d25a7a13de log 2024-06-03 10:33:27 +08:00
lwl0608 7af540c2a7 Merge branch 'main' into dev-lwl/consul 2024-06-03 10:08:45 +08:00
lwl0608 99baf50984 t 2024-06-03 10:08:15 +08:00
lwl0608 1a4140c32a Merge branch 'dev-lwl/yop' into test 2024-05-30 11:10:03 +08:00
lwl0608 dcf2057a86 redirect url 2024-05-30 11:09:59 +08:00
lwl0608 f19658caf3 Merge branch 'dev-lwl/yop' into test 2024-05-30 09:48:17 +08:00
lwl0608 1920418c31 fix 2024-05-30 09:48:09 +08:00
lwl0608 c3165aa0c2 x 2024-05-29 14:34:58 +08:00
lwl0608 b5dca9fa04 Merge branch 'dev-lwl/yop' into test 2024-05-29 10:56:59 +08:00
lwl0608 cc93c10aa2 退款 2024-05-29 10:56:52 +08:00
lwl0608 ad7dd3b052 Merge branch 'dev-lwl/yop' into test 2024-05-27 19:37:58 +08:00
lwl0608 fe3cb342d6 fix yeepay callback 2024-05-27 19:37:52 +08:00
lwl0608 31f4673b94 Merge branch 'dev-lwl/yop' into test 2024-05-27 19:23:13 +08:00
lwl0608 49561af1de fix yeepay callback 2024-05-27 19:23:05 +08:00
lwl0608 99cd5896a0 merge 2024-05-27 16:54:34 +08:00
lwl0608 53797b066c yop 2024-05-27 16:50:58 +08:00
lwl0608 f34bf3670e yop 2024-05-27 16:48:25 +08:00
lwl0608 675a6e42fb yeepay 2024-05-27 16:48:25 +08:00
lwl0608 95bafcf056 yop 2024-05-27 16:48:25 +08:00
Leufolium 9308fbd796 by Robin 2024-05-24 08:38:58 +08:00
Leufolium 4983f71f0e by RObin 2024-05-24 04:30:34 +08:00
Leufolium 7701447d64 Merge remote-tracking branch 'origin/feat-IRONFANS-133-Robin' into conf 2024-05-24 02:59:59 +08:00
Leufolium 248b93ced7 by Robin at 20240524 2024-05-24 02:52:23 +08:00
Leufolium e428c72b6d Merge branch 'feat-IRONFANS-133-Robin' into conf 2024-05-24 02:36:19 +08:00
Leufolium f7f0e53d5d by Robin at 20240524 2024-05-24 02:34:31 +08:00
chenhao e8aa3b20c5 Merge pull request '1231231' (#484) from feat-IRONFANS-133-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/484
 2024-05-24 00:04:30 +08:00
Leufolium ceb46b5f38 1231231 2024-05-24 00:04:14 +08:00
Leufolium 865ce9434d Merge remote-tracking branch 'origin/feat-IRONFANS-133-Robin' into conflict 2024-05-24 00:00:40 +08:00
Leufolium a54361d249 by Robin at 20240523 2024-05-23 23:59:14 +08:00
lwl0608 a0096de95b f 2024-05-23 11:31:10 +08:00
lwl0608 5d2735e957 cancel 2024-05-23 11:18:38 +08:00
Leufolium cddc6fe29a Merge remote-tracking branch 'origin/feat-IRONFANS-133-Robin' into conflict 2024-05-23 04:12:37 +08:00
Leufolium 58229ca3d1 by Robin at 20240522; separtaion of offline and online services 2024-05-22 17:14:20 +08:00
lwl0608 10ff3f25ae merge 2024-05-21 20:05:44 +08:00
lwl0608 194dcc192d fix 2024-05-21 19:58:24 +08:00