wishpal_ironfan
/
service
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,105 Commits 89 Branches 0 Tags 39 MiB
Commit Graph

312 Commits

Author SHA1 Message Date
Leufolium 50fa5e32b7 by Robin at 20240422 2024-04-22 18:56:53 +08:00
chenhao 7696327333 Merge pull request 'feat-IRONFANS-70' (#315) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/315
 2024-04-22 18:34:16 +08:00
chenhao d074023584 Merge pull request 'by Robin at 20240422' (#314) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/314
 2024-04-22 18:34:06 +08:00
Leufolium bf1de24bcd by Robin at 20240422 2024-04-22 18:33:40 +08:00
chenhao 3a3448e873 Merge pull request 'feat-IRONFANS-70' (#313) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/313
 2024-04-22 18:20:47 +08:00
chenhao 796e09af2f Merge pull request 'by Robin at 20240422' (#312) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/312
 2024-04-22 18:20:36 +08:00
Leufolium ab8db00368 by Robin at 20240422 2024-04-22 18:19:37 +08:00
chenhao 7601fd548c Merge pull request 'feat-IRONFANS-70' (#311) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/311
 2024-04-22 07:21:38 +08:00
chenhao 0178df0ff0 Merge pull request 'by Robin at 20240422' (#310) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/310
 2024-04-22 07:21:29 +08:00
Leufolium d762f5df3a by Robin at 20240422 2024-04-22 07:21:16 +08:00
chenhao dbafa1917e Merge pull request 'feat-IRONFANS-70' (#307) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/307
 2024-04-22 07:16:53 +08:00
chenhao a5837da513 Merge pull request 'by Robin at 20240422' (#306) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/306
 2024-04-22 07:16:39 +08:00
Leufolium f0074facd9 by Robin at 20240422 2024-04-22 07:15:46 +08:00
lwl0608 f4f3f7482b Merge branch 'feat-IRONFANS-70' into test 2024-04-18 23:00:07 +08:00
lwl0608 b2c89fb357 fix 2024-04-18 22:59:32 +08:00
lwl0608 5981c7d076 Merge branch 'feat-IRONFANS-70' into test 2024-04-18 20:27:25 +08:00
lwl0608 e7ba504413 优化 2024-04-18 20:27:18 +08:00
lwl0608 d6217c6f39 vas 2024-04-18 19:26:52 +08:00
chenhao cb592d0113 Merge pull request 'feat-IRONFANS-70' (#305) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/305
 2024-04-18 17:43:42 +08:00
chenhao 953fb01d89 Merge pull request 'by Robin at 20240418' (#304) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/304
 2024-04-18 17:43:32 +08:00
Leufolium 460153a394 by Robin at 20240418 2024-04-18 17:43:12 +08:00
chenhao 78e5e6a33a Merge pull request 'feat-IRONFANS-70' (#301) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/301
 2024-04-18 06:00:15 +08:00
chenhao 9436053275 Merge pull request 'by Robin at 20240418' (#300) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/300
 2024-04-18 05:59:58 +08:00
Leufolium 4fc3732b94 by Robin at 20240418 2024-04-18 05:59:11 +08:00
lwl0608 563e007d92 Merge branch 'feat-IRONFANS-70' into test 2024-04-16 21:13:39 +08:00
lwl0608 03fdc98f3d 修复 2024-04-16 21:13:26 +08:00
lwl0608 ca7ec97855 Merge branch 'feat-IRONFANS-70' into test 2024-04-16 20:21:09 +08:00
lwl0608 5dedd4fd27 fix db 2024-04-16 20:20:53 +08:00
chenhao 0d2fab9ed1 Merge pull request 'feat-IRONFANS-70' (#297) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/297
 2024-04-16 19:48:40 +08:00
Leufolium 50ef95271c by Robin at 20240416 2024-04-16 19:48:15 +08:00
chenhao a44167db93 Merge pull request 'feat-IRONFANS-70' (#295) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/295
 2024-04-16 19:11:02 +08:00
Leufolium 5cd1cbf027 by Robin at 20240416 2024-04-16 19:10:04 +08:00
lwl0608 c3200bcf2a Merge branch 'feat-IRONFANS-70' into test 2024-04-16 10:49:26 +08:00
lwl0608 9fdbd5bcb2 add 2024-04-16 10:49:02 +08:00
lwl0608 5c01857d28 add 2024-04-16 09:51:39 +08:00
chenhao a1d6d0eda1 Merge pull request 'feat-IRONFANS-70' (#290) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/290
 2024-04-16 07:43:02 +08:00
Leufolium da6d60020c by Robin at 20240416 2024-04-16 07:41:52 +08:00
lwl0608 eb3d14199e vas 2024-04-15 15:17:30 +08:00
chenhao 1830fcdc2a Merge pull request 'feat-IRONFANS-70' (#287) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/287
 2024-04-12 23:07:31 +08:00
chenhao c1a2237479 Merge pull request 'dev-feat-IRONFANS-70-Robin' (#286) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/286
 2024-04-12 23:07:12 +08:00
Leufolium e986f9ba07 by Robin at 20240412 2024-04-12 23:02:55 +08:00
chenhao b0c3908130 Merge pull request 'feat-IRONFANS-70' (#285) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/285
 2024-04-12 06:46:15 +08:00
chenhao 4e99c4fe82 Merge pull request 'b' (#284) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/284
 2024-04-12 06:46:07 +08:00
Leufolium 156cc92de9 b 2024-04-12 06:45:51 +08:00
chenhao a51b63478e Merge pull request 'feat-IRONFANS-70' (#283) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/283
 2024-04-12 06:43:30 +08:00
Leufolium 648a860a83 Merge branch 'dev-feat-IRONFANS-70-Robin' into conflict-feat-IRONFANS-70 2024-04-12 06:43:00 +08:00
Leufolium 52624ac592 by Robin at 20240411 2024-04-12 06:40:30 +08:00
chenhao 20be36d9b4 Merge pull request 'feat-IRONFANS-70' (#278) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/278
 2024-04-11 21:57:12 +08:00
chenhao c420f41c05 Merge pull request 'by Robin at 20240411' (#277) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/277
 2024-04-11 21:57:03 +08:00
Leufolium 1ecae673f6 by Robin at 20240411 2024-04-11 21:56:48 +08:00
chenhao a7f9a76be0 Merge pull request 'feat-IRONFANS-70' (#268) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/268
 2024-04-11 19:35:23 +08:00
chenhao 127c289735 Merge pull request 'by Robin at 20240411' (#267) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/267
 2024-04-11 19:35:10 +08:00
Leufolium c89082aea9 by Robin at 20240411 2024-04-11 19:34:51 +08:00
chenhao 9d53f252ce Merge pull request 'feat-IRONFANS-70' (#266) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/266
 2024-04-11 18:34:05 +08:00
chenhao 1301c0a9ec Merge pull request 'by Robin at 20240411' (#265) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/265
 2024-04-11 18:33:56 +08:00
Leufolium acfe24623f by Robin at 20240411 2024-04-11 18:33:38 +08:00
chenhao a7a036f562 Merge pull request 'feat-IRONFANS-70' (#264) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/264
 2024-04-11 18:20:03 +08:00
chenhao 469c7f8775 Merge pull request 'by Robin at 20240411' (#263) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/263
 2024-04-11 18:19:55 +08:00
Leufolium 776e50f148 by Robin at 20240411 2024-04-11 18:19:34 +08:00
chenhao 3ece8f7504 Merge pull request 'feat-IRONFANS-70' (#260) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/260
 2024-04-11 17:59:45 +08:00
lwl0608 8f24732eb4 udpate proto 2024-04-11 17:57:01 +08:00
lwl0608 aff4682096 fix proto 2024-04-11 17:51:41 +08:00
lwl0608 1aa8641cd2 protos 2024-04-11 17:47:24 +08:00
chenhao 381cd689ba Merge pull request 'feat-IRONFANS-70' (#258) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/258
 2024-04-11 16:53:04 +08:00
Leufolium 0dd9eb1360 by Robin at 20240411 2024-04-11 16:52:30 +08:00
chenhao 706546cb1f Merge pull request 'feat-IRONFANS-70' (#256) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/256
 2024-04-11 16:16:11 +08:00
Leufolium 76f35eaced b 2024-04-11 16:15:46 +08:00
chenhao 711aaa3d03 Merge pull request 'feat-IRONFANS-70' (#250) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/250
 2024-04-11 15:46:38 +08:00
Leufolium 0975288b86 by Robin at 20240411 2024-04-11 15:46:01 +08:00
chenhao b565383703 Merge pull request 'feat-IRONFANS-70' (#244) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/244
 2024-04-11 14:04:53 +08:00
Leufolium da1aa0ebd7 by Robin at 20240411 2024-04-11 00:25:06 +08:00
chenhao 580e55829a Merge pull request 'feat-IRONFANS-70' (#240) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/240
 2024-04-09 19:19:51 +08:00
Leufolium f96a04614a by Robin at 20240409 2024-04-09 19:19:16 +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 8b3d7a96cb by Robin at 20240404 2024-04-04 21:25:13 +08:00
Leufolium 2400311048 by Robin at 20240404 2024-04-04 21:03:32 +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 cd19d49538 by Robin at 20240403 2024-04-03 16:45:30 +08:00
Leufolium 6a043dbbb7 by Robin at 20240403 2024-04-03 06:19:11 +08:00
Leufolium 50f7e16608 by Robin at 20240403 2024-04-03 04:56:21 +08:00
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 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 4066114141 Merge pull request 'by Robin at 20240329' (#220) from feat-IRONFANS-76-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/220
 2024-03-29 22:56:36 +08:00
Leufolium 8cc83fc70c by Robin at 20240329 2024-03-29 22:55:58 +08:00
Leufolium f435a98c08 Merge branch 'feat-IRONFANS-76-Robin' into conflict 2024-03-29 14:06:28 +08:00
Leufolium 12549d2de5 by Robin at 20240329; alter moment audit procedure 2024-03-29 00:16:42 +08:00
Leufolium 113cf31495 Merge remote-tracking branch 'origin/main' into test 2024-03-28 12:12:05 +08:00
Leufolium b67808caca by Robin at 20240327 2024-03-27 19:34:16 +08:00
Leufolium f7472ea634 by Robin at 20240326 2024-03-26 12:31:00 +08:00
Leufolium 594987f8ac by Robin at 20240326; alter 2024-03-26 12:29:53 +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
lwl0608 6d73c70cf7 op order list 2024-03-21 16:02:41 +08:00
Leufolium a364553c0c by Robin at 20240320 2024-03-20 10:06:26 +08:00
lwl0608 fca64cbb67 refund coin order 2024-03-19 16:04:36 +08:00
Leufolium 3d09829521 1 2024-03-19 00:05:23 +08:00
Leufolium 37c3929e9d Merge remote-tracking branch 'origin/feat-IRONFANS-62-Robin' into mainconflict 2024-03-19 00:01:43 +08:00
chenhao 6bda0929d9 Merge pull request 'feat-IRONFANS-66-Robin' (#189) from feat-IRONFANS-66-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/189
 2024-03-18 23:51:52 +08:00
chenhao 6518d37c1f Merge pull request 'feat-IRONFANS-66-Robin' (#188) from feat-IRONFANS-66-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/188
 2024-03-18 23:43:13 +08:00
Leufolium ec2bad2abf by 2024-03-18 23:36:53 +08:00
Leufolium 67e27e04db Merge branch 'BUG-20240316-0001-Robin' into conflict 2024-03-16 22:36:05 +08:00
Leufolium 1954e80ab3 Merge branch 'feat-IRONFANS-58-Robin' into conflict 2024-03-14 07:55:43 +08:00
Leufolium a2f70a63d9 by Robin at 20240314; add newly-created moment 2024-03-14 07:53:25 +08:00
lwl0608 b833ecdc9e refund 2024-03-13 20:35:18 +08:00
chenhao 4711e9e2e4 Merge pull request 'by Robin at 20240313; alter msg for permanent block' (#175) from feat-IRONFANS-66-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/175
 2024-03-13 16:32:42 +08:00
Leufolium 3d0dbb6ca2 by Robin at 20240313; alter msg for permanent block 2024-03-13 16:31:51 +08:00
Leufolium f990dd0be0 Merge branch 'feat-IRONFANS-66-Robin' into conflict 2024-03-12 12:10:16 +08:00
Leufolium 81916b58bb by Robin at 20240312; apply 2024-03-12 12:06:45 +08:00
Leufolium 4cf49ad204 Merge branch 'feat-IRONFANS-58-Robin' into conflict 2024-03-08 21:21:20 +08:00
Leufolium 43138ec16d by Robin at 20240308; moment recomm 2024-03-08 21:14:40 +08:00
chenhao 2c7ffb40c9 Merge pull request 'by Robin at 20240308; add bottom flag' (#165) from feat-IRONFANS-58-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/165
 2024-03-08 15:15:49 +08:00
Leufolium bed1313e84 by Robin at 20240308; add bottom flag 2024-03-08 15:15:09 +08:00
Leufolium 960adc1455 Merge branch 'feat-IRONFANS-58-Robin' into conflict 2024-03-08 01:30:30 +08:00
Leufolium 7dec418bfa by Robin at 20240308 2024-03-08 00:42:42 +08:00
Leufolium a1a4820b2c by Robin at 20240307 alter streamer cancel text 2024-03-07 02:17:24 +08:00
Leufolium 8dfbc2326b by Robin at 20240307 2024-03-07 01:43:30 +08:00
Leufolium 51d3e5e568 By Robin at 20240307 2024-03-07 01:18:41 +08:00
chenhao e95ca7f4f1 revert 5fab9ff0fd 
revert By Robin at 20240304; cancel account function at mongo part
 2024-03-05 13:21:22 +08:00
Leufolium 5fab9ff0fd By Robin at 20240304; cancel account function at mongo part 2024-03-04 19:21:30 +08:00
Leufolium b728ab5e48 by Robin at 20240229; fix 2024-02-29 11:20:25 +08:00
Leufolium b2c8a76e37 by Robin at 20240229; add robot 2024-02-29 09:55:56 +08:00
chenhao 4903267633 Merge pull request 'feat-20240117-001-Robin' (#137) from feat-20240117-001-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/137
 2024-02-27 00:55:59 +08:00
lwl0608 48d058610d add wxpayh5 2024-02-26 19:28:03 +08:00
Leufolium f3f3c7633e by Robin at 20240223 2024-02-23 20:48:51 +08:00
Leufolium 86be2a9a84 Merge remote-tracking branch 'origin/main' into feat-20240117-001-Robin 2024-02-22 22:31:20 +08:00
Leufolium cd07846804 by Robin at 20240222; fix 2024-02-22 21:50:34 +08:00
Leufolium 7e967887d9 by Robin at 20240222; add mobile phone get 2024-02-22 15:20:26 +08:00
Leufolium 19de07fbe4 by Robin at 20240221; change moment audit logic 2024-02-21 18:04:01 +08:00
lwl0608 98ea808079 add wechat auth code 2024-02-20 23:13:17 +08:00
lwl0608 201e1f4c5c wx jsapi 2024-02-20 23:05:24 +08:00
Leufolium cffaa2c880 by Robin at 20240207; fix error 2024-02-07 14:39:18 +08:00
Leufolium a1bb6f4a01 by Robin at 20240207 2024-02-07 14:06:05 +08:00
Leufolium 5079d25bb3 Merge remote-tracking branch 'origin/main' into feat-20240117-001-Robin 2024-02-07 13:51:00 +08:00
Leufolium 12870ef2fd by Robin at 20240207; add aligned 2024-02-07 12:07:28 +08:00
lwl0608 ccf4417659 Merge branch 'dev-lwl/wechat' 2024-02-05 23:25:47 +08:00
Leufolium 96d6c8e703 by Robin at 20240205; content 2024-02-05 22:12:47 +08:00
chenhao 2be2b3f4a7 revert 21c4f6f18d 
revert by Robin at 20240205; content
 2024-02-05 22:11:49 +08:00
Leufolium 21c4f6f18d by Robin at 20240205; content 2024-02-05 22:11:00 +08:00
lwl0608 2793229b6c fix 2024-02-05 22:06:28 +08:00
Leufolium eeccbf6315 Merge branch 'feat-IRONFANS-53-20240205-Robin' into feat-20240117-001-Robin 2024-02-05 21:26:22 +08:00
Leufolium 01092097c8 by Robin at 20240205 2024-02-05 21:18:27 +08:00
lwl0608 2261c021fa add config 2024-02-05 21:16:49 +08:00
chenhao 4346b953d6 Merge pull request 'feat-IRONFANS-46-20240201-Robin' (#92) from feat-IRONFANS-46-20240201-Robin into main 
Reviewed-on: #92
 2024-02-04 17:01:34 +08:00
lwl0608 332bcc87fc wx 2024-02-03 17:58:40 +08:00