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

gx数据



查看合并请求 !1936

@@ -52,9 +52,9 @@ class LyhImportTest extends Command
      * @time   :2023/11/20 15:13
      * @time   :2023/11/20 15:13
      */
      */
     public function handle(){
     public function handle(){
-        ProjectServer::useProject(3283);
+        ProjectServer::useProject(2140);
         echo date('Y-m-d H:i:s') . 'start' . PHP_EOL;
         echo date('Y-m-d H:i:s') . 'start' . PHP_EOL;
-        $this->importProductCategory('https://ecdn6.globalso.com/upload/p/3283/file/2025-04/zhouyongpaxu.csv',3283);
+        $this->import2140CustomModule('https://ecdn6.globalso.com/upload/p/2140/file/2025-05/all-202557.csv',2140);
         DB::disconnect('custom_mysql');
         DB::disconnect('custom_mysql');
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
     }
     }
@@ -463,7 +463,7 @@ class LyhImportTest extends Command
         foreach ($line_of_text as $k => $item){
         foreach ($line_of_text as $k => $item){
 //            try {
 //            try {
             //添加内容
             //添加内容
-            $contentId = $customContentModel->addReturnId(['name'=>$item[0],'image'=>'/upload/p/2140/image/'.$item[2],'module_id'=>2,'project_id'=>$project_id]);
+            $contentId = $customContentModel->addReturnId(['name'=>$item[0],'image'=>'/upload/p/2140/image/'.$item[2],'module_id'=>7,'project_id'=>$project_id]);
             echo date('Y-m-d H:i:s') . '当前扩展数据id:'. $contentId . PHP_EOL;
             echo date('Y-m-d H:i:s') . '当前扩展数据id:'. $contentId . PHP_EOL;
             //注册路由
             //注册路由
             $route = RouteMap::setRoute($item[0], RouteMap::SOURCE_MODULE,
             $route = RouteMap::setRoute($item[0], RouteMap::SOURCE_MODULE,