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

插件管理优化

feat/task1-c-wallet
gongfuxiang 2019-07-16 00:09:54 +08:00
parent 3cc3edcdd6
commit 455c7c1dfc
5 changed files with 18 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
application/admin/controller/Pluginsadmin.php
View File

@ -92,14 +92,12 @@ class Pluginsadmin extends Common
if(!empty($params['id']))
{
// 获取数据
$data_params = array(
'm' => 0,
'n' => 1,
'where' => ['id' => intval($params['id'])],
);
$ret = PluginsAdminService::PluginsList($data_params);
$data = $ret['data'][0];
$params['plugins'] = $ret['data'][0]['plugins'];
$ret = PluginsAdminService::PluginsList();
if(isset($ret['data'][$params['id']]))
{
$data = $ret['data'][$params['id']];
$params['plugins'] = $params['id'];
}
}
$this->assign('data', $data);

2
application/admin/view/default/pluginsadmin/first_step.html
View File

@ -13,7 +13,7 @@
应用编辑
{{/if}}
</span>
<a href="{{:MyUrl('admin/pluginsadmin/index', $params)}}" class="fr fs-14 m-t-5 am-icon-mail-reply"> 返回</a>
<a href="{{:MyUrl('admin/pluginsadmin/index')}}" class="fr fs-14 m-t-5 am-icon-mail-reply"> 返回</a>
</legend>
<div class="am-form-group">

4
application/admin/view/default/pluginsadmin/index.html
View File

@ -30,8 +30,8 @@
<div class="am-gallery-desc">{{$v.desc}}</div>
<div class="operation">
{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
<a href="{{:MyUrl('admin/pluginsadmin/saveinfo', array('id'=>$v['id']))}}" class="am-btn am-btn-default am-btn-xs am-radius am-icon-edit" title="编辑"></a>
<a href="{{:MyUrl('admin/pluginsadmin/download', array('id'=>$v['id']))}}" class="am-btn am-btn-default am-btn-xs am-radius am-icon-download" title="打包"></a>
<a href="{{:MyUrl('admin/pluginsadmin/saveinfo', array('id'=>$v['plugins']))}}" class="am-btn am-btn-default am-btn-xs am-radius am-icon-edit" title="编辑"></a>
<a href="{{:MyUrl('admin/pluginsadmin/download', array('id'=>$v['plugins']))}}" class="am-btn am-btn-default am-btn-xs am-radius am-icon-download" title="打包"></a>
{{/if}}
{{if isset($v['is_install']) and $v['is_install'] eq 1}}

4
application/admin/view/default/pluginsadmin/save_info.html
View File

@ -4,7 +4,7 @@
<div class="content-right">
<div class="content">
<!-- form start -->
<form class="am-form form-validation view-save" action="{{:MyUrl('admin/pluginsadmin/save')}}" method="POST" request-type="ajax-url" request-value="{{:MyUrl('admin/pluginsadmin/index', $params)}}" enctype="multipart/form-data">
<form class="am-form form-validation view-save" action="{{:MyUrl('admin/pluginsadmin/save')}}" method="POST" request-type="ajax-url" request-value="{{:MyUrl('admin/pluginsadmin/index')}}" enctype="multipart/form-data">
<legend>
<span class="fs-16">
{{if empty($data['id'])}}
@ -13,7 +13,7 @@
应用编辑
{{/if}}
</span>
<a href="{{:MyUrl('admin/pluginsadmin/index', $params)}}" class="fr fs-14 m-t-5 am-icon-mail-reply"> 返回</a>
<a href="{{:MyUrl('admin/pluginsadmin/index')}}" class="fr fs-14 m-t-5 am-icon-mail-reply"> 返回</a>
</legend>
<div class="am-form-group">

28
application/service/PluginsAdminService.php
View File

@ -56,8 +56,8 @@ class PluginsAdminService
// 数据组装
$base = $config['base'];
$data[] = [
'id' => date('YmdHis').GetNumberCode(8),
$data[$config['base']['plugins']] = [
'id' => empty($db_config['id']) ? date('YmdHis').GetNumberCode(8) : $db_config['id'],
'plugins' => isset($base['plugins']) ? $base['plugins'] : '',
'is_enable' => isset($db_config['is_enable']) ? $db_config['is_enable'] : 0,
'is_install' => empty($db_config) ? 0 : 1,
@ -144,7 +144,7 @@ class PluginsAdminService
Db::startTrans();
// 开始卸载
if(db('Plugins')->where(['plugins'=>$params['id']])->delete())
if(DB::name('Plugins')->where(['plugins'=>$params['id']])->delete())
{
// 钩子部署
$ret = self::PluginsHookDeployment();
@ -154,11 +154,13 @@ class PluginsAdminService
Db::commit();
return DataReturn('卸载成功');
}
} else {
$ret = DataReturn('卸载失败', -100);
}
// 事务回退
Db::rollback();
return DataReturn('卸载失败', -100);
return $ret;
}
/**
@ -502,17 +504,6 @@ class PluginsAdminService
return $ret;
}
// 应用是否已存在数据库
$plugins_id = Db::name('Plugins')->where(['plugins'=>$plugins])->value('id');
if(empty($plugins_id))
{
$plugins_id = Db::name('Plugins')->insertGetId(['plugins'=>$plugins, 'is_enable'=>0, 'add_time'=>time()]);
if(empty($plugins_id))
{
return DataReturn('应用添加失败', -100);
}
}
// 应用目录不存在则创建
$app_dir = APP_PATH.'plugins'.DS.$plugins;
if(\base\FileUtil::CreateDir($app_dir) !== true)
@ -1129,12 +1120,7 @@ php;
}
// 获取应用标记
$where = ['id'=>intval($params['id'])];
$plugins = Db::name('Plugins')->where($where)->value('plugins');
if(empty($plugins))
{
return DataReturn('应用不存在', -10);
}
$plugins = $params['id'];
// 目录不存在则创建
$new_dir = ROOT.'runtime'.DS.'data'.DS.'plugins_package'.DS.$plugins;