周海龙 / globalso · 提交

转到一个项目

作者 lyh
提交 e891fdaeea865944e30a8f4d79327e45d9ff9c38 2 个父辈 8abb1cc7 bac0cdc6

Merge branch 'master-server' of http://47.244.231.31:8099/zhl/globalso-v6

内嵌 并排对比
正在显示 5 个修改的文件 包含 67 行增加 和 8 行删除
@@ -87,7 +87,7 @@ class ReplaceHtmlLog extends Command @@ -87,7 +87,7 @@ class ReplaceHtmlLog extends Command
87 if($info['template_id'] == 0){ 87 if($info['template_id'] == 0){
88 $bTemplateModel->formatQuery($condition)->update(['html' => DB::raw("REPLACE(html, '$old_html', '$html')")]); 88 $bTemplateModel->formatQuery($condition)->update(['html' => DB::raw("REPLACE(html, '$old_html', '$html')")]);
89 }else{ 89 }else{
90 - $bTemplateModel->formatQuery($condition)->update(['main_html' => DB::raw("REPLACE(main_html, '$old_html', '$html')")]); 90 + $bTemplateModel->formatQuery($condition)->update(['main_html' => DB::raw("REPLACE(main_html, ?, ?)", [$old_html, $html])]);
91 } 91 }
92 return true; 92 return true;
93 } 93 }
  1 +<?php
  2 +/**
  3 + * @remark :
  4 + * @name :UpdateHeartbeat.php
  5 + * @author :lyh
  6 + * @method :post
  7 + * @time :2024/8/28 15:13
  8 + */
  9 +
  10 +namespace App\Console\Commands\Update;
  11 +
  12 +use App\Models\Log\OperationHeartbeat;
  13 +use App\Models\Project\Project;
  14 +use App\Services\ProjectServer;
  15 +use Illuminate\Console\Command;
  16 +use Illuminate\Support\Facades\DB;
  17 +
  18 +class UpdateHeartbeat extends Command
  19 +{
  20 + /**
  21 + * The name and signature of the console command.
  22 + *
  23 + * @var string
  24 + */
  25 + protected $signature = 'operation_heartbeat';
  26 +
  27 + /**
  28 + * The console command description.
  29 + *
  30 + * @var string
  31 + */
  32 + protected $description = '心跳半小时未操作更新为未操作';
  33 +
  34 +
  35 + /**
  36 + * @remark :更新半小时未操作的界面
  37 + * @name :handle
  38 + * @author :lyh
  39 + * @method :post
  40 + * @time :2024/8/28 15:25
  41 + */
  42 + public function handle(){
  43 + $date = date('Y-m-d H:i:s',time() - 30 * 60);
  44 + $operationHeartbeatModel = new OperationHeartbeat();
  45 + $operationHeartbeatModel->edit(['status'=>0],['updated_at'=>['<=',$date]]);
  46 + echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
  47 + }
  48 +}
