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

@@ -87,7 +87,7 @@ class ReplaceHtmlLog extends Command
         if($info['template_id'] == 0){
             $bTemplateModel->formatQuery($condition)->update(['html' => DB::raw("REPLACE(html, '$old_html', '$html')")]);
         }else{
-            $bTemplateModel->formatQuery($condition)->update(['main_html' => DB::raw("REPLACE(main_html, '$old_html', '$html')")]);
+            $bTemplateModel->formatQuery($condition)->update(['main_html' => DB::raw("REPLACE(main_html, ?, ?)", [$old_html, $html])]);
         }
         return true;
     }

+<?php
+/**
+ * @remark :
+ * @name   :UpdateHeartbeat.php
+ * @author :lyh
+ * @method :post
+ * @time   :2024/8/28 15:13
+ */
+
+namespace App\Console\Commands\Update;
+
+use App\Models\Log\OperationHeartbeat;
+use App\Models\Project\Project;
+use App\Services\ProjectServer;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
+
+class UpdateHeartbeat extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'operation_heartbeat';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = '心跳半小时未操作更新为未操作';
+
+
+    /**
+     * @remark :更新半小时未操作的界面
+     * @name   :handle
+     * @author :lyh
+     * @method :post
+     * @time   :2024/8/28 15:25
+     */
+    public function handle(){
+        $date = date('Y-m-d H:i:s',time() - 30 * 60);
+        $operationHeartbeatModel = new OperationHeartbeat();
+        $operationHeartbeatModel->edit(['status'=>0],['updated_at'=>['<=',$date]]);
+        echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
+    }
+}

@@ -25,22 +25,25 @@ class OperationHeartbeatController extends BaseController
     public function saveHeartbeat(){
         $this->request->validate([
             'source'=>'required',
+            'source_id'=>'required',
             'is_list' => 'required',
             'is_custom'=>'required',
             'is_template'=>'required',
-            'operator_id'=>'required',
         ], [
             'source.required' => '请选择页面',
+            'source_id.required' => '请选择数据id',
             'is_list.required' => '列表页/详情页',
             'is_custom.required' => '是否为扩展模版',
             'is_template.required' => '详情页/可视化',
-            'operator_id.required' => '操作人',
         ]);
-        $condition = ['source'=>$this->param['source'],'is_list'=>$this->param['is_list'],'is_custom'=>$this->param['is_custom'],'is_template'=>$this->param['is_template']];
+        $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();
         $info = $operationHeartbeatModel->read($condition,['id','status']);
+        $condition['status'] = $condition['status'] ?? 0;
         if($info === false){
-            $condition['status'] = 1;
+            $condition['operator_id'] = $this->user['id'];
+            $condition['project_id'] = $this->user['project_id'];
             $operationHeartbeatModel->addReturnId($condition);
         }else{
             $operationHeartbeatModel->edit(['status'=>1],['id'=>$info['id']]);
@@ -58,18 +61,19 @@ class OperationHeartbeatController extends BaseController
     public function getInfo(){
         $this->request->validate([
             'source'=>'required',
+            'source_id'=>'required',
             'is_list' => 'required',
             'is_custom'=>'required',
             'is_template'=>'required',
-            'operator_id'=>'required',
         ], [
             'source.required' => '请选择页面',
+            'source_id.required' => '请选择数据id',
             'is_list.required' => '列表页/详情页',
             'is_custom.required' => '是否为扩展模版',
             'is_template.required' => '详情页/可视化',
-            'operator_id.required' => '操作人',
         ]);
-        $condition = ['source'=>$this->param['source'],'is_list'=>$this->param['is_list'],'is_custom'=>$this->param['is_custom'],'is_template'=>$this->param['is_template']];
+        $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();
         $info = $operationHeartbeatModel->read($condition,['id','status']);
         $this->response('success',Code::SUCCESS,$info);

@@ -370,6 +370,10 @@ class ImageController extends Controller
      */
     public function getProjectConfig($project_id = 0){
         $str = '';
+        $is_watermark = ($this->cache['is_watermark'] ?? 0);
+        if($is_watermark != 1){
+            return $str;
+        }
         $imageSettingModel = new ImageSetting();
         $settingInfo = $imageSettingModel->read(['project_id'=>$project_id]);
         if($settingInfo !== false){

@@ -601,8 +601,11 @@ Route::middleware(['bloginauth'])->group(function () {
         Route::any('/del', [\App\Http\Controllers\Bside\Inquiry\InquiryFieldController::class, 'del'])->name('inquiry_field_del');
     });
 
+    //获取心跳
     Route::prefix('operation_heartbeat')->group(function () {
         Route::any('/saveHeartbeat', [\App\Http\Controllers\Bside\BCom\OperationHeartbeatController::class, 'saveHeartbeat'])->name('operation_heartbeat_saveHeartbeat');
+        Route::any('/getInfo', [\App\Http\Controllers\Bside\BCom\OperationHeartbeatController::class, 'getInfo'])->name('operation_heartbeat_getInfo');
+
     });
 });
 //无需登录验证的路由组