wishpal_ironfan
/
service
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,013 Commits 84 Branches 0 Tags 35 MiB
Commit Graph

729 Commits

Author SHA1 Message Date
Leufolium a10ce673ec by Robin at 20240315; alter upper bound 2024-03-15 21:13:57 +08:00
Leufolium b8dc1a7a1b Merge remote-tracking branch 'origin/testonly-vericode_create' into mainconflict 2024-03-15 00:45:38 +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 7b4954bbf8 fix streamer id 2024-03-13 21:06:00 +08:00
lwl0608 371cf04c5f ch log 2024-03-13 20:51:29 +08:00
lwl0608 9e1a95bfe3 refund 2024-03-13 20:38:03 +08:00
lwl0608 779e47996e Merge branch 'dev-lwl/refund' 2024-03-13 20:35:32 +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
chenhao 5881859273 Merge pull request 'by Robin at 20240222; fix' (#174) from feat-IRONFANS-54-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/174
 2024-03-12 23:49:14 +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
chenhao 0c3499f6a9 Merge pull request 'feat-IRONFANS-58-Robin' (#171) from feat-IRONFANS-58-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/171
 2024-03-08 23:03:50 +08:00
Leufolium d93e59e24f by Robin at 20240308; moment list by ids add follow 2024-03-08 23:03:20 +08:00
Leufolium 7497d4afe5 by Robin at 20240308; remove log 2024-03-08 22:46:49 +08:00
chenhao 758dc0ef66 Merge pull request 'by Robin at 20240308' (#170) from feat-IRONFANS-58-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/170
 2024-03-08 22:37:15 +08:00
Leufolium db9d6b2b0b by Robin at 20240308 2024-03-08 22:36:16 +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 b173c28626 Merge pull request 'by Robin at 20240308，up op refreshes bottom flag' (#167) from feat-IRONFANS-58-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/167
 2024-03-08 15:43:54 +08:00
Leufolium 30bcd59226 by Robin at 20240308，up op refreshes bottom flag 2024-03-08 15:43:15 +08:00
chenhao 11ddcd1c93 Merge pull request 'feat-IRONFANS-58-Robin' (#166) from feat-IRONFANS-58-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/166
 2024-03-08 15:22:51 +08:00
Leufolium 5f253ab9d3 fix 2024-03-08 15:22:33 +08:00
Leufolium 81d0858aad by 2024-03-08 15:21:52 +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
chenhao 74c6061db0 Merge pull request 'by Robin at 20240308; logout' (#164) from feat-IRONFANS-62-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/164
 2024-03-08 12:52:59 +08:00
Leufolium f94f90b0e7 by Robin at 20240308; logout 2024-03-08 12:52:10 +08:00
chenhao acd2370031 Merge pull request 'feat-IRONFANS-58-Robin' (#162) from feat-IRONFANS-58-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/162
 2024-03-08 01:38:50 +08:00
Leufolium 5a965d4f75 by Robin at 20240308 2024-03-08 01:38:07 +08:00
Leufolium 960adc1455 Merge branch 'feat-IRONFANS-58-Robin' into conflict 2024-03-08 01:30:30 +08:00
Leufolium 23d64b3454 by Robin at 20240308 2024-03-08 01:25:43 +08:00
Leufolium 47ef06b88f by Robin at 20240308 2024-03-08 01:13:48 +08:00
Leufolium 9692680528 by 2024-03-08 00:59:20 +08:00
Leufolium 7dec418bfa by Robin at 20240308 2024-03-08 00:42:42 +08:00
lwl0608 614c93f962 cancel token 2024-03-07 19:40:15 +08:00
lwl0608 3273330c76 refund 2024-03-07 19:39:33 +08:00
chenhao dcf617df52 Merge pull request 'd' (#159) from feat-IRONFANS-62-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/159
 2024-03-07 01:50:04 +08:00
Leufolium 279263fd54 d 2024-03-07 01:49:37 +08:00
chenhao 365b860df3 Merge pull request 'feat-IRONFANS-62-Robin' (#158) from feat-IRONFANS-62-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/158
 2024-03-07 01:46:51 +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 08f457a4ba Merge pull request 'feat-IRONFANS-62-Robin' (#157) from feat-IRONFANS-62-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/157
 2024-03-06 20:08:27 +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 b2b29d7466 by Robin at 20240302 2024-03-02 08:29:20 +08:00
chenhao 20a97b8ba7 Merge pull request 'feat-IRONFANS-61-Robin' (#154) from feat-IRONFANS-61-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/154
 2024-02-29 11:23:45 +08:00
Leufolium b41aad7e4e 1 2024-02-29 11:22:33 +08:00
Leufolium b728ab5e48 by Robin at 20240229; fix 2024-02-29 11:20:25 +08:00
Leufolium 32c5541cdb Merge branch 'feat-IRONFANS-61-Robin' into conflict 2024-02-29 10:54:09 +08:00
Leufolium 9f924901ec by Robin at 20240229; fix 2024-02-29 10:49:54 +08:00
Leufolium 0e297f564c by Robin at 20240229; fix 2024-02-29 10:34:21 +08:00
Leufolium b2c8a76e37 by Robin at 20240229; add robot 2024-02-29 09:55:56 +08:00
chenhao 757739b646 Merge pull request 'by Robin at 20240229; fix' (#151) from feat-20240117-001-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/151
 2024-02-29 02:05:33 +08:00
chenhao e0ffa31e10 Merge pull request 'by Robin at 20240229; fix' (#150) from feat-20240117-001-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/150
 2024-02-29 02:05:24 +08:00
Leufolium eec07ab1d7 by Robin at 20240229; fix 2024-02-29 02:05:10 +08:00
chenhao 11a478825f Merge pull request 'by Robin at 20240227; op moment audit task' (#147) from feat-20240117-001-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/147
 2024-02-27 19:29:00 +08:00
chenhao 69135f732a Merge pull request 'by Robin at 20240227; op moment audit task' (#146) from feat-20240117-001-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/146
 2024-02-27 19:28:26 +08:00
Leufolium 4a45945c07 by Robin at 20240227; op moment audit task 2024-02-27 19:28:13 +08:00
chenhao ac9f26eac3 Merge pull request 'feat-20240117-001-Robin' (#145) from feat-20240117-001-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/145
 2024-02-27 19:19:22 +08:00
chenhao 86dfb4c6f6 Merge pull request 'by Robin at 20240227; when audit task is nil set its status = success' (#144) from feat-20240117-001-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/144
 2024-02-27 19:19:13 +08:00
Leufolium 4458e8228c by Robin at 20240227; when audit task is nil set its status = success 2024-02-27 19:18:52 +08:00
chenhao ce6336ab34 Merge pull request 'by Robin at 20240227' (#142) from testonly-vericode_create into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/142
 2024-02-27 02:29:47 +08:00
Leufolium b46a911e16 by Robin at 20240227 2024-02-27 02:29:15 +08:00
Leufolium ebfb44a78b by Robin at 20240227; 2024-02-27 02:06:26 +08:00
chenhao 71f7764e07 Merge pull request 'feat-IRONFANS-56-Robin' (#140) from feat-IRONFANS-56-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/140
 2024-02-27 01:51:28 +08:00
Leufolium 2decbe9c67 by Robin at 20240227; register source statistics 2024-02-27 01:50:47 +08:00
Leufolium 14e8ae6cd7 by Robin at 20240227; 2024-02-27 01:28:27 +08:00
chenhao 5c164795f7 Merge pull request 'main' (#139) from main into feat-IRONFANS-56-Robin 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/139
 2024-02-27 01:12:54 +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 a0cb8555ce add wxpayh5 2024-02-26 19:29:59 +08:00
lwl0608 48d058610d add wxpayh5 2024-02-26 19:28:03 +08:00
chenhao 0c80c91fba Merge pull request 'by Robin at 20240226;' (#136) from feat-20240117-001-Robin into test 
Reviewed-on: #136
 2024-02-26 09:08:18 +08:00
Leufolium d31a7c0ffc by Robin at 20240226; 2024-02-26 09:07:17 +08:00
chenhao 828c3fbadd Merge pull request 'feat-20240117-001-Robin' (#135) from feat-20240117-001-Robin into test 
Reviewed-on: #135
 2024-02-26 08:27:01 +08:00
Leufolium d0017528b0 by Robin at 20240226; 2024-02-26 08:26:21 +08:00
Leufolium 6fb4fe002e by Robin at 20240226; 2024-02-26 08:03:37 +08:00
lwl0608 0b1a71a343 fix 2024-02-26 00:50:56 +08:00
lwl0608 8b3d5b5ec6 体现用 心意到了账户 2024-02-25 23:17:17 +08:00
chenhao e2be821d62 Merge pull request 'by Robin at 20240223' (#134) from feat-20240117-001-Robin into test 
Reviewed-on: #134
 2024-02-23 23:49:47 +08:00
Leufolium 3beeb4c7e6 by Robin at 20240223 2024-02-23 23:48:31 +08:00
chenhao 9051c79080 Merge pull request 'by Robin at 20240223' (#133) from feat-20240117-001-Robin into test 
Reviewed-on: #133
 2024-02-23 20:49:57 +08:00
Leufolium f3f3c7633e by Robin at 20240223 2024-02-23 20:48:51 +08:00
chenhao a03abd2073 Merge pull request 'by Robin at 202240223; fix' (#132) from feat-20240117-001-Robin into test 
Reviewed-on: #132
 2024-02-23 17:22:38 +08:00
Leufolium 48d087d6df by Robin at 202240223; fix 2024-02-23 17:20:36 +08:00
Leufolium 8cb0ab6819 by Robin at 20240223; fix 2024-02-23 16:04:54 +08:00
Leufolium baa6256491 Merge remote-tracking branch 'origin/main' into feat-20240117-001-Robin 2024-02-22 22:50:41 +08:00
Leufolium 86be2a9a84 Merge remote-tracking branch 'origin/main' into feat-20240117-001-Robin 2024-02-22 22:31:20 +08:00
Leufolium cadcb90538 by Robin at 20240222; fix 2024-02-22 22:29:21 +08:00
Leufolium cd07846804 by Robin at 20240222; fix 2024-02-22 21:50:34 +08:00
chenhao 4cda86c8e4 Merge pull request 'by Robin at 20240222; add mobile phone get' (#126) from feat-IRONFANS-57-Robin into test 
Reviewed-on: #126
 2024-02-22 15:22:38 +08:00
Leufolium 7e967887d9 by Robin at 20240222; add mobile phone get 2024-02-22 15:20:26 +08:00
Leufolium 582cb27830 Merge branch 'feat-IRONFANS-54-Robin' into conflict 2024-02-22 14:39:53 +08:00
Leufolium 967d383b46 by Robin at 20240222; fix 2024-02-22 14:36:28 +08:00
chenhao 27e6c08ce4 Merge pull request 'by Robin at 20240221; change moment audit logic' (#123) from feat-20240117-001-Robin into test 
Reviewed-on: #123
 2024-02-21 18:05:42 +08:00
Leufolium 19de07fbe4 by Robin at 20240221; change moment audit logic 2024-02-21 18:04:01 +08:00
lwl0608 59f206a612 recover apply 2024-02-21 11:36:21 +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
lwl0608 272210b23a add recover 2024-02-20 00:37:13 +08:00
lwl0608 8e134f4db5 提现维护 2024-02-19 23:27:36 +08:00
lwl0608 698f7ff1f2 fix 2024-02-19 21:18:12 +08:00
lwl0608 6952c1fbce fix 2024-02-19 21:13:18 +08:00
lwl0608 da9203fe64 fix 2024-02-19 21:04:45 +08:00
lwl0608 7f38018b8c 打开提现 2024-02-19 13:07:56 +08:00
lwl0608 2a09163410 add oid3 2024-02-18 23:51:52 +08:00
lwl0608 c61abde23b fff 2024-02-18 23:47:58 +08:00
lwl0608 ef6538528d 支付宝优化 2024-02-18 23:24:52 +08:00
lwl0608 13261a3f8d add alipay ymkj 2024-02-12 19:41:41 +04:00
chenhao f7a823dfd6 Merge pull request 'fix query audit bug' (#121) from feat-20240117-001-Robin into test 
Reviewed-on: #121
 2024-02-07 14:44:21 +08:00
Leufolium d195f05661 fix query audit bug 2024-02-07 14:42:50 +08:00
Leufolium 8666678a6b Merge branch 'feat-20240117-001-Robin' into conf-test-0117 2024-02-07 13:58:02 +08:00
Leufolium d072565b80 Merge remote-tracking branch 'origin/main' into feat-20240117-001-Robin 2024-02-07 13:52:12 +08:00
Leufolium 5079d25bb3 Merge remote-tracking branch 'origin/main' into feat-20240117-001-Robin 2024-02-07 13:51:00 +08:00
chenhao 0b2d00d47e Merge pull request '修复错误码' (#114) from feat-IRONFANS-53-20240205-Robin into main 
Reviewed-on: #114
 2024-02-07 13:47:58 +08:00
Leufolium c539a93b66 修复错误码 2024-02-07 13:47:08 +08:00
chenhao 4c9c70d334 Merge pull request 'w' (#113) from feat-IRONFANS-53-20240205-Robin into main 
Reviewed-on: #113
 2024-02-07 13:07:50 +08:00
Leufolium 0e36036b11 w 2024-02-07 13:07:34 +08:00
chenhao a4bd34e4cd Merge pull request '启动定时任务' (#112) from feat-IRONFANS-53-20240205-Robin into main 
Reviewed-on: #112
 2024-02-07 12:44:03 +08:00
Leufolium 9e3d5de744 启动定时任务 2024-02-07 12:43:47 +08:00
chenhao cc576a5228 Merge pull request 'by Robin at 20240207;' (#111) from feat-20240117-001-Robin into test 
Reviewed-on: #111
 2024-02-07 12:24:34 +08:00
Leufolium 22c605022d by Robin at 20240207; 2024-02-07 12:23:27 +08:00
Leufolium b19f4eb26d Merge branch 'feat-20240117-001-Robin' into conflict-test-feat-20240117-001-Robin 2024-02-07 12:15:34 +08:00
Leufolium 12870ef2fd by Robin at 20240207; add aligned 2024-02-07 12:07:28 +08:00
lwl0608 632ce1228e SelectMinSizeOssId 2024-02-06 02:51:24 +08:00
lwl0608 ccf4417659 Merge branch 'dev-lwl/wechat' 2024-02-05 23:25:47 +08:00
lwl0608 1415b2d6ee Merge branch 'dev-lwl/wechat' into test 2024-02-05 22:57:27 +08:00
lwl0608 02a84531e4 fix 2024-02-05 22:57:17 +08:00
lwl0608 3ed0c7bdeb Merge branch 'dev-lwl/wechat' into test 2024-02-05 22:06:38 +08:00
lwl0608 2793229b6c fix 2024-02-05 22:06:28 +08:00
chenhao 2a45bd9339 Merge pull request 'cron add clear moment create times' (#106) from feat-20240117-001-Robin into test 
Reviewed-on: #106
 2024-02-05 21:40:39 +08:00
Leufolium bbf0492655 cron add clear moment create times 2024-02-05 21:39:29 +08:00
Leufolium cbbf3579e4 Merge branch 'feat-20240117-001-Robin' into conflict-test-feat-20240117-001 2024-02-05 21:35:08 +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 c8d6c0bc0e cron 2024-02-05 21:21:24 +08:00
chenhao 4627c9d2a0 Merge pull request 'feat-IRONFANS-53-20240205-Robin' (#102) from feat-IRONFANS-53-20240205-Robin into test 
Reviewed-on: #102
 2024-02-05 21:21:13 +08:00
Leufolium 01092097c8 by Robin at 20240205 2024-02-05 21:18:27 +08:00
lwl0608 cb718d1850 Merge branch 'dev-lwl/wechat' into test 2024-02-05 21:17:06 +08:00
lwl0608 2261c021fa add config 2024-02-05 21:16:49 +08:00
chenhao 5392b29437 Merge pull request 'return info' (#100) from feat-IRONFANS-40-20240125-Robin into test 
Reviewed-on: #100
 2024-02-05 19:09:36 +08:00
Leufolium 87c431ce8e return info 2024-02-05 19:09:18 +08:00
chenhao b7648251ec Merge pull request 'by Robin at 20240205' (#99) from feat-IRONFANS-40-20240125-Robin into test 
Reviewed-on: #99
 2024-02-05 19:06:57 +08:00
Leufolium 9178b4a5ce by Robin at 20240205 2024-02-05 19:06:42 +08:00
chenhao 2d2877131a Merge pull request 'fix null' (#98) from feat-IRONFANS-40-20240125-Robin into test 
Reviewed-on: #98
 2024-02-05 19:03:52 +08:00
Leufolium 242074a491 fix null 2024-02-05 19:03:35 +08:00
Leufolium 2664c50ce4 Merge branch 'feat-IRONFANS-40-20240125-Robin' into conflict-test-feat-IRONFANS-40 2024-02-05 18:55:53 +08:00
Leufolium 27e8d492cc Merge remote-tracking branch 'origin/main' into feat-IRONFANS-40-20240125-Robin 2024-02-05 18:51:18 +08:00
Leufolium 9e85281c9f by Robin at 20240205; add op moment list by mid 2024-02-05 18:47:51 +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
chenhao 0d0f51902e Merge pull request 'by Robin at 20240204; moment list by mid' (#91) from feat-IRONFANS-40-20240125-Robin into test 
Reviewed-on: #91
 2024-02-04 08:06:16 +08:00
chenhao c7962fa4e8 Merge pull request 'feat-IRONFANS-40-20240125-Robin' (#90) from feat-IRONFANS-40-20240125-Robin into main 
Reviewed-on: #90
 2024-02-04 08:04:44 +08:00
Leufolium e8eabcc42e by Robin at 20240204; moment list by mid 2024-02-04 08:04:13 +08:00
lwl0608 d4011adb92 deal_one_order 2024-02-03 17:23:08 +08:00
Leufolium 2d405a4549 Merge branch 'feat-20240117-001-Robin' into conflict-test-feat-20240117-001 2024-02-02 07:42:29 +08:00
Leufolium 91c6864787 by Robin at 20240201; add moment audit 2024-02-01 20:12:53 +08:00
Leufolium b3809eddf5 Merge remote-tracking branch 'origin/main' into feat-20240117-001-Robin 2024-02-01 20:10:02 +08:00
Leufolium 110043116d by Robin at 20240201; add moment audit 2024-02-01 20:06:43 +08:00
Leufolium a5b635b5be by Robin at 20240201; fix 2024-02-01 19:44:07 +08:00
chenhao 1876129865 Merge pull request 'by Robin at 20240201;' (#86) from feat-IRONFANS-46-20240201-Robin into test 
Reviewed-on: #86
 2024-02-01 11:08:03 +08:00
Leufolium 2a60148d49 by Robin at 20240201; 2024-02-01 11:07:38 +08:00
Leufolium 4f80f4540b Merge branch 'feat-IRONFANS-46-20240201-Robin' into conflict-test-feat-IRONFANS-46 2024-02-01 10:52:52 +08:00
Leufolium 52279af4a9 by Robin at 20240201; 2024-02-01 10:19:44 +08:00
Leufolium c71c996afd by Robin at 20240201; 2024-02-01 09:52:45 +08:00
Leufolium f1ffbf473a by Robin at 20240201; 2024-02-01 09:02:11 +08:00
chenhao b645981428 Merge pull request 'by Robin at 20240127; add op list by mid account' (#83) from feat-IRONFANS-40-20240125-Robin into test 
Reviewed-on: #83
 2024-01-27 16:51:15 +08:00
Leufolium 9297aa8fbd by Robin at 20240127; add op list by mid account 2024-01-27 16:50:39 +08:00
chenhao 7004bbbf78 Merge pull request 'by Robin at 20240127; fix op delete' (#81) from feat-IRONFANS-40-20240125-Robin into test 
Reviewed-on: #81
 2024-01-27 02:04:39 +08:00
Leufolium 20c1a9bd69 by Robin at 20240127; fix op delete 2024-01-27 02:04:17 +08:00
chenhao 9161d982a2 Merge pull request 'feat-IRONFANS-32-20240125-Robin' (#80) from feat-IRONFANS-32-20240125-Robin into test 
Reviewed-on: #80
 2024-01-25 09:53:37 +08:00
Leufolium de3619efe3 by Robin at 20240125; get_coins_product_list not token auth 2024-01-25 09:50:08 +08:00
Leufolium 3e484d0e31 by Robin at 20240125; apipaycallback not token auth 2024-01-25 09:44:53 +08:00
chenhao ad33ea365d Merge pull request 'feat-IRONFANS-32-20240125-Robin' (#79) from feat-IRONFANS-32-20240125-Robin into test 
Reviewed-on: #79
 2024-01-25 09:01:56 +08:00
Leufolium 12ee83520f by Robin at 20240125; add token auth 2024-01-25 08:59:52 +08:00
chenhao 1ce311a90e Merge pull request 'by Robin at 20240123; add consume his' (#76) from feat-20240121-001-Robin into test 
Reviewed-on: #76
 2024-01-23 20:57:52 +08:00
Leufolium 68a75a8184 by Robin at 20240123; add consume his 2024-01-23 20:57:30 +08:00
chenhao 2c0855ffb0 Merge pull request 'feat-20240121-001-Robin' (#74) from feat-20240121-001-Robin into test 
Reviewed-on: #74
 2024-01-23 19:39:31 +08:00
Leufolium ff9e1acf68 by Robin at 20240123; fix 2024-01-23 19:36:49 +08:00
Leufolium 48d1cb1b88 Merge remote-tracking branch 'origin/main' into feat-20240121-001-Robin 2024-01-23 19:12:27 +08:00
chenhao af8763e8d8 Merge pull request 'by Robin at 20240123; return_url alteration' (#70) from feat-20240121-001-Robin into test 
Reviewed-on: #70
 2024-01-23 19:09:23 +08:00
Leufolium 9eac3af283 by Robin at 20240123; return_url alteration 2024-01-23 19:08:59 +08:00
Leufolium e20f3c338c Merge branch 'feat-20240121-001-Robin' into conflict-feat-20240112-001-main 2024-01-23 18:01:39 +08:00
chenhao f724fed644 Merge pull request 'feat-20230112-001-Robin' (#67) from feat-20230112-001-Robin into main 
Reviewed-on: #67
 2024-01-23 17:56:14 +08:00
chenhao 0f3407746e Merge pull request 'by Robin at 20240123; fix' (#66) from feat-20240121-001-Robin into test 
Reviewed-on: #66
 2024-01-23 17:39:15 +08:00
Leufolium 415c71f150 by Robin at 20240123; fix 2024-01-23 17:38:28 +08:00
chenhao b1262d838a Merge pull request 'by Robin at 20240122; fix' (#65) from feat-20240121-001-Robin into test 
Reviewed-on: #65
 2024-01-22 17:17:04 +08:00
Leufolium e1e6b253e2 by Robin at 20240122; fix 2024-01-22 15:23:19 +08:00
chenhao 75fc8d2611 Merge pull request 'feat-20240121-001-Robin' (#64) from feat-20240121-001-Robin into test 
Reviewed-on: #64
 2024-01-22 15:14:17 +08:00
Leufolium f91231f5b3 by Robin at 20240112; fix 2024-01-22 15:13:52 +08:00
Leufolium 87f088aeaa by Robin at 20240122; fix 2024-01-22 15:10:51 +08:00
Leufolium 851e62264f by Robin at 20240122; fix 2024-01-22 14:21:13 +08:00
lwl0608 d26081c0e3 err 2024-01-21 12:48:17 +08:00
lwl0608 f3a9c15507 coinorder 2024-01-21 12:45:20 +08:00
lwl0608 7f352fd00d keyword 2024-01-21 12:37:46 +08:00
lwl0608 d1884ced69 add ret 2024-01-21 12:28:09 +08:00
lwl0608 e3abdff08c opt 2024-01-21 12:27:34 +08:00
Leufolium 9430918b7b by Robin at 20240120; fix 2024-01-20 18:48:38 +08:00
Leufolium a52ac4dfa7 by Robin at 20240120;l fix 2024-01-20 06:33:10 +08:00
chenhao 6d51dcf696 Merge pull request 'by Robin at 20240120; fix' (#63) from feat-20230112-001-Robin into test 
Reviewed-on: #63
 2024-01-20 00:54:34 +08:00
Leufolium e7da8609c8 by Robin at 20240120; fix 2024-01-20 00:53:31 +08:00
chenhao 75873b7c44 Merge pull request 'feat-20240119-001-Robin' (#61) from feat-20240119-001-Robin into test 
Reviewed-on: #61
 2024-01-19 17:56:39 +08:00
Leufolium b14fd35846 by Robin at 20240119; fix 2024-01-19 17:56:17 +08:00
Leufolium 04b65a72d2 by Robin at 20240119; fix 2024-01-19 17:31:38 +08:00
chenhao b38f89228d Merge pull request 'By Robin at 20240119; fix' (#60) from feat-20230112-001-Robin into test 
Reviewed-on: #60
 2024-01-19 00:31:56 +08:00
Leufolium 876ec6513f By Robin at 20240119; fix 2024-01-19 00:31:03 +08:00
Leufolium 1602de1156 by Robin at 20240118; 2024-01-18 18:19:31 +08:00
lwl0608 7fff48036d op coin_order_list 2024-01-17 22:11:12 +08:00
lwl0608 c6085f42d6 op order_list 2024-01-17 21:57:45 +08:00
Leufolium 19953dddb3 by 2024-01-17 19:53:17 +08:00
Leufolium 75b8d47ba9 by Robin at 20240117; xxl-job 2024-01-17 19:52:54 +08:00
chenhao 9d30b82e70 Merge pull request 'by Robin at 20240117; fix' (#59) from feat-20230112-001-Robin into test 
Reviewed-on: #59
 2024-01-17 19:19:01 +08:00
Leufolium c5f5eb661c by Robin at 20240117; fix 2024-01-17 19:18:23 +08:00
chenhao 8958e679f1 Merge pull request 'feat-20230112-001-Robin' (#57) from feat-20230112-001-Robin into test 
Reviewed-on: #57
 2024-01-13 00:32:56 +08:00
Leufolium 26c55749a0 by Robin at 20240113; moment 2024-01-13 00:32:19 +08:00
chenhao 9821c38167 Merge pull request 'by Robin at 20240112; fix' (#55) from feat-20240109-001-Robin into test 
Reviewed-on: #55
 2024-01-12 16:08:11 +08:00
Leufolium ad07404137 by Robin at 20240112; fix 2024-01-12 16:06:50 +08:00
chenhao 0a63f58952 Merge pull request 'by Robin at 20240110; login add inviter field' (#54) from feat-20240109-001-Robin into test 
Reviewed-on: #54
 2024-01-10 23:20:04 +08:00
Leufolium 1f6a083f93 by Robin at 20240110; login add inviter field 2024-01-10 23:19:34 +08:00
chenhao dca22b02ef Merge pull request 'by Robin at 20240110; fix un-jwt auth' (#52) from feat-20240109-001-Robin into test 
Reviewed-on: #52
 2024-01-10 22:02:22 +08:00
Leufolium adeb7cea44 by Robin at 20240110; fix un-jwt auth 2024-01-10 22:01:16 +08:00
chenhao 8545955ac0 Merge pull request 'by Robin at 20230110; fix' (#50) from feat-20240109-001-Robin into test 
Reviewed-on: #50
 2024-01-10 00:37:23 +08:00
Leufolium 5b42bdd111 by Robin at 20230110; fix 2024-01-10 00:37:03 +08:00
chenhao b4edbef3b9 Merge pull request 'feat-20240109-001-Robin' (#48) from feat-20240109-001-Robin into test 
Reviewed-on: #48
 2024-01-10 00:20:14 +08:00
lwl0608 ca0ed7bec9 apply time 2024-01-08 22:38:18 +08:00
lwl0608 447ba67460 修复 bug 2024-01-08 21:24:45 +08:00
lwl0608 2aef43b32a fix ret -1 2024-01-08 19:24:07 +08:00
lwl0608 e83ef6f0ed args fix 2024-01-08 12:51:45 +08:00
lwl0608 0973f04892 agrs cnt 2024-01-08 12:49:24 +08:00
lwl0608 7a55c52f0d add 2024-01-08 12:40:27 +08:00
lwl0608 537ed90d65 withdraw apply 2024-01-08 11:49:16 +08:00
lwl0608 4c6125177b add 2024-01-07 23:02:25 +08:00
lwl0608 9f2b80566e add 2024-01-07 22:37:06 +08:00
lwl0608 e104db33be fix 2024-01-05 00:31:39 +08:00
chenhao 1edf374213 Merge pull request 'feat-20230104-001-Robin' (#47) from feat-20230104-001-Robin into main 
Reviewed-on: #47
 2024-01-05 00:24:32 +08:00
chenhao 505d617b9f Merge pull request 'feat-20230104-001-Robin' (#44) from feat-20230104-001-Robin into test 
Reviewed-on: #44
 2024-01-04 21:56:14 +08:00
Leufolium 710f5f01a3 by Robin at 20240104; fix 2024-01-04 21:55:00 +08:00
lwl0608 ac91201240 add 2024-01-04 18:10:26 +08:00
chenhao 5050e01352 Merge pull request 'by Robin at 20240104; fix divide by 2' (#43) from feat-20230102-001-Robin into main 
Reviewed-on: #43
 2024-01-04 15:03:01 +08:00
chenhao ae291c5b96 Merge pull request 'by Robin at 20240104; fix divide by 2' (#42) from feat-20230102-001-Robin into test 
Reviewed-on: #42
 2024-01-04 14:54:36 +08:00
Leufolium a98c741f7c by Robin at 20240104; fix divide by 2 2024-01-04 14:54:16 +08:00
chenhao bb8a2acd6a Merge pull request 'feat-20230102-001-Robin' (#41) from feat-20230102-001-Robin into main 
Reviewed-on: #41
 2024-01-04 13:09:50 +08:00
chenhao 25979ca949 Merge pull request 'by Robin at 20230103; fix' (#40) from feat-20230102-001-Robin into test 
Reviewed-on: #40
 2024-01-03 23:04:11 +08:00
Leufolium b7906680aa by Robin at 20230103; fix 2024-01-03 23:03:49 +08:00
chenhao 944a42c2ee Merge pull request 'by' (#39) from feat-20230102-001-Robin into test 
Reviewed-on: #39
 2024-01-03 23:00:44 +08:00
Leufolium da32271c8b by 2024-01-03 23:00:15 +08:00
chenhao 8dd36740ce Merge pull request 'by Robin at 20240103; fix' (#38) from feat-20230102-001-Robin into test 
Reviewed-on: #38
 2024-01-03 22:56:32 +08:00
Leufolium 82985d051c by Robin at 20240103; fix 2024-01-03 22:53:53 +08:00
chenhao eaed3195e6 Merge pull request 'feat-20230102-001-Robin' (#37) from feat-20230102-001-Robin into test 
Reviewed-on: #37
 2024-01-03 16:19:38 +08:00
Leufolium 3cc042ba66 by Robin at 20230103; add daily statement 2024-01-03 16:16:41 +08:00
chenhao b1b4fed922 Merge pull request 'feat-20231228-001-Robin' (#36) from feat-20231228-001-Robin into main 
Reviewed-on: #36
 2024-01-02 22:41:44 +08:00
Leufolium db6670572e by Robin at 20230102; account count 2024-01-02 19:34:05 +08:00
chenhao 1b90e9fd44 Merge pull request 'by Robin at 20230102; fix imageaudit' (#33) from fix-20230102-BUG0001-Robin into test 
Reviewed-on: #33
 2024-01-02 16:49:45 +08:00
Leufolium ce47257020 by Robin at 20230102; fix imageaudit 2024-01-02 16:49:02 +08:00
chenhao e5d6e1adbb Merge pull request 'fix-20230102-BUG0001-Robin' (#32) from fix-20230102-BUG0001-Robin into test 
Reviewed-on: #32
 2024-01-02 15:57:08 +08:00
Leufolium da9b6b522b by Robin at 20240102; fix 2024-01-02 15:56:04 +08:00
Leufolium c20e3ac9c9 by Robin at 20240102; fix 2024-01-02 15:50:46 +08:00
lwl0608 b1890121cd 优化 2024-01-01 12:21:13 +08:00
lwl0608 a4e9c589a3 优化 2024-01-01 12:19:48 +08:00
chenhao cea0140c61 Merge pull request 'by Robin at20231231; remarks' (#27) from feat-20231228-001-Robin into test 
Reviewed-on: #27
 2023-12-31 13:23:14 +08:00
Leufolium bf99c91b79 by Robin at20231231; remarks 2023-12-31 13:22:45 +08:00
chenhao c58fe1debc Merge pull request 'feat-20231230-001-Robin' (#25) from feat-20231230-001-Robin into test 
Reviewed-on: #25
 2023-12-30 19:49:54 +08:00
Leufolium 2be5fc87a3 Merge remote-tracking branch 'origin/main' into feat-20231230-001-Robin 2023-12-30 19:48:43 +08:00
chenhao 7eb88bdded Merge pull request 'feat-20231228-003-Robin' (#23) from feat-20231228-003-Robin into main 
Reviewed-on: #23
 2023-12-30 19:44:21 +08:00
Leufolium ee1aabe66c by Robin 2023-12-30 19:30:37 +08:00
Leufolium b0d29a76db by Robin at 20231230; fix 2023-12-30 19:28:50 +08:00
chenhao 60f6b50381 Merge pull request 'by Robin at 20231230; add status' (#21) from feat-20231228-001-Robin into test 
Reviewed-on: #21
 2023-12-30 17:33:19 +08:00
Leufolium ed3bc2294c by Robin at 20231230; add status 2023-12-30 17:32:41 +08:00
lwl0608 6b73807a4e fix 2023-12-30 14:52:53 +08:00
lwl0608 8660fcf986 fix 2023-12-30 14:42:40 +08:00
lwl0608 0352b0eb33 重复解锁判断 2023-12-30 14:22:02 +08:00
lwl0608 6d4c1eb05a 优化 1 2023-12-30 13:49:05 +08:00
lwl0608 090667063e 优化 2023-12-30 12:43:58 +08:00
chenhao 5577c15695 Merge pull request 'by Robin at 20231229; media fill' (#20) from feat-20231228-001-Robin into test 
Reviewed-on: #20
 2023-12-29 22:22:53 +08:00
Leufolium 2e638c4f04 by Robin at 20231229; media fill 2023-12-29 22:22:25 +08:00
lwl0608 5d8fda536a add check 2023-12-29 21:30:59 +08:00
lwl0608 1277bbafc9 fix 2023-12-29 20:47:34 +08:00
lwl0608 9916c644de fix 2023-12-29 17:40:33 +08:00
lwl0608 15e8c2b6c6 fix 2023-12-29 17:33:56 +08:00
lwl0608 dfe353abe5 fix 2023-12-29 17:25:13 +08:00
lwl0608 c1bbea227c fix 2023-12-29 15:31:33 +08:00
lwl0608 a29420236b fix 2023-12-29 15:03:50 +08:00
lwl0608 648296574d add 2023-12-29 14:22:33 +08:00
lwl0608 7d5758d999 alipay callback 2023-12-29 14:16:37 +08:00
chenhao 65602b8275 Merge pull request 'by Robin at 20231228; fix' (#14) from feat-20231228-003-Robin into test 
Reviewed-on: #14
 2023-12-28 18:38:07 +08:00
Leufolium d9a43a3c47 by Robin at 20231228; fix 2023-12-28 18:37:39 +08:00
chenhao 1ce724a2c6 Merge pull request 'feat-20231228-001-Robin' (#13) from feat-20231228-001-Robin into test 
Reviewed-on: #13
 2023-12-28 18:24:26 +08:00
Leufolium ac3b6c54b1 by Robin at 20231228; fix 2023-12-28 18:20:53 +08:00
chenhao f6137a8299 Merge pull request 'by Robin at 20231227; fix' (#12) from feat-20231227-002-Robin into main 
Reviewed-on: #12
 2023-12-28 17:43:40 +08:00
chenhao 6a335d882a Merge pull request 'by Robin at 20231226' (#11) from fix-20231226-Robin-BUG0001 into main 
Reviewed-on: #11
 2023-12-28 17:43:13 +08:00
Leufolium e24879ee3d by Robin at 20231227;fix 2023-12-27 21:47:16 +08:00
chenhao 6729b8180f Merge pull request 'by Robin at 20231227; fix' (#8) from feat-20231227-002-Robin into test 
Reviewed-on: #8
 2023-12-27 18:30:30 +08:00
Leufolium 8e32e5ac4a by Robin at 20231227; fix 2023-12-27 18:29:49 +08:00
chenhao fa94f04873 Merge pull request 'fix-20231226-Robin-BUG0001' (#7) from fix-20231226-Robin-BUG0001 into test 
Reviewed-on: #7
 2023-12-26 22:07:03 +08:00
Leufolium e4ee8542ea by Robin at 20231226 2023-12-26 22:03:48 +08:00
Leufolium d8bd43b767 by Robin at 20231226; main 2023-12-26 20:09:35 +08:00
Leufolium 915371e6ad by Robin at 20231226; username 2023-12-26 15:20:08 +08:00
Leufolium 837f12c614 test 2023-12-25 16:14:17 +08:00
lwl0608 0ebb07f1e1 invalid 2023-12-25 01:14:14 +08:00
lwl0608 eaf9974b55 mysql ping 2023-12-25 01:02:06 +08:00
Leufolium 0e343fe97f by 2023-12-24 19:14:18 +08:00
chenhao a76e4c7a3c Merge pull request 'main' (#1) from main into test 
Reviewed-on: #1
 2023-12-24 16:51:26 +08:00
Leufolium 562ff379b8 by Robin at 20231224; PrepareToC 2023-12-24 15:53:20 +08:00
Leufolium 3669f868de Merge branch 'main' of http://121.196.202.62:3000/wishpal_ironfan/service 2023-12-24 13:35:01 +08:00
Leufolium 4faacbd342 by Robin at 20231224; userId 2023-12-24 13:34:25 +08:00
lwl0608 ac89ddbf74 fix ip 2023-12-24 13:24:01 +08:00
lwl0608 8af970d0b3 fix password 2023-12-24 12:51:44 +08:00
lwl0608 00ce752b6c production path 2023-12-24 12:44:04 +08:00
lwl0608 8e6b8d65ac add 2023-12-24 12:33:21 +08:00
lwl0608 9db01451e2 add 2023-12-24 11:59:24 +08:00
Leufolium be71d1b97e Merge branch 'main' of http://121.196.202.62:3000/wishpal_ironfan/service 2023-12-24 02:02:24 +08:00
Leufolium 87cf6ecb49 by Robin at 20231224; inviter 2023-12-24 02:02:20 +08:00
lwl0608 e21f302b28 add 2023-12-24 00:02:22 +08:00
Leufolium f3520a506c Merge branch 'main' of http://121.196.202.62:3000/wishpal_ironfan/service 2023-12-23 22:46:01 +08:00
Leufolium 338ace4d30 by Robin at 20231223; op list by session 2023-12-23 22:45:59 +08:00
lwl0608 c2b0792804 add 2023-12-23 22:41:47 +08:00
Leufolium bb9f771189 by Robin at 20231223; session 2023-12-23 22:06:36 +08:00
Leufolium 4d560e5637 Merge branch 'main' of http://121.196.202.62:3000/wishpal_ironfan/service 2023-12-23 22:03:57 +08:00
Leufolium 7ea7b36776 by Robin at 20231223; contact session 2023-12-23 22:03:53 +08:00
lwl0608 157eed2d28 tmp 2023-12-23 19:34:02 +08:00
lwl0608 2634ad7c17 list_by mid 2023-12-23 17:42:28 +08:00
lwl0608 9f62b24fff fix gold_num 2023-12-23 17:09:07 +08:00
Leufolium 247704ad75 by Robin at 20231223; api streamer add vas 2023-12-23 15:47:57 +08:00
Leufolium a39852ff69 by Robin at 20231222; op list by userid 2023-12-22 17:00:57 +08:00
Leufolium 4b56ad1be5 err rollback 2023-12-22 15:51:26 +08:00
Leufolium 6fcff1c8c6 by Robin at 20231222; streamer vas 2023-12-22 15:49:42 +08:00
Leufolium 5b9452aa91 by Robin at 20231222; vas 2023-12-22 15:03:10 +08:00
Leufolium 1cbc732469 by Robin at 20231222; Op service validate 2023-12-22 12:53:21 +08:00
lwl0608 9a00286db6 service 2023-12-21 22:17:40 +08:00