From ab819da5a9974c4bb1bf568704b8085fd9235c08 Mon Sep 17 00:00:00 2001
From: hdm <hdm58@qq.com>
Date: Wed, 1 Jun 2022 00:00:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8B=BE=E8=82=A1CMS3.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/middleware/Auth.php |  4 +--
 app/home/view/index/logs.html | 53 ++++++++++++++++++++++++++++++++++-
 app/install/data/gougucms.sql |  2 +-
 public/404.html               | 26 -----------------
 4 files changed, 55 insertions(+), 30 deletions(-)
 delete mode 100644 public/404.html

diff --git a/app/admin/middleware/Auth.php b/app/admin/middleware/Auth.php
index 6d3663c..601748b 100644
--- a/app/admin/middleware/Auth.php
+++ b/app/admin/middleware/Auth.php
@@ -37,10 +37,10 @@ class Auth
                     exit;
                 }
             }
-
+            $uid = Session::get($session_admin)['id'];
             // 验证用户访问权限
             if ($action !== 'index' && $action !== 'api') {
-                if (!$this->checkAuth($controller, $pathInfo, $action, Session::get($session_admin)['id'])) {
+                if (!$this->checkAuth($controller, $pathInfo, $action, $uid)) {
                     if ($request->isAjax()) {
                         return to_assign(202, '你没有权限,请联系超级管理员！');
                     } else {
diff --git a/app/home/view/index/logs.html b/app/home/view/index/logs.html
index 3ebd086..3c5acd1 100644
--- a/app/home/view/index/logs.html
+++ b/app/home/view/index/logs.html
@@ -11,6 +11,57 @@
   <div class="site-content">
     <h1 style="height:60px; font-size:24px">更新日志</h1>
     <ul class="layui-timeline">
+		<li class="layui-timeline-item">
+			<i class="layui-icon layui-timeline-axis">&#xe63f;</i>
+			<div class="layui-timeline-content layui-text">
+			  <div class="layui-timeline-title">
+				<h2>3.0.61</h2>
+			  </div>
+			  <blockquote class="layui-elem-quote">
+					<p>勾股CMS3.0版本正式发布，改头换面</p>
+			  </blockquote>
+			  <ul>
+				<li>
+				  <a name="2.5.27"> </a>
+				  <h3>3.0.61 <span class="layui-badge-rim">2022-06-01</span></h3>
+				  <ul>
+					<li>升级了系统的前端UI库为Layui2.7，并对UI组件进行新的封装。</li>
+					<li>系统的文本编辑器从百度编辑器替换成为TinyMCE富文本编辑器，新的编辑器体验更佳。保留了编辑器可切换功能，随时可以切换成mardown编辑器</li>
+					<li>整体优化了系统页面的视觉UI及操作体验。</li>
+					<li>引入全新的【bootstrap-icons】ICON图标库，图表更全，更规范。</li>
+					<li>规范各个功能板块的数据请求方法，严格按照post/get/delete/put请求方法执行。</li>
+					<li>新增了单页面功能模块。</li>
+					<li>文章模块新增了前台文章查看功能。</li>
+					<li>修改了已知的bug</li>
+				  </ul>
+				</li>
+			  </ul>
+			</div>
+		</li>
+		<li class="layui-timeline-item">
+			<i class="layui-icon layui-timeline-axis">&#xe63f;</i>
+			<div class="layui-timeline-content layui-text">
+			  <div class="layui-timeline-title">
+				<h2>2.5.27</h2>
+			  </div>
+			  <blockquote class="layui-elem-quote">
+					<p>重构安装系统的模式，安装更智能。</p>
+			  </blockquote>
+			  <ul>
+				<li>
+				  <a name="2.5.27"> </a>
+				  <h3>v2.5.27 <span class="layui-badge-rim">2022-05-27</span></h3>
+				  <ul>
+					<li>重构安装了系统的模式，安装更智能，无需手动创建数据库也可完成系统的安装。</li>
+					<li>文章列表显示阅读数。</li>
+					<li>重构数据备份和还原功能模块。</li>
+					<li>优化了部分内容描述。</li>
+					<li>修改了已知的bug/li>
+				  </ul>
+				</li>
+			  </ul>
+			</div>
+		</li>
 		<li class="layui-timeline-item">
 			<i class="layui-icon layui-timeline-axis">&#xe63f;</i>
 			<div class="layui-timeline-content layui-text">
@@ -39,7 +90,7 @@
 				</li>
 			  </ul>
 			</div>
-		  </li>
+		</li>
 		<li class="layui-timeline-item">
         <i class="layui-icon layui-timeline-axis">&#xe63f;</i>
         <div class="layui-timeline-content layui-text">
diff --git a/app/install/data/gougucms.sql b/app/install/data/gougucms.sql
index 825b353..f5ebeb0 100644
--- a/app/install/data/gougucms.sql
+++ b/app/install/data/gougucms.sql
@@ -115,7 +115,7 @@ INSERT INTO `cms_admin_rule` VALUES (17, 1, 'admin/role/index', '权限角色',
 INSERT INTO `cms_admin_rule` VALUES (18, 17, 'admin/role/add', '新建/编辑', '权限角色', '', 2, 1, 1, 0, 0);
 INSERT INTO `cms_admin_rule` VALUES (19, 17, 'admin/role/delete', '删除', '权限角色', '', 2, 1, 1, 0, 0);
 
-INSERT INTO `cms_admin_rule` VALUES (20, 1, 'admin/admin/index', '管理员', '管理员', '', 1, 1, 1, 0, 0);
+INSERT INTO `cms_admin_rule` VALUES (20, 1, 'admin/admin/index', '管 理 员', '管理员', '', 1, 1, 1, 0, 0);
 INSERT INTO `cms_admin_rule` VALUES (21, 20, 'admin/admin/add', '添加/修改', '管理员', '', 2, 1, 1, 0, 0);
 INSERT INTO `cms_admin_rule` VALUES (22, 20, 'admin/admin/view', '查看', '管理员', '', 2, 1, 1, 0, 0);
 INSERT INTO `cms_admin_rule` VALUES (23, 20, 'admin/admin/delete', '删除', '管理员', '', 2, 1, 1, 0, 0);
diff --git a/public/404.html b/public/404.html
deleted file mode 100644
index 99ff94f..0000000
--- a/public/404.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!doctype html>
-<html>
-<head>
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-<title>404</title>
-<style>
-	body{
-		background-color:#444;
-		font-size:14px;
-	}
-	h3{
-		font-size:60px;
-		color:#eee;
-		text-align:center;
-		padding-top:30px;
-		font-weight:normal;
-	}
-</style>
-</head>
-
-<body>
-<h3>404，您请求的文件不存在!</h3>
-</body>
-</html>