From 75c28dc48a0400d7f7d455ac4e719cbfbde1aaea Mon Sep 17 00:00:00 2001 From: Karson Date: Fri, 15 Sep 2017 17:55:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=95=B0=E6=8D=AE=E9=99=90?= =?UTF-8?q?=E5=88=B6=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=94=AF=E6=8C=81=E9=99=90?= =?UTF-8?q?=E5=88=B6=E5=BD=93=E5=89=8D=E7=AE=A1=E7=90=86=E5=91=98=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=20=E4=BC=98=E5=8C=96=E5=85=A8=E7=AB=99=E5=A4=9A?= =?UTF-8?q?=E8=AF=AD=E8=A8=80=E7=9A=84=E6=96=87=E5=AD=97=E6=A0=87=E8=AF=86?= =?UTF-8?q?=20=E4=BC=98=E5=8C=96=E5=90=8E=E5=8F=B0=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E5=8F=B0=E9=A6=96=E9=A1=B5=E6=98=BE=E7=A4=BA=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86=E5=91=98=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E8=87=AA=E5=8A=A8=E5=A1=AB=E5=85=85=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=A4=9A=E8=AF=AD=E8=A8=80=E5=87=BD=E6=95=B0=5F=5F?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=85=A8=E9=83=A8=E8=AF=AD=E8=A8=80=E5=8C=85?= =?UTF-8?q?=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/command/Install/fastadmin.sql | 165 +++++++++-- application/admin/command/Menu.php | 8 +- application/admin/common.php | 38 +-- application/admin/controller/Dashboard.php | 28 +- application/admin/controller/auth/Group.php | 5 + application/admin/controller/auth/Rule.php | 11 +- .../admin/controller/general/Config.php | 1 + application/admin/lang/zh-cn.php | 51 +++- application/admin/lang/zh-cn/auth/rule.php | 1 + application/admin/lang/zh-cn/dashboard.php | 43 +++ .../admin/lang/zh-cn/general/config.php | 18 ++ application/admin/lang/zh-cn/index.php | 4 + application/admin/library/Auth.php | 2 + application/admin/library/traits/Backend.php | 27 +- application/admin/view/auth/admin/add.html | 2 +- application/admin/view/auth/admin/edit.html | 2 +- application/admin/view/auth/group/add.html | 2 +- application/admin/view/auth/group/edit.html | 2 +- application/admin/view/auth/rule/add.html | 2 +- application/admin/view/auth/rule/edit.html | 2 +- application/admin/view/common/menu.html | 8 +- application/admin/view/dashboard/index.html | 256 ++++++++++-------- .../admin/view/general/config/index.html | 4 +- application/common.php | 2 +- application/common/controller/Backend.php | 47 +++- application/common/model/Category.php | 9 +- public/assets/js/backend/dashboard.js | 30 +- 27 files changed, 553 insertions(+), 217 deletions(-) create mode 100644 application/admin/lang/zh-cn/dashboard.php diff --git a/application/admin/command/Install/fastadmin.sql b/application/admin/command/Install/fastadmin.sql index 9b108207..926f1d26 100755 --- a/application/admin/command/Install/fastadmin.sql +++ b/application/admin/command/Install/fastadmin.sql @@ -4,13 +4,13 @@ 官网: http://www.fastadmin.net 演示: http://demo.fastadmin.net - Date: 08/08/2017 23:19:44 PM + Date: 2017年09月15日 */ SET FOREIGN_KEY_CHECKS = 0; -- ---------------------------- --- Table structure for `fa_admin` +-- Table structure for fa_admin -- ---------------------------- DROP TABLE IF EXISTS `fa_admin`; CREATE TABLE `fa_admin` ( @@ -29,17 +29,21 @@ CREATE TABLE `fa_admin` ( `status` varchar(30) NOT NULL DEFAULT 'normal' COMMENT '状态', PRIMARY KEY (`id`), UNIQUE KEY `username` (`username`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='管理员表'; +) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='管理员表'; -- ---------------------------- --- Records of `fa_admin` +-- Records of fa_admin -- ---------------------------- BEGIN; -INSERT INTO `fa_admin` VALUES ('1', 'admin', 'Admin', '075eaec83636846f51c152f29b98a2fd', 's4f3', '/assets/img/avatar.png', 'admin@fastadmin.net', '0', '1502029281', '1492186163', '1502029281', 'd3992c3b-5ecc-4ecb-9dc2-8997780fcadc', 'normal'), ('2', 'admin2', 'admin2', '9a28ce07ce875fbd14172a9ca5357d3c', '2dHDmj', '/assets/img/avatar.png', 'admin2@fastadmin.net', '0', '1502015003', '1492186163', '1502029266', '', 'normal'), ('3', 'admin3', 'admin3', '1c11f945dfcd808a130a8c2a8753fe62', 'WOKJEn', '/assets/img/avatar.png', 'admin3@fastadmin.net', '0', '1501980868', '1492186201', '1501982377', '', 'normal'), ('4', 'admin22', 'admin22', '1c1a0aa0c3c56a8c1a908aab94519648', 'Aybcn5', '/assets/img/avatar.png', 'admin22@fastadmin.net', '0', '0', '1492186240', '1492186240', '', 'normal'), ('5', 'admin32', 'admin32', 'ade94d5d7a7033afa7d84ac3066d0a02', 'FvYK0u', '/assets/img/avatar.png', 'admin32@fastadmin.net', '0', '0', '1492186263', '1492186263', '', 'normal'); +INSERT INTO `fa_admin` VALUES (1, 'admin', 'Admin', '075eaec83636846f51c152f29b98a2fd', 's4f3', '/assets/img/avatar.png', 'admin@fastadmin.net', 0, 1502029281, 1492186163, 1502029281, 'd3992c3b-5ecc-4ecb-9dc2-8997780fcadc', 'normal'); +INSERT INTO `fa_admin` VALUES (2, 'admin2', 'admin2', '9a28ce07ce875fbd14172a9ca5357d3c', '2dHDmj', '/assets/img/avatar.png', 'admin2@fastadmin.net', 0, 1505450906, 1492186163, 1505450906, 'df45fdd5-26f4-45ca-83b3-47e4491a315a', 'normal'); +INSERT INTO `fa_admin` VALUES (3, 'admin3', 'admin3', '1c11f945dfcd808a130a8c2a8753fe62', 'WOKJEn', '/assets/img/avatar.png', 'admin3@fastadmin.net', 0, 1501980868, 1492186201, 1501982377, '', 'normal'); +INSERT INTO `fa_admin` VALUES (4, 'admin22', 'admin22', '1c1a0aa0c3c56a8c1a908aab94519648', 'Aybcn5', '/assets/img/avatar.png', 'admin22@fastadmin.net', 0, 0, 1492186240, 1492186240, '', 'normal'); +INSERT INTO `fa_admin` VALUES (5, 'admin32', 'admin32', 'ade94d5d7a7033afa7d84ac3066d0a02', 'FvYK0u', '/assets/img/avatar.png', 'admin32@fastadmin.net', 0, 0, 1492186263, 1492186263, '', 'normal'); COMMIT; -- ---------------------------- --- Table structure for `fa_admin_log` +-- Table structure for fa_admin_log -- ---------------------------- DROP TABLE IF EXISTS `fa_admin_log`; CREATE TABLE `fa_admin_log` ( @@ -54,10 +58,10 @@ CREATE TABLE `fa_admin_log` ( `createtime` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '操作时间', PRIMARY KEY (`id`), KEY `name` (`username`) -) ENGINE=InnoDB AUTO_INCREMENT=1218 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='管理员日志表'; +) ENGINE=InnoDB AUTO_INCREMENT=1317 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='管理员日志表'; -- ---------------------------- --- Table structure for `fa_attachment` +-- Table structure for fa_attachment -- ---------------------------- DROP TABLE IF EXISTS `fa_attachment`; CREATE TABLE `fa_attachment` ( @@ -73,20 +77,20 @@ CREATE TABLE `fa_attachment` ( `createtime` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '创建日期', `updatetime` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '更新时间', `uploadtime` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '上传时间', - `storage` enum('local','upyun') NOT NULL DEFAULT 'local' COMMENT '存储位置', + `storage` enum('local','upyun','qiniu') NOT NULL DEFAULT 'local' COMMENT '存储位置', `sha1` varchar(40) NOT NULL DEFAULT '' COMMENT '文件 sha1编码', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='附件表'; +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='附件表'; -- ---------------------------- --- Records of `fa_attachment` +-- Records of fa_attachment -- ---------------------------- BEGIN; -INSERT INTO `fa_attachment` VALUES ('1', '/assets/img/qrcode.png', '150', '150', 'png', '0', '21859', 'image/png', '', '1499681848', '1499681848', '1499681848', 'local', '17163603d0263e4838b9387ff2cd4877e8b018f6'); +INSERT INTO `fa_attachment` VALUES (1, '/assets/img/qrcode.png', '150', '150', 'png', 0, 21859, 'image/png', '', 1499681848, 1499681848, 1499681848, 'local', '17163603d0263e4838b9387ff2cd4877e8b018f6'); COMMIT; -- ---------------------------- --- Table structure for `fa_auth_group` +-- Table structure for fa_auth_group -- ---------------------------- DROP TABLE IF EXISTS `fa_auth_group`; CREATE TABLE `fa_auth_group` ( @@ -101,14 +105,18 @@ CREATE TABLE `fa_auth_group` ( ) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8 COMMENT='分组表'; -- ---------------------------- --- Records of `fa_auth_group` +-- Records of fa_auth_group -- ---------------------------- BEGIN; -INSERT INTO `fa_auth_group` VALUES ('1', '0', '超级管理员', '*', '1490883540', '149088354', 'normal'), ('2', '1', '二级管理员', '1,2,4,6,7,8,9,10,11,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,40,41,42,43,44,45,46,47,48,49,50,55,56,57,58,59,60,61,62,63,64,65,5', '1490883540', '1502205308', 'normal'), ('3', '2', '三级管理员', '1,4,9,10,11,13,14,15,16,17,40,41,42,43,44,45,46,47,48,49,50,55,56,57,58,59,60,61,62,63,64,65,5', '1490883540', '1502205322', 'normal'), ('4', '1', '二级管理员2', '1,4,13,14,15,16,17,55,56,57,58,59,60,61,62,63,64,65', '1490883540', '1502205350', 'normal'), ('5', '2', '三级管理员2', '1,2,6,7,8,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34', '1490883540', '1502205344', 'normal'); +INSERT INTO `fa_auth_group` VALUES (1, 0, 'Admin group', '*', 1490883540, 149088354, 'normal'); +INSERT INTO `fa_auth_group` VALUES (2, 1, 'Second group', '13,14,16,15,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,40,41,42,43,44,45,46,47,48,49,50,55,56,57,58,59,60,61,62,63,64,65,1,9,10,11,7,6,8,2,4,5', 1490883540, 1505465692, 'normal'); +INSERT INTO `fa_auth_group` VALUES (3, 2, 'Third group', '1,4,9,10,11,13,14,15,16,17,40,41,42,43,44,45,46,47,48,49,50,55,56,57,58,59,60,61,62,63,64,65,5', 1490883540, 1502205322, 'normal'); +INSERT INTO `fa_auth_group` VALUES (4, 1, 'Second group 2', '1,4,13,14,15,16,17,55,56,57,58,59,60,61,62,63,64,65', 1490883540, 1502205350, 'normal'); +INSERT INTO `fa_auth_group` VALUES (5, 2, 'Third group 2', '1,2,6,7,8,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34', 1490883540, 1502205344, 'normal'); COMMIT; -- ---------------------------- --- Table structure for `fa_auth_group_access` +-- Table structure for fa_auth_group_access -- ---------------------------- DROP TABLE IF EXISTS `fa_auth_group_access`; CREATE TABLE `fa_auth_group_access` ( @@ -120,14 +128,18 @@ CREATE TABLE `fa_auth_group_access` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='权限分组表'; -- ---------------------------- --- Records of `fa_auth_group_access` +-- Records of fa_auth_group_access -- ---------------------------- BEGIN; -INSERT INTO `fa_auth_group_access` VALUES ('1', '1'), ('2', '2'), ('3', '3'), ('4', '5'), ('5', '5'); +INSERT INTO `fa_auth_group_access` VALUES (1, 1); +INSERT INTO `fa_auth_group_access` VALUES (2, 2); +INSERT INTO `fa_auth_group_access` VALUES (3, 3); +INSERT INTO `fa_auth_group_access` VALUES (4, 5); +INSERT INTO `fa_auth_group_access` VALUES (5, 5); COMMIT; -- ---------------------------- --- Table structure for `fa_auth_rule` +-- Table structure for fa_auth_rule -- ---------------------------- DROP TABLE IF EXISTS `fa_auth_rule`; CREATE TABLE `fa_auth_rule` ( @@ -151,14 +163,78 @@ CREATE TABLE `fa_auth_rule` ( ) ENGINE=InnoDB AUTO_INCREMENT=66 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='节点表'; -- ---------------------------- --- Records of `fa_auth_rule` +-- Records of fa_auth_rule -- ---------------------------- BEGIN; -INSERT INTO `fa_auth_rule` VALUES ('1', 'file', '0', 'dashboard', '控制台', 'fa fa-dashboard\r', '', '用于展示当前系统中的统计数据、统计报表及重要实时数据\r', '1', '1497429920', '1497429920', '143', 'normal'), ('2', 'file', '0', 'general', '常规管理', 'fa fa-cogs', '', '', '1', '1497429920', '1497430169', '137', 'normal'), ('3', 'file', '0', 'category', '分类管理', 'fa fa-list\r', '', '用于统一管理网站的所有分类,分类可进行无限级分类\r', '1', '1497429920', '1497429920', '119', 'normal'), ('4', 'file', '0', 'addon', '插件管理', 'fa fa-rocket', '', '可在线安装、卸载、禁用、启用插件，同时支持添加本地插件。FastAdmin已上线插件商店 ，你可以发布你的免费或付费插件：http://www.fastadmin.net/store.html', '1', '1502035509', '1502035509', '0', 'normal'), ('5', 'file', '0', 'auth', '权限管理', 'fa fa-group', '', '', '1', '1497429920', '1497430092', '99', 'normal'), ('6', 'file', '2', 'general/config', '系统配置', 'fa fa-cog', '', '', '1', '1497429920', '1497430683', '60', 'normal'), ('7', 'file', '2', 'general/attachment', '附件管理', 'fa fa-file-image-o', '', '主要用于管理上传到又拍云的数据或上传至本服务的上传数据\r\n', '1', '1497429920', '1497430699', '53', 'normal'), ('8', 'file', '2', 'general/profile', '个人配置', 'fa fa-user\r', '', '', '1', '1497429920', '1497429920', '34', 'normal'), ('9', 'file', '5', 'auth/admin', '管理员管理', 'fa fa-user', '', '一个管理员可以有多个角色组,左侧的菜单根据管理员所拥有的权限进行生成', '1', '1497429920', '1497430320', '118', 'normal'), ('10', 'file', '5', 'auth/adminlog', '管理员日志', 'fa fa-list-alt', '', '管理员可以查看自己所拥有的权限的管理员日志', '1', '1497429920', '1497430307', '113', 'normal'), ('11', 'file', '5', 'auth/group', '角色组', 'fa fa-group', '', '角色组可以有多个,角色有上下级层级关系,如果子角色有角色组和管理员的权限则可以派生属于自己组别下级的角色组或管理员', '1', '1497429920', '1497429920', '109', 'normal'), ('12', 'file', '5', 'auth/rule', '规则管理', 'fa fa-bars', '', '规则通常对应一个控制器的方法,同时左侧的菜单栏数据也从规则中体现,通常建议通过控制台进行生成规则节点', '1', '1497429920', '1497430581', '104', 'normal'), ('13', 'file', '1', 'dashboard/index', '查看', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '136', 'normal'), ('14', 'file', '1', 'dashboard/add', '添加', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '135', 'normal'), ('15', 'file', '1', 'dashboard/del', '删除', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '133', 'normal'), ('16', 'file', '1', 'dashboard/edit', '编辑', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '134', 'normal'), ('17', 'file', '1', 'dashboard/multi', '批量更新', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '132', 'normal'), ('18', 'file', '6', 'general/config/index', '查看', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '52', 'normal'), ('19', 'file', '6', 'general/config/add', '添加', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '51', 'normal'), ('20', 'file', '6', 'general/config/edit', '编辑', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '50', 'normal'), ('21', 'file', '6', 'general/config/del', '删除', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '49', 'normal'), ('22', 'file', '6', 'general/config/multi', '批量更新', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '48', 'normal'), ('23', 'file', '7', 'general/attachment/index', '查看', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '59', 'normal'), ('24', 'file', '7', 'general/attachment/select', '选择附件', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '58', 'normal'), ('25', 'file', '7', 'general/attachment/add', '添加', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '57', 'normal'), ('26', 'file', '7', 'general/attachment/edit', '编辑', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '56', 'normal'), ('27', 'file', '7', 'general/attachment/del', '删除', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '55', 'normal'), ('28', 'file', '7', 'general/attachment/multi', '批量更新', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '54', 'normal'), ('29', 'file', '8', 'general/profile/index', '查看', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '33', 'normal'), ('30', 'file', '8', 'general/profile/update', '更新个人信息', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '32', 'normal'), ('31', 'file', '8', 'general/profile/add', '添加', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '31', 'normal'), ('32', 'file', '8', 'general/profile/edit', '编辑', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '30', 'normal'), ('33', 'file', '8', 'general/profile/del', '删除', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '29', 'normal'), ('34', 'file', '8', 'general/profile/multi', '批量更新', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '28', 'normal'), ('35', 'file', '3', 'category/index', '查看', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '142', 'normal'), ('36', 'file', '3', 'category/add', '添加', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '141', 'normal'), ('37', 'file', '3', 'category/edit', '编辑', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '140', 'normal'), ('38', 'file', '3', 'category/del', '删除', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '139', 'normal'), ('39', 'file', '3', 'category/multi', '批量更新', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '138', 'normal'), ('40', 'file', '9', 'auth/admin/index', '查看', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '117', 'normal'), ('41', 'file', '9', 'auth/admin/add', '添加', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '116', 'normal'), ('42', 'file', '9', 'auth/admin/edit', '编辑', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '115', 'normal'), ('43', 'file', '9', 'auth/admin/del', '删除', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '114', 'normal'), ('44', 'file', '10', 'auth/adminlog/index', '查看', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '112', 'normal'), ('45', 'file', '10', 'auth/adminlog/detail', '详情', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '111', 'normal'), ('46', 'file', '10', 'auth/adminlog/del', '删除', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '110', 'normal'), ('47', 'file', '11', 'auth/group/index', '查看', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '108', 'normal'), ('48', 'file', '11', 'auth/group/add', '添加', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '107', 'normal'), ('49', 'file', '11', 'auth/group/edit', '编辑', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '106', 'normal'), ('50', 'file', '11', 'auth/group/del', '删除', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '105', 'normal'), ('51', 'file', '12', 'auth/rule/index', '查看', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '103', 'normal'), ('52', 'file', '12', 'auth/rule/add', '添加', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '102', 'normal'), ('53', 'file', '12', 'auth/rule/edit', '编辑', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '101', 'normal'), ('54', 'file', '12', 'auth/rule/del', '删除', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '100', 'normal'), ('55', 'file', '4', 'addon/index', '查看', 'fa fa-circle-o', '', '', '0', '1502035509', '1502035509', '0', 'normal'), ('56', 'file', '4', 'addon/add', '添加', 'fa fa-circle-o', '', '', '0', '1502035509', '1502035509', '0', 'normal'), ('57', 'file', '4', 'addon/edit', '修改', 'fa fa-circle-o', '', '', '0', '1502035509', '1502035509', '0', 'normal'), ('58', 'file', '4', 'addon/del', '删除', 'fa fa-circle-o', '', '', '0', '1502035509', '1502035509', '0', 'normal'), ('59', 'file', '4', 'addon/local', '本地安装', 'fa fa-circle-o', '', '', '0', '1502035509', '1502035509', '0', 'normal'), ('60', 'file', '4', 'addon/state', '禁用启用', 'fa fa-circle-o', '', '', '0', '1502035509', '1502035509', '0', 'normal'), ('61', 'file', '4', 'addon/install', '安装', 'fa fa-circle-o', '', '', '0', '1502035509', '1502035509', '0', 'normal'), ('62', 'file', '4', 'addon/uninstall', '卸载', 'fa fa-circle-o', '', '', '0', '1502035509', '1502035509', '0', 'normal'), ('63', 'file', '4', 'addon/config', '配置', 'fa fa-circle-o', '', '', '0', '1502035509', '1502035509', '0', 'normal'), ('64', 'file', '4', 'addon/refresh', '刷新', 'fa fa-circle-o', '', '', '0', '1502035509', '1502035509', '0', 'normal'), ('65', 'file', '4', 'addon/multi', '批量更新', 'fa fa-circle-o', '', '', '0', '1502035509', '1502035509', '0', 'normal'); +INSERT INTO `fa_auth_rule` VALUES (1, 'file', 0, 'dashboard', 'Dashboard', 'fa fa-dashboard\r', '', 'Dashboard tips', 1, 1497429920, 1497429920, 143, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (2, 'file', 0, 'general', 'General', 'fa fa-cogs', '', '', 1, 1497429920, 1497430169, 137, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (3, 'file', 0, 'category', 'Category', 'fa fa-list\r', '', 'Category tips', 1, 1497429920, 1497429920, 119, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (4, 'file', 0, 'addon', 'Addon', 'fa fa-rocket', '', 'Addon tips', 1, 1502035509, 1502035509, 0, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (5, 'file', 0, 'auth', 'Auth', 'fa fa-group', '', '', 1, 1497429920, 1497430092, 99, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (6, 'file', 2, 'general/config', 'Config', 'fa fa-cog', '', 'Config tips', 0, 1497429920, 1497430683, 60, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (7, 'file', 2, 'general/attachment', 'Attachment', 'fa fa-file-image-o', '', 'Attachment tips', 1, 1497429920, 1497430699, 53, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (8, 'file', 2, 'general/profile', 'Profile', 'fa fa-user\r', '', '', 1, 1497429920, 1497429920, 34, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (9, 'file', 5, 'auth/admin', 'Admin', 'fa fa-user', '', 'Admin tips', 1, 1497429920, 1497430320, 118, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (10, 'file', 5, 'auth/adminlog', 'Admin log', 'fa fa-list-alt', '', 'Admin log tips', 1, 1497429920, 1497430307, 113, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (11, 'file', 5, 'auth/group', 'Group', 'fa fa-group', '', 'Group tips', 1, 1497429920, 1497429920, 109, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (12, 'file', 5, 'auth/rule', 'Rule', 'fa fa-bars', '', 'Rule tips', 1, 1497429920, 1497430581, 104, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (13, 'file', 1, 'dashboard/index', 'View', 'fa fa-circle-o', '', '', 0, 1497429920, 1497429920, 136, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (14, 'file', 1, 'dashboard/add', 'Add', 'fa fa-circle-o', '', '', 0, 1497429920, 1497429920, 135, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (15, 'file', 1, 'dashboard/del', 'Delete', 'fa fa-circle-o', '', '', 0, 1497429920, 1497429920, 133, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (16, 'file', 1, 'dashboard/edit', 'Edit', 'fa fa-circle-o', '', '', 0, 1497429920, 1497429920, 134, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (17, 'file', 1, 'dashboard/multi', 'Multi', 'fa fa-circle-o', '', '', 0, 1497429920, 1497429920, 132, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (18, 'file', 6, 'general/config/index', 'View', 'fa fa-circle-o', '', '', 0, 1497429920, 1497429920, 52, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (19, 'file', 6, 'general/config/add', 'Add', 'fa fa-circle-o', '', '', 0, 1497429920, 1497429920, 51, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (20, 'file', 6, 'general/config/edit', 'Edit', 'fa fa-circle-o', '', '', 0, 1497429920, 1497429920, 50, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (21, 'file', 6, 'general/config/del', 'Delete', 'fa fa-circle-o', '', '', 0, 1497429920, 1497429920, 49, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (22, 'file', 6, 'general/config/multi', 'Multi', 'fa fa-circle-o', '', '', 0, 1497429920, 1497429920, 48, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (23, 'file', 7, 'general/attachment/index', 'View', 'fa fa-circle-o', '', '', 0, 1497429920, 1497429920, 59, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (24, 'file', 7, 'general/attachment/select', 'Select attachment', 'fa fa-circle-o', '', '', 0, 1497429920, 1497429920, 58, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (25, 'file', 7, 'general/attachment/add', 'Add', 'fa fa-circle-o', '', '', 0, 1497429920, 1497429920, 57, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (26, 'file', 7, 'general/attachment/edit', 'Edit', 'fa fa-circle-o', '', '', 0, 1497429920, 1497429920, 56, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (27, 'file', 7, 'general/attachment/del', 'Delete', 'fa fa-circle-o', '', '', 0, 1497429920, 1497429920, 55, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (28, 'file', 7, 'general/attachment/multi', 'Multi', 'fa fa-circle-o', '', '', 0, 1497429920, 1497429920, 54, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (29, 'file', 8, 'general/profile/index', 'View', 'fa fa-circle-o', '', '', 0, 1497429920, 1497429920, 33, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (30, 'file', 8, 'general/profile/update', 'Update profile', 'fa fa-circle-o', '', '', 0, 1497429920, 1497429920, 32, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (31, 'file', 8, 'general/profile/add', 'Add', 'fa fa-circle-o', '', '', 0, 1497429920, 1497429920, 31, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (32, 'file', 8, 'general/profile/edit', 'Edit', 'fa fa-circle-o', '', '', 0, 1497429920, 1497429920, 30, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (33, 'file', 8, 'general/profile/del', 'Delete', 'fa fa-circle-o', '', '', 0, 1497429920, 1497429920, 29, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (34, 'file', 8, 'general/profile/multi', 'Multi', 'fa fa-circle-o', '', '', 0, 1497429920, 1497429920, 28, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (35, 'file', 3, 'category/index', 'View', 'fa fa-circle-o', '', '', 0, 1497429920, 1497429920, 142, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (36, 'file', 3, 'category/add', 'Add', 'fa fa-circle-o', '', '', 0, 1497429920, 1497429920, 141, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (37, 'file', 3, 'category/edit', 'Edit', 'fa fa-circle-o', '', '', 0, 1497429920, 1497429920, 140, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (38, 'file', 3, 'category/del', 'Delete', 'fa fa-circle-o', '', '', 0, 1497429920, 1497429920, 139, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (39, 'file', 3, 'category/multi', 'Multi', 'fa fa-circle-o', '', '', 0, 1497429920, 1497429920, 138, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (40, 'file', 9, 'auth/admin/index', 'View', 'fa fa-circle-o', '', '', 0, 1497429920, 1497429920, 117, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (41, 'file', 9, 'auth/admin/add', 'Add', 'fa fa-circle-o', '', '', 0, 1497429920, 1497429920, 116, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (42, 'file', 9, 'auth/admin/edit', 'Edit', 'fa fa-circle-o', '', '', 0, 1497429920, 1497429920, 115, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (43, 'file', 9, 'auth/admin/del', 'Delete', 'fa fa-circle-o', '', '', 0, 1497429920, 1497429920, 114, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (44, 'file', 10, 'auth/adminlog/index', 'View', 'fa fa-circle-o', '', '', 0, 1497429920, 1497429920, 112, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (45, 'file', 10, 'auth/adminlog/detail', 'Detail', 'fa fa-circle-o', '', '', 0, 1497429920, 1497429920, 111, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (46, 'file', 10, 'auth/adminlog/del', 'Delete', 'fa fa-circle-o', '', '', 0, 1497429920, 1497429920, 110, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (47, 'file', 11, 'auth/group/index', 'View', 'fa fa-circle-o', '', '', 0, 1497429920, 1497429920, 108, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (48, 'file', 11, 'auth/group/add', 'Add', 'fa fa-circle-o', '', '', 0, 1497429920, 1497429920, 107, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (49, 'file', 11, 'auth/group/edit', 'Edit', 'fa fa-circle-o', '', '', 0, 1497429920, 1497429920, 106, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (50, 'file', 11, 'auth/group/del', 'Delete', 'fa fa-circle-o', '', '', 0, 1497429920, 1497429920, 105, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (51, 'file', 12, 'auth/rule/index', 'View', 'fa fa-circle-o', '', '', 0, 1497429920, 1497429920, 103, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (52, 'file', 12, 'auth/rule/add', 'Add', 'fa fa-circle-o', '', '', 0, 1497429920, 1497429920, 102, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (53, 'file', 12, 'auth/rule/edit', 'Edit', 'fa fa-circle-o', '', '', 0, 1497429920, 1497429920, 101, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (54, 'file', 12, 'auth/rule/del', 'Delete', 'fa fa-circle-o', '', '', 0, 1497429920, 1497429920, 100, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (55, 'file', 4, 'addon/index', 'View', 'fa fa-circle-o', '', '', 0, 1502035509, 1502035509, 0, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (56, 'file', 4, 'addon/add', 'Add', 'fa fa-circle-o', '', '', 0, 1502035509, 1502035509, 0, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (57, 'file', 4, 'addon/edit', 'Edit', 'fa fa-circle-o', '', '', 0, 1502035509, 1502035509, 0, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (58, 'file', 4, 'addon/del', 'Delete', 'fa fa-circle-o', '', '', 0, 1502035509, 1502035509, 0, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (59, 'file', 4, 'addon/local', 'Local install', 'fa fa-circle-o', '', '', 0, 1502035509, 1502035509, 0, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (60, 'file', 4, 'addon/state', 'Update state', 'fa fa-circle-o', '', '', 0, 1502035509, 1502035509, 0, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (61, 'file', 4, 'addon/install', 'Install', 'fa fa-circle-o', '', '', 0, 1502035509, 1502035509, 0, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (62, 'file', 4, 'addon/uninstall', 'Uninstall', 'fa fa-circle-o', '', '', 0, 1502035509, 1502035509, 0, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (63, 'file', 4, 'addon/config', 'Setting', 'fa fa-circle-o', '', '', 0, 1502035509, 1502035509, 0, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (64, 'file', 4, 'addon/refresh', 'Refresh', 'fa fa-circle-o', '', '', 0, 1502035509, 1502035509, 0, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (65, 'file', 4, 'addon/multi', 'Multi', 'fa fa-circle-o', '', '', 0, 1502035509, 1502035509, 0, 'normal'); COMMIT; -- ---------------------------- --- Table structure for `fa_category` +-- Table structure for fa_category -- ---------------------------- DROP TABLE IF EXISTS `fa_category`; CREATE TABLE `fa_category` ( @@ -182,14 +258,26 @@ CREATE TABLE `fa_category` ( ) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='分类表'; -- ---------------------------- --- Records of `fa_category` +-- Records of fa_category -- ---------------------------- BEGIN; -INSERT INTO `fa_category` VALUES ('1', '0', 'page', '官方新闻', 'news', 'recommend', '/assets/img/qrcode.png', '', '', 'news', '1495262190', '1495262190', '1', 'normal'), ('2', '0', 'page', '移动应用', 'mobileapp', 'hot', '/assets/img/qrcode.png', '', '', 'mobileapp', '1495262244', '1495262244', '2', 'normal'), ('3', '2', 'page', '微信公众号', 'wechatpublic', 'index', '/assets/img/qrcode.png', '', '', 'wechatpublic', '1495262288', '1495262288', '3', 'normal'), ('4', '2', 'page', 'Android开发', 'android', 'recommend', '/assets/img/qrcode.png', '', '', 'android', '1495262317', '1495262317', '4', 'normal'), ('5', '0', 'page', '软件产品', 'software', 'recommend', '/assets/img/qrcode.png', '', '', 'software', '1495262336', '1499681850', '5', 'normal'), ('6', '5', 'page', '网站建站', 'website', 'recommend', '/assets/img/qrcode.png', '', '', 'website', '1495262357', '1495262357', '6', 'normal'), ('7', '5', 'page', '企业管理软件', 'company', 'index', '/assets/img/qrcode.png', '', '', 'company', '1495262391', '1495262391', '7', 'normal'), ('8', '6', 'page', 'PC端', 'website-pc', 'recommend', '/assets/img/qrcode.png', '', '', 'website-pc', '1495262424', '1495262424', '8', 'normal'), ('9', '6', 'page', '移动端', 'website-mobile', 'recommend', '/assets/img/qrcode.png', '', '', 'website-mobile', '1495262456', '1495262456', '9', 'normal'), ('10', '7', 'page', 'CRM系统 ', 'company-crm', 'recommend', '/assets/img/qrcode.png', '', '', 'company-crm', '1495262487', '1495262487', '10', 'normal'), ('11', '7', 'page', 'SASS平台软件', 'company-sass', 'recommend', '/assets/img/qrcode.png', '', '', 'company-sass', '1495262515', '1495262515', '11', 'normal'), ('12', '0', 'test', '测试1', 'test1', 'recommend', '/assets/img/qrcode.png', '', '', 'test1', '1497015727', '1497015727', '12', 'normal'), ('13', '0', 'test', '测试2', 'test2', 'recommend', '/assets/img/qrcode.png', '', '', 'test2', '1497015738', '1497015738', '13', 'normal'); +INSERT INTO `fa_category` VALUES (1, 0, 'page', '官方新闻', 'news', 'recommend', '/assets/img/qrcode.png', '', '', 'news', 1495262190, 1495262190, 1, 'normal'); +INSERT INTO `fa_category` VALUES (2, 0, 'page', '移动应用', 'mobileapp', 'hot', '/assets/img/qrcode.png', '', '', 'mobileapp', 1495262244, 1495262244, 2, 'normal'); +INSERT INTO `fa_category` VALUES (3, 2, 'page', '微信公众号', 'wechatpublic', 'index', '/assets/img/qrcode.png', '', '', 'wechatpublic', 1495262288, 1495262288, 3, 'normal'); +INSERT INTO `fa_category` VALUES (4, 2, 'page', 'Android开发', 'android', 'recommend', '/assets/img/qrcode.png', '', '', 'android', 1495262317, 1495262317, 4, 'normal'); +INSERT INTO `fa_category` VALUES (5, 0, 'page', '软件产品', 'software', 'recommend', '/assets/img/qrcode.png', '', '', 'software', 1495262336, 1499681850, 5, 'normal'); +INSERT INTO `fa_category` VALUES (6, 5, 'page', '网站建站', 'website', 'recommend', '/assets/img/qrcode.png', '', '', 'website', 1495262357, 1495262357, 6, 'normal'); +INSERT INTO `fa_category` VALUES (7, 5, 'page', '企业管理软件', 'company', 'index', '/assets/img/qrcode.png', '', '', 'company', 1495262391, 1495262391, 7, 'normal'); +INSERT INTO `fa_category` VALUES (8, 6, 'page', 'PC端', 'website-pc', 'recommend', '/assets/img/qrcode.png', '', '', 'website-pc', 1495262424, 1495262424, 8, 'normal'); +INSERT INTO `fa_category` VALUES (9, 6, 'page', '移动端', 'website-mobile', 'recommend', '/assets/img/qrcode.png', '', '', 'website-mobile', 1495262456, 1495262456, 9, 'normal'); +INSERT INTO `fa_category` VALUES (10, 7, 'page', 'CRM系统 ', 'company-crm', 'recommend', '/assets/img/qrcode.png', '', '', 'company-crm', 1495262487, 1495262487, 10, 'normal'); +INSERT INTO `fa_category` VALUES (11, 7, 'page', 'SASS平台软件', 'company-sass', 'recommend', '/assets/img/qrcode.png', '', '', 'company-sass', 1495262515, 1495262515, 11, 'normal'); +INSERT INTO `fa_category` VALUES (12, 0, 'test', '测试1', 'test1', 'recommend', '/assets/img/qrcode.png', '', '', 'test1', 1497015727, 1497015727, 12, 'normal'); +INSERT INTO `fa_category` VALUES (13, 0, 'test', '测试2', 'test2', 'recommend', '/assets/img/qrcode.png', '', '', 'test2', 1497015738, 1497015738, 13, 'normal'); COMMIT; -- ---------------------------- --- Table structure for `fa_config` +-- Table structure for fa_config -- ---------------------------- DROP TABLE IF EXISTS `fa_config`; CREATE TABLE `fa_config` ( @@ -208,18 +296,35 @@ CREATE TABLE `fa_config` ( ) ENGINE=InnoDB AUTO_INCREMENT=18 DEFAULT CHARSET=utf8 COMMENT='系统配置'; -- ---------------------------- --- Records of `fa_config` +-- Records of fa_config -- ---------------------------- BEGIN; -INSERT INTO `fa_config` VALUES ('1', 'name', 'basic', '站点名称', '请填写站点名称', 'string', 'FastAdmin', '', 'required', ''), ('2', 'beian', 'basic', '备案号', '粤ICP备15054802号-4', 'string', '', '', '', ''), ('3', 'cdnurl', 'basic', 'CDN地址', '如果使用CDN云储存请配置该值', 'string', '', '', '', ''), ('4', 'version', 'basic', '版本号', '如果静态资源有变动请重新配置该值', 'string', '1.0.1', '', 'required', ''), ('5', 'timezone', 'basic', '时区', '', 'string', 'Asia/Shanghai', '', 'required', ''), ('6', 'forbiddenip', 'basic', '禁止访问IP', '一行一条记录', 'text', '', '', '', ''), ('7', 'languages', 'basic', '模块语言', '', 'array', '{\"backend\":\"zh-cn\",\"frontend\":\"zh-cn\"}', '', 'required', ''), ('8', 'fixedpage', 'basic', '后台默认页', '请尽量输入左侧菜单栏存在的链接', 'string', 'dashboard', '', 'required', ''), ('9', 'categorytype', 'dictionary', '分类类型', '', 'array', '{\"default\":\"默认\",\"page\":\"单页\",\"article\":\"文章\",\"test\":\"测试\"}', '', '', ''), ('10', 'configgroup', 'dictionary', '配置分组', '', 'array', '{\"basic\":\"基础配置\",\"email\":\"邮件配置\",\"dictionary\":\"字典配置\",\"user\":\"会员配置\",\"example\":\"示例分组\"}', '', '', ''), ('11', 'mail_type', 'email', '邮件发送方式', '选择邮件发送方式', 'select', '1', '[\"请选择\",\"SMTP\",\"mail()函数\"]', '', ''), ('12', 'mail_smtp_host', 'email', 'SMTP[服务器]', '错误的配置发送邮件会导致服务器超时', 'string', 'smtp.qq.com', '', '', ''), ('13', 'mail_smtp_port', 'email', 'SMTP[端口]', '(不加密默认25,SSL默认465,TLS默认587)', 'string', '465', '', '', ''), ('14', 'mail_smtp_user', 'email', 'SMTP[用户名]', '（填写完整用户名）', 'string', '10000', '', '', ''), ('15', 'mail_smtp_pass', 'email', 'SMTP[密码]', '（填写您的密码）', 'string', 'password', '', '', ''), ('16', 'mail_verify_type', 'email', 'SMTP验证方式', '（SMTP验证方式[推荐SSL]）', 'select', '2', '[\"无\",\"TLS\",\"SSL\"]', '', ''), ('17', 'mail_from', 'email', '发件人邮箱', '', 'string', '10000@qq.com', '', '', ''); +INSERT INTO `fa_config` VALUES (1, 'name', 'basic', 'Site name', '请填写站点名称', 'string', 'FastAdmin', '', 'required', ''); +INSERT INTO `fa_config` VALUES (2, 'beian', 'basic', 'Beian', '粤ICP备15054802号-4', 'string', '', '', '', ''); +INSERT INTO `fa_config` VALUES (3, 'cdnurl', 'basic', 'Cdn url', '如果使用CDN云储存请配置该值', 'string', '', '', '', ''); +INSERT INTO `fa_config` VALUES (4, 'version', 'basic', 'Version', '如果静态资源有变动请重新配置该值', 'string', '1.0.1', '', 'required', ''); +INSERT INTO `fa_config` VALUES (5, 'timezone', 'basic', 'Timezone', '', 'string', 'Asia/Shanghai', '', 'required', ''); +INSERT INTO `fa_config` VALUES (6, 'forbiddenip', 'basic', 'Forbidden ip', '一行一条记录', 'text', '', '', '', ''); +INSERT INTO `fa_config` VALUES (7, 'languages', 'basic', 'Languages', '', 'array', '{\"backend\":\"zh-cn\",\"frontend\":\"zh-cn\"}', '', 'required', ''); +INSERT INTO `fa_config` VALUES (8, 'fixedpage', 'basic', 'Fixed page', '请尽量输入左侧菜单栏存在的链接', 'string', 'dashboard', '', 'required', ''); +INSERT INTO `fa_config` VALUES (9, 'categorytype', 'dictionary', 'Cateogry type', '', 'array', '{\"default\":\"Default\",\"page\":\"Page\",\"article\":\"Article\",\"test\":\"Test\"}', '', '', ''); +INSERT INTO `fa_config` VALUES (10, 'configgroup', 'dictionary', 'Config group', '', 'array', '{\"basic\":\"Basic\",\"email\":\"Email\",\"dictionary\":\"Dictionary\",\"user\":\"User\",\"example\":\"Example\"}', '', '', ''); +INSERT INTO `fa_config` VALUES (11, 'mail_type', 'email', 'Mail type', '选择邮件发送方式', 'select', '1', '[\"Please select\",\"SMTP\",\"Mail\"]', '', ''); +INSERT INTO `fa_config` VALUES (12, 'mail_smtp_host', 'email', 'Mail smtp host', '错误的配置发送邮件会导致服务器超时', 'string', 'smtp.qq.com', '', '', ''); +INSERT INTO `fa_config` VALUES (13, 'mail_smtp_port', 'email', 'Mail smtp port', '(不加密默认25,SSL默认465,TLS默认587)', 'string', '465', '', '', ''); +INSERT INTO `fa_config` VALUES (14, 'mail_smtp_user', 'email', 'Mail smtp user', '（填写完整用户名）', 'string', '10000', '', '', ''); +INSERT INTO `fa_config` VALUES (15, 'mail_smtp_pass', 'email', 'Mail smtp password', '（填写您的密码）', 'string', 'password', '', '', ''); +INSERT INTO `fa_config` VALUES (16, 'mail_verify_type', 'email', 'Mail vertify type', '（SMTP验证方式[推荐SSL]）', 'select', '2', '[\"None\",\"TLS\",\"SSL\"]', '', ''); +INSERT INTO `fa_config` VALUES (17, 'mail_from', 'email', 'Mail from', '', 'string', '10000@qq.com', '', '', ''); COMMIT; -- ---------------------------- --- Table structure for `fa_test` +-- Table structure for fa_test -- ---------------------------- DROP TABLE IF EXISTS `fa_test`; CREATE TABLE `fa_test` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'ID', + `admin_id` int(10) NOT NULL COMMENT '管理员ID', `category_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '分类ID(单选)', `category_ids` varchar(100) NOT NULL COMMENT '分类ID(多选)', `week` enum('monday','tuesday','wednesday') NOT NULL COMMENT '星期(单选):monday=星期一,tuesday=星期二,wednesday=星期三', @@ -251,10 +356,10 @@ CREATE TABLE `fa_test` ( ) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='测试表'; -- ---------------------------- --- Records of `fa_test` +-- Records of fa_test -- ---------------------------- BEGIN; -INSERT INTO `fa_test` VALUES ('1', '12', '12,13', 'monday', 'hot,index', 'male', 'music,reading', '我是一篇测试文章', '

