Merge remote-tracking branch 'origin/master' into zhl

@@ -55,7 +55,7 @@ class RemainDay extends Command
     {
     {
         $list = Project::whereIn('type', [2,3,4])->get();
         $list = Project::whereIn('type', [2,3,4])->get();
         foreach ($list as $item){
         foreach ($list as $item){
-            if($item['type'] == 3){
+            if($item['type'] == Project::TYPE_TWO){
                 //排名达标天数
                 //排名达标天数
                 $compliance_day = GoogleRankModel::where(['project_id' => $item['id'], 'lang' => ''])->value('compliance_day') ?: 0;
                 $compliance_day = GoogleRankModel::where(['project_id' => $item['id'], 'lang' => ''])->value('compliance_day') ?: 0;
                 $remain_day = $item['deploy_build']['service_duration'] - $compliance_day;
                 $remain_day = $item['deploy_build']['service_duration'] - $compliance_day;

@@ -619,6 +619,7 @@ class ProjectController extends BaseController
                 $domain_array = parse_url($domain_pro ? $domain_pro->domain : '');
                 $domain_array = parse_url($domain_pro ? $domain_pro->domain : '');
                 $domain = $domain_array['host'] ?? $domain_array['path'];
                 $domain = $domain_array['host'] ?? $domain_array['path'];
             }
             }
+            $manage = new Manage();
             $param = [
             $param = [
                   "id" => $item['id'],
                   "id" => $item['id'],
                   "title" => $item['title'],
                   "title" => $item['title'],
@@ -639,8 +640,11 @@ class ProjectController extends BaseController
                   "test_domain" => $item['deploy_build']['test_domain'] ?? '',
                   "test_domain" => $item['deploy_build']['test_domain'] ?? '',
                   "online_time" => $item['online_check']['qa_check_time'] ?? '',
                   "online_time" => $item['online_check']['qa_check_time'] ?? '',
                   "cooperate_date" => $item['cooperate_date'],
                   "cooperate_date" => $item['cooperate_date'],
+                  "project_manager_name" => $manage->getName($item['deploy_build']['manager_mid']), //项目经理
+                  "after_sales_manager_name" => $manage->getName($item['deploy_optimize']['manager_mid']), //售后服务经理
+                  "leader_name" => $manage->getName($item['deploy_build']['leader_mid']), //组长
             ];
             ];
-            if ($item['type'] == 3) {
+            if ($item['type'] == Project::TYPE_TWO) {
                 $param['is_compliance'] = RankData::where('project_id', $item['id'])->where('lang', '')->value('is_compliance') ?: 0;
                 $param['is_compliance'] = RankData::where('project_id', $item['id'])->where('lang', '')->value('is_compliance') ?: 0;
             } else {
             } else {
                 $param['is_compliance'] = 1;
                 $param['is_compliance'] = 1;

@@ -29,7 +29,7 @@ class NavController extends BaseController
      */
      */
     public function index(BNav $nav){
     public function index(BNav $nav){
         $this->map['project_id'] = $this->user['project_id'];
         $this->map['project_id'] = $this->user['project_id'];
-        $lists = $nav->list($this->map,$this->order = 'sort');
+        $lists = $nav->list($this->map,$this->order = ['sort','id']);
         $data = array();
         $data = array();
         foreach ($lists as $v){
         foreach ($lists as $v){
             $v = (array)$v;
             $v = (array)$v;

@@ -120,7 +120,7 @@ class ProjectLogic extends BaseLogic
             DB::rollBack();
             DB::rollBack();
             $this->fail('请填写完整后再提交');
             $this->fail('请填写完整后再提交');
         }
         }
-        app(SyncService::class)->projectAcceptAddress($this->param['id']);
+        (new SyncService())->projectAcceptAddress($this->param['id']);
         return $this->success();
         return $this->success();
     }
     }
 
 

@@ -68,7 +68,6 @@ class BTemplateLogic extends BaseLogic
         if($this->param['source'] == $this->model::SOURCE_PRODUCT){//产品页
         if($this->param['source'] == $this->model::SOURCE_PRODUCT){//产品页
             $TemplateInfo = $this->productHtml($info,$this->param['source'],$this->param['source_id']);
             $TemplateInfo = $this->productHtml($info,$this->param['source'],$this->param['source_id']);
         }
         }
-        @file_put_contents(storage_path('logs/lyh_error.log'), var_export($TemplateInfo['html'], true) . PHP_EOL, FILE_APPEND);
         return $this->success($TemplateInfo);
         return $this->success($TemplateInfo);
     }
     }
 
 

@@ -89,7 +89,7 @@ class CustomTemplateLogic extends BaseLogic
     public function saveHtml(){
     public function saveHtml(){
         $html = $this->param['html'];
         $html = $this->param['html'];
         $this->saveCommonTemplate($html);
         $this->saveCommonTemplate($html);
-        $this->param['html'] = characterTruncation($html,'/<main>(.*?)<\/main>/s');
+        $this->param['html'] = characterTruncation($html,'/<main\b[^>]*>(.*?)<\/main>/s');
         $this->param['html_style'] = characterTruncation($html,'/<style id="globalsojs-styles">(.*?)<\/style>/s');
         $this->param['html_style'] = characterTruncation($html,'/<style id="globalsojs-styles">(.*?)<\/style>/s');
         $rs = $this->model->edit($this->param,['id'=>$this->param['id']]);
         $rs = $this->model->edit($this->param,['id'=>$this->param['id']]);
         if($rs === false){
         if($rs === false){

@@ -69,15 +69,6 @@ class BaseLogic extends Logic
      */
      */
     public function getParam(){
     public function getParam(){
         $requestAll = $this->request->all();
         $requestAll = $this->request->all();
-        foreach ($requestAll as $k => $v){
-            if(is_array($v)){
-                continue;
-            }else{
-                if(empty($v) && ($v == null)){
-                    unset($requestAll[$k]);
-                }
-            }
-        }
         return $this->success($requestAll);
         return $this->success($requestAll);
     }
     }
 
 

@@ -26,6 +26,7 @@ class NavLogic extends  BaseLogic
         $this->model = new BNav();
         $this->model = new BNav();
     }
     }
 
 
+
     /**
     /**
      * @remark :保存数据
      * @remark :保存数据
      * @name   :navSave
      * @name   :navSave
@@ -35,29 +36,22 @@ class NavLogic extends  BaseLogic
      */
      */
     public function navSave()
     public function navSave()
     {
     {
-        DB::beginTransaction();
-        try {
-            if(!empty($this->param['location'])){
-                if($this->param['location'] == 'header'){
-                    $this->param['group_id'] = BNavGroup::DEFAULT_HEADER_ID;
-                }
-                if($this->param['location'] == 'footer'){
-                    $this->param['group_id'] = BNavGroup::DEFAULT_FOOTER_ID;
-                }
+        if(!empty($this->param['location'])){
+            if($this->param['location'] == 'header'){
+                $this->param['group_id'] = BNavGroup::DEFAULT_HEADER_ID;
             }
             }
-            $this->param['image'] = str_replace_url(isset($this->param['image']) ? $this->param['image'] : '');
-            $this->param['remark_image'] = str_replace_url(isset($this->param['remark_image']) ? $this->param['remark_image'] : '');
-            if(isset($this->param['id']) && !empty($this->param['id'])){
-                $this->handleEditParam();//验证是否可编辑分类
-                $this->model->edit($this->param,['id'=>$this->param['id']]);
-            }else{
-                $this->param['project_id'] = $this->user['project_id'];
-                $this->model->add($this->param);
+            if($this->param['location'] == 'footer'){
+                $this->param['group_id'] = BNavGroup::DEFAULT_FOOTER_ID;
             }
             }
-            DB::commit();
-        }catch (\Exception $e){
-            DB::rollBack();
-            $this->fail('error');
+        }
+        $this->param['image'] = str_replace_url(isset($this->param['image']) ? $this->param['image'] : '');
+        $this->param['remark_image'] = str_replace_url(isset($this->param['remark_image']) ? $this->param['remark_image'] : '');
+        if(isset($this->param['id']) && !empty($this->param['id'])){
+            $this->handleEditParam();//验证是否可编辑分类
+            $this->model->edit($this->param,['id'=>$this->param['id']]);
+        }else{
+            $this->param['project_id'] = $this->user['project_id'];
+            $this->model->add($this->param);
         }
         }
         //编辑菜单后,通知更新
         //编辑菜单后,通知更新
         $this->updateNotify(['project_id'=>$this->user['project_id'], 'type'=>RouteMap::SOURCE_NAV, 'route'=>'all']);
         $this->updateNotify(['project_id'=>$this->user['project_id'], 'type'=>RouteMap::SOURCE_NAV, 'route'=>'all']);

@@ -110,8 +110,8 @@ class CategoryLogic extends  BaseLogic
      * @time   :2023/8/21 17:14
      * @time   :2023/8/21 17:14
      */
      */
     public function categorySave(){
     public function categorySave(){
-        DB::beginTransaction();
-        try {
+//        DB::beginTransaction();
+//        try {
             if(isset($this->param['id']) && !empty($this->param['id'])){
             if(isset($this->param['id']) && !empty($this->param['id'])){
                 //是否编辑路由
                 //是否编辑路由
                 $id = $this->editCategoryRoute($this->param['id'],$this->param['route']);
                 $id = $this->editCategoryRoute($this->param['id'],$this->param['route']);
@@ -128,11 +128,11 @@ class CategoryLogic extends  BaseLogic
             $this->edit(['route'=>$route],['id'=>$id]);
             $this->edit(['route'=>$route],['id'=>$id]);
             //清除缓存
             //清除缓存
             Common::del_user_cache('product_category',$this->user['project_id']);
             Common::del_user_cache('product_category',$this->user['project_id']);
-            DB::commit();
-        } catch (\Exception $e){
-            DB::rollBack();
-            $this->fail('系统错误，请联系管理员');
-        }
+//            DB::commit();
+//        } catch (\Exception $e){
+//            DB::rollBack();
+//            $this->fail('系统错误，请联系管理员');
+//        }
         //通知更新
         //通知更新
         $notifyData = ['project_id'=>$this->user['project_id'], 'type'=>RouteMap::SOURCE_PRODUCT_CATE, 'route'=>$route];
         $notifyData = ['project_id'=>$this->user['project_id'], 'type'=>RouteMap::SOURCE_PRODUCT_CATE, 'route'=>$route];
         $this->updateNotify($notifyData);
         $this->updateNotify($notifyData);

@@ -461,7 +461,7 @@ class RankDataLogic extends BaseLogic
             //保证关键词数
             //保证关键词数
             $keyword_num = DeployBuild::where('project_id', $project_id)->value('keyword_num');
             $keyword_num = DeployBuild::where('project_id', $project_id)->value('keyword_num');
             $type = Project::where('id', $project_id)->value('type');
             $type = Project::where('id', $project_id)->value('type');
-            if($keyword_num && $type == 2 && $first_page_num >= $keyword_num){
+            if($keyword_num && $type == Project::TYPE_TWO && $first_page_num >= $keyword_num){
                 $model->compliance_day = $model->compliance_day + 1;
                 $model->compliance_day = $model->compliance_day + 1;
                 $model->is_compliance = 1;
                 $model->is_compliance = 1;
 
 

@@ -14,7 +14,6 @@ class WebSettingLogic extends BaseLogic
     public function __construct()
     public function __construct()
     {
     {
         parent::__construct();
         parent::__construct();
-
         $this->model = new WebSetting();
         $this->model = new WebSetting();
         $this->param = $this->requestAll;
         $this->param = $this->requestAll;
     }
     }
@@ -26,13 +25,9 @@ class WebSettingLogic extends BaseLogic
      * @time   :2023/4/28 15:14
      * @time   :2023/4/28 15:14
      */
      */
     public function setting_read(){
     public function setting_read(){
-        $info = CommonHelper::get_user_cache($this->model->getTable(),$this->user['project_id']);
-        if(empty($info)){
-            $info = $this->model->read(['project_id'=>$this->user['project_id']]);
-            if($info === false){
-                $info = [];
-            }
-            CommonHelper::set_user_cache($info,$this->model->getTable(),$this->user['project_id']);
+        $info = $this->model->read(['project_id'=>$this->user['project_id']]);
+        if($info === false){
+            $info = [];
         }
         }
         return $this->success($info);
         return $this->success($info);
     }
     }

@@ -35,6 +35,7 @@ class NavRequest extends FormRequest
 //            'group_id'   =>  ['required','integer'],
 //            'group_id'   =>  ['required','integer'],
             'pid'   =>  ['required','integer'],
             'pid'   =>  ['required','integer'],
             'name'   =>  ['required','max:100'],
             'name'   =>  ['required','max:100'],
+            'url'   =>  ['required'],
         ];
         ];
         return $rule;
         return $rule;
     }
     }
@@ -49,6 +50,7 @@ class NavRequest extends FormRequest
             'pid.integer'  =>  '上级选择错误',
             'pid.integer'  =>  '上级选择错误',
             'name.required'  =>  '名称必须',
             'name.required'  =>  '名称必须',
             'name.max'  =>  '名称不能超过100个字符',
             'name.max'  =>  '名称不能超过100个字符',
+            'url.required'  =>  '链接不能为空',
         ];
         ];
     }
     }
 }
 }