1、bug的修复

2、内核更新
This commit is contained in:
2016-07-10 23:48:24 +08:00
parent f3fff63632
commit 1a0a29413a
50 changed files with 760 additions and 958 deletions

View File

@@ -82,11 +82,16 @@ class Addons extends \app\common\model\Base {
public function install($data){
if ($data) {
$result = $this->save($data);
if ($result) {
model('Hooks')->addHooks($data['name']);
return true;
$info = $this->where('name', $data['name'])->find();
if (null == $info) {
$result = $this->save($data);
if ($result) {
return model('Hooks')->addHooks($data['name']);
}else{
return false;
}
}else{
$this->error = "已安装!";
return false;
}
}else{

View File

@@ -24,6 +24,10 @@ class Content extends Base{
'cover_id' => 'integer',
);
protected function setUidAttr(){
return session('user_auth.uid');
}
protected function setCreateTimeAttr($value){
return $value ? strtotime($value) : time();
}
@@ -41,7 +45,7 @@ class Content extends Base{
return date('Y-m-d H:i:s',$value);
}
public function setInfo($name){
public function extend($name){
$this->name = $name;
return $this;
}

View File

@@ -33,8 +33,10 @@ class Hooks extends Base {
}
protected function setAddonsAttr($value){
$string = implode(",", $value[1]);
return $string;
if ($value[1]) {
$string = implode(",", $value[1]);
return $string;
}
}
protected function getTypeTextAttr($value, $data){
@@ -71,7 +73,30 @@ class Hooks extends Base {
return false;
}
$methods = get_class_methods($addons_class);
dump($methods);
foreach ($methods as $item) {
if ('Addon' === substr($item, -5, 5)) {
$info = $this->where('name', substr($item, 0, -5))->find();
if (null == $info) {
$save = array(
'name' => $addons_name,
'description' => '',
'type' => 1,
'addons' => array($addons_name),
'update_time' => time(),
'status' => 1
);
$this->save($save);
}else{
if ($info['addons']) {
# code...
}else{
$addons = substr($item, 0, -5);
}
$this->where('name', $addons_name)->setField('addons', $addons);
}
}
}
return true;
}
public function removeHooks($addons_name){

View File

@@ -55,11 +55,13 @@ class Model extends Base{
if($data['extend'] == 1){
//默认文档前缀
$tablename = 'document_'.$data['name'];
$is_auto_increment = false;
}else{
$tablename = $data['name'];
$is_auto_increment = true;
}
$sql = $db->start_table($tablename)
->create_id('id', 11 , '主键' , false);
->create_id('id', 11 , '主键' , $is_auto_increment);
if ($data['extend'] != 1) {
$sql = $sql->create_uid();
}