我是测试内容

', '/assets/img/avatar.png', '/assets/img/avatar.png,/assets/img/qrcode.png', '/assets/img/avatar.png', '关键字', '描述', '广西壮族自治区/百色市/平果县', '0.00', '0', '2017-07-10', '2017-07-10 18:24:45', '2017', '18:24:45', '1499682285', '1499682526', '1499682526', '0', '1', 'normal', '1'); +INSERT INTO `fa_test` VALUES (1, 0, 12, '12,13', 'monday', 'hot,index', 'male', 'music,reading', '我是一篇测试文章', '

我是测试内容

', '/assets/img/avatar.png', '/assets/img/avatar.png,/assets/img/qrcode.png', '/assets/img/avatar.png', '关键字', '描述', '广西壮族自治区/百色市/平果县', 0.00, 0, '2017-07-10', '2017-07-10 18:24:45', 2017, '18:24:45', 1499682285, 1499682526, 1499682526, 0, 1, 'normal', '1'); COMMIT; SET FOREIGN_KEY_CHECKS = 1; \ No newline at end of file diff --git a/application/admin/command/Menu.php b/application/admin/command/Menu.php index 4fc80c10..6d49e62a 100644 --- a/application/admin/command/Menu.php +++ b/application/admin/command/Menu.php @@ -225,7 +225,7 @@ class Menu extends Command $title = (!isset($controllerArr[$key]) ? $controllerTitle : ''); $icon = (!isset($controllerArr[$key]) ? $controllerIcon : 'fa fa-list'); $remark = (!isset($controllerArr[$key]) ? $controllerRemark : ''); - $title = $title ? $title : __(ucfirst($v) . ' manager'); + $title = $title ? $title : ucfirst($v); $rulemodel = $this->model->get(['name' => $name]); if (!$rulemodel) { @@ -262,8 +262,10 @@ class Menu extends Command } //过滤掉其它字符 $comment = preg_replace(array('/^\/\*\*(.*)[\n\r\t]/u', '/[\s]+\*\//u', '/\*\s@(.*)/u', '/[\s|\*]+/u'), '', $comment); - - $ruleArr[] = array('pid' => $pid, 'name' => $name . "/" . strtolower($n->name), 'icon' => 'fa fa-circle-o', 'title' => $comment ? $comment : $n->name, 'ismenu' => 0, 'status' => 'normal'); + + $title = $comment ? $comment : $n->name; + + $ruleArr[] = array('pid' => $pid, 'name' => $name . "/" . strtolower($n->name), 'icon' => 'fa fa-circle-o', 'title' => ucfirst($name), 'ismenu' => 0, 'status' => 'normal'); } $this->model->saveAll($ruleArr); } diff --git a/application/admin/common.php b/application/admin/common.php index 5a73c6b1..250034ee 100644 --- a/application/admin/common.php +++ b/application/admin/common.php @@ -121,29 +121,31 @@ function build_toolbar($btns = NULL, $attr = []) /** * 生成页面Heading * - * @param string $title - * @param string $content + * @param string $path 指定的path * @return string */ -function build_heading($title = NULL, $content = NULL, $path = NULL) +function build_heading($path = NULL, $container = TRUE) { - if (is_null($title) && is_null($content)) + $title = $content = ''; + if (is_null($path)) { - if (is_null($path)) - { - $action = request()->action(); - $controller = str_replace('.', '/', request()->controller()); - $path = strtolower($controller . ($action && $action != 'index' ? '/' . $action : '')); - } - // 根据当前的URI自动匹配父节点的标题和备注 - $data = Db::name('auth_rule')->where('name', $path)->field('title,remark')->find(); - if ($data) - { - $title = $data['title']; - $content = $data['remark']; - } + $action = request()->action(); + $controller = str_replace('.', '/', request()->controller()); + $path = strtolower($controller . ($action && $action != 'index' ? '/' . $action : '')); + } + // 根据当前的URI自动匹配父节点的标题和备注 + $data = Db::name('auth_rule')->where('name', $path)->field('title,remark')->find(); + if ($data) + { + $title = __($data['title']); + $content = __($data['remark']); } if (!$content) return ''; - return '
' . $title . '' . $content . '
'; + $result = '
' . $title . '' . $content . '
'; + if ($container) + { + $result = '
' . $result . '
'; + } + return $result; } diff --git a/application/admin/controller/Dashboard.php b/application/admin/controller/Dashboard.php index 7017b757..4b2ce9e1 100644 --- a/application/admin/controller/Dashboard.php +++ b/application/admin/controller/Dashboard.php @@ -26,22 +26,24 @@ class Dashboard extends Backend $createlist[$day] = mt_rand(20, 200); $paylist[$day] = mt_rand(1, mt_rand(1, $createlist[$day])); } + $hooks = config('addons.hooks'); + $uploadmode = isset($hooks['upload_config_init']) && $hooks['upload_config_init'] ? implode(',', $hooks['upload_config_init']) : 'local'; $this->view->assign([ - 'totaluser' => 35200, - 'totalviews' => 219390, - 'totalorder' => 32143, - 'totalorderamount' => 174800, - 'todayuserlogin' => 321, - 'todayusersignup' => 430, - 'todayorder' => 2324, - 'todayunsettleorder' => 132, - 'sevendnu' => '80%', - 'sevendau' => '32%', - 'paylist' => $paylist, - 'createlist' => $createlist, + 'totaluser' => 35200, + 'totalviews' => 219390, + 'totalorder' => 32143, + 'totalorderamount' => 174800, + 'todayuserlogin' => 321, + 'todayusersignup' => 430, + 'todayorder' => 2324, + 'unsettleorder' => 132, + 'sevendnu' => '80%', + 'sevendau' => '32%', + 'paylist' => $paylist, + 'createlist' => $createlist, + 'uploadmode' => $uploadmode ]); - return $this->view->fetch(); } diff --git a/application/admin/controller/auth/Group.php b/application/admin/controller/auth/Group.php index d08cf7f6..a82435ec 100644 --- a/application/admin/controller/auth/Group.php +++ b/application/admin/controller/auth/Group.php @@ -32,6 +32,11 @@ class Group extends Backend $groupName = AuthGroup::where('id', 'in', $this->childrenGroupIds) ->column('id,name'); + foreach ($groupName as $k => &$v) + { + $v = __($v); + } + unset($v); $this->groupdata = $groupName; $this->assignconfig("admin", ['id' => $this->auth->id, 'group_ids' => $this->auth->getGroupIds()]); diff --git a/application/admin/controller/auth/Rule.php b/application/admin/controller/auth/Rule.php index 48a51ace..66c1e759 100644 --- a/application/admin/controller/auth/Rule.php +++ b/application/admin/controller/auth/Rule.php @@ -24,10 +24,17 @@ class Rule extends Backend parent::_initialize(); $this->model = model('AuthRule'); // 必须将结果集转换为数组 - Tree::instance()->init(collection($this->model->order('weigh', 'desc')->select())->toArray()); + $ruleList = collection($this->model->order('weigh', 'desc')->select())->toArray(); + foreach ($ruleList as $k => &$v) + { + $v['title'] = __($v['title']); + $v['remark'] = __($v['remark']); + } + unset($v); + Tree::instance()->init($ruleList); $this->rulelist = Tree::instance()->getTreeList(Tree::instance()->getTreeArray(0), 'title'); $ruledata = [0 => __('None')]; - foreach ($this->rulelist as $k => $v) + foreach ($this->rulelist as $k => &$v) { if (!$v['ismenu']) continue; diff --git a/application/admin/controller/general/Config.php b/application/admin/controller/general/Config.php index 16c367d3..e19ad988 100644 --- a/application/admin/controller/general/Config.php +++ b/application/admin/controller/general/Config.php @@ -42,6 +42,7 @@ class Config extends Backend continue; } $value = $v->toArray(); + $value['title'] = __($value['title']); if (in_array($value['type'], ['select', 'selects', 'checkbox', 'radio'])) { $value['value'] = explode(',', $value['value']); diff --git a/application/admin/lang/zh-cn.php b/application/admin/lang/zh-cn.php index 47246e38..d8536179 100644 --- a/application/admin/lang/zh-cn.php +++ b/application/admin/lang/zh-cn.php @@ -11,10 +11,14 @@ return [ 'Keep login' => '保持会话', 'Guest' => '游客', 'Welcome' => '%s，你好！', + 'View' => '查看', 'Add' => '添加', 'Edit' => '编辑', + 'Del' => '删除', 'Delete' => '删除', 'Detail' => '详情', + 'Multi' => '批量更新', + 'Setting' => '配置', 'Move' => '移动', 'Name' => '名称', 'Status' => '状态', @@ -40,6 +44,8 @@ return [ 'Choose' => '选择', 'Search' => '搜索', 'Refresh' => '刷新', + 'Install' => '安装', + 'Uninstall' => '卸载', 'First' => '首页', 'Previous' => '上一页', 'Next' => '下一页', @@ -81,14 +87,6 @@ return [ 'Update time' => '更新时间', 'Flag' => '标志', 'Redirect now' => '立即跳转', - 'Operation completed' => '操作成功!', - 'Operation failed' => '操作失败!', - 'Unknown data format' => '未知的数据格式!', - 'Network error' => '网络错误!', - 'Auth manager' => '权限管理', - 'General manager' => '常规管理', - 'Example manager' => '示例管理', - 'Wechat manager' => '微信管理', 'Common search' => '普通搜索', 'Search %s' => '搜索 %s', 'View %s' => '查看 %s', @@ -99,9 +97,13 @@ return [ '%d week%s ago' => '%d周前', '%d month%s ago' => '%d月前', '%d year%s ago' => '%d年前', - // 'Set to normal' => '设为正常', 'Set to hidden' => '设为隐藏', + //提示 + 'Operation completed' => '操作成功!', + 'Operation failed' => '操作失败!', + 'Unknown data format' => '未知的数据格式!', + 'Network error' => '网络错误!', 'Invalid parameters' => '未知参数', 'No results were found' => '记录未找到', 'Parameter %s can not be empty' => '参数%s不能为空', @@ -114,4 +116,35 @@ return [ 'Please login first' => '请登录后操作', 'An unexpected error occurred' => '发生了一个意外错误,程序猿正在紧急处理中', 'This page will be re-directed in %s seconds' => '页面将在 %s 秒后自动跳转', + //菜单 + 'Dashboard' => '控制台', + 'General' => '常规管理', + 'Category' => '分类管理', + 'Addon' => '插件管理', + 'Auth' => '权限管理', + 'Config' => '系统配置', + 'Attachment' => '附件管理', + 'Profile' => '个人配置', + 'Admin' => '管理员管理', + 'Admin log' => '管理员日志', + 'Group' => '角色组', + 'Rule' => '规则管理', + 'Select attachment' => '选择附件', + 'Update profile' => '更新个人信息', + 'Local install' => '本地安装', + 'Update state' => '禁用启用', + 'Admin group' => '超级管理组', + 'Second group' => '二级管理组', + 'Third group' => '三级管理组', + 'Second group 2' => '二级管理组2', + 'Third group 2' => '三级管理组2', + 'Dashboard tips' => '用于展示当前系统中的统计数据、统计报表及重要实时数据', + 'Config tips' => '可以在此增改系统的变量和分组,也可以自定义分组和变量,如果需要删除请从数据库中删除', + 'Category tips' => '用于统一管理网站的所有分类,分类可进行无限级分类', + 'Attachment tips' => '主要用于管理上传到服务器或第三方存储的数据', + 'Addon tips' => '可在线安装、卸载、禁用、启用插件，同时支持Add本地插件。FastAdmin已上线插件商店 ，你可以发布你的免费或付费插件：http://www.fastadmin.net/store.html', + 'Admin tips' => '一个管理员可以有多个角色组,左侧的菜单根据管理员所拥有的权限进行生成', + 'Admin log tips' => '管理员可以View自己所拥有的权限的管理员日志', + 'Group tips' => '角色组可以有多个,角色有上下级层级关系,如果子角色有角色组和管理员的权限则可以派生属于自己组别下级的角色组或管理员', + 'Rule tips' => '规则通常对应一个控制器的方法,同时左侧的菜单栏数据也从规则中体现,通常建议通过控制台进行生成规则节点', ]; diff --git a/application/admin/lang/zh-cn/auth/rule.php b/application/admin/lang/zh-cn/auth/rule.php index 2d667d4b..e9ce0195 100644 --- a/application/admin/lang/zh-cn/auth/rule.php +++ b/application/admin/lang/zh-cn/auth/rule.php @@ -9,6 +9,7 @@ return [ 'Name' => '规则URL', 'Controller/Action' => '控制器名/方法名', 'Ismenu' => '菜单', + 'Search icon' => '搜索图标', 'The non-menu rule must have parent' => '非菜单规则节点必须有父级', 'If not necessary, use the command line to build rule' => '非必要情况下请直接使用命令行php think menu来生成', ]; diff --git a/application/admin/lang/zh-cn/dashboard.php b/application/admin/lang/zh-cn/dashboard.php new file mode 100644 index 00000000..2b88341b --- /dev/null +++ b/application/admin/lang/zh-cn/dashboard.php @@ -0,0 +1,43 @@ + '自定义', + 'Pid' => '父ID', + 'Type' => '栏目类型', + 'Image' => '图片', + 'Total user' => '总会员数', + 'Total view' => '总访问数', + 'Total order' => '总订单数', + 'Total order amount' => '总金额', + 'Today user signup' => '今日注册', + 'Today user login' => '今日登录', + 'Today order' => '今日订单', + 'Unsettle order' => '未处理订单', + 'Seven dnu' => '七日新增', + 'Seven dau' => '七日活跃', + 'Custom zone' => '这里是你的自定义数据', + 'Custom zone' => '这里是你的自定义数据', + 'Sales' => '成交数', + 'Orders' => '订单数', + 'Real time' => '实时', + 'Category count' => '分类统计', + 'Category count tips' => '当前分类总记录数', + 'Attachment count' => '附件统计', + 'Attachment count tips' => '当前上传的附件数量', + 'Article count' => '文章统计', + 'News count' => '新闻统计', + 'Comment count' => '评论次数', + 'Like count' => '点赞次数', + 'Recent news' => '最新新闻', + 'Recent discussion' => '最新发贴', + 'Server info' => '服务器信息', + 'PHP version' => 'PHP版本', + 'Fastadmin version' => 'FastAdmin版本', + 'Sapi name' => '运行方式', + 'Debug mode' => '调试模式', + 'Software' => '环境信息', + 'Upload mode' => '上传模式', + 'Upload url' => '上传URL', + 'Timezone' => '时区', + 'Language' => '语言', +]; diff --git a/application/admin/lang/zh-cn/general/config.php b/application/admin/lang/zh-cn/general/config.php index 60511256..89877983 100644 --- a/application/admin/lang/zh-cn/general/config.php +++ b/application/admin/lang/zh-cn/general/config.php @@ -10,6 +10,7 @@ return [ 'Basic' => '基础配置', 'Email' => '邮件配置', 'Attachment' => '附件配置', + 'Dictionary' => '字典配置', 'User' => '会员配置', 'Example' => '示例分组', 'Extend' => '扩展属性', @@ -32,6 +33,23 @@ return [ 'Array value' => '键值', 'Content' => '数据列表', 'Rule' => '校验规则', + 'Site name' => '站点名称', + 'Beian' => '备案号', + 'Cdn url' => 'CDN地址', + 'Version' => '版本号', + 'Timezone' => '时区', + 'Forbidden ip' => '禁止IP', + 'Languages' => '语言', + 'Fixed page' => '后台固定页', + 'Category type' => '分类类型', + 'Config group' => '配置分组', + 'Mail type' => '邮件发送方式', + 'Mail smtp host' => 'SMTP服务器', + 'Mail smtp port' => 'SMTP端口', + 'Mail smtp user' => 'SMTP用户名', + 'Mail smtp password' => 'SMTP密码', + 'Mail vertify type' => 'SMTP验证方式', + 'Mail from' => '发件人邮箱', 'Name already exist' => '变量名称已经存在', 'Send a test message' => '发送测试邮件', 'This is a test mail content' => '这是一封测试邮件,用于测试邮件配置是否正常!', diff --git a/application/admin/lang/zh-cn/index.php b/application/admin/lang/zh-cn/index.php index 9bba7d10..a0ad15aa 100644 --- a/application/admin/lang/zh-cn/index.php +++ b/application/admin/lang/zh-cn/index.php @@ -35,4 +35,8 @@ return [ 'Check for updates' => '检测更新', 'Latest news' => '最新消息', 'View more' => '查看更多', + 'Links' => '相关链接', + 'Docs' => '官方文档', + 'Forum' => '交流社区', + 'QQ qun' => 'QQ交流群', ]; diff --git a/application/admin/library/Auth.php b/application/admin/library/Auth.php index a4e9e3d7..a23df732 100644 --- a/application/admin/library/Auth.php +++ b/application/admin/library/Auth.php @@ -313,6 +313,7 @@ class Auth extends \fast\Auth foreach ($this->breadcrumb as $k => &$v) { $v['url'] = url($v['name']); + $v['title'] = __($v['title']); } } return $this->breadcrumb; @@ -373,6 +374,7 @@ class Auth extends \fast\Auth $v['badge'] = isset($badgeList[$v['name']]) ? $badgeList[$v['name']] : ''; $v['py'] = $pinyin->abbr($v['title'], ''); $v['pinyin'] = $pinyin->permalink($v['title'], ''); + $v['title'] = __($v['title']); } // 构造菜单数据 Tree::instance()->init($ruleList); diff --git a/application/admin/library/traits/Backend.php b/application/admin/library/traits/Backend.php index 67bd793b..d701436b 100644 --- a/application/admin/library/traits/Backend.php +++ b/application/admin/library/traits/Backend.php @@ -52,6 +52,10 @@ trait Backend { $v = is_array($v) ? implode(',', $v) : $v; } + if ($this->dataLimitType) + { + $params[$this->dataLimitField] = $this->auth->id; + } try { //是否采用模型验证 @@ -89,6 +93,14 @@ trait Backend $row = $this->model->get($ids); if (!$row) $this->error(__('No Results were found')); + $adminIds = $this->getDataLimitAdminIds(); + if (is_array($adminIds)) + { + if (!in_array($row[$this->dataLimitField], $adminIds)) + { + $this->error(__('You have no permission')); + } + } if ($this->request->isPost()) { $params = $this->request->post("row/a"); @@ -135,7 +147,15 @@ trait Backend { if ($ids) { - $count = $this->model->destroy($ids); + $adminIds = $this->getDataLimitAdminIds(); + if (is_array($adminIds)) + { + $count = $this->model->where($this->dataLimitField, 'in', $adminIds)->delete($ids); + } + else + { + $count = $this->model->destory($ids); + } if ($count) { $this->success(); @@ -158,6 +178,11 @@ trait Backend $values = array_intersect_key($values, array_flip(is_array($this->multiFields) ? $this->multiFields : explode(',', $this->multiFields))); if ($values) { + $adminIds = $this->getDataLimitAdminIds(); + if (is_array($adminIds)) + { + $this->model->where($this->dataLimitField, 'in', $adminIds); + } $count = $this->model->where($this->model->getPk(), 'in', $ids)->update($values); if ($count) { diff --git a/application/admin/view/auth/admin/add.html b/application/admin/view/auth/admin/add.html index de739965..0f3471c9 100644 --- a/application/admin/view/auth/admin/add.html +++ b/application/admin/view/auth/admin/add.html @@ -2,7 +2,7 @@
- {:build_select('group[]', $groupdata, null, ['class'=>'form-control selectpicker', 'multiple'=>'', 'required'=>''])} + {:build_select('group[]', $groupdata, null, ['class'=>'form-control selectpicker', 'multiple'=>'', 'data-rule'=>'required'])}
diff --git a/application/admin/view/auth/admin/edit.html b/application/admin/view/auth/admin/edit.html index 0c15fa69..a1569a8f 100644 --- a/application/admin/view/auth/admin/edit.html +++ b/application/admin/view/auth/admin/edit.html @@ -2,7 +2,7 @@
- {:build_select('group[]', $groupdata, $groupids, ['class'=>'form-control selectpicker', 'multiple'=>''])} + {:build_select('group[]', $groupdata, $groupids, ['class'=>'form-control selectpicker', 'multiple'=>'', 'data-rule'=>'required'])}
diff --git a/application/admin/view/auth/group/add.html b/application/admin/view/auth/group/add.html index 406a5b93..9879f2f5 100644 --- a/application/admin/view/auth/group/add.html +++ b/application/admin/view/auth/group/add.html @@ -3,7 +3,7 @@
- {:build_select('row[pid]', $groupdata, null, ['class'=>'form-control selectpicker', 'required'=>''])} + {:build_select('row[pid]', $groupdata, null, ['class'=>'form-control selectpicker', 'data-rule'=>'required'])}
diff --git a/application/admin/view/auth/group/edit.html b/application/admin/view/auth/group/edit.html index fbd76fe1..20cfde02 100644 --- a/application/admin/view/auth/group/edit.html +++ b/application/admin/view/auth/group/edit.html @@ -3,7 +3,7 @@
- {:build_select('row[pid]', $groupdata, $row['pid'], ['class'=>'form-control selectpicker', 'required'=>'', 'data-id'=>$row['id'], 'data-pid'=>$row['pid']])} + {:build_select('row[pid]', $groupdata, $row['pid'], ['class'=>'form-control selectpicker', 'data-rule'=>'required', 'data-id'=>$row['id'], 'data-pid'=>$row['pid']])}
diff --git a/application/admin/view/auth/rule/add.html b/application/admin/view/auth/rule/add.html index 92b1d74a..7f808a3c 100644 --- a/application/admin/view/auth/rule/add.html +++ b/application/admin/view/auth/rule/add.html @@ -32,7 +32,7 @@
- 搜索图标 + {:__('Search icon')}
diff --git a/application/admin/view/auth/rule/edit.html b/application/admin/view/auth/rule/edit.html index 023381f2..e0afebc2 100644 --- a/application/admin/view/auth/rule/edit.html +++ b/application/admin/view/auth/rule/edit.html @@ -28,7 +28,7 @@
- 搜索图标 + {:__('Search icon')}
diff --git a/application/admin/view/common/menu.html b/application/admin/view/common/menu.html index cc4a28f4..30b6457c 100644 --- a/application/admin/view/common/menu.html +++ b/application/admin/view/common/menu.html @@ -29,10 +29,10 @@ \ No newline at end of file diff --git a/application/admin/view/dashboard/index.html b/application/admin/view/dashboard/index.html index dab32afe..1490e5b6 100644 --- a/application/admin/view/dashboard/index.html +++ b/application/admin/view/dashboard/index.html @@ -124,10 +124,10 @@
-
控制台（Dashboard）用于展示当前系统中的统计数据、统计报表及重要实时数据
+ {:build_heading(null, false)}
@@ -140,7 +140,7 @@
{$totaluser} - 总会员数 + {:__('Total user')}
@@ -149,7 +149,7 @@
{$totalviews} - 总访问数 + {:__('Total view')}
@@ -158,7 +158,7 @@
{$totalorder} - 总订单数 + {:__('Total order')}
@@ -167,7 +167,7 @@
{$totalorderamount} - 总金额 + {:__('Total order amount')}
@@ -185,60 +185,60 @@
{$todayusersignup}
-
今日注册
+
{:__('Today user signup')}
-
+
{$todayuserlogin}
-
今日登录
+
{:__('Today user login')}
-
+
{$todayorder}
-
今日订单
+
{:__('Today order')}
-
+
-
{$todayunsettleorder}
-
未处理订单
+
{$unsettleorder}
+
{:__('Unsettle order')}
-
+
{$sevendnu}
-
七日新增
+
{:__('Seven dnu')}
-
+
{$sevendau}
-
七日活跃
+
{:__('Seven dau')}
-
+
@@ -246,43 +246,22 @@ -
-

