Commit 97394a51 authored by jiangkebao's avatar jiangkebao

Merge branch 'jkb' into test

# Conflicts:
#	composer.json
parents 50a06dbb aec8f3e6
<?php
namespace Meibuyu\Micro\Tools;
use Chumper\Zipper\Zipper;
use Dimsav\UnixZipper;
use Meibuyu\Micro\Exceptions\HttpResponseException;
/**
* 打包器
......@@ -11,15 +12,12 @@ class Unpacker
{
//文件列表 一位数组
public $fileList;
//保存路径
public $path;
//文件名
public $fileName;
public function __construct(array $fileList, $path, $fileName)
public function __construct(array $fileList, $fileName)
{
$this->fileList = $fileList;
$this->path = $path;
$this->fileName = $fileName;
}
......@@ -30,10 +28,18 @@ class Unpacker
*/
public function unpack()
{
$zipper = new Zipper();
$filePath = $this->path.'/'.$this->fileName.'.zip';
$zipper->make($filePath)->add($this->fileList);
$zipper->close();
return $filePath;
if (count($this->fileList) > 0) {
$zipper = new UnixZipper();
$filePath = $this->fileName.'.zip';
foreach ($this->fileList as $k => $v) {
$zipper->add($v);
}
$zipper->setDestination($filePath);
$zipper->compress();
return $filePath;
} else {
throw new HttpResponseException('打包失败,请重试');
}
}
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment