Merge remote-tracking branch 'origin/develop' into akun

-Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into develop
-# Please enter a commit message to explain why this merge is necessary,
-# especially if it merges an updated upstream into a topic branch.
-#
-# Lines starting with '#' will be ignored, and an empty message aborts
-# the commit.

@@ -122,6 +122,7 @@ class OptimizeController extends BaseController
             'gl_project_deploy_optimize.domain AS domain',
             'gl_project_deploy_optimize.domain AS domain',
             'gl_project_deploy_optimize.quality_mid AS quality_mid',
             'gl_project_deploy_optimize.quality_mid AS quality_mid',
             'gl_project_deploy_optimize.design_mid AS design_mid',
             'gl_project_deploy_optimize.design_mid AS design_mid',
+            'gl_project_deploy_optimize.special AS special',
         ];
         ];
         return $select;
         return $select;
     }
     }
@@ -138,6 +139,9 @@ class OptimizeController extends BaseController
         if(isset($this->map['title'])){
         if(isset($this->map['title'])){
             $query = $query->where('gl_project.title','like','%'.$this->map['title'].'%');
             $query = $query->where('gl_project.title','like','%'.$this->map['title'].'%');
         }
         }
+        if(isset($this->map['special'])){
+            $query = $query->where('gl_project_deploy_optimize.special','like','%'.$this->map['special'].'%');
+        }
         $query = $query->whereIn('gl_project.type',[2,4]);//TODO::2,4代表优化项目
         $query = $query->whereIn('gl_project.type',[2,4]);//TODO::2,4代表优化项目
         return $query;
         return $query;
     }
     }

@@ -205,8 +205,9 @@ class ProjectLogic extends BaseLogic
             //更改域名
             //更改域名
             $this->editDomainStatus($deploy_optimize['domain'],$deploy_optimize['project_id']);
             $this->editDomainStatus($deploy_optimize['domain'],$deploy_optimize['project_id']);
         }
         }
-        $deploy_optimize['minor_languages'] = Arr::a2s(!empty($deploy_optimize['minor_languages']) ?? []);
-        $deploy_optimize['minor_keywords'] = Arr::a2s(!empty($deploy_optimize['minor_keywords']) ?? []);
+        $deploy_optimize['minor_languages'] = Arr::a2s(!empty($deploy_optimize['minor_languages']) ? $deploy_optimize['minor_languages'] : []);
+        $deploy_optimize['minor_keywords'] = Arr::a2s(!empty($deploy_optimize['minor_keywords']) ? $deploy_optimize['minor_keywords'] : []);
+        $deploy_optimize['special'] = !empty($deploy_optimize['special']) ? ','.trim($deploy_optimize['special'],',').',' : '';
         //是否更新了api_no
         //是否更新了api_no
         $api_no = DeployOptimize::where('id', $deploy_optimize['id'])->value('api_no');
         $api_no = DeployOptimize::where('id', $deploy_optimize['id'])->value('api_no');
         if($api_no != $deploy_optimize['api_no']){
         if($api_no != $deploy_optimize['api_no']){

@@ -36,8 +36,8 @@ class NavLogic extends  BaseLogic
     {
     {
         DB::beginTransaction();
         DB::beginTransaction();
         try {
         try {
-            $this->param['image'] = str_replace_url(isset($this->param['image']) ?? '');
-            $this->param['remark_image'] = str_replace_url(isset($this->param['remark_image']) ?? '');
+            $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'])){
             if(isset($this->param['id']) && !empty($this->param['id'])){
                 $this->handleEditParam();//验证是否可编辑分类
                 $this->handleEditParam();//验证是否可编辑分类
                 $this->model->edit($this->param,['id'=>$this->param['id']]);
                 $this->model->edit($this->param,['id'=>$this->param['id']]);

@@ -62,4 +62,16 @@ class BNav extends Base
         return $value;
         return $value;
     }
     }
 
 
+    /**
+     * @remark :获取图片
+     * @name   :getImageAttribute
+     * @author :lyh
+     * @method :post
+     * @time   :2023/9/18 16:20
+     */
+    public function  getRemarkImageAttribute($value)
+    {
+        $value = getImageUrl($value);
+        return $value;
+    }
 }
 }

@@ -25,4 +25,18 @@ class DeployOptimize extends Base
         Cache::forget($cache_key);
         Cache::forget($cache_key);
     }
     }
 
 
+    /**
+     * @remark :
+     * @name   :getSpecialAttribute
+     * @author :lyh
+     * @method :post
+     * @time   :2023/9/25 9:58
+     */
+    public function getSpecialAttribute($value)
+    {
+        if(!empty($value)){
+            $value = trim($value,',');
+        }
+        return $value;
+    }
 }
 }