Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into develop

@@ -96,4 +96,33 @@ class ATemplateController extends BaseController
         $aTemplateLogic->aTemplateDel();
         $aTemplateLogic->aTemplateDel();
         $this->response('success');
         $this->response('success');
     }
     }
+
+    /**
+     * @remark :公共主题设置公共head
+     * @name   :setHead
+     * @author :lyh
+     * @method :post
+     * @time   :2023/7/10 15:30
+     */
+    public function setHead(ATemplateLogic $aTemplateLogic){
+        $this->request->validate([
+            'values'=>'required'
+        ],[
+            'values.required' => 'values不能为空'
+        ]);
+        $aTemplateLogic->setHeadSave();
+        $this->response('success');
+    }
+
+    /**
+     * @remark :获取公共主题head
+     * @name   :getHead
+     * @author :lyh
+     * @method :post
+     * @time   :2023/7/10 15:30
+     */
+    public function getHead(ATemplateLogic $aTemplateLogic){
+        $info = $aTemplateLogic->getHeadInfo();
+        $this->response('success',Code::SUCCESS,$info);
+    }
 }
 }

+<?php
+
+namespace App\Http\Controllers\Aside\Template;
+
+use App\Http\Controllers\Aside\BaseController;
+use App\Http\Logic\Aside\Template\ATemplateTypeLogic;
+use App\Http\Requests\Aside\Template\ATemplateTypeRequest;
+
+/**
+ * @remark :左边模块类型
+ * @class  :ATemplateTypeController.php
+ * @author :lyh
+ * @time   :2023/7/10 15:49
+ */
+class ATemplateTypeController extends BaseController
+{
+    /**
+     * @remark :设置类型
+     * @name   :save
+     * @author :lyh
+     * @method :post
+     * @time   :2023/7/10 15:49
+     */
+    public function save(ATemplateTypeRequest $ATemplateTypeRequest,ATemplateTypeLogic $ATemplateTypeLogic){
+        if(isset($this->param['id']) && !empty($this->param['id'])){
+            $this->request->validate([
+                'id'=>'required'
+            ],[
+                'id.required' => 'ID不能为空'
+            ]);
+        }
+        $ATemplateTypeRequest->validated();
+        $ATemplateTypeLogic->typeSave();
+        $this->response('success');
+    }
+}

@@ -15,6 +15,7 @@ class BlogController extends BaseController
 {
 {
     //通知别名
     //通知别名
     public $updateModelView = 'blog';
     public $updateModelView = 'blog';
+
     /**
     /**
      * @name :博客列表
      * @name :博客列表
      * @author :liyuhang
      * @author :liyuhang
@@ -38,6 +39,7 @@ class BlogController extends BaseController
         }
         }
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }
+
     /**
     /**
      * @remark :根据状态数量
      * @remark :根据状态数量
      * @name   :getStatusNumber
      * @name   :getStatusNumber
@@ -60,6 +62,7 @@ class BlogController extends BaseController
         $list = $blogLogic->blog_get_category_list();
         $list = $blogLogic->blog_get_category_list();
         $this->response('success',Code::SUCCESS,$list);
         $this->response('success',Code::SUCCESS,$list);
     }
     }
+
     /**
     /**
      * @name :获取当前博客详情
      * @name :获取当前博客详情
      * @author :liyuhang
      * @author :liyuhang
@@ -76,6 +79,7 @@ class BlogController extends BaseController
         $info['url'] = $this->getProjectDomain() . $info['route'];
         $info['url'] = $this->getProjectDomain() . $info['route'];
         $this->response('success',Code::SUCCESS,$info);
         $this->response('success',Code::SUCCESS,$info);
     }
     }
+
     /**
     /**
      * @name :添加博客
      * @name :添加博客
      * @author :liyuhang
      * @author :liyuhang
@@ -126,6 +130,7 @@ class BlogController extends BaseController
         $blogLogic->edit_seo();
         $blogLogic->edit_seo();
         $this->response('success');
         $this->response('success');
     }
     }
+
     /**
     /**
      * @name :编辑博客状态/排序
      * @name :编辑博客状态/排序
      * @author :liyuhang
      * @author :liyuhang

@@ -3,8 +3,11 @@
 namespace App\Http\Logic\Aside\Template;
 namespace App\Http\Logic\Aside\Template;
 
 
 use App\Http\Logic\Aside\BaseLogic;
 use App\Http\Logic\Aside\BaseLogic;
+use App\Models\Service\Service as ServiceSettingModel;
 use App\Models\Template\Template;
 use App\Models\Template\Template;
 use App\Models\Template\BSetting;
 use App\Models\Template\BSetting;
+use Illuminate\Support\Facades\DB;
+use mysql_xdevapi\Exception;
 
 
 class ATemplateLogic extends BaseLogic
 class ATemplateLogic extends BaseLogic
 {
 {
@@ -116,4 +119,39 @@ class ATemplateLogic extends BaseLogic
         }
         }
         return $this->success($info);
         return $this->success($info);
     }
     }
+
+    /**
+     * @remark :设置主题公共head
+     * @name   :setHeadInfo
+     * @author :lyh
+     * @method :post
+     * @time   :2023/7/10 15:32
+     */
+    public function setHeadSave(){
+        $serviceSettingModel = new ServiceSettingModel();
+        DB::beginTransaction();
+        try {
+            $serviceSettingModel->del(['type'=>2]);
+            $this->param['type'] = 2;
+            $this->param['key'] = 'head';
+            $serviceSettingModel->add($this->param);
+            DB::commit();
+        }catch (Exception $e){
+            DB::rollBack();
+            $this->fail('error');
+        }
+    }
+
+    /**
+     * @remark :获取主题公共head
+     * @name   :getHeadInfo
+     * @author :lyh
+     * @method :post
+     * @time   :2023/7/10 15:33
+     */
+    public function getHeadInfo(){
+        $serviceSettingModel = new ServiceSettingModel();
+        $info = $serviceSettingModel->read(['type'=>2,'key'=>'head']);
+        return $this->success($info);
+    }
 }
 }

