补丁

app/controller/api/Demo.php

@@ -30,19 +30,42 @@ class Demo extends BaseController
 {
     public function index()
     {
+        $mer_id = 65;
         $file = request()->file('file');
         $zip_name = explode('.', $file->getOriginalName())[0];
         // 上传到本地服务器
         $savename = \think\facade\Filesystem::putFile('zippic', $file);
-        $destination_path = public_path('uploads/pic') . $zip_name;
+        $dir = date('Y-m-d_H-i-s') . '_' . $mer_id;
+        $path = public_path('uploads/pic').$dir;
+        try {
             $zip = new ZipArchive;
-        if ($zip->open(public_path('uploads').$savename) === TRUE) {
-            $zip->extractTo($destination_path);
-            $zip->close();
-        } else {
-            throw new \think\exception\HttpException(404, '解压失败');
+            $filePath = public_path('uploads') . $savename;
+            $zip->open($filePath);
+            for ($i = 0; $i < $zip->numFiles; $i++) {
+                $statInfo = $zip->statIndex($i, ZipArchive::FL_ENC_RAW);
+                $filename = $this->transcoding($statInfo['name']);
+                $mkdFile = explode('/',$filename);
+                if ($statInfo['crc'] == 0) {
+                    // 新建目录
+                    if (!file_exists($path . '/' . $filename)) {
+                        mkdir($path . '/' . $filename, 0777, true);
+                    }
+                    // $this->createDirectories($path . '/' . $filename);
+                } else {
+                    // 拷贝文件
+                    if(count($mkdFile)==3){
+                        if (!file_exists($path . '/' . $mkdFile[0].'/'.$mkdFile[1])) {
+                            mkdir($path . '/' .$mkdFile[0].'/'.$mkdFile[1], 0777, true);
+                        }
+                        copy('zip://' . $file . '#' . $zip->getNameIndex($i), $path . '/' . $filename);
+
+                    }
+                }
+            }
+            $zip->close();
+        } catch (\Exception $e) {
+            throw new \think\exception\HttpException(404, $e->getMessage() . '。line:' . $e->getLine());
         }
-        $mer_id = 48;
         $directory = $destination_path;
         $files = scandir($directory);
         $dir = 'def/' . date('Y-m-d');
@@ -90,7 +113,6 @@ class Demo extends BaseController
                     if ($sku) {
                         $sku = implode(',', $sku);
                         $sku_arr[$sku] = $directory . '/' . $file . '/' . $file_two;
-
                     }
                 }
             }
@@ -147,4 +169,38 @@ class Demo extends BaseController
         }
         halt(1);
     }
+
+    public function transcoding($fileName)
+    {
+        $encoding = mb_detect_encoding($fileName, ['UTF-8', 'GBK', 'BIG5', 'CP936']);
+        if (DIRECTORY_SEPARATOR == '/') { // linux
+            $fileName = iconv($encoding, 'UTF-8', $fileName);
+        } else { // win
+            $fileName = iconv($encoding, 'GBK', $fileName);
+        }
+        return $fileName;
+    }
+
+    function createDirectories($path) {
+        if (is_dir($path)) {
+            return true ;
+        } else {
+            $parts = explode(DIRECTORY_SEPARATOR, $path);
+            $part = null;
+    
+            foreach ($parts as $part) {
+                if ($part === '' || $part === '.' || $part === '..') {
+                    continue;
+                }
+    
+                $dir = dirname($path) . DIRECTORY_SEPARATOR . $part;
+                if (!file_exists($dir)) {
+                    mkdir($dir, 0777, true);
+                }
+            }
+    
+            return true ;
+        }
+    }
+    
 }

app/controller/merchant/store/StoreImport.php

@@ -173,15 +173,35 @@ class StoreImport extends BaseController
         $savename = \think\facade\Filesystem::putFile('zippic', $file);
         $mer_id = $this->request->merId();
         $dir = date('Y-m-d_H-i-s') . '_' . $mer_id;
-        $destination_path = public_path('uploads/pic/'.$dir) . $zip_name;
+        $path = public_path('uploads/pic').$dir;
+        try {
             $zip = new ZipArchive;
-        if ($zip->open(public_path('uploads').$savename) === true) {
-            $zip->extractTo($destination_path);
-            $zip->close();
-        } else {
-            throw new \think\exception\HttpException(404, '解压失败');
+            $filePath = public_path('uploads') . $savename;
+            $zip->open($filePath);
+            for ($i = 0; $i < $zip->numFiles; $i++) {
+                $statInfo = $zip->statIndex($i, ZipArchive::FL_ENC_RAW);
+                $filename = $this->transcoding($statInfo['name']);
+                $mkdFile = explode('/',$filename);
+                if ($statInfo['crc'] == 0) {
+                    // 新建目录
+                    if (!file_exists($path . '/' . $filename)) {
+                        mkdir($path . '/' . $filename, 0777, true);
                     }
-        Queue::push(ImportPicJob::class,['mer_id'=>$mer_id,'path'=>$destination_path]);
+                } else {
+                    // 拷贝文件
+                    if(count($mkdFile)==3){
+                        if (!file_exists($path . '/' . $mkdFile[0].'/'.$mkdFile[1])) {
+                            mkdir($path . '/' .$mkdFile[0].'/'.$mkdFile[1], 0777, true);
+                        }
+                        copy('zip://' . $file . '#' . $zip->getNameIndex($i), $path . '/' . $filename);
+                    }
+                }
+            }
+            $zip->close();
+        } catch (\Exception $e) {
+            throw new \think\exception\HttpException(404, $e->getMessage() . '。line:' . $e->getLine());
+        }
+        Queue::push(ImportPicJob::class,['mer_id'=>$mer_id,'path'=>$path.'/'.$zip_name]);
         return app('json')->success('开始导入数据，请稍后在列表中查看！,如果未导入请检查格式');
     }
     
@@ -241,5 +261,37 @@ class StoreImport extends BaseController
           app()->make(StoreOrderRepository::class)->setProduct($data['data'],$data['mer_id'],$type_id);
         }
     }
+    public function transcoding($fileName)
+    {
+        $encoding = mb_detect_encoding($fileName, ['UTF-8', 'GBK', 'BIG5', 'CP936']);
+        if (DIRECTORY_SEPARATOR == '/') { // linux
+            $fileName = iconv($encoding, 'UTF-8', $fileName);
+        } else { // win
+            $fileName = iconv($encoding, 'GBK', $fileName);
+        }
+        return $fileName;
+    }
+
+    function createDirectories($path) {
+        if (is_dir($path)) {
+            return true ;
+        } else {
+            $parts = explode(DIRECTORY_SEPARATOR, $path);
+            $part = null;
+    
+            foreach ($parts as $part) {
+                if ($part === '' || $part === '.' || $part === '..') {
+                    continue;
+                }
+    
+                $dir = dirname($path) . DIRECTORY_SEPARATOR . $part;
+                if (!file_exists($dir)) {
+                    mkdir($dir, 0777, true);
+                }
+            }
+    
+            return true ;
+        }
+    }
 }