周海龙 / globalso · 提交

转到一个项目

作者 lyh
提交 2109af0808977ca19a709f6aaa81a3f4d9a2112f 2 个父辈 374bc551 5ffd8529

gx脚本错误合并问题

内嵌 并排对比
正在显示 6 个修改的文件 包含 47 行增加 和 104 行删除
... ... @@ -24,7 +24,6 @@ use App\Models\Product\Keyword;
use App\Models\Product\Product;
use App\Models\Project\DeployOptimize;
use App\Models\Project\MinorLanguages;
use App\Models\Project\PageSetting;
use App\Models\Project\Project;
use App\Models\Purchaser\PurchaserInfo;
use App\Models\RouteMap\RouteMap;
... ... @@ -53,105 +52,6 @@ class Demo extends Command
protected $description = 'demo';
public function handle(){
$pageSettingModel = new PageSetting();
$pageList = $pageSettingModel->list();
foreach ($pageList as $v){
ProjectServer::useProject($v['project_id']);
if($v['product_list'] == 1){
$param = [
'name'=>'产品列表',
'source'=>2,
'is_list'=>1,
'is_custom'=>0,
'header_status'=>1,
'footer_status'=>1,
'created_at'=>date('Y-m-d H:i:s'),
'updated_at'=>date('Y-m-d H:i:s'),
];
DB::connection('custom_mysql')->table('gl_project_com_config')->insert($param);
}
if($v['product_details'] == 1){
$param = [
'name'=>'产品详情',
'source'=>2,
'is_list'=>0,
'is_custom'=>0,
'header_status'=>1,
'footer_status'=>1,
'created_at'=>date('Y-m-d H:i:s'),
'updated_at'=>date('Y-m-d H:i:s'),
];
DB::connection('custom_mysql')->table('gl_project_com_config')->insert($param);
}
if($v['page_list'] == 1){
$param = [
'name'=>'单页面',
'source'=>9,
'is_list'=>0,
'is_custom'=>0,
'header_status'=>1,
'footer_status'=>1,
'created_at'=>date('Y-m-d H:i:s'),
'updated_at'=>date('Y-m-d H:i:s'),
];
DB::connection('custom_mysql')->table('gl_project_com_config')->insert($param);
}
if($v['blog_list'] == 1){
$param = [
'name'=>'博客列表',
'source'=>3,
'is_list'=>1,
'is_custom'=>0,
'header_status'=>1,
'footer_status'=>1,
'created_at'=>date('Y-m-d H:i:s'),
'updated_at'=>date('Y-m-d H:i:s'),
];
DB::connection('custom_mysql')->table('gl_project_com_config')->insert($param);
}
if($v['blog_details'] == 1){
$param = [
'name'=>'博客详情',
'source'=>3,
'is_list'=>0,
'is_custom'=>0,
'header_status'=>1,
'footer_status'=>1,
'created_at'=>date('Y-m-d H:i:s'),
'updated_at'=>date('Y-m-d H:i:s'),
];
DB::connection('custom_mysql')->table('gl_project_com_config')->insert($param);
}
if($v['news_list'] == 1){
$param = [
'name'=>'新闻列表',
'source'=>4,
'is_list'=>1,
'is_custom'=>0,
'header_status'=>1,
'footer_status'=>1,
'created_at'=>date('Y-m-d H:i:s'),
'updated_at'=>date('Y-m-d H:i:s'),
];
DB::connection('custom_mysql')->table('gl_project_com_config')->insert($param);
}
if($v['news_details'] == 1){
$param = [
'name'=>'新闻详情',
'source'=>4,
'is_list'=>0,
'is_custom'=>0,
'header_status'=>1,
'footer_status'=>1,
'created_at'=>date('Y-m-d H:i:s'),
'updated_at'=>date('Y-m-d H:i:s'),
];
DB::connection('custom_mysql')->table('gl_project_com_config')->insert($param);
}
DB::disconnect('custom_mysql');
}
}
... ...
... ... @@ -26,4 +26,21 @@ class BProjectIsComController extends BaseController
$data = $logic->getIsComConfig();
$this->response('success',Code::SUCCESS,$data);
}
/**
* @remark :保存配置
* @name :saveComConfig
* @author :lyh
* @method :post
* @time :2024/8/1 15:38
*/
public function saveComConfig(BProjectIsComLogic $logic){
$this->request->validate([
'data'=>'required',
],[
'data.required' => 'data不能为空',
]);
$logic->saveComConfig();
$this->response('success');
}
}
... ...
... ... @@ -70,7 +70,7 @@ class BProjectIsComLogic extends BaseLogic
$is_list = [self::IS_LIST,self::IS_DETAIL];
foreach ($is_list as $isValue){
//查询当前数据是否已保存
$info = $this->read(['source'=>$pValue,'is_list'=>$isValue,'is_custom'=>BTemplate::IS_NO_CUSTOM],['name','source','is_list','is_custom','header_status','footer_status']);
$info = $this->model->read(['source'=>$pValue,'is_list'=>$isValue,'is_custom'=>BTemplate::IS_NO_CUSTOM],['name','source','is_list','is_custom','header_status','footer_status']);
if($info !== false){
$data[] = $info;
}else{
... ... @@ -98,7 +98,7 @@ class BProjectIsComLogic extends BaseLogic
public function initPageParamData(&$data){
$initPageParam = $this->model->initPageParam;
foreach($initPageParam as $key => $value){
$info = $this->read(['source'=>$value,'is_list'=>self::IS_DETAIL,'is_custom'=>BTemplate::IS_NO_CUSTOM],['name','source','is_list','is_custom','header_status','footer_status']);
$info = $this->model->read(['source'=>$value,'is_list'=>self::IS_DETAIL,'is_custom'=>BTemplate::IS_NO_CUSTOM],['name','source','is_list','is_custom','header_status','footer_status']);
if($info !== false){
$data[] = $info;
}else{
... ... @@ -145,4 +145,26 @@ class BProjectIsComLogic extends BaseLogic
}
return $this->success($data);
}
/**
* @remark :保存配置
* @name :saveComConfig
* @author :lyh
* @method :post
* @time :2024/8/1 15:41
*/
public function saveComConfig(){
$data = $this->param['data'];
foreach ($data as $k => $v){
if(isset($v['id']) && !empty($v['id'])){
$id = $v['id'];
unset($v['id']);
$this->model->edit($v,['id'=>$id]);
}else{
//查询当前数据是否存在
$this->model->add($v);
}
}
return $this->success();
}
}
... ...
... ... @@ -188,6 +188,7 @@ class UserLoginLogic
$info['is_visualization'] = json_decode($project['is_visualization']);
}
$info['is_visualization_authority'] = $project['deploy_build']['is_visualization_authority'];
$info['is_inquiry_country'] = $project['is_inquiry_country'];
//是否开通AMP
$is_amp = 0;
if(!empty($project['deploy_optimize']['domain'])){
... ... @@ -293,6 +294,7 @@ class UserLoginLogic
$info['is_visualization'] = json_decode($project['is_visualization']);
}
$info['is_visualization_authority'] = $project['deploy_build']['is_visualization_authority'];
$info['is_inquiry_country'] = $project['is_inquiry_country'];
//是否开通AMP
$is_amp = 0;
if(!empty($project['deploy_optimize']['domain'])){
... ...
... ... @@ -30,7 +30,6 @@ class ProjectIsCom extends Base
* @var array
*/
public $initParam = [
'首页'=>BTemplate::SOURCE_HOME,
'产品'=>BTemplate::SOURCE_PRODUCT,
'博客'=>BTemplate::SOURCE_BLOG,
'新闻'=>BTemplate::SOURCE_NEWS,
... ... @@ -41,6 +40,7 @@ class ProjectIsCom extends Base
* @var array
*/
public $initPageParam = [
'首页'=>BTemplate::SOURCE_HOME,
'单页面'=>BTemplate::SOURCE_PAGE,
];
... ...
... ... @@ -556,7 +556,9 @@ Route::middleware(['bloginauth'])->group(function () {
});
//设置公共头部+底部配置
Route::prefix('com_config')->group(function () {
Route::any('/getIsComConfig', [\App\Http\Controllers\Bside\Template\BProjectIsComController::class, 'getIsComConfig'])->name('template_label_getUserLists');
Route::any('/getIsComConfig', [\App\Http\Controllers\Bside\Template\BProjectIsComController::class, 'getIsComConfig'])->name('com_config_getIsComConfig');
Route::any('/saveComConfig', [\App\Http\Controllers\Bside\Template\BProjectIsComController::class, 'saveComConfig'])->name('com_config_getIsComConfig');
});
});
//无需登录验证的路由组
... ...