+<?php
+
+namespace App\Http\Logic\Aside\Template;
+
+use App\Http\Logic\Aside\BaseLogic;
+use App\Models\Template\TemplateType;
+
+/**
+ * @remark :
+ * @class  :ATemplateTypeLogic.php
+ * @author :lyh
+ * @time   :2023/7/10 15:52
+ */
+class ATemplateTypeLogic extends BaseLogic
+{
+    public function __construct()
+    {
+        parent::__construct();
+        $this->model = new TemplateType();
+        $this->param = $this->requestAll;
+    }
+
+    /**
+     * @remark :保存类型
+     * @name   :TypeSave
+     * @author :lyh
+     * @method :post
+     * @time   :2023/7/10 15:53
+     */
+    public function typeSave(){
+        if(isset($this->param['id']) && !empty($this->param['id'])){
+            $rs = $this->model->edit($this->param,['id'=>$this->param['id']]);
+        }else{
+            $rs = $this->model->add($this->param);
+        }
+        if($rs === false){
+            $this->fail('error');
+        }
+        return $this->success();
+    }
+}

@@ -195,4 +195,5 @@ class CountLogic extends BaseLogic
         }
         }
         return $this->success($lists);
         return $this->success($lists);
     }
     }
+
 }
 }

+<?php
+
+namespace App\Http\Requests\Aside\Template;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+/**
+ * @remark :
+ * @class  :ATemplateTypeRequest.php
+ * @author :lyh
+ * @time   :2023/7/10 16:01
+ */
+class ATemplateTypeRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'name'=>'required',
+        ];
+    }
+
+    public function messages()
+    {
+        return [
+            'name.required'=>'名称不能为空',
+        ];
+    }
+}

@@ -235,7 +235,9 @@ Route::group([], function () {
         Route::any('/save', [Aside\Template\ATemplateController::class, 'save'])->name('admin.ATemplate_save');
         Route::any('/save', [Aside\Template\ATemplateController::class, 'save'])->name('admin.ATemplate_save');
         Route::any('/status', [Aside\Template\ATemplateController::class, 'status'])->name('admin.ATemplate_status');
         Route::any('/status', [Aside\Template\ATemplateController::class, 'status'])->name('admin.ATemplate_status');
         Route::any('/del', [Aside\Template\ATemplateController::class, 'del'])->name('admin.ATemplate_del');
         Route::any('/del', [Aside\Template\ATemplateController::class, 'del'])->name('admin.ATemplate_del');
-
+        //设置公共主题head
+        Route::any('/setHead', [Aside\Template\ATemplateController::class, 'setHead'])->name('template_setHead');
+        Route::any('/getHead', [Aside\Template\ATemplateController::class, 'getHead'])->name('template_getHead');
         // 左侧模块
         // 左侧模块
         Route::prefix('module')->group(function () {
         Route::prefix('module')->group(function () {
             Route::any('/', [Aside\Template\ATemplateModuleController::class, 'lists'])->name('admin.ATemplateModule_lists');
             Route::any('/', [Aside\Template\ATemplateModuleController::class, 'lists'])->name('admin.ATemplateModule_lists');
@@ -244,6 +246,10 @@ Route::group([], function () {
             Route::any('/del', [Aside\Template\ATemplateModuleController::class, 'del'])->name('admin.ATemplateModule_del');
             Route::any('/del', [Aside\Template\ATemplateModuleController::class, 'del'])->name('admin.ATemplateModule_del');
             Route::any('/type', [Aside\Template\ATemplateModuleController::class, 'getType'])->name('admin.ATemplateModule_getType');
             Route::any('/type', [Aside\Template\ATemplateModuleController::class, 'getType'])->name('admin.ATemplateModule_getType');
         });
         });
+        //设置类型
+        Route::prefix('type')->group(function () {
+            Route::any('/save', [Aside\Template\ATemplateTypeController::class, 'save'])->name('admin.ATemplateType_save');
+        });
     });
     });
 });
 });