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
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
lwl0608 51508a0f47 log fix 2024-05-21 19:58:23 +08:00
lwl0608 b2cc85ce8a fix 2024-05-21 19:57:46 +08:00
lwl0608 39cb4e3166 fix 2024-05-21 19:57:46 +08:00
lwl0608 0ebbd95ba7 fix 2024-05-21 19:57:46 +08:00
lwl0608 2b395f24aa fix 2024-05-21 19:57:46 +08:00
lwl0608 3d353514b5 fix 2024-05-21 19:57:46 +08:00
lwl0608 466916376e fix 2024-05-21 19:57:46 +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
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
Leufolium 6dc26aeb1b Merge remote-tracking branch 'origin/main' into test 2024-05-20 15:31:38 +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
lwl0608 8fbbcc803e t 2024-05-17 15:46:08 +08:00
lwl0608 53a7521996 Merge branch 'dev-lwl/consul' into test 2024-05-17 14:49:34 +08:00
lwl0608 38c5b5f049 fix 2024-05-17 14:49:29 +08:00
lwl0608 d724628f11 Merge branch 'dev-lwl/consul' into test 2024-05-17 14:37:09 +08:00
lwl0608 e9116d17d4 fix 2024-05-17 14:37:03 +08:00
lwl0608 56bca2291c Merge branch 'dev-lwl/consul' into test 2024-05-17 14:35:23 +08:00
lwl0608 d21f625787 fix 2024-05-17 14:35:19 +08:00
lwl0608 989ea4ee60 Merge branch 'dev-lwl/consul' into test 2024-05-17 11:46:24 +08:00
lwl0608 dc3d27f79a fix 2024-05-17 11:46:18 +08:00
lwl0608 9fa177d2b6 Merge branch 'dev-lwl/consul' into test 2024-05-17 11:38:52 +08:00
lwl0608 d76bf6a811 fix 2024-05-17 11:38:43 +08:00
lwl0608 c976b01e8a vercmp 2024-05-16 23:33:37 +08:00
lwl0608 1b2769d429 add log 2024-05-16 23:18:24 +08:00
lwl0608 6a975818f7 merge 2024-05-16 21:08:42 +08:00
lwl0608 ae822fd49c consul 2024-05-16 20:43:21 +08:00
lwl0608 a6774a563a fix alipay notify url 2024-05-16 19:59:10 +08:00
lwl0608 b9d33072eb fix 2024-05-16 19:59:10 +08:00
lwl0608 ae09bc906e vendor 2024-05-16 19:59:10 +08:00
lwl0608 2313cee7b3 consul 2024-05-16 19:59:10 +08:00
lwl0608 65152f30a7 add 2024-05-16 19:59:10 +08:00
lwl0608 34fa94bf1f consul 2024-05-16 19:59:10 +08:00
Leufolium f21050d3f2 by Robin at 20240516 2024-05-16 14:09:31 +08:00
Leufolium 757ca5edc6 Merge remote-tracking branch 'origin/feat-IRONFANS-120-Robin' into conf 2024-05-15 16:32:37 +08:00
Leufolium c0698c2da3 Merge remote-tracking branch 'origin/main' into feat-IRONFANS-120-Robin 2024-05-15 16:30:50 +08:00
lwl0608 83f659df3a Merge branch 'dev-lwl/with' into test 2024-05-15 12:40:33 +08:00
Leufolium 17c25c5128 by Robin at 20240515 2024-05-15 10:16:57 +08:00
Leufolium 7107bb0393 by Robin at 20240515 2024-05-15 09:58:45 +08:00
chenhao 75338ff450 Merge pull request 'by Robin at 20240514' (#436) from feat-IRONFANS-117-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/436
 2024-05-14 22:44:12 +08:00
Leufolium 7ab0b8ae82 by Robin at 20240514 2024-05-14 22:43:52 +08:00
chenhao 36cc467854 Merge pull request 'feat-IRONFANS-117-Robin' (#428) from feat-IRONFANS-117-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/428
 2024-05-13 12:28:45 +08:00
Leufolium f6ee79f147 by Robin at 20240511 2024-05-11 19:29:33 +08:00
Leufolium 2c9e1cdb91 by Robin at 20240511 2024-05-11 10:22:32 +08:00
Leufolium d1fcc7da5c by Robin at 20240510 2024-05-10 18:11:36 +08:00
Leufolium c13973cd60 by Robin at 20240510 2024-05-10 15:40:09 +08:00
lwl0608 e1c738aefb all chagne hw cdn 2024-05-10 14:33:13 +08:00
lwl0608 a09f537ec1 hw to 80 2024-05-09 09:17:11 +08:00
lwl0608 d901999264 add tifenzone 2024-05-08 09:53:04 +08:00
lwl0608 028a5232cd wechat 2024-05-08 09:53:04 +08:00
lwl0608 aeeb97dc7c Merge branch 'dev-lwl/wx' into test 2024-05-07 19:25:11 +08:00
lwl0608 af9aae9551 add tifenzone 2024-05-07 19:24:47 +08:00
lwl0608 5aab80fcdd add media op 2024-05-07 10:50:40 +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 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 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
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 ba6d14ccc5 wechat 2024-05-03 02:26:48 +08:00
Leufolium c82974fadf Merge remote-tracking branch 'origin/main' into conf 2024-05-01 03:27:04 +08:00
Leufolium aca9281087 by Robin at 20240501; fix upload fail video mod 2024-05-01 01:54:47 +08:00
chenhao 9c893d4a9c Merge pull request 'feat-IRONFANS-86-Robin' (#378) from feat-IRONFANS-86-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/378
 2024-04-29 22:20:05 +08:00
chenhao 1313f17fe0 Merge pull request 'by Robin at 20240429' (#376) from feat-IRONFANS-87-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/376
 2024-04-29 14:25:16 +08:00
Leufolium 29f4a72c32 by Robin at 20240429 2024-04-29 14:24:31 +08:00
chenhao 06624dc801 Merge pull request 'by Robin at 20240429' (#374) from feat-IRONFANS-87-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/374
 2024-04-29 14:18:23 +08:00
Leufolium f6c60cf574 by Robin at 20240429 2024-04-29 14:17:29 +08:00
chenhao d24b4380a4 Merge pull request 'by Robin at 20240428' (#371) from feat-IRONFANS-87-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/371
 2024-04-28 21:51:32 +08:00
Leufolium 58a238e9c9 by Robin at 20240428 2024-04-28 21:51:16 +08:00
chenhao e56dd98007 Merge pull request 'feat-IRONFANS-87-Robin' (#368) from feat-IRONFANS-87-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/368
 2024-04-28 21:27:24 +08:00
Leufolium e8649e1111 BY ROBIN AT 20240428 2024-04-28 21:16:18 +08:00
chenhao 0c86d4db01 Merge pull request 'feat-IRONFANS-86-Robin' (#365) from feat-IRONFANS-86-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/365
 2024-04-27 11:17:19 +08:00
Leufolium edb5caf001 by Robin at 20240427 2024-04-27 11:14:44 +08:00
Leufolium ddbba1f860 by Robin at 20240427 2024-04-27 00:18:31 +08:00
Leufolium 0630bd9a18 by Robin at 20240426 2024-04-26 10:46:37 +08:00
lwl0608 8b9bc15d2f 测试环境不加token 2024-04-22 21:11:08 +08:00
chenhao 6524a34a85 Merge pull request 'feat-IRONFANS-70' (#276) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/276
 2024-04-11 21:52:48 +08:00
Leufolium b4e04b8841 by Robin at 20240411 2024-04-11 21:51:46 +08:00
Leufolium e985e15ae1 Merge remote-tracking branch 'origin/feat-IRONFANS-70' into conf 2024-04-08 20:14:44 +08:00
Leufolium 8927d22bba by Robin at 20240408 2024-04-08 20:05:13 +08:00
Leufolium 5a333382ff Merge remote-tracking branch 'origin/feat-IRONFANS-70' into cf 2024-04-05 17:11:18 +08:00
Leufolium 4820bd9503 by Robin at 20240404 2024-04-04 20:48:42 +08:00
Leufolium be27160261 Merge remote-tracking branch 'origin/feat-IRONFANS-70' into conflict 2024-04-03 16:55:08 +08:00
Leufolium 50f7e16608 by Robin at 20240403 2024-04-03 04:56:21 +08:00
Leufolium a31e57c806 by Robin at 20240402 2024-04-02 18:53:26 +08:00