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

900 Commits

Author SHA1 Message Date
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
Leufolium 22c605022d by Robin at 20240207; 2024-02-07 12:23:27 +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 02a84531e4 fix 2024-02-05 22:57:17 +08:00
lwl0608 2793229b6c fix 2024-02-05 22:06:28 +08:00
Leufolium bbf0492655 cron add clear moment create times 2024-02-05 21:39:29 +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
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
Leufolium 87c431ce8e return info 2024-02-05 19:09:18 +08:00
Leufolium 9178b4a5ce by Robin at 20240205 2024-02-05 19:06:42 +08:00
Leufolium 242074a491 fix null 2024-02-05 19:03:35 +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 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 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
Leufolium 2a60148d49 by Robin at 20240201; 2024-02-01 11:07:38 +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
Leufolium 9297aa8fbd by Robin at 20240127; add op list by mid account 2024-01-27 16:50:39 +08:00
Leufolium 20c1a9bd69 by Robin at 20240127; fix op delete 2024-01-27 02:04:17 +08:00
Leufolium 68a75a8184 by Robin at 20240123; add consume his 2024-01-23 20:57:30 +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
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
Leufolium 415c71f150 by Robin at 20240123; fix 2024-01-23 17:38:28 +08:00
Leufolium e1e6b253e2 by Robin at 20240122; fix 2024-01-22 15:23:19 +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
Leufolium e7da8609c8 by Robin at 20240120; fix 2024-01-20 00:53:31 +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
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
Leufolium c5f5eb661c by Robin at 20240117; fix 2024-01-17 19:18:23 +08:00
Leufolium 26c55749a0 by Robin at 20240113; moment 2024-01-13 00:32:19 +08:00
Leufolium ad07404137 by Robin at 20240112; fix 2024-01-12 16:06:50 +08:00
Leufolium 1f6a083f93 by Robin at 20240110; login add inviter field 2024-01-10 23:19:34 +08:00
Leufolium adeb7cea44 by Robin at 20240110; fix un-jwt auth 2024-01-10 22:01:16 +08:00
Leufolium 5b42bdd111 by Robin at 20230110; fix 2024-01-10 00:37:03 +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
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
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
Leufolium b7906680aa by Robin at 20230103; fix 2024-01-03 23:03:49 +08:00
Leufolium da32271c8b by 2024-01-03 23:00:15 +08:00
Leufolium 82985d051c by Robin at 20240103; fix 2024-01-03 22:53:53 +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
Leufolium ce47257020 by Robin at 20230102; fix imageaudit 2024-01-02 16:49:02 +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
Leufolium bf99c91b79 by Robin at20231231; remarks 2023-12-31 13:22:45 +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
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
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
Leufolium d9a43a3c47 by Robin at 20231228; fix 2023-12-28 18:37:39 +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
Leufolium 8e32e5ac4a by Robin at 20231227; fix 2023-12-27 18:29:49 +08:00
Leufolium e4ee8542ea by Robin at 20231226 2023-12-26 22:03:48 +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 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 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