合并分支 'lyh-server' 到 'master'

gxai设置banner



查看合并请求 !1966

@@ -10,11 +10,14 @@
 namespace App\Console\Commands\LyhTest;
 namespace App\Console\Commands\LyhTest;
 
 
 use App\Console\Commands\Domain\DomainInfo;
 use App\Console\Commands\Domain\DomainInfo;
+use App\Models\Ai\AiBlogAuthor;
 use App\Models\Com\NoticeLog;
 use App\Models\Com\NoticeLog;
 use App\Models\Project\AiBlogTask;
 use App\Models\Project\AiBlogTask;
 use App\Models\Project\DeployBuild;
 use App\Models\Project\DeployBuild;
 use App\Models\Project\OnlineCheck;
 use App\Models\Project\OnlineCheck;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
+use App\Models\WebSetting\WebSetting;
+use App\Services\ProjectServer;
 use Illuminate\Console\Command;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\DB;
@@ -36,7 +39,21 @@ class lyhDemo extends Command
     protected $description = '更新路由';
     protected $description = '更新路由';
 
 
     public function handle(){
     public function handle(){
-       return true;
+        $projectModel = new Project();
+        $lists = $projectModel->list(['delete_status' => 0,'extend_type'=>0,'type'=>['in',[1,2,3,4]]], 'id', ['id']);
+        foreach ($lists as $val) {
+//            echo date('Y-m-d H:i:s') . '开始--项目的id:'. $val['id'] . PHP_EOL;
+            ProjectServer::useProject($val['id']);
+            try {
+                $settingModel = new WebSetting();
+                $settingModel->edit(['']);
+            }catch (\Exception $e){
+
+            }
+
+            DB::disconnect('custom_mysql');
+        }
+        return true;
     }
     }
 
 
 }
 }

@@ -13,6 +13,7 @@ use App\Enums\Common\Code;
 use App\Helper\Arr;
 use App\Helper\Arr;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Controllers\Bside\BaseController;
 use App\Models\WebSetting\AggregationSetting;
 use App\Models\WebSetting\AggregationSetting;
+use App\Models\WebSetting\WebSettingImage;
 
 
 /**
 /**
  * @remark :聚合页
  * @remark :聚合页
@@ -58,6 +59,19 @@ class AggregationSettingController extends BaseController
     public function edit(){
     public function edit(){
         $aggSettingModel = new AggregationSetting();
         $aggSettingModel = new AggregationSetting();
         if(isset($this->param['top_banner']) && !empty($this->param['top_banner'])){
         if(isset($this->param['top_banner']) && !empty($this->param['top_banner'])){
+            $number = count($this->param['top_banner']);
+            //查询ai——blog是否拥有banner图
+            $settingImageModel = new WebSettingImage();
+            $info = $settingImageModel->read(['type'=>4]);
+            if($info === false){
+                $settingImageModel->addReturnId(['type'=>4,'project_id'=>$this->user['project_id'],'image'=>reset($this->param['top_banner'])]);
+                if($number > 1){
+                    $this->param['top_banner'] = array_slice($this->param['top_banner'], 1);
+                }
+            }
+            if($number > 3){
+                $this->param['top_banner'] = array_slice($this->param['top_banner'], 0, 3);
+            }
             $this->param['top_banner'] = Arr::a2s($this->param['top_banner']);
             $this->param['top_banner'] = Arr::a2s($this->param['top_banner']);
         }
         }
         if(isset($this->param['foot_banner']) && !empty($this->param['foot_banner'])){
         if(isset($this->param['foot_banner']) && !empty($this->param['foot_banner'])){

@@ -23,7 +23,7 @@ class WebSettingImageController extends BaseController
      * @time   :2023/9/21 15:12
      * @time   :2023/9/21 15:12
      */
      */
     public function lists(WebSettingImage $webSettingImage){
     public function lists(WebSettingImage $webSettingImage){
-        $list = $webSettingImage->list([],'id',['id','image','type']);
+        $list = $webSettingImage->list($this->map,'id',['id','image','type']);
         foreach ($list as $k=>$v){
         foreach ($list as $k=>$v){
             $v['image'] = getImageUrl($v['image'],$this->user['storage_type'],$this->user['project_location']);
             $v['image'] = getImageUrl($v['image'],$this->user['storage_type'],$this->user['project_location']);
             $list[$k] = $v;
             $list[$k] = $v;

@@ -17,4 +17,13 @@ class WebSettingImage extends Base
 
 
     //连接数据库
     //连接数据库
     protected $connection = 'custom_mysql';
     protected $connection = 'custom_mysql';
+
+    public function imageMap(){
+        return [
+            1 => '产品',
+            2 => '博客',
+            3 => '新闻',
+            4 => 'ai_blog'
+        ];
+    }
 }
 }