diff --git a/app/admin/controller/system/Admin.php b/app/admin/controller/system/Admin.php
index cc71635..99ba21d 100644
--- a/app/admin/controller/system/Admin.php
+++ b/app/admin/controller/system/Admin.php
@@ -62,6 +62,10 @@ class Admin extends AdminController
*/
public function index()
{
+ $this->jobs = Jobs::select()->toArray();
+ $this->group = AdminGroupModel::select()->toArray();
+ $this->department = Department::getListTree();
+
// 判断isAjax
if (request()->isAjax()) {
@@ -116,13 +120,9 @@ class Admin extends AdminController
return $this->success('查询成功', null, $list, $count);
}
- $this->jobs = Jobs::select()->toArray();
- $this->group = AdminGroupModel::select()->toArray();
- $this->department = Department::getListTree();
-
return view('/system/admin/index', [
- 'jobs' => $this->jobs,
- 'group' => $this->group,
+ 'jobs' => $this->jobs,
+ 'group' => $this->group,
'department' => json_encode($this->department),
]);
}
@@ -223,7 +223,7 @@ class Admin extends AdminController
/**
* 更新权限函数
* @access protected
- * @param string $type
+ * @param string $type
* @return \support\Response|void
*/
protected function _update_RuleCates(string $type = AUTH_RULES)
@@ -252,12 +252,12 @@ class Admin extends AdminController
}
$rules = array_unique(array_merge($rules, $current));
- $this->model = new AdminAccessModel();
+ $AdminAccessModel = new AdminAccessModel();
$data = [
"$type" => implode(',', $rules)
];
- if ($this->model->where('admin_id', $admin_id)->save($data)) {
+ if ($AdminAccessModel->where('admin_id', $admin_id)->save($data)) {
return $this->success('更新权限成功！');
}
@@ -267,35 +267,28 @@ class Admin extends AdminController
}
/**
- * 获取用户菜单
+ * 获取用户权限树
* getAdminRules
- * @return void
+ * @return mixed
*/
- public function getUserMenu()
+ public function getPermissions()
{
+ $list = [];
if (\request()->isAjax()) {
- return $this->auth->getRulesMenu();
- }
- }
-
- /**
- * 权限函数接口
- * @access public
- * @return mixed|array
- */
- public function getRuleCateTree()
- {
- if (request()->isAjax()) {
- $type = input('type') ?? 'rules';
- try {
- $list = $this->auth->getRuleCatesTree($type, $this->auth->authPrivate);
- } catch (\Exception $e) {
- return $this->error($e->getMessage());
+ $type = input('type', 'menu');
+ $group = input('group', 0);
+ if ($type == 'menu') {
+ return $this->auth->getRulesMenu();
+ } else {
+ try {
+ $list = $this->auth->getRuleCatesTree($type, $group ? $this->auth->authGroup : $this->auth->authPrivate);
+ } catch (\Exception $e) {
+ return $this->error($e->getMessage());
+ }
+ return $list;
}
- return $list;
}
-
- return [];
+ return $list;
}
/**
@@ -313,34 +306,34 @@ class Admin extends AdminController
{
// 配置消息
$msg = [
- 'msg' => [
+ 'msg' => [
'0' => [
- 'title' => '你收到了几份周报！',
- 'type' => '周报类型',
+ 'title' => '你收到了几份周报！',
+ 'type' => '周报类型',
'create_time' => '1周前',
],
'1' => [
- 'title' => '你收到了来自女下属的周报',
- 'type' => '周报类型',
+ 'title' => '你收到了来自女下属的周报',
+ 'type' => '周报类型',
'create_time' => '2周前',
]
],
'comment' => [
'0' => [
- 'title' => '一个领导评论了你',
- 'content' => '小伙子不错，继续努力！',
+ 'title' => '一个领导评论了你',
+ 'content' => '小伙子不错，继续努力！',
'create_time' => '1周前',
]
],
- 'things' => [
+ 'things' => [
'0' => [
- 'title' => '客户说尽快修复瞟了么APP闪退的问题...',
- 'type' => '0',
+ 'title' => '客户说尽快修复瞟了么APP闪退的问题...',
+ 'type' => '0',
'create_time' => '1周前',
],
'1' => [
- 'title' => '秦老板和经销商的下季度合同尽快签订！',
- 'type' => '1',
+ 'title' => '秦老板和经销商的下季度合同尽快签订！',
+ 'type' => '1',
'create_time' => '2周前',
]
],
@@ -377,9 +370,9 @@ class Admin extends AdminController
$data = $this->model->find($request->adminId);
if (!empty($data['group_id'])) {
$group = AdminGroupModel::field('title')
- ->whereIn('id', $data['group_id'])
- ->select()
- ->toArray();
+ ->whereIn('id', $data['group_id'])
+ ->select()
+ ->toArray();
foreach ($group as $key => $value) {
$title[$key] = $value['title'];
}
@@ -473,7 +466,7 @@ class Admin extends AdminController
$this->model->where($where)->update(['pwd' => encryptPwd($post['pass'])]);
return $this->success('更改密码成功！');
} else {
- return $this->error('原始密码输入错误');
+ return $this->error('原始密码输入错误');
}
}
diff --git a/app/admin/controller/system/AdminGroup.php b/app/admin/controller/system/AdminGroup.php
index 88921f2..b843d91 100644
--- a/app/admin/controller/system/AdminGroup.php
+++ b/app/admin/controller/system/AdminGroup.php
@@ -106,19 +106,6 @@ class AdminGroup extends AdminController
}
}
- /**
- * 权限函数接口
- * @access public
- * @return mixed|array
- */
- public function getRuleCateTree()
- {
- if (request()->isAjax()) {
- $type = input('type') ?? 'rules';
- return $this->auth->getRuleCatesTree($type, $this->auth->authGroup);
- }
- }
-
/**
* 更新权限
*/
diff --git a/app/admin/library/Auth.php b/app/admin/library/Auth.php
index c24cf01..df9b5cf 100644
--- a/app/admin/library/Auth.php
+++ b/app/admin/library/Auth.php
@@ -305,12 +305,6 @@ class Auth
'field' => $this->authFields
], true);
}
-
- if (empty($list)) {
- $list = Event::emit('cmscategoryPermissions', [
- 'field' => $this->authFields
- ], true);
- }
}
return $tree ? ($list ? json_encode(list_to_tree($list)) : json_encode([])) : $list;
diff --git a/app/admin/view/index/index.html b/app/admin/view/index/index.html
index 597594a..f2526d3 100644
--- a/app/admin/view/index/index.html
+++ b/app/admin/view/index/index.html
@@ -122,7 +122,7 @@
Build {:release()}
-
+
diff --git a/app/admin/view/system/admin/group.html b/app/admin/view/system/admin/group.html
index 0093efd..bfc13a6 100644
--- a/app/admin/view/system/admin/group.html
+++ b/app/admin/view/system/admin/group.html
@@ -154,7 +154,7 @@
admin.callback.auth = function(clickthis,colletction,config) {
// 获取表格对象
- var tableThis = colletction.tableThis,checkKeys = [];
+ var tableThis = colletction.tableThis, checkKeys = [];
// 勾选默认权限
if (typeof (tableThis.data.rules) !== undefined && tableThis.data.rules != null) {
@@ -164,49 +164,60 @@
}
}
- // 渲染树列表
- tree.render({
- id: 'authTree'
- ,elem: '#authTree'
- ,data: _ajax('rules')
- ,showCheckbox: true
- ,checkids: checkKeys
- ,oncheck: function(obj){}
- });
-
- // 监听提交
- form.on("submit(submitPage)",function(post){
- // 获取提交地址
- var pageThat = jquery(this), _form = pageThat.parents('form'),
- _pageUrl = _form.attr("action") || pageThat.data('url');
- pageThat.attr("disabled",true);
- if (typeof(_pageUrl) === 'undefined') {
- layer.msg('缺少URL属性','error');
- return false;
- }
+ jquery.ajax({
+ url:'{:url("/system/Admin/getPermissions")}',
+ type:'post',
+ dataType:'json',
+ data:{
+ type : 'rules',
+ group: true,
+ },
+ success(data) {
+ // 渲染树列表
+ tree.render({
+ id: 'authTree'
+ ,elem: '#authTree'
+ ,data: data
+ ,showCheckbox: true
+ ,oncheck: function(obj){}
+ });
+ tree.setChecked('authTree', checkKeys);
- // 增加角色id
- post.field.id = tableThis.data.id;
- // 增加节点数据
- post.field.rules = tree.getChecked('authTree',true);
-
- // 开始POST提交数据
- jquery.post(_pageUrl,
- post.field, function(res){
- if (res.code === 200) {
- layer.msg(res.msg);
- // 更新本地规则
- tableThis.update({
- rules: tree.getChecked('authTree',true).join(',')
- });
- // 关闭当前窗口
- layer.close(colletction.index);
- }else{
- layer.error(res.msg);
+ // 监听提交
+ form.on("submit(submitPage)",function(post){
+ // 获取提交地址
+ var pageThat = jquery(this), _form = pageThat.parents('form'),
+ _pageUrl = _form.attr("action") || pageThat.data('url');
+ pageThat.attr("disabled",true);
+ if (typeof(_pageUrl) === 'undefined') {
+ layer.msg('缺少URL属性','error');
+ return false;
}
- }, 'json');
- return false;
+ // 增加角色id
+ post.field.id = tableThis.data.id;
+ // 增加节点数据
+ post.field.rules = tree.getChecked('authTree',true);
+
+ // 开始POST提交数据
+ jquery.post(_pageUrl,
+ post.field, function(res){
+ if (res.code === 200) {
+ layer.msg(res.msg);
+ // 更新本地规则
+ tableThis.update({
+ rules: tree.getChecked('authTree',true).join(',')
+ });
+ // 关闭当前窗口
+ layer.close(colletction.index);
+ }else{
+ layer.error(res.msg);
+ }
+ }, 'json');
+
+ return false;
+ })
+ }
})
}
@@ -225,64 +236,73 @@
}
}
- var rules = _ajax('cates');
- if (typeof rules.code != "undefined") {
- return layer.msg(rules.msg,'info');
- }
+ jquery.ajax({
+ url:'{:url("/system/Admin/getPermissions")}',
+ type:'post',
+ dataType:'json',
+ data:{
+ type : 'cates',
+ group: true,
+ },
+ success(data) {
- // 渲染树列表
- tree.render({
- id: 'cateTree'
- ,elem: '#cateTree'
- ,data: rules
- ,showCheckbox: true
- ,checkids: checkKeys
- ,oncheck: function(obj){}
- });
+ // 渲染树列表
+ tree.render({
+ id: 'cateTree'
+ ,elem: '#cateTree'
+ ,data: data
+ ,showCheckbox: true
+ ,oncheck: function(obj){}
+ });
- // 监听提交
- form.on("submit(submitPage)",function(post){
- // 获取提交地址
- var pageThat = jquery(this), _form = pageThat.parents('form'),
- _pageUrl = _form.attr("action") || pageThat.data('url');
- pageThat.attr("disabled",true);
- if (typeof(_pageUrl) === 'undefined') {
- layer.msg('缺少URL属性','error');
- return false;
- }
+ tree.setChecked('cateTree', checkKeys);
- // 增加角色id
- post.field.id = tableThis.data.id;
- // 增加节点数据
- post.field.cates = tree.getChecked('cateTree',true);
-
- // 开始POST提交数据
- jquery.post(_pageUrl,
- post.field, function(res){
- if (res.code === 200) {
- layer.msg(res.msg);
- // 更新栏目权限
- tableThis.update({
- cates: tree.getChecked('cateTree',true).join(',')
- });
- // 关闭当前窗口
- layer.close(colletction.index);
- }else{
- layer.error(res.msg);
+ // 监听提交
+ form.on("submit(submitPage)",function(post){
+ // 获取提交地址
+ var pageThat = jquery(this), _form = pageThat.parents('form'),
+ _pageUrl = _form.attr("action") || pageThat.data('url');
+ pageThat.attr("disabled",true);
+ if (typeof(_pageUrl) === 'undefined') {
+ layer.msg('缺少URL属性','error');
+ return false;
}
- }, 'json');
- return false;
- })
+ // 增加角色id
+ post.field.id = tableThis.data.id;
+ // 增加节点数据
+ post.field.cates = tree.getChecked('cateTree',true);
+
+ // 开始POST提交数据
+ jquery.post(_pageUrl,
+ post.field, function(res){
+ if (res.code === 200) {
+ layer.msg(res.msg);
+ // 更新栏目权限
+ tableThis.update({
+ cates: tree.getChecked('cateTree',true).join(',')
+ });
+ // 关闭当前窗口
+ layer.close(colletction.index);
+ }else{
+ layer.error(res.msg);
+ }
+ }, 'json');
+
+ return false;
+ })
+ }
+ })
+
+ // var rules = _ajax('cates');
+ // if (typeof rules.code != "undefined") {
+ // return layer.msg(rules.msg,'info');
+ // }
+
+
}
- // 同步加载函数
- var _ajax = function (type) {
- var func = '{:url("/system/Admin/getRuleCateTree")}';
- return admin.event.ajax(func,{
- type : type,
- },false)
- }
+
});
diff --git a/app/admin/view/system/admin/index.html b/app/admin/view/system/admin/index.html
index 8edd904..cf28930 100644
--- a/app/admin/view/system/admin/index.html
+++ b/app/admin/view/system/admin/index.html
@@ -333,7 +333,7 @@
// 开始POST提交数据
layui.$.post(_pageUrl,
post.field, function(res){
- if (res.code == 200) {
+ if (res.code === 200) {
layer.msg(res.msg);
// 关闭当前窗口
table.reload('lay-tableList');
@@ -351,58 +351,55 @@
// 编辑用户权限/栏目权限回调函数
admin.callback.rulecates = function(clickthis,colletction,config) {
+ var tableThis = colletction.tableThis,
+ event = tableThis.event;
- var tableThis = colletction.tableThis, event = tableThis.event;
+ layui.$.ajax({
+ url:'{:url("/system/Admin/getPermissions")}',
+ type:'post',
+ dataType:'json',
+ data:{
+ type : event,
+ },
+ success(data) {
+ tree.render({
+ id: 'authTree',
+ elem: '#authTree',
+ data: data,
+ showCheckbox: true,
+ })
- var rules = _ajax(event);
- if (typeof rules.code != "undefined") {
- return layer.msg(rules.msg,'info');
- }
+ tree.setChecked('authTree', tableThis.data[event].length ? tableThis.data[event].map(Number): []);
- // 创建实例
- tree.render({
- id: 'authTree',
- elem: '#authTree',
- data: rules,
- showCheckbox: true,
- checkids: tableThis.data[event].map(Number)
+ // 监听权限提交
+ form.on("submit(submitPage)", function (post) {
+
+ // 获取用户id
+ post.field.admin_id = tableThis.data.id;
+ // 增加节点数据
+ post.field[event] = tree.getChecked('authTree', true);
+ // 开始POST提交数据
+ clickthis.attr("disabled", true);
+ layui.$.post("{:url('/system/admin/edit" + event + "')}",
+ post.field, function (res) {
+ if (res.code === 200) {
+ // 更新本地规则
+ tableThis.update({
+ [event]: post.field[event]
+ });
+
+ // 关闭当前窗口
+ layer.msg(res.msg);
+ layer.close(colletction.index);
+ } else {
+ layer.error(res.msg);
+ }
+ }, 'json');
+
+ return false;
+ })
+ }
})
-
- // 监听权限提交
- form.on("submit(submitPage)", function (post) {
-
- // 获取用户id
- post.field.admin_id = tableThis.data.id;
- // 增加节点数据
- post.field[event] = tree.getChecked('authTree', true);
- // 开始POST提交数据
- clickthis.attr("disabled", true);
- layui.$.post("{:url('/system/admin/edit" + event + "')}",
- post.field, function (res) {
- if (res.code === 200) {
- // 更新本地规则
- tableThis.update({
- [event]: post.field[event]
- });
-
- // 关闭当前窗口
- layer.msg(res.msg);
- layer.close(colletction.index);
- } else {
- layer.error(res.msg);
- }
- }, 'json');
-
- return false;
- })
- }
-
- // 同步加载函数
- var _ajax = function (type) {
- var func = '{:url("/system/Admin/getRuleCateTree")}';
- return admin.event.ajax(func,{
- type : type,
- },false)
}
});
diff --git a/app/admin/view/system/admin/rules.html b/app/admin/view/system/admin/rules.html
index c6acb6b..625a234 100644
--- a/app/admin/view/system/admin/rules.html
+++ b/app/admin/view/system/admin/rules.html
@@ -301,7 +301,7 @@
return layui.layer.error('路由必须以/符号开始');
}
router = router.substring(1);
- jquery('.alias').val(router.replace('/',':'));
+ jquery('.alias').val(router.replaceAll('/',':'));
})
}
diff --git a/app/admin/view/system/department/index.html b/app/admin/view/system/department/index.html
index 5d9a2ea..d30a4f7 100644
--- a/app/admin/view/system/department/index.html
+++ b/app/admin/view/system/department/index.html
@@ -140,7 +140,7 @@
{field: 'email', align: 'center',title: '{:__("邮箱")}'},
{field: 'address', width: 220,title: '{:__("部门地址")}'},
{field: 'sort', width: 80, align: 'center',title: '{:__("排序")}'},
- {field: 'create_time', align: 'center',width: 160,title: '{:__("创建时间")}'},
+ {field: 'create_time', align: 'center',width: 180,title: '{:__("创建时间")}'},
{align: 'center', toolbar: '#tableBar', width: 160,title: '{:__("操作")}'},
]]
});
diff --git a/app/install/install.sql b/app/install/install.sql
index 3bf9ebb..6653f37 100644
--- a/app/install/install.sql
+++ b/app/install/install.sql
@@ -145,37 +145,37 @@ INSERT INTO `__PREFIX__admin_rules` VALUES (7, 6, '修改配置', '/index/basese
INSERT INTO `__PREFIX__admin_rules` VALUES (8, 6, 'FTP接口', '/index/testftp', 'index:testftp', 2, '', '', 8, '', 0, 1, 0, 1657002180, 1657002180, NULL);
INSERT INTO `__PREFIX__admin_rules` VALUES (9, 6, '邮件接口', '/index/testemail', 'index:testemail', 2, '', '', 9, '', 0, 1, 0, 1657002180, 1657002180, NULL);
INSERT INTO `__PREFIX__admin_rules` VALUES (10, 6, '缓存接口', '/index/testcache', 'index:testcache', 2, '', '', 10, '', 0, 1, 0, 1657002180, 1657002180, NULL);
-INSERT INTO `__PREFIX__admin_rules` VALUES (11, 5, '用户管理', '/system/admin/index', 'system:admin:index', 0, '', '', 11, '', 1, 1, 0, 1657002180, 1657002180, NULL);
-INSERT INTO `__PREFIX__admin_rules` VALUES (12, 11, '查看', '/system/admin/index', 'system:admin:index', 1, '', '', 12, '', 1, 1, 0, 1657002180, 1657002180, NULL);
-INSERT INTO `__PREFIX__admin_rules` VALUES (13, 11, '添加', '/system/admin/add', 'system:admin:add', 1, '', '', 13, '', 1, 1, 0, 1657002180, 1657002180, NULL);
-INSERT INTO `__PREFIX__admin_rules` VALUES (14, 11, '编辑', '/system/admin/edit', 'system:admin:edit', 1, '', '', 14, '', 1, 1, 0, 1657002180, 1657002180, NULL);
-INSERT INTO `__PREFIX__admin_rules` VALUES (15, 11, '删除', '/system/admin/del', 'system:admin:del', 1, '', '', 15, '', 1, 1, 0, 1657002180, 1657002180, NULL);
-INSERT INTO `__PREFIX__admin_rules` VALUES (16, 11, '状态', '/system/admin/status', 'system:admin:status', 2, '', '', 16, '', 1, 1, 0, 1657002180, 1657002180, NULL);
-INSERT INTO `__PREFIX__admin_rules` VALUES (17, 11, '编辑权限', '/system/admin/editrules', 'system:admin:editrules', 2, '', '', 17, '', 1, 1, 0, 1657002180, 1657002180, NULL);
-INSERT INTO `__PREFIX__admin_rules` VALUES (18, 11, '编辑栏目', '/system/admin/editcates', 'system:admin:editcates', 2, '', '', 18, '', 1, 1, 0, 1657002180, 1657002180, NULL);
-INSERT INTO `__PREFIX__admin_rules` VALUES (19, 11, '系统模板', '/system/admin/theme', 'system:admin:theme', 2, '', '', 19, '', 0, 1, 0, 1657002180, 1657002180, NULL);
-INSERT INTO `__PREFIX__admin_rules` VALUES (20, 11, '短消息', '/system/admin/message', 'system:admin:message', 2, '', '', 20, '', 0, 1, 0, 1657002180, 1657002180, NULL);
-INSERT INTO `__PREFIX__admin_rules` VALUES (21, 11, '个人中心', '/system/admin/center', 'system:admin:center', 2, '', '', 21, '', 0, 1, 0, 1657002180, 1657002180, NULL);
-INSERT INTO `__PREFIX__admin_rules` VALUES (22, 11, '修改资料', '/system/admin/modify', 'system:admin:modify', 2, '', '', 22, '', 0, 1, 0, 1657002180, 1657002180, NULL);
-INSERT INTO `__PREFIX__admin_rules` VALUES (23, 11, '修改密码', '/system/admin/pwd', 'system:admin:pwd', 2, '', '', 23, '', 0, 1, 0, 1657002180, 1657002180, NULL);
-INSERT INTO `__PREFIX__admin_rules` VALUES (24, 11, '系统语言', '/system/admin/language', 'system:admin:language', 2, '', '', 24, '', 0, 1, 0, 1657002180, 1657002180, NULL);
-INSERT INTO `__PREFIX__admin_rules` VALUES (25, 11, '清理缓存', '/system/admin/clear', 'system:admin:clear', 2, '', '', 25, '', 0, 1, 0, 1657002180, 1657002180, NULL);
-INSERT INTO `__PREFIX__admin_rules` VALUES (26, 11, '数据接口', '/system/admin/getUserMenu', 'system:admin:getUserMenu', 3, '', '', 26, '', 0, 1, 0, 1657002180, 1657002180, NULL);
-INSERT INTO `__PREFIX__admin_rules` VALUES (27, 5, '用户中心', '/system/admin/center', 'system:admin:center', 0, '', '', 27, '', 1, 1, 0, 1657002180, 1657002180, NULL);
-INSERT INTO `__PREFIX__admin_rules` VALUES (28, 27, '系统模板', '/system/admin/theme', 'system:admin:theme', 2, '', '', 28, '', 0, 1, 0, 1657002180, 1657002180, NULL);
-INSERT INTO `__PREFIX__admin_rules` VALUES (29, 27, '短消息', '/system/admin/message', 'system:admin:message', 2, '', '', 29, '', 0, 1, 0, 1657002180, 1657002180, NULL);
-INSERT INTO `__PREFIX__admin_rules` VALUES (30, 27, '修改资料', '/system/admin/modify', 'system:admin:modify', 2, '', '', 30, '', 0, 1, 0, 1657002180, 1657002180, NULL);
-INSERT INTO `__PREFIX__admin_rules` VALUES (31, 27, '修改密码', '/system/admin/pwd', 'system:admin:pwd', 2, '', '', 31, '', 0, 1, 0, 1657002180, 1657002180, NULL);
-INSERT INTO `__PREFIX__admin_rules` VALUES (32, 27, '系统语言', '/system/admin/language', 'system:admin:language', 2, '', '', 32, '', 0, 1, 0, 1657002180, 1657002180, NULL);
-INSERT INTO `__PREFIX__admin_rules` VALUES (33, 27, '清理缓存', '/system/admin/clear', 'system:admin:clear', 2, '', '', 33, '', 0, 1, 0, 1657002180, 1657002180, NULL);
+INSERT INTO `__PREFIX__admin_rules` VALUES (11, 5, '用户管理', '/system/Admin/index', 'system:Admin:index', 0, '', '', 11, '', 1, 1, 0, 1657002180, 1657002180, NULL);
+INSERT INTO `__PREFIX__admin_rules` VALUES (12, 11, '查看', '/system/Admin/index', 'system:Admin:index', 1, '', '', 12, '', 1, 1, 0, 1657002180, 1657002180, NULL);
+INSERT INTO `__PREFIX__admin_rules` VALUES (13, 11, '添加', '/system/Admin/add', 'system:Admin:add', 1, '', '', 13, '', 1, 1, 0, 1657002180, 1657002180, NULL);
+INSERT INTO `__PREFIX__admin_rules` VALUES (14, 11, '编辑', '/system/Admin/edit', 'system:Admin:edit', 1, '', '', 14, '', 1, 1, 0, 1657002180, 1657002180, NULL);
+INSERT INTO `__PREFIX__admin_rules` VALUES (15, 11, '删除', '/system/Admin/del', 'system:Admin:del', 1, '', '', 15, '', 1, 1, 0, 1657002180, 1657002180, NULL);
+INSERT INTO `__PREFIX__admin_rules` VALUES (16, 11, '状态', '/system/Admin/status', 'system:Admin:status', 2, '', '', 16, '', 1, 1, 0, 1657002180, 1657002180, NULL);
+INSERT INTO `__PREFIX__admin_rules` VALUES (17, 11, '编辑权限', '/system/Admin/editRules', 'system:Admin:editRules', 2, '', '', 17, '', 1, 1, 0, 1657002180, 1657002180, NULL);
+INSERT INTO `__PREFIX__admin_rules` VALUES (18, 11, '编辑栏目', '/system/Admin/editCates', 'system:Admin:editCates', 2, '', '', 18, '', 1, 1, 0, 1657002180, 1657002180, NULL);
+INSERT INTO `__PREFIX__admin_rules` VALUES (19, 11, '系统模板', '/system/Admin/theme', 'system:Admin:theme', 2, '', '', 19, '', 0, 1, 0, 1657002180, 1657002180, NULL);
+INSERT INTO `__PREFIX__admin_rules` VALUES (20, 11, '短消息', '/system/Admin/message', 'system:Admin:message', 2, '', '', 20, '', 0, 1, 0, 1657002180, 1657002180, NULL);
+INSERT INTO `__PREFIX__admin_rules` VALUES (21, 11, '个人中心', '/system/Admin/center', 'system:Admin:center', 2, '', '', 21, '', 0, 1, 0, 1657002180, 1657002180, NULL);
+INSERT INTO `__PREFIX__admin_rules` VALUES (22, 11, '修改资料', '/system/Admin/modify', 'system:Admin:modify', 2, '', '', 22, '', 0, 1, 0, 1657002180, 1657002180, NULL);
+INSERT INTO `__PREFIX__admin_rules` VALUES (23, 11, '修改密码', '/system/Admin/pwd', 'system:Admin:pwd', 2, '', '', 23, '', 0, 1, 0, 1657002180, 1657002180, NULL);
+INSERT INTO `__PREFIX__admin_rules` VALUES (24, 11, '系统语言', '/system/Admin/language', 'system:Admin:language', 2, '', '', 24, '', 0, 1, 0, 1657002180, 1657002180, NULL);
+INSERT INTO `__PREFIX__admin_rules` VALUES (25, 11, '清理缓存', '/system/Admin/clear', 'system:Admin:clear', 2, '', '', 25, '', 0, 1, 0, 1657002180, 1657002180, NULL);
+INSERT INTO `__PREFIX__admin_rules` VALUES (26, 11, '数据接口', '/system/Admin/getPermissions', 'system:Admin:getPermissions', 3, '', '', 26, '', 0, 1, 0, 1657002180, 1657002180, NULL);
+INSERT INTO `__PREFIX__admin_rules` VALUES (27, 5, '用户中心', '/system/Admin/center', 'system:Admin:center', 0, '', '', 27, '', 1, 1, 0, 1657002180, 1657002180, NULL);
+INSERT INTO `__PREFIX__admin_rules` VALUES (28, 27, '系统模板', '/system/Admin/theme', 'system:Admin:theme', 2, '', '', 28, '', 0, 1, 0, 1657002180, 1657002180, NULL);
+INSERT INTO `__PREFIX__admin_rules` VALUES (29, 27, '短消息', '/system/Admin/message', 'system:Admin:message', 2, '', '', 29, '', 0, 1, 0, 1657002180, 1657002180, NULL);
+INSERT INTO `__PREFIX__admin_rules` VALUES (30, 27, '修改资料', '/system/Admin/modify', 'system:Admin:modify', 2, '', '', 30, '', 0, 1, 0, 1657002180, 1657002180, NULL);
+INSERT INTO `__PREFIX__admin_rules` VALUES (31, 27, '修改密码', '/system/Admin/pwd', 'system:Admin:pwd', 2, '', '', 31, '', 0, 1, 0, 1657002180, 1657002180, NULL);
+INSERT INTO `__PREFIX__admin_rules` VALUES (32, 27, '系统语言', '/system/Admin/language', 'system:Admin:language', 2, '', '', 32, '', 0, 1, 0, 1657002180, 1657002180, NULL);
+INSERT INTO `__PREFIX__admin_rules` VALUES (33, 27, '清理缓存', '/system/Admin/clear', 'system:Admin:clear', 2, '', '', 33, '', 0, 1, 0, 1657002180, 1657002180, NULL);
INSERT INTO `__PREFIX__admin_rules` VALUES (34, 5, '角色管理', '/system/AdminGroup/index', 'system:AdminGroup:index', 0, '', '', 34, '', 1, 1, 0, 1657002180, 1657002180, NULL);
INSERT INTO `__PREFIX__admin_rules` VALUES (35, 34, '查看', '/system/AdminGroup/index', 'system:AdminGroup:index', 1, '', '', 35, '', 1, 1, 0, 1657002180, 1657002180, NULL);
INSERT INTO `__PREFIX__admin_rules` VALUES (36, 34, '添加', '/system/AdminGroup/add', 'system:AdminGroup:add', 1, '', '', 36, '', 1, 1, 0, 1657002180, 1657002180, NULL);
INSERT INTO `__PREFIX__admin_rules` VALUES (37, 34, '编辑', '/system/AdminGroup/edit', 'system:AdminGroup:edit', 1, '', '', 37, '', 1, 1, 0, 1657002180, 1657002180, NULL);
INSERT INTO `__PREFIX__admin_rules` VALUES (38, 34, '删除', '/system/AdminGroup/del', 'system:AdminGroup:del', 1, '', '', 38, '', 1, 1, 0, 1657002180, 1657002180, NULL);
INSERT INTO `__PREFIX__admin_rules` VALUES (39, 34, '状态', '/system/AdminGroup/status', 'system:AdminGroup:status', 2, '', '', 39, '', 1, 1, 0, 1657002180, 1657002180, NULL);
-INSERT INTO `__PREFIX__admin_rules` VALUES (40, 34, '编辑权限', '/system/AdminGroup/editrules', 'system:AdminGroup:editrules', 2, '', '', 40, '', 1, 1, 0, 1657002180, 1657002180, NULL);
-INSERT INTO `__PREFIX__admin_rules` VALUES (41, 34, '编辑栏目', '/system/AdminGroup/editcates', 'system:AdminGroup:editcates', 2, '', '', 41, '', 1, 1, 0, 1657002180, 1657002180, NULL);
+INSERT INTO `__PREFIX__admin_rules` VALUES (40, 34, '编辑权限', '/system/AdminGroup/editRules', 'system:AdminGroup:editRules', 2, '', '', 40, '', 1, 1, 0, 1657002180, 1657002180, NULL);
+INSERT INTO `__PREFIX__admin_rules` VALUES (41, 34, '编辑栏目', '/system/AdminGroup/editCates', 'system:AdminGroup:editCates', 2, '', '', 41, '', 1, 1, 0, 1657002180, 1657002180, NULL);
INSERT INTO `__PREFIX__admin_rules` VALUES (42, 5, '菜单管理', '/system/AdminRules/index', 'system:AdminRules:index', 0, '', '', 42, '', 1, 1, 0, 1657002180, 1657002180, NULL);
INSERT INTO `__PREFIX__admin_rules` VALUES (43, 42, '查询', '/system/AdminRules/index', 'system:AdminRules:index', 1, '', '', 43, NULL, 1, 1, 0, 1657002180, 1657002180, NULL);
INSERT INTO `__PREFIX__admin_rules` VALUES (44, 42, '添加', '/system/AdminRules/add', 'system:AdminRules:add', 1, '', '', 44, NULL, 1, 1, 0, 1657002180, 1657002180, NULL);
@@ -466,14 +466,14 @@ CREATE TABLE `__PREFIX__dictionary` (
-- ----------------------------
-- Records of __PREFIX__dictionary
-- ----------------------------
-INSERT INTO `__PREFIX__dictionary` VALUES (1, 0, '内容属性', 'cattr', 1, '', 1, 1659839499, 1637738903, NULL);
+INSERT INTO `__PREFIX__dictionary` VALUES (1, 0, '内容属性', 'content', 1, '', 1, 1659839499, 1637738903, NULL);
INSERT INTO `__PREFIX__dictionary` VALUES (2, 1, '头条', '1', 2, '', 1, 1638093403, 1638093403, NULL);
INSERT INTO `__PREFIX__dictionary` VALUES (3, 1, '推荐', '2', 3, '', 1, 1657367329, 1638093425, NULL);
INSERT INTO `__PREFIX__dictionary` VALUES (4, 1, '幻灯', '3', 4, '', 1, 1657438818, 1638093430, NULL);
INSERT INTO `__PREFIX__dictionary` VALUES (5, 1, '滚动', '4', 5, '', 1, 1638093435, 1638093435, NULL);
INSERT INTO `__PREFIX__dictionary` VALUES (6, 1, '图文', '5', 6, '', 1, 1638093456, 1638093456, NULL);
INSERT INTO `__PREFIX__dictionary` VALUES (7, 1, '跳转', '6', 7, '', 1, 1638093435, 1638093435, NULL);
-INSERT INTO `__PREFIX__dictionary` VALUES (8, 0, '友链类型', 'ftype', 8, '', 1, 1638093456, 1638093456, NULL);
+INSERT INTO `__PREFIX__dictionary` VALUES (8, 0, '友链类型', 'friendlink', 8, '', 1, 1638093456, 1638093456, NULL);
INSERT INTO `__PREFIX__dictionary` VALUES (9, 8, '资源', '1', 9, '', 1, 1638093430, 1638093430, NULL);
INSERT INTO `__PREFIX__dictionary` VALUES (10, 8, '社区', '2', 10, '', 1, 1638093435, 1638093435, NULL);
INSERT INTO `__PREFIX__dictionary` VALUES (11, 8, '合作伙伴', '3', 11, '', 1, 1659450310, 1638093456, NULL);