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

@@ -40,7 +40,7 @@ class UpdateBuildConfiguration extends Command
      * @method :post
      * @time   :2024/12/11 11:49
      */
-    public function handle(){
+    public function handles(){
         //查询当前的所有项目都开启可视化
         $buildModel = new DeployBuild();
         $lists = $buildModel->list();
@@ -59,9 +59,9 @@ class UpdateBuildConfiguration extends Command
      * @method :post
      * @time   :2024/12/11 14:33
      */
-    public function handles(){
+    public function handle(){
         $projectModel = new Project();
-        $list = $projectModel->list(['delete_status'=>0]);
+        $list = $projectModel->list(['delete_status'=>0,'id'=>['>',1718]],'id',['id'],'asc');
         foreach ($list as $k => $v){
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             ProjectServer::useProject($v['id']);
@@ -79,21 +79,48 @@ class UpdateBuildConfiguration extends Command
      * @time   :2024/12/11 14:40
      */
     public function getProduct(){
+        Detail::truncate();
         $productModel = new Product();
-        $lists = $productModel->list();
-        $detailModel = new Detail();
-        foreach ($lists as $k => $v){
-            echo date('Y-m-d H:i:s') . '产品id:'.$v['id'] . PHP_EOL;
-            $data = [
-                'product_id'=>$v['id'],
-                'column_id'=>1,
-                'text_type'=>1,
-                'title'=>'',
-                'sort'=>1,
-                'content'=>$v['describe']
-            ];
-            $detailModel->add($data);
+        $page = 1;
+        while (true){
+            $lists = $productModel->lists([],$page,50,['id','describe']);
+            $detailModel = new Detail();
+            if(!empty($lists['list'])){
+                foreach ($lists['list'] as $k => $v){
+                    echo date('Y-m-d H:i:s') . '产品id:'.$v['id'] . PHP_EOL;
+                    if(empty($v['describe'])){
+                        continue;
+                    }
+                    foreach ($v['describe'] as $key => $value){
+                        if(isset($value['title']) && ($value['title'] == null)){
+                            $value['title'] = '';
+                        }
+                        if(isset($value['text']) && ($value['text'] == null)){
+                            $value['text'] = '';
+                        }
+                        if(empty($value['text'])){
+                            continue;
+                        }
+                        $data = [
+                            'product_id'=>$v['id'],
+                            'column_id'=>1,
+                            'text_type'=>1,
+                            'title'=>$value['title'] ?? '',
+                            'sort'=>1,
+                            'content'=>json_encode(['content'=>$value['text'] ?? ''],JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES),
+                            'created_at'=>date('Y-m-d H:i:s'),
+                            'updated_at'=>date('Y-m-d H:i:s')
+                        ];
+                        $detailModel->insert($data);
+                    }
+                }
+            }else{
+                break;
+                return false;
+            }
+            $page++;
         }
+        return true;
     }
 
 }

@@ -180,8 +180,8 @@ class RankDataLogic extends BaseLogic
 
         //多个api_no项目 切换api_no查看数据
         if($project_id == 2104){
-            $data['other_api_no'] = $api_no ==  10690 ? 11201 : 10690;
-            $data['other_api_no_source'] = $api_no ==  10690 ? 'Yandex' : 'Google';
+            $data['other_api_no'] = ($api_no ==  10690) ? 11201 : 10690;
+            $data['other_api_no_source'] = ($data['other_api_no'] ==  10690) ? 'Yandex' : 'Google';
         }
 
         return $data;

@@ -267,7 +267,6 @@ class UserLoginLogic
         $info['uptime'] = $project['uptime'];
         $info['is_update_language'] = $project['is_update_language'];
         $info['is_watermark'] = $project['is_watermark'];
-        $project['deploy_build']['configuration']['is_product'] = $project['deploy_build']['configuration']['is_news'] = $project['deploy_build']['configuration']['is_blogs'] = $project['deploy_build']['configuration']['is_module'] = "1";
         $info['configuration'] = $project['deploy_build']['configuration'];
         $info['project_type'] = $project['type'];
         $info['storage_type'] = $project['storage_type'];