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

Lyh server



查看合并请求 !3133

@@ -35,6 +35,7 @@ use App\Services\CosService;
 use App\Services\Geo\GeoService;
 use App\Services\Geo\GeoService;
 use App\Services\MidJourneyService;
 use App\Services\MidJourneyService;
 use App\Services\ProjectServer;
 use App\Services\ProjectServer;
+use Hashids\Hashids;
 use Illuminate\Console\Command;
 use Illuminate\Console\Command;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\DB;
@@ -56,7 +57,7 @@ class lyhDemo extends Command
     protected $description = '更新路由';
     protected $description = '更新路由';
 
 
     public function handle(){
     public function handle(){
-       return $this->translate_action();
+       return $this->_actionRoute();
     }
     }
 
 
     public function _actionDa()
     public function _actionDa()
@@ -113,21 +114,14 @@ class lyhDemo extends Command
      */
      */
     public function _actionRoute(){
     public function _actionRoute(){
         $projectModel = new Project();
         $projectModel = new Project();
-        $lists = $projectModel->list(['delete_status' => 0,'is_ai_blog'=>1,'project_type'=>0,'extend_type'=>0,'type'=>['in',[1,2,3,4,6]]], 'id', ['id']);
+        $lists = $projectModel->list(['type'=>['in',[1,2,3,4,6]]], 'id', ['id']);
         $data = [];
         $data = [];
         foreach ($lists as $item){
         foreach ($lists as $item){
             echo date('Y-m-d H:i:s') . '开始--项目的id:'. $item['id'] . PHP_EOL;
             echo date('Y-m-d H:i:s') . '开始--项目的id:'. $item['id'] . PHP_EOL;
-            ProjectServer::useProject($item['id']);
-            $aiBlogModel = new AiBlog();
-            $info = $aiBlogModel->read(['text'=>['like','%href="blog/%']],['id']);
-            if($info !== false){
-                echo '需要处理->项目id:'.$item['id'].PHP_EOL;
-                $data[] = $item['id'];
-            }
-            echo 'end';
-            DB::disconnect('custom_mysql');
+            $data['post_id'] = mt_rand(100000, 999999).$item['id'];
+            $projectModel->edit(['post_id'=>$data['post_id']],['id'=>$item['id']]);
         }
         }
-        dd($data);
+        return true;
     }
     }
 
 
     public function _actionTemplateMain(){
     public function _actionTemplateMain(){

@@ -98,8 +98,9 @@ class CopyProject extends Command
         $data['old_project_id'] = $old_project_id;
         $data['old_project_id'] = $old_project_id;
         unset($data['id'],$data['exclusive_aicc_day'],$data['aicc'],$data['robots'],$data['is_translate_tag'],$data['is_translate'],$data['is_minor_languages'],$data['uptime']);
         unset($data['id'],$data['exclusive_aicc_day'],$data['aicc'],$data['robots'],$data['is_translate_tag'],$data['is_translate'],$data['is_minor_languages'],$data['uptime']);
         $project_id = $projectModel->insertGetId($data);
         $project_id = $projectModel->insertGetId($data);
+        $data['post_id'] = mt_rand(100000, 999999).$project_id;
         $hashids = new Hashids($data['from_order_id'], 13, 'abcdefghjkmnpqrstuvwxyz1234567890');
         $hashids = new Hashids($data['from_order_id'], 13, 'abcdefghjkmnpqrstuvwxyz1234567890');
-        $projectModel->edit(['from_order_id'=>$hashids->encode($project_id)],['id'=>$project_id]);
+        $projectModel->edit(['from_order_id'=>$hashids->encode($project_id),'post_id'=>$data['post_id']],['id'=>$project_id]);
         //复制设置的模版
         //复制设置的模版
         $settingTemplateModel = new Setting();
         $settingTemplateModel = new Setting();
         $settingData = $settingTemplateModel::where('project_id', $old_project_id)->first();
         $settingData = $settingTemplateModel::where('project_id', $old_project_id)->first();