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

+<?php
+
+namespace App\Http\Controllers\Bside\Nav;
+
+
+use App\Enums\Common\Code;
+use App\Http\Controllers\Bside\BaseController;
+use App\Models\Nav\BNavGroup;
+use Illuminate\Http\Request;
+
+/**
+ * 导航组
+ * Class NavGroupController
+ * @package App\Http\Controllers\Bside\Nav
+ * @author zbj
+ * @date 2023/10/9
+ */
+class NavGroupController extends BaseController
+{
+
+    public function index(BNavGroup $nav_group){
+        $this->map['project_id'] = $this->user['project_id'];
+        $lists = $nav_group->list($this->map, 'id', ['id', 'name'], 'asc');
+        $this->response('success',Code::SUCCESS,$lists);
+    }
+
+    public function save(Request $request){
+        $request->validate([
+            'name'=> ['required','max:100'],
+        ],[
+            'name.required' => '菜单组名称不能为空',
+            'name.max' => '菜单组名称不能超过100个字符'
+        ]);
+        if(empty($this->param['id'])){
+            $nav_group = new BNavGroup();
+        }else{
+            if(in_array($this->param['id'], [BNavGroup::DEFAULT_HEADER_ID,BNavGroup::DEFAULT_FOOTER_ID])){
+                $this->fail('系统内置菜单组不能修改');
+            }
+            $nav_group = BNavGroup::find($this->param['id']);
+            if(!$nav_group){
+                $this->fail('数据不存在或者已经删除');
+            }
+        }
+        $nav_group->project_id = $this->user['project_id'];
+        $nav_group->name = $this->param['name'];
+        $nav_group->save();
+
+        $this->response('success');
+    }
+
+    public function delete(Request $request){
+        $request->validate([
+            'id'=>'required',
+        ],[
+            'id.required' => 'ID不能为空',
+        ]);
+        if(in_array($this->param['id'], [BNavGroup::DEFAULT_HEADER_ID,BNavGroup::DEFAULT_FOOTER_ID])){
+            $this->fail('系统内置菜单组不能删除');
+        }
+        $nav_group = BNavGroup::find($this->param['id']);
+        if(!$nav_group){
+            $this->response('数据不存在或者已经删除');
+        }
+        $nav_group->delete();
+
+        $this->response('success');
+    }
+}

@@ -158,8 +158,6 @@ class ProjectLogic extends BaseLogic
                 'upload_max_size' => $param['upload_config']['upload_max_size'] ?? 5,
             ];
         }
-
-
         $this->model->edit($param,['id'=>$param['id']]);
         Common::del_user_cache($this->model->getTable(),$param['id']);
         return $this->success();
@@ -196,9 +194,6 @@ class ProjectLogic extends BaseLogic
      */
     protected function saveProjectDeployBuild($deploy_build){
         $deployBuildModel = new DeployBuild();
-        if(isset($deploy_build['configuration']['build_status']) && ($deploy_build['configuration']['build_status'] == 0)){
-
-        }
         $deploy_build['configuration'] = Arr::a2s(!empty($deploy_build['configuration']) ? $deploy_build['configuration'] : []);
         $deployBuildModel->edit($deploy_build,['id'=>$deploy_build['id']]);
         return $this->success();

@@ -7,7 +7,6 @@ use App\Models\Service\Service as ServiceSettingModel;
 use App\Models\Template\Template;
 use App\Models\Template\Setting;
 use Illuminate\Support\Facades\DB;
-use mysql_xdevapi\Exception;
 
 class ATemplateLogic extends BaseLogic
 {
@@ -141,7 +140,7 @@ class ATemplateLogic extends BaseLogic
             ];
             $serviceSettingModel->insert($data);
             DB::commit();
-        }catch (Exception $e){
+        }catch (\Exception $e){
             DB::rollBack();
             $this->fail('error');
         }

@@ -33,7 +33,7 @@ class WebSettingReceivingLogic extends BaseLogic
      * @time   :2023/5/8 16:26
      */
     public function setting_receiving_save(){
-//        try {
+        try {
             $this->model->del(['project_id'=>$this->user['project_id']]);
             foreach ($this->param['data'] as $k => $v){
                 $v['project_id'] = $this->user['project_id'];
@@ -42,9 +42,9 @@ class WebSettingReceivingLogic extends BaseLogic
                 $this->param['data'][$k] = $v;
             }
             $this->model->insert($this->param['data']);
-//        }catch (\Exception $e){
-//            $this->fail('error');
-//        }
+        }catch (\Exception $e){
+            $this->fail('error');
+        }
         return $this->success();
     }
 }

@@ -41,6 +41,9 @@ class WebSettingServiceLogic extends BaseLogic
             //删除以前的数据
             $this->model->del(['project_id'=>$this->user['project_id']]);
             foreach ($this->param['data'] as $k => $v){
+                if(!isset($v['values']) || empty($v['values'])){
+                    $v['values']  = '';
+                }
                 $v['project_id'] = $this->user['project_id'];
                 $v['created_at'] = date('Y-m-d H:i:s');
                 $v['updated_at'] = date('Y-m-d H:i:s');
@@ -50,7 +53,7 @@ class WebSettingServiceLogic extends BaseLogic
             DB::commit();
         }catch (\Exception $e){
             DB::rollBack();
-            $this->fail('error');
+            $this->fail('系统错误，请联系管理员');
         }
         return $this->success();
     }

@@ -32,6 +32,7 @@ class NavRequest extends FormRequest
     public function rules()
     {
         $rule = [
+            'group_id'   =>  ['required','integer'],
             'pid'   =>  ['required','integer'],
             'name'   =>  ['required','max:100'],
         ];
@@ -41,6 +42,8 @@ class NavRequest extends FormRequest
     public function messages()
     {
         return [
+            'group_id.required'  =>  '未定义菜单组',
+            'group_id.integer'  =>  '菜单组错误',
             'pid.required'  =>  '上级选择错误',
             'pid.gte'  =>  '上级选择错误',
             'pid.integer'  =>  '上级选择错误',

+<?php
+
+namespace App\Models\Nav;
+
+use App\Models\Base;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+/**
+ * Class BNavGroup
+ * @package App\Models\Nav
+ * @author zbj
+ * @date 2023/10/9
+ */
+class BNavGroup extends Base
+{
+
+    protected $table = 'gl_web_nav_group';
+    //连接数据库
+    protected $connection = 'custom_mysql';
+    use SoftDeletes;
+
+    public $hidden = ['deleted_at'];
+
+    const DEFAULT_HEADER_ID = 1;
+    const DEFAULT_FOOTER_ID = 2;
+
+}

+<?php
+/**
+ * @remark :
+ * @name   :BTemplateCommon.php
+ * @author :lyh
+ * @method :post
+ * @time   :2023/10/13 11:45
+ */
+
+namespace App\Models\Template;
+
+use App\Models\Base;
+
+class BTemplateCommon extends Base
+{
+    protected $table = 'gl_template_common';
+    //连接数据库
+    protected $connection = 'custom_mysql';
+}