详细统计

- 管理 -
教练统计
+ {:__('Real time')} +
{:__('Category count')}

1234

1234
- 总评论数 + {:__('Category count tips')}
@@ -291,13 +270,13 @@
- 管理 -
文章统计
+ {:__('Real time')} +
{:__('Attachment count')}

1043

2592
- 总文章数 + {:__('Attachment count tips')}
@@ -307,19 +286,19 @@
- 管理 -
动态统计
+ {:__('Real time')} +
{:__('Article count')}

1234

-
总评论数
+
{:__('Comment count')}

6754

-
总评论点赞数
+
{:__('Like count')}
@@ -330,19 +309,19 @@
- 管理 -
活动统计
+ {:__('Real time')} +
{:__('News count')}

5302

-
总评论数
+
{:__('Comment count')}

8205

-
总参与人数
+
{:__('Like count')}
@@ -351,78 +330,119 @@
+
+
+
+
+

{:__('Recent news')}

+
+ {:__('More')} +
+
+
+ +
+
+
+
+
+
+

{:__('Recent discussion')}

+
+ {:__('More')} +
+
+
+ +
+
+
+
+
+

{:__('Server info')}

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{:__('PHP version')}{$Think.const.PHP_VERSION}
{:__('FastAdmin version')}{$Think.config.fastadmin.version}
{:__('Sapi name')}{:php_sapi_name()}
{:__('Debug mode')}{$Think.config.app_debug?__('Yes'):__('No')}
{:__('Software')}{$Think.server.SERVER_SOFTWARE}
{:__('Upload mode')}{$uploadmode}
{:__('Upload url')}{$config.upload.uploadurl}
{:__('Timezone')}{:date_default_timezone_get()}
{:__('Language')}{$config.language}
+
+
+
+
-
-
-
Monthly -
- 统计数据1 -
-
-
-
-

40 886,200

-
98%
- Total income -
-
-
-
-
-
-
Monthly -
- 统计数据2 -
-
-
-
-

40 886,200

-
98%
- Total income -
-
-
-
-
-
-
Monthly -
- 统计数据3 -
-
-
-
-

40 886,200

-
98%
- Total income -
-
-
-
-
-
-
Monthly -
- 统计数据4 -
-
-
-
-

40 886,200

-
98%
- Total income -
-
-
+
+ {:__('Custom zone')}
+ +