提交 8d625ad0 编写于 作者: D devil_gong

优化安装包

上级 52ee0a39
\ No newline at end of file
...@@ -76,7 +76,7 @@ class AppMiniAlipayListController extends CommonController ...@@ -76,7 +76,7 @@ class AppMiniAlipayListController extends CommonController
$url = __MY_URL__.'AppMini'.DS.'New'.DS.$this->application_name.DS.$temp_file; $url = __MY_URL__.'AppMini'.DS.'New'.DS.$this->application_name.DS.$temp_file;
$result[] = [ $result[] = [
'name' => $temp_file, 'name' => $temp_file,
'url' => $url, 'url' => substr($url, -4) == '.zip' ? $url : '',
'size' => FileSizeByteToUnit(filesize($file_path)), 'size' => FileSizeByteToUnit(filesize($file_path)),
'time' => date('Y-m-d H:i:s', filectime($file_path)), 'time' => date('Y-m-d H:i:s', filectime($file_path)),
]; ];
...@@ -165,7 +165,14 @@ class AppMiniAlipayListController extends CommonController ...@@ -165,7 +165,14 @@ class AppMiniAlipayListController extends CommonController
} }
// 删除压缩包 // 删除压缩包
if(\Library\FileUtil::UnlinkFile($this->new_path.DS.I('id'))) $path = $this->new_path.DS.I('id');
if(substr($path, -4) == '.zip')
{
$status = \Library\FileUtil::UnlinkFile($this->new_path.DS.I('id'));
} else {
$status = \Library\FileUtil::UnlinkDir($this->new_path.DS.I('id'));
}
if($status)
{ {
$this->ajaxReturn(L('common_operation_delete_success')); $this->ajaxReturn(L('common_operation_delete_success'));
} else { } else {
......
...@@ -52,13 +52,9 @@ class CacheController extends CommonController ...@@ -52,13 +52,9 @@ class CacheController extends CommonController
*/ */
public function SiteUpdate() public function SiteUpdate()
{ {
DelDirFile(TEMP_PATH); \Library\FileUtil::UnlinkDir(TEMP_PATH);
DelDirFile(DATA_PATH); \Library\FileUtil::UnlinkDir(DATA_PATH);
if(file_exists(RUNTIME_PATH.'common~runtime.php')) \Library\FileUtil::UnlinkFile(RUNTIME_PATH.'common~runtime.php');
{
unlink(RUNTIME_PATH.'common~runtime.php');
}
$this->success(L('common_operation_update_success')); $this->success(L('common_operation_update_success'));
} }
...@@ -72,7 +68,7 @@ class CacheController extends CommonController ...@@ -72,7 +68,7 @@ class CacheController extends CommonController
public function TemplateUpdate() public function TemplateUpdate()
{ {
// 模板 Cache // 模板 Cache
DelDirFile(CACHE_PATH); \Library\FileUtil::UnlinkDir(CACHE_PATH);
$this->success(L('common_operation_update_success')); $this->success(L('common_operation_update_success'));
} }
......
...@@ -168,7 +168,7 @@ class ThemeController extends CommonController ...@@ -168,7 +168,7 @@ class ThemeController extends CommonController
} }
// 开始删除主题 // 开始删除主题
if(DelDirFile($this->html_path.$id, true) && DelDirFile($this->static_path.$id, true)) if(\Library\FileUtil::UnlinkDir($this->html_path.$id) && \Library\FileUtil::UnlinkDir($this->static_path.$id))
{ {
$this->ajaxReturn(L('common_operation_delete_success')); $this->ajaxReturn(L('common_operation_delete_success'));
} else { } else {
......
...@@ -27,9 +27,11 @@ ...@@ -27,9 +27,11 @@
<td>{{$v.size}}</td> <td>{{$v.size}}</td>
<td>{{$v.time}}</td> <td>{{$v.time}}</td>
<td class="view-operation"> <td class="view-operation">
<a href="{{$v.url}}"> <notempty name="v.url">
<button class="am-btn am-btn-default am-btn-xs am-radius am-icon-download"> {{:L('common_operation_download')}}</button> <a href="{{$v.url}}">
</a> <button class="am-btn am-btn-default am-btn-xs am-radius am-icon-download"> {{:L('common_operation_download')}}</button>
</a>
</notempty>
<button class="am-btn am-btn-default am-btn-xs am-radius am-icon-trash-o submit-delete" data-url="{{:U('Admin/AppMiniAlipayList/Delete')}}" data-id="{{$v.name}}" data-view="reload"> {{:L('common_operation_delete')}}</button> <button class="am-btn am-btn-default am-btn-xs am-radius am-icon-trash-o submit-delete" data-url="{{:U('Admin/AppMiniAlipayList/Delete')}}" data-id="{{$v.name}}" data-view="reload"> {{:L('common_operation_delete')}}</button>
</td> </td>
</tr> </tr>
......
...@@ -356,49 +356,6 @@ function GetClientIP($long = false) ...@@ -356,49 +356,6 @@ function GetClientIP($long = false)
return $onlineip; return $onlineip;
} }
/**
* [DelDirFile 删除指定目录下的所有文件]
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
* @datetime 2017-01-11T18:30:37+0800
* @param [string] $dir_name [目录地址]
* @param [boolean] $is_del_dir [是否删除目录(默认false)]
* @return [boolean] [成功true, 失败false]
*/
function DelDirFile($dir_name, $is_del_dir = false)
{
$error = 0;
if($handle = opendir($dir_name))
{
while(false !== ($item = readdir($handle)))
{
if($item != '.' && $item != '..' )
{
if(is_dir("{$dir_name}/{$item}"))
{
DelDirFile("$dir_name/$item", $is_del_dir);
} else {
if(!is_writable("$dir_name/$item") || !unlink("$dir_name/$item"))
{
$error++;
}
}
}
}
// 关闭目录句柄
closedir($handle);
// 是否删除目录
if($is_del_dir == true && !rmdir($dir_name))
{
$error++;
}
}
return ($error == 0);
}
/** /**
* [UrlParamJoin url参数拼接] * [UrlParamJoin url参数拼接]
* @author Devil * @author Devil
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册