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

@@ -104,11 +104,13 @@ class ATemplateController extends BaseController
      * @method :post
      * @time   :2023/7/10 15:30
      */
-    public function setHead(ATemplateLogic $aTemplateLogic){
+    public function setHeadFooter(ATemplateLogic $aTemplateLogic){
         $this->request->validate([
-            'values'=>'required'
+            'head'=>'required',
+            'footer'=>'required'
         ],[
-            'values.required' => 'values不能为空'
+            'head.required' => 'head不能为空',
+            'footer.required' => 'footer不能为空'
         ]);
         $aTemplateLogic->setHeadSave();
         $this->response('success');

@@ -132,9 +132,11 @@ class ATemplateLogic extends BaseLogic
         DB::beginTransaction();
         try {
             $serviceSettingModel->del(['type'=>2]);
-            $this->param['type'] = 2;
-            $this->param['key'] = 'head';
-            $serviceSettingModel->add($this->param);
+            $data = [
+                ['type'=>2,'key'=>'head','values'=>$this->param['head'],'created_at'=>date('Y-m-d H:i:s'),'updated_at'=>date('Y-m-d H:i:s')],
+                ['type'=>2,'key'=>'footer','values'=>$this->param['footer'],'created_at'=>date('Y-m-d H:i:s'),'updated_at'=>date('Y-m-d H:i:s')]
+            ];
+            $serviceSettingModel->insert($data);
             DB::commit();
         }catch (Exception $e){
             DB::rollBack();