周海龙 / globalso · 提交

转到一个项目

作者 lyh
提交 56f8d6df4f5e92cecd5fdc449c0c58c95e82a2d4 1 个父辈 3b4a2fc5

gx

内嵌 并排对比
正在显示 6 个修改的文件 包含 131 行增加 和 1 行删除
... ... @@ -105,6 +105,10 @@ class ComController extends BaseController
if($uploadCode != 1){
$info['role_menu'] = trim(str_replace(',41,',',',','.$info['role_menu'].','),',');
}
$projectCode = $this->getProjectWatermark();
if($projectCode != 1){
$info['role_menu'] = trim(str_replace(',50,',',',','.$info['role_menu'].','),',');
}
$this->map = [
'status'=>0,
'is_role'=>0,
... ... @@ -140,9 +144,28 @@ class ComController extends BaseController
if(!empty($data)){
$this->map['id'] = ['not in',$data];
}
$projectCode = $this->getProjectWatermark();
if($projectCode != 1){
$data[] = 50;
}
if(!empty($data)){
$this->map['id'] = ['not in',$data];
}
return $this->map;
}
/**
* @remark :是否开启水印功能
* @name :getProjectWatermark
* @author :lyh
* @method :post
* @time :2024/8/28 14:47
*/
public function getProjectWatermark(){
$projectModel = new Project();
$info = $projectModel->read(['id'=>$this->user['project_id']],['id','is_watermark']);
return $info['is_watermark'] ?? 0;
}
/**
* @remark :查看是否显示网站装饰
... ...
<?php
/**
* @remark :
* @name :OperationHeartbeatController.php
* @author :lyh
* @method :post
* @time :2024/8/28 14:02
*/
namespace App\Http\Controllers\Bside\BCom;
use App\Enums\Common\Code;
use App\Http\Controllers\Bside\BaseController;
use App\Models\Log\OperationHeartbeat;
class OperationHeartbeatController extends BaseController
{
/**
* @remark :保存数据
* @name :saveHeartbeat
* @author :lyh
* @method :post
* @time :2024/8/28 14:03
*/
public function saveHeartbeat(){
$this->request->validate([
'source'=>'required',
'is_list' => 'required',
'is_custom'=>'required',
'is_template'=>'required',
'operator_id'=>'required',
], [
'source.required' => '请选择页面',
'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']];
$operationHeartbeatModel = new OperationHeartbeat();
$info = $operationHeartbeatModel->read($condition,['id','status']);
if($info === false){
$condition['status'] = 1;
$operationHeartbeatModel->addReturnId($condition);
}else{
$operationHeartbeatModel->edit(['status'=>1],['id'=>$info['id']]);
}
$this->response('success');
}
/**
* @remark :获取当前详情
* @name :getInfo
* @author :lyh
* @method :post
* @time :2024/8/28 14:29
*/
public function getInfo(){
$this->request->validate([
'source'=>'required',
'is_list' => 'required',
'is_custom'=>'required',
'is_template'=>'required',
'operator_id'=>'required',
], [
'source.required' => '请选择页面',
'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']];
$operationHeartbeatModel = new OperationHeartbeat();
$info = $operationHeartbeatModel->read($condition,['id','status']);
$this->response('success',Code::SUCCESS,$info);
}
}
... ...
... ... @@ -180,6 +180,7 @@ class UserLoginLogic
$info['project_location'] = $project['project_location'];
$info['open_export_product'] = $project['open_export_product'];
$info['is_update_language'] = $project['is_update_language'];
$info['is_watermark'] = $project['is_watermark'];
$info['configuration'] = $project['deploy_build']['configuration'];
$info['file_cdn'] = $project['deploy_build']['file_cdn'];
$info['project_type'] = $project['type'];
... ... @@ -284,6 +285,7 @@ class UserLoginLogic
$info['uptime_type'] = $this->getHistory($project);
$info['uptime'] = $project['uptime'];
$info['is_update_language'] = $project['is_update_language'];
$info['is_watermark'] = $project['is_watermark'];
$info['configuration'] = $project['deploy_build']['configuration'];
$info['project_type'] = $project['type'];
$info['storage_type'] = $project['storage_type'];
... ...
<?php
/**
* @remark :
* @name :OperationHeartbeat.php
* @author :lyh
* @method :post
* @time :2024/8/28 10:35
*/
namespace App\Models\Log;
use App\Models\Base;
/**
* @remark :用户心跳
* @name :OperationHeartbeat
* @author :lyh
* @method :post
* @time :2024/8/28 10:36
*/
class OperationHeartbeat extends Base
{
protected $table = 'gl_operation_heartbeat';
}
... ...
... ... @@ -77,7 +77,6 @@ class Project extends Base
public static function planMap()
{
return [
10 => '专业版',
1 => '标准版',
2 => '商务版',
3 => '旗舰版',
... ... @@ -87,6 +86,7 @@ class Project extends Base
7 => '定制建站（PS订制）',
8 => '星链网站（1年版）',
9 => '星链网站（2年版）',
10 => '专业版',
11 => '俄语标准版',
12 => '俄语商务版',
14 => '俄语旗舰版',
... ...
... ... @@ -600,6 +600,10 @@ Route::middleware(['bloginauth'])->group(function () {
Route::any('/save', [\App\Http\Controllers\Bside\Inquiry\InquiryFieldController::class, 'save'])->name('inquiry_field_save');
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::group([], function () {
... ...