1.内核更新

2.规则从菜单中批量导入bug修复

application/admin/controller/Group.php

@@ -127,26 +127,13 @@ class Group extends Admin {
 	//根据菜单更新节点
 	public function upnode($type) {
 		$rule = model('Menu')->getAuthNodes($type);
-		foreach ($rule as $value) {
-			$data = array(
-				'module' => $type,
-				'type'   => 2,
-				'name'   => $value['url'],
-				'title'  => $value['title'],
-				'group'  => $value['group'],
-				'status' => 1,
-			);
-			$id = $this->rule->where(array('name' => $data['name']))->value('id');
-			if ($id) {
-				$data['id'] = $id;
-				$this->rule->save($data, array('id' => $id));
-			} else {
-				$this->rule->save($data);
-			}
-		}
+		$reuslt = $this->rule->uprule($rule, $type);
 		return $this->success("更新成功！");
 	}
 
+	/**
+	 * 授权
+	 */
 	public function auth($id) {
 		if (!$id) {
 			return $this->error("非法操作！");

application/common/model/AuthRule.php

@@ -22,7 +22,6 @@ class AuthRule extends Base{
 	);
 
 	public $keyList = array(
-		//array('name'=>'id','title'=>'标识','type'=>'hidden'),
 		array('name'=>'module','title'=>'所属模块','type'=>'hidden'),
 		array('name'=>'title','title'=>'节点名称','type'=>'text','help'=>''),
 		array('name'=>'name','title'=>'节点标识','type'=>'text','help'=>''),
@@ -30,4 +29,25 @@ class AuthRule extends Base{
 		array('name'=>'status','title'=>'状态','type'=>'select','option'=>array('1'=>'启用','0'=>'禁用'),'help'=>''),
 		array('name'=>'condition','title'=>'条件','type'=>'text','help'=>'')
 	);
+
+	public function uprule($data, $type){
+		foreach ($data as $value) {
+			$data = array(
+				'module' => $type,
+				'type'   => 2,
+				'name'   => $value['url'],
+				'title'  => $value['title'],
+				'group'  => $value['group'],
+				'status' => 1,
+			);
+			$id = $this->where(array('name' => $data['name']))->value('id');
+			if ($id) {
+				$data['id'] = $id;
+				$this->save($data, array('id' => $id));
+			} else {
+				self::create($data);
+			}
+		}
+		return true;
+	}
 }