@@ -25,22 +25,25 @@ class OperationHeartbeatController extends BaseController @@ -25,22 +25,25 @@ class OperationHeartbeatController extends BaseController
25 public function saveHeartbeat(){ 25 public function saveHeartbeat(){
26 $this->request->validate([ 26 $this->request->validate([
27 'source'=>'required', 27 'source'=>'required',
  28 + 'source_id'=>'required',
28 'is_list' => 'required', 29 'is_list' => 'required',
29 'is_custom'=>'required', 30 'is_custom'=>'required',
30 'is_template'=>'required', 31 'is_template'=>'required',
31 - 'operator_id'=>'required',  
32 ], [ 32 ], [
33 'source.required' => '请选择页面', 33 'source.required' => '请选择页面',
  34 + 'source_id.required' => '请选择数据id',
34 'is_list.required' => '列表页/详情页', 35 'is_list.required' => '列表页/详情页',
35 'is_custom.required' => '是否为扩展模版', 36 'is_custom.required' => '是否为扩展模版',
36 'is_template.required' => '详情页/可视化', 37 'is_template.required' => '详情页/可视化',
37 - 'operator_id.required' => '操作人',  
38 ]); 38 ]);
39 - $condition = ['source'=>$this->param['source'],'is_list'=>$this->param['is_list'],'is_custom'=>$this->param['is_custom'],'is_template'=>$this->param['is_template']]; 39 + $condition = ['project_id'=>$this->user['project_id'],'source'=>$this->param['source'],'source_id'=>$this->param['source_id'],
  40 + 'is_list'=>$this->param['is_list'],'is_custom'=>$this->param['is_custom'],'is_template'=>$this->param['is_template']];
40 $operationHeartbeatModel = new OperationHeartbeat(); 41 $operationHeartbeatModel = new OperationHeartbeat();
41 $info = $operationHeartbeatModel->read($condition,['id','status']); 42 $info = $operationHeartbeatModel->read($condition,['id','status']);
  43 + $condition['status'] = $condition['status'] ?? 0;
42 if($info === false){ 44 if($info === false){
43 - $condition['status'] = 1; 45 + $condition['operator_id'] = $this->user['id'];
  46 + $condition['project_id'] = $this->user['project_id'];
44 $operationHeartbeatModel->addReturnId($condition); 47 $operationHeartbeatModel->addReturnId($condition);
45 }else{ 48 }else{
46 $operationHeartbeatModel->edit(['status'=>1],['id'=>$info['id']]); 49 $operationHeartbeatModel->edit(['status'=>1],['id'=>$info['id']]);
@@ -58,18 +61,19 @@ class OperationHeartbeatController extends BaseController @@ -58,18 +61,19 @@ class OperationHeartbeatController extends BaseController
58 public function getInfo(){ 61 public function getInfo(){
59 $this->request->validate([ 62 $this->request->validate([
60 'source'=>'required', 63 'source'=>'required',
  64 + 'source_id'=>'required',
61 'is_list' => 'required', 65 'is_list' => 'required',
62 'is_custom'=>'required', 66 'is_custom'=>'required',
63 'is_template'=>'required', 67 'is_template'=>'required',
64 - 'operator_id'=>'required',  
65 ], [ 68 ], [
66 'source.required' => '请选择页面', 69 'source.required' => '请选择页面',
  70 + 'source_id.required' => '请选择数据id',
67 'is_list.required' => '列表页/详情页', 71 'is_list.required' => '列表页/详情页',
68 'is_custom.required' => '是否为扩展模版', 72 'is_custom.required' => '是否为扩展模版',
69 'is_template.required' => '详情页/可视化', 73 'is_template.required' => '详情页/可视化',
70 - 'operator_id.required' => '操作人',  
71 ]); 74 ]);
72 - $condition = ['source'=>$this->param['source'],'is_list'=>$this->param['is_list'],'is_custom'=>$this->param['is_custom'],'is_template'=>$this->param['is_template']]; 75 + $condition = ['project_id'=>$this->user['project_id'],'source'=>$this->param['source'],'source_id'=>$this->param['source_id'],
  76 + 'is_list'=>$this->param['is_list'],'is_custom'=>$this->param['is_custom'],'is_template'=>$this->param['is_template']];
73 $operationHeartbeatModel = new OperationHeartbeat(); 77 $operationHeartbeatModel = new OperationHeartbeat();
74 $info = $operationHeartbeatModel->read($condition,['id','status']); 78 $info = $operationHeartbeatModel->read($condition,['id','status']);
75 $this->response('success',Code::SUCCESS,$info); 79 $this->response('success',Code::SUCCESS,$info);
@@ -370,6 +370,10 @@ class ImageController extends Controller @@ -370,6 +370,10 @@ class ImageController extends Controller
370 */ 370 */
371 public function getProjectConfig($project_id = 0){ 371 public function getProjectConfig($project_id = 0){
372 $str = ''; 372 $str = '';
  373 + $is_watermark = ($this->cache['is_watermark'] ?? 0);
  374 + if($is_watermark != 1){
  375 + return $str;
  376 + }
373 $imageSettingModel = new ImageSetting(); 377 $imageSettingModel = new ImageSetting();
374 $settingInfo = $imageSettingModel->read(['project_id'=>$project_id]); 378 $settingInfo = $imageSettingModel->read(['project_id'=>$project_id]);
375 if($settingInfo !== false){ 379 if($settingInfo !== false){
@@ -601,8 +601,11 @@ Route::middleware(['bloginauth'])->group(function () { @@ -601,8 +601,11 @@ Route::middleware(['bloginauth'])->group(function () {
601 Route::any('/del', [\App\Http\Controllers\Bside\Inquiry\InquiryFieldController::class, 'del'])->name('inquiry_field_del'); 601 Route::any('/del', [\App\Http\Controllers\Bside\Inquiry\InquiryFieldController::class, 'del'])->name('inquiry_field_del');
602 }); 602 });
603 603
  604 + //获取心跳
604 Route::prefix('operation_heartbeat')->group(function () { 605 Route::prefix('operation_heartbeat')->group(function () {
605 Route::any('/saveHeartbeat', [\App\Http\Controllers\Bside\BCom\OperationHeartbeatController::class, 'saveHeartbeat'])->name('operation_heartbeat_saveHeartbeat'); 606 Route::any('/saveHeartbeat', [\App\Http\Controllers\Bside\BCom\OperationHeartbeatController::class, 'saveHeartbeat'])->name('operation_heartbeat_saveHeartbeat');
  607 + Route::any('/getInfo', [\App\Http\Controllers\Bside\BCom\OperationHeartbeatController::class, 'getInfo'])->name('operation_heartbeat_getInfo');
  608 +
606 }); 609 });
607 }); 610 });
608 //无需登录验证的路由组 611 //无需登录验证的路由组