sileya-ai
/
vr-shopxo-source
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

插件下载名称优化

feat/task1-c-wallet
Devil 2019-10-14 21:33:20 +08:00
parent 1bb958dc37
commit b4aadfdf56
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
application/service/PluginsAdminService.php
View File

@ -1115,9 +1115,21 @@ php;
{
return DataReturn('请先开启开发者模式', -1);
}
// 获取应用标记
$plugins = $params['id'];
// 防止路径回溯
$plugins = htmlentities(str_replace(array('.', '/', '\\', ':'), '', strip_tags($params['id'])));
if(empty($plugins))
{
return DataReturn('插件标识有误', -1);
}
// 配置信息
$config = self::GetPluginsConfig($plugins);
if($config === false)
{
return DataReturn('插件配置有误', -10);
}
// 目录不存在则创建
$new_dir = ROOT.'runtime'.DS.'data'.DS.'plugins_package'.DS.$plugins;
@ -1214,7 +1226,7 @@ php;
\base\FileUtil::UnlinkDir($new_dir);
// 开始下载
if(\base\FileUtil::DownloadFile($new_dir.'.zip', $plugins.'.zip'))
if(\base\FileUtil::DownloadFile($new_dir.'.zip', $config['base']['name'].'.zip'))
{
@unlink($new_dir.'.zip');
} else {

14
application/service/ThemeService.php
View File

@ -261,6 +261,18 @@ class ThemeService
return DataReturn('主题名称有误', -1);
}
// 获取配置信息
$config_file = ROOT.self::$html_path.$theme.DS.'config.json';
if(!file_exists($config_file))
{
return DataReturn('主题配置文件不存在', -1);
}
$config = json_decode(file_get_contents($config_file), true);
if(empty($config))
{
return DataReturn('主题配置信息有误', -1);
}
// 目录不存在则创建
$new_dir = ROOT.'runtime'.DS.'data'.DS.'theme_package'.DS.$theme;
\base\FileUtil::CreateDir($new_dir);
@ -296,7 +308,7 @@ class ThemeService
\base\FileUtil::UnlinkDir($new_dir);
// 开始下载
if(\base\FileUtil::DownloadFile($new_dir.'.zip', $theme.'.zip'))
if(\base\FileUtil::DownloadFile($new_dir.'.zip', $config['name'].'.zip'))
{
@unlink($new_dir.'.zip');
} else {