molong/sentcms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

完善扩展插件机制

Browse Source
This commit is contained in:
tensent
2020-04-13 10:40:47 +08:00
parent 6560f723cd
commit 53ccc5f123
11 changed files with 167 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/controller/Base.php
View File

@@ -15,6 +15,7 @@ use think\facade\Cache;
use think\Validate;
use app\model\Config;
use think\facade\Route;
use think\facade\Event;
use app\model\Hooks;
class Base {
@@ -72,11 +73,26 @@ class Base {
$config = Config::getConfigList($this->request);
Cache::set('system_config_data', $config);
}
$hooks = Hooks::where('status', 1)->column('addons', 'name');
foreach($hooks as $key => $value){
$hooks[$key] = $value ? explode(",", $value) : [];
$hooks = Cache::get('sentcms_hooks');
if (!$hooks) {
$hooks = Hooks::where('status', 1)->column('addons', 'name');
foreach($hooks as $key => $values){
if (is_string($values)) {
$values = explode(',', $values);
} else {
$values = (array) $values;
}
$hooks[$key] = array_filter(array_map(function ($v) use ($key) {
return [get_addons_class($v), $key];
}, $values));
// $hooks[$key] = $value ? explode(",", $value) : [];
}
}
Cache::set('sentcms_hooks', $hooks);
if (!empty($hooks)) {
Cache::set('sentcms_hooks', $hooks);
Event::listenEvents($hooks);
}
View::assign('config', $config);
// 控制器初始化
$this->initialize();

68
app/controller/admin/Addons.php
View File

@@ -10,6 +10,8 @@ namespace app\controller\admin;
use app\model\Addons as AddonsM;
use app\model\Hooks;
use think\facade\Cache;
use think\facade\Config;
/**
* @title 插件管理
@@ -50,26 +52,22 @@ class Addons extends Base {
* @title 安装插件
*/
public function install() {
$addon_name = input('addon_name', '', 'trim,ucfirst');
$class = get_addon_class($addon_name);
$addon_name = input('addon_name', '', 'trim');
$class = get_addons_class($addon_name);
if (class_exists($class)) {
$addons = new $class;
$info = $addons->info;
if (!$info || !$addons->checkInfo()) {
//检测信息的正确性
return $this->error('插件信息缺失');
}
$addons = get_addons_instance($addon_name);
$info = $addons->getInfo();
session('addons_install_error', null);
$install_flag = $addons->install();
if (!$install_flag) {
return $this->error('执行插件预安装操作失败' . session('addons_install_error'));
}
$result = $this->addons->install($info);
$result = AddonsM::install($info);
if ($result) {
cache('hooks', null);
Cache::delete("sentcms_hooks");
return $this->success('安装成功');
} else {
return $this->error($this->addons->getError());
return $this->error("安装失败！");
}
} else {
return $this->error('插件不存在');
@@ -80,8 +78,9 @@ class Addons extends Base {
* @title 卸载插件
*/
public function uninstall($id) {
$result = $this->addons->uninstall($id);
$result = AddonsM::uninstall($id);
if ($result === false) {
Cache::delete("sentcms_hooks");
return $this->error($this->addons->getError(), '');
} else {
return $this->success('卸载成功！');
@@ -91,12 +90,10 @@ class Addons extends Base {
/**
* @title 启用插件
*/
public function enable() {
$id = input('id');
cache('hooks', null);
$model = model('Addons');
$result = $model::where(array('id' => $id))->update(array('status' => 1));
public function enable($id) {
$result = AddonsM::update(['status' => 1], ['id' => $id]);
if ($result) {
Cache::delete('sentcms_hooks');
return $this->success('启用成功');
} else {
return $this->error("启用失败！");
@@ -106,12 +103,10 @@ class Addons extends Base {
/**
* @title 禁用插件
*/
public function disable() {
$id = input('id');
cache('hooks', null);
$model = model('Addons');
$result = $model::where(array('id' => $id))->update(array('status' => 0));
public function disable($id) {
$result = AddonsM::update(['status' => 0], ['id' => $id]);
if ($result) {
Cache::delete('sentcms_hooks');
return $this->success('禁用成功');
} else {
return $this->error("禁用失败！");
@@ -123,23 +118,30 @@ class Addons extends Base {
*/
public function config() {
if ($this->request->isPost()) {
# code...
$config = $this->request->post();
$id = $this->request->param('id');
$result = AddonsM::update(['config' => $config], ['id' => $id]);
if ($result) {
return $this->success('完成设置！');
} else {
return $this->error("无法完成设置！");
}
} else {
$id = input('id', '', 'trim,intval');
$id = $this->request->param('id');
if (!$id) {
return $this->error("非法操作！");
}
$info = $this->addons->find($id);
$info = AddonsM::find($id);
if (!empty($info)) {
$class = get_addon_class($info['name']);
$class = get_addons_instance($info['name']);
$keyList = array();
$data = array(
$keyList = $class->getConfig(true);
$this->data = array(
'keyList' => $keyList,
'meta_title' => $info['title'] . " - 设置"
);
$this->assign($data);
$this->setMeta($info['title'] . " - 设置");
return $this->fetch('public/edit');
return $this->fetch('admin/public/edit');
} else {
return $this->error("未安装此插件！");
}
@@ -222,7 +224,9 @@ class Addons extends Base {
*/
public function edithook($id) {
if ($this->request->isPost()) {
$result = $hooks->change();
$data = $this->request->post();
$result = Hooks::update($data, ['id' => $data['id']]);
if ($result !== false) {
return $this->success("修改成功");
} else {