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

843 Commits

Author SHA1 Message Date
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