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

@@ -177,10 +177,11 @@ class UpdateSeoTdk extends Command
                     if(!Redis::setnx($cache_key, 1)){
                     if(!Redis::setnx($cache_key, 1)){
                         continue;
                         continue;
                     }
                     }
-                    Redis::expire($cache_key, 120);
+                    Redis::expire($cache_key, 300);
 
 
                     echo date('Y-m-d H:i:s') . '更新--' . $table . ': 项目id' . $project_id . ':id' . $v['id'] . PHP_EOL;
                     echo date('Y-m-d H:i:s') . '更新--' . $table . ': 项目id' . $project_id . ':id' . $v['id'] . PHP_EOL;
-
+                    $v = DB::connection('custom_mysql')->table($table)->where('id', $v['id'])->first();
+                    $v = (array)$v;
                     $data = [];
                     $data = [];
                     $json_field = '';
                     $json_field = '';
                     foreach ($map as $ai_key => $field) {
                     foreach ($map as $ai_key => $field) {

@@ -13,6 +13,7 @@ use App\Enums\Common\Code;
 use App\Http\Controllers\Aside\BaseController;
 use App\Http\Controllers\Aside\BaseController;
 use App\Models\ASide\APublicModel;
 use App\Models\ASide\APublicModel;
 use App\Models\Channel\Channel;
 use App\Models\Channel\Channel;
+use App\Models\Domain\DomainInfo;
 use App\Models\Manage\Manage;
 use App\Models\Manage\Manage;
 use App\Models\Project\OnlineCheck;
 use App\Models\Project\OnlineCheck;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
@@ -127,9 +128,14 @@ class OnlineController extends BaseController
      * @time   :2023/8/18 10:58
      * @time   :2023/8/18 10:58
      */
      */
     public function searchParam(&$query){
     public function searchParam(&$query){
-        //搜索条件处理
-        if(isset($this->map['title'])){
-            $query = $query->where('gl_project.title','like','%'.$this->map['title'].'%');
+        if(!empty($this->map['search']) && !empty($this->map['search_type'])){
+            // 搜索域名
+            if($this->map['search_type'] == 'test_domain'){
+                $query->where('gl_project_deploy_build.test_domain','like','%'.$this->map['search'].'%');
+            } else {
+                // 搜索名称
+                $query->where('gl_project.title', 'like', '%' . $this->map['search'] . '%');
+            }
         }
         }
         $query = $query->where('gl_project.status',1);//TODO::已提交审核
         $query = $query->where('gl_project.status',1);//TODO::已提交审核
         return $query;
         return $query;

@@ -24,6 +24,10 @@ class WebSettingImageController extends BaseController
      */
      */
     public function lists(WebSettingImage $webSettingImage){
     public function lists(WebSettingImage $webSettingImage){
         $list = $webSettingImage->list([],'id',['id','image','type']);
         $list = $webSettingImage->list([],'id',['id','image','type']);
+        foreach ($list as $k=>$v){
+            $v['image'] = getImageUrl($v['image']);
+            $list[$k] = $v;
+        }
         $this->response('success',Code::SUCCESS,$list);
         $this->response('success',Code::SUCCESS,$list);
     }
     }
 
 
@@ -35,17 +39,16 @@ class WebSettingImageController extends BaseController
      * @time   :2023/9/21 15:17
      * @time   :2023/9/21 15:17
      */
      */
     public function save(WebSettingImage $webSettingImage){
     public function save(WebSettingImage $webSettingImage){
+        try {
+            $webSettingImage->del(['project_id'=>$this->user['project_id']]);
             foreach ($this->param['data'] as $v){
             foreach ($this->param['data'] as $v){
-            if(isset($v['id']) && !empty($v['id'])){
-                $rs = $webSettingImage->edit($v,['id'=>$v['id']]);
-            }else{
                 $v['project_id'] = $this->user['project_id'];
                 $v['project_id'] = $this->user['project_id'];
-                $rs = $webSettingImage->add($v);
+                $v['image'] = str_replace_url($v['image']);
+                $webSettingImage->add($v);
             }
             }
-            if($rs === false){
+        }catch (\Exception $e){
             $this->response('系统错误请联系管理员');
             $this->response('系统错误请联系管理员');
         }
         }
-        }
         $this->response('success');
         $this->response('success');
     }
     }
 }
 }