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

@@ -112,7 +112,7 @@ class ATemplateController extends BaseController
             'head.required' => 'head不能为空',
             'head.required' => 'head不能为空',
             'footer.required' => 'footer不能为空'
             'footer.required' => 'footer不能为空'
         ]);
         ]);
-        $aTemplateLogic->setHeadSave();
+        $aTemplateLogic->setHeadFooterSave();
         $this->response('success');
         $this->response('success');
     }
     }
 
 
@@ -123,8 +123,8 @@ class ATemplateController extends BaseController
      * @method :post
      * @method :post
      * @time   :2023/7/10 15:30
      * @time   :2023/7/10 15:30
      */
      */
-    public function getHead(ATemplateLogic $aTemplateLogic){
-        $info = $aTemplateLogic->getHeadInfo();
+    public function getHeadFooter(ATemplateLogic $aTemplateLogic){
+        $info = $aTemplateLogic->getHeadFooterInfo();
         $this->response('success',Code::SUCCESS,$info);
         $this->response('success',Code::SUCCESS,$info);
     }
     }
 }
 }

@@ -127,7 +127,7 @@ class ATemplateLogic extends BaseLogic
      * @method :post
      * @method :post
      * @time   :2023/7/10 15:32
      * @time   :2023/7/10 15:32
      */
      */
-    public function setHeadSave(){
+    public function setHeadFooterSave(){
         $serviceSettingModel = new ServiceSettingModel();
         $serviceSettingModel = new ServiceSettingModel();
         DB::beginTransaction();
         DB::beginTransaction();
         try {
         try {
@@ -151,9 +151,9 @@ class ATemplateLogic extends BaseLogic
      * @method :post
      * @method :post
      * @time   :2023/7/10 15:33
      * @time   :2023/7/10 15:33
      */
      */
-    public function getHeadInfo(){
+    public function getHeadFooterInfo(){
         $serviceSettingModel = new ServiceSettingModel();
         $serviceSettingModel = new ServiceSettingModel();
-        $info = $serviceSettingModel->read(['type'=>2,'key'=>'head'],['key','values','created_at']);
+        $info = $serviceSettingModel->read(['type'=>2],['key','values','created_at']);
         return $this->success($info);
         return $this->success($info);
     }
     }
 }
 }

@@ -239,8 +239,8 @@ Route::group([], function () {
         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
         //设置公共主题head
-        Route::any('/setHead', [Aside\Template\ATemplateController::class, 'setHead'])->name('template_setHead');
-        Route::any('/getHead', [Aside\Template\ATemplateController::class, 'getHead'])->name('template_getHead');
+        Route::any('/setHeadFooter', [Aside\Template\ATemplateController::class, 'setHeadFooter'])->name('template_setHeadFooter');
+        Route::any('/getHeadFooter', [Aside\Template\ATemplateController::class, 'getHeadFooter'])->name('template_getHeadFooter');
         // 左侧模块
         // 左侧模块
         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');