周海龙 / globalso · 提交

转到一个项目

作者 李宇航
提交 440a6462e2e2ee836fc0df597da62cd3fb43f0b4 2 个父辈 d429ee36 81519f01

合并分支 'master-server' 到 'master' 

Master server



查看合并请求 !781
内嵌 并排对比
正在显示 3 个修改的文件 包含 32 行增加 和 5 行删除
... ... @@ -275,7 +275,11 @@ class VideoTask extends Command
}
}else{
$product_all_id = Product::where('thumb','!=',null)->where("status",Product::STATUS_ON)->inRandomOrder()->take(20)->pluck('id')->toArray();
$products = Product::whereIn("id", $product_all_id)->orderByRaw(DB::raw("FIELD(id, " . implode(',', $product_all_id) . ")"))->get();
if(empty($product_all_id)){
$products = [];
}else{
$products = Product::whereIn("id", $product_all_id)->orderByRaw(DB::raw("FIELD(id, " . implode(',', $product_all_id) . ")"))->get();
}
}
$data = [];
if (!empty($products)){
... ...
... ... @@ -12,6 +12,8 @@ namespace App\Http\Controllers\Bside\BCom;
use App\Enums\Common\Code;
use App\Http\Controllers\Bside\BaseController;
use App\Models\Log\OperationHeartbeat;
use App\Models\Manage\Manage;
use App\Models\User\User;
class OperationHeartbeatController extends BaseController
{
... ... @@ -36,6 +38,7 @@ class OperationHeartbeatController extends BaseController
'is_custom.required' => '是否为扩展模版',
'is_template.required' => '详情页/可视化',
]);
$condition = ['project_id'=>$this->user['project_id'],'source'=>$this->param['source'],'source_id'=>$this->param['source_id'],
'is_list'=>$this->param['is_list'],'is_custom'=>$this->param['is_custom'],'is_template'=>$this->param['is_template']];
$operationHeartbeatModel = new OperationHeartbeat();
... ... @@ -44,9 +47,11 @@ class OperationHeartbeatController extends BaseController
if($info === false){
$condition['operator_id'] = $this->user['id'];
$condition['project_id'] = $this->user['project_id'];
$condition['ip'] = $this->request->ip();
$condition['manager_id'] = $this->user['manager_id'] ?? 0;
$operationHeartbeatModel->addReturnId($condition);
}else{
$operationHeartbeatModel->edit(['status'=>$condition['status'] ?? 0],['id'=>$info['id']]);
$operationHeartbeatModel->edit(['status'=>$condition['status'] ?? 0,'ip'=>$this->request->ip(),'manager_id'=> $this->user['manager_id'] ?? 0],['id'=>$info['id']]);
}
$this->response('success');
}
... ... @@ -81,10 +86,28 @@ class OperationHeartbeatController extends BaseController
}else{
$date_time = strtotime($info['updated_at']) + 7200;
if($date_time < time()){
$operationHeartbeatModel->edit(['status'=>0],$condition);
$operationHeartbeatModel->edit(['status'=>0,'ip'=>'127.0.0.1'],$condition);
$info['status'] = 0;
}
}
if($info['status'] == 1){
//当前登录为切入登录
if(isset($this->user['manager_id']) && !empty($this->user['manager_id'])){
//上一次验证也是切入登录
if($info['manager_id'] != 0){
$managerModel = new Manage();
$managerInfo = $managerModel->read(['id'=>$info['manager_id']],['name']);
$info['message'] = '此页面数据已有人在编辑，请勿重复操作！操作人ip：'.$info['ip'].'操作的管理员为：'.$managerInfo['name'];
}else{
//账号密码登录
$userModel = new User();
$userInfo = $userModel->read(['id'=>$info['operator_id']],['name']);
$info['message'] = '此页面数据已有人在编辑，请勿重复操作！'.$userInfo['name'].'用户登录在操作。';
}
}else{
$info['message'] = '此页面数据已有人在编辑，请勿重复操作！';
}
}
$this->response('success',Code::SUCCESS,$info);
}
}
... ...
... ... @@ -186,8 +186,8 @@ class InquiryLogic extends BaseLogic
public function sendMobileVerifyData($phone){
$phoneDataModel = new PhoneData();
$num_phone = preg_replace('/\D/', '',$phone) ?? ''; // \D 匹配所有非数字字符
$info = $phoneDataModel->read(['phone'=>$num_phone]);
if($info === false){
$data = $phoneDataModel->read(['phone'=>$num_phone]);
if($data === false){
$url = 'https://fob.ai.cc/api/mobile_verify_data/'.$phone;
$data = http_get($url);
if(!empty($data)){
... ...