|
|
@@ -103,6 +103,7 @@ class PackageClass
|
|
|
//返回包的相关信息
|
|
|
return array(
|
|
|
"repoName" => $data["name"],
|
|
|
+ "version" => $data["version"],
|
|
|
"cacheDir" => $cacheDir,
|
|
|
"ossHost" => $config['oss-host'],
|
|
|
"moduleName" => $moduleName,
|
|
|
@@ -117,6 +118,7 @@ class PackageClass
|
|
|
private static function fetchModuleFiles($packageInfo){
|
|
|
$cacheDir = $packageInfo['cacheDir'];
|
|
|
$repoName = $packageInfo['repoName'];
|
|
|
+ $version = $packageInfo['version'];
|
|
|
$moduleDir = $packageInfo['moduleDir'];
|
|
|
$ossHost = $packageInfo['ossHost'];
|
|
|
|
|
|
@@ -131,7 +133,7 @@ class PackageClass
|
|
|
printf("[%s] fetching file -- %s\n",$repoName,$fileName);
|
|
|
|
|
|
//下载文件到缓存区
|
|
|
- $filePath = downloadToDir($ossHost,$repoName,$fileName,$cacheDir);
|
|
|
+ $filePath = downloadToDir($ossHost,$repoName,$version,$fileName,$cacheDir);
|
|
|
if(! $filePath ){
|
|
|
printf("[%s] fetch file failed -- %s\n",$repoName,$fileName);
|
|
|
continue;
|
|
|
@@ -151,6 +153,7 @@ class PackageClass
|
|
|
private static function fetchCommonFiles($packageInfo){
|
|
|
$cacheDir = $packageInfo['cacheDir'];
|
|
|
$repoName = $packageInfo['repoName'];
|
|
|
+ $version = $packageInfo['version'];
|
|
|
$commonDir = $packageInfo['commonDir'];
|
|
|
$ossHost = $packageInfo['ossHost'];
|
|
|
$commonFiles = $packageInfo['helper']['common-files'];
|
|
|
@@ -162,7 +165,7 @@ class PackageClass
|
|
|
$fileName = $fileInfo['name'];
|
|
|
printf("[%s] fetching common file -- %s\n",$repoName,$fileName);
|
|
|
//下载文件到缓存区
|
|
|
- $filePath = downloadToDir($ossHost,$repoName,$fileName,$cacheDir);
|
|
|
+ $filePath = downloadToDir($ossHost,$repoName,$version,$fileName,$cacheDir);
|
|
|
if(! $filePath ){
|
|
|
printf("[%s] fetch common file failed -- %s\n",$repoName,$fileName);
|
|
|
continue;
|
|
|
@@ -182,6 +185,7 @@ class PackageClass
|
|
|
private static function fetchConfigFiles($packageInfo){
|
|
|
$cacheDir = $packageInfo['cacheDir'];
|
|
|
$repoName = $packageInfo['repoName'];
|
|
|
+ $version = $packageInfo['version'];
|
|
|
$configDir = $packageInfo['configDir'];
|
|
|
$ossHost = $packageInfo['ossHost'];
|
|
|
$configFiles = $packageInfo['helper']['config-files'];
|
|
|
@@ -193,7 +197,7 @@ class PackageClass
|
|
|
$fileName = $fileInfo['name'];
|
|
|
printf("[%s] fetching config file -- %s\n",$repoName,$fileName);
|
|
|
//下载文件到缓存区
|
|
|
- $filePath = downloadToDir($ossHost,$repoName,$fileName,$cacheDir);
|
|
|
+ $filePath = downloadToDir($ossHost,$repoName,$version,$fileName,$cacheDir);
|
|
|
if(! $filePath ){
|
|
|
printf("[%s] fetch config file failed -- %s\n",$repoName,$fileName);
|
|
|
continue;
|
elviss