Compare commits

...

2 Commits

  1. 31
      app/command/ApiLogCommand.php
  2. 7
      app/home/controller/Wallet.php
  3. 2
      app/home/middleware/ApiLogMiddleware.php
  4. 3
      app/home/service/LoginService.php
  5. 17
      app/model/UserBankModel.php

31
app/command/ApiLogCommand.php

@ -10,22 +10,15 @@ use think\console\Input;
use think\console\Output;
use think\facade\Cache;
use think\facade\Log;
use think\facade\Db;
class ApiLogCommand extends Command
{
protected function configure()
{
// 指令配置
$this->setName('api_log')
->setDescription('the api_log command');
}
/**
* Execute the console command.
*
* @param Input $input
* @param Output $output
* @return void
*/
$this->setName('api_log')->setDescription('the api_log command');
}
protected function execute(Input $input, Output $output)
{
while (true) {
@ -38,15 +31,25 @@ class ApiLogCommand extends Command
if (!is_array($logData) || empty($logData)) {
continue;
}
if ($logData) {
$logData['params'] = json_encode($logData['params'] ?? [], JSON_UNESCAPED_UNICODE);
$logData['response'] = json_encode($logData['response'] ?? [], JSON_UNESCAPED_UNICODE);
try {
ApiLogModel::create($logData);
} catch (\Throwable $e) {
// 如果是 MySQL 2006 错误,则重连后再执行
if (strpos($e->getMessage(), '2006 MySQL server has gone away') !== false) {
Log::warning('MySQL connection lost, reconnecting...');
Db::disconnect(); // 清理旧连接
Db::reconnect(); // 重新连接
ApiLogModel::create($logData); // 重试一次
} else {
throw $e;
}
}
} else {
// 如果没有数据,休眠一段时间再继续
sleep(10);
sleep(10); // 没数据时休眠
}
} catch (\Throwable $e) {
Log::error('ApiLogCommand error: ' . $e->getMessage());

7
app/home/controller/Wallet.php

@ -1,6 +1,7 @@
<?php
namespace app\home\controller;
use app\home\service\WalletService;
use app\model\PreUsStockModel;
use think\response\Json;
@ -141,6 +142,8 @@ class Wallet extends HomeBaseController
$data['bank_address'] = $request->post('bank_address');
$data['user_address'] = $request->post('user_address');
$data['bank_country'] = $request->post('bank_country');
$data['branch_name'] = $request->post('branch_name');
$data['branch_phone'] = $request->post('branch_phone');
$result = (new WalletService())->insertUserBank($data);
return json($result);
}
@ -199,7 +202,8 @@ class Wallet extends HomeBaseController
$result = (new WalletService())->dealDrawalApply($data);
return json($result);
} /**
}
/**
* 用户提款申请
* @param Request $request
* @return Json
@ -293,5 +297,4 @@ class Wallet extends HomeBaseController
$result = (new WalletService())->getRateToTransfer($this->request->param());
return json($result);
}
}

2
app/home/middleware/ApiLogMiddleware.php

@ -29,6 +29,7 @@ class ApiLogMiddleware
'user_drawal',
'pre_stock/order',
'fund/order',
'generate_token'
];
@ -71,6 +72,5 @@ class ApiLogMiddleware
\think\facade\Cache::store('redis')->lpush('api_log', json_encode($logData));
}
return $response;
}
}

3
app/home/service/LoginService.php

@ -453,7 +453,8 @@ class LoginService extends BaseHomeService
$this->checkRegisterLimit($ipCanRegisterNumPerIpPerDay);
// 校验验证码
$mobile = $param['nation'] . $param['phone'];
$mobile = $param['nation'] . ltrim($param['phone'], '0');
// $mobile = $param['nation'] . $param['phone'];
$smsKey = 'DB:USER:UNLOGIN:SMS_CODE:' . $mobile;
if (!$this->checkCode($smsKey, $param['sms_code'])) {
//注册验证码

17
app/model/UserBankModel.php

@ -1,5 +1,7 @@
<?php
namespace app\model;
/**
* @property int user_id
* @property string true_name
@ -22,7 +24,7 @@ class UserBankModel extends BaseModel
public static function getUserBankList($data): array
{
$count = self::where('user_id', $data['user_id'])->count();
$list = self::where('user_id', $data['user_id'])->field("id,true_name,bank_name,bank_card,bank_phone,bank_email,is_default,identity_card,ifsc")
$list = self::where('user_id', $data['user_id'])->field("id,true_name,bank_name,bank_card,bank_phone,bank_email,is_default,identity_card,ifsc,branch_name,branch_phone")
->page($data['page'], $data['page_size'])->select();
if (empty($list)) {
return [];
@ -69,6 +71,8 @@ class UserBankModel extends BaseModel
'bank_phone' => isset($data['bank_phone']) ? $data['bank_phone'] : '',
'user_address' => isset($data['user_address']) ? $data['user_address'] : '',
'bank_address' => isset($data['bank_address']) ? $data['bank_address'] : '',
'branch_name' => isset($data['branch_name']) ? $data['branch_name'] : '',
'branch_phone' => isset($data['branch_phone']) ? $data['branch_phone'] : '',
'ifsc' => isset($data['ifsc']) ? $data['ifsc'] : '',
'bank_code' => $data['bank_code'],
'bank_country' => $data['bank_country'],
@ -98,6 +102,12 @@ class UserBankModel extends BaseModel
if (isset($data['user_address'])) {
$self->user_address = $data['user_address'];
}
if (isset($data['branch_name'])) {
$self->branch_name = $data['branch_name'];
}
if (isset($data['branch_phone'])) {
$self->branch_phone = $data['branch_phone'];
}
$self->bank_code = $data['bank_code'];
$self->bank_country = $data['bank_country'];
$self->is_default = $data['is_default'];
@ -106,7 +116,8 @@ class UserBankModel extends BaseModel
$self->save();
}
}
public static function updateDefault(int $user_id){
public static function updateDefault(int $user_id)
{
self::where([
'user_id' => $user_id
])->save([
@ -114,6 +125,4 @@ class UserBankModel extends BaseModel
'update_time' => date('Y-m-d H:i:s')
]);
}
}
Loading…
Cancel
Save