From 5b2e678b689076d5d11080324238278f3b76e520 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A9=99=E6=A9=99=E6=A5=8A?= <2370374436@qq.com>
Date: Thu, 24 Oct 2019 18:16:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Log.php                  |  4 ++--
 admin/Login.php          | 23 +++++++++++++++++++++--
 admin/Manager.php        | 18 +++++++-----------
 admin/Question.php       | 12 ++++++------
 admin/WasteSorting.php   | 16 ++++++++--------
 api/BaiduImage.php       | 10 +++++-----
 api/QueryText.php        |  8 ++++----
 api/QuestionAPI.php      |  8 ++++----
 baidu/BaiduAiRequest.php |  4 ++--
 config.php               |  6 +++---
 database/DbUtil.php      |  4 ++--
 database/Query.php       | 12 ++++++------
 head.php                 |  2 +-
 index.php                | 12 +++++++-----
 static/js/Cookie.js      | 15 +++++++++++++++
 test.php                 | 15 +++++++++------
 16 files changed, 102 insertions(+), 67 deletions(-)
 create mode 100644 static/js/Cookie.js

diff --git a/Log.php b/Log.php
index 3d61fad..ea658f8 100644
--- a/Log.php
+++ b/Log.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __ROOT__ . '/vendor/autoload.php';
+require_once $_SERVER["DOCUMENT_ROOT"] . '/vendor/autoload.php';
 
 use Monolog\Formatter\LineFormatter;
 use Monolog\Handler\StreamHandler;
@@ -30,7 +30,7 @@ function getStream($path)
 function getLogger()
 {
     $log = new Logger('name');
-    $log->pushHandler(getStream(__ROOT__ . "/log/run.log"));
+    $log->pushHandler(getStream($_SERVER["DOCUMENT_ROOT"] . "/log/run.log"));
     $log->pushHandler(getStream("php://stdout")); // <<< uses a stream
     return $log;
 }
diff --git a/admin/Login.php b/admin/Login.php
index dbc7a70..20a6212 100644
--- a/admin/Login.php
+++ b/admin/Login.php
@@ -21,8 +21,27 @@ function update_token(QueryManager $manager_result, $msg)
 
     //            跳转到首页
     if ($_SERVER["SCRIPT_NAME"] == "/admin/Manager.php") {
-        info_res($msg, "/admin/Login.php");
-    } else {
+        info_res($msg, "/",);
+        echo <<<EOF
+<script>
+<!--3秒后自动跳转-->
+let count=3
+let i=setInterval(function() {
+   if(count-->0){
+       $("#tip").text(count+"秒后自动跳转");
+   }else{
+       location.href="/"
+   }
+  console.info("定时器！！！！！")
+},1000)
+</script>
+
+<div class="alert alert-info alert-dismissible fade show col-5 m-auto text-center" role="alert">
+      <strong id="tip"></strong>
+</div>
+EOF;
+
+    } else if ($_SERVER["SCRIPT_NAME"] == "/index.php" && empty($_SERVER["HTTP_REFERER"])) {
         response($msg, "alert-info");
     }
 
diff --git a/admin/Manager.php b/admin/Manager.php
index f98007c..27fa60f 100644
--- a/admin/Manager.php
+++ b/admin/Manager.php
@@ -1,20 +1,16 @@
 <?php
 //管理员后台登陆
-if (file_exists("../config.php")) {
-    require_once "../config.php";
-} else {
-    require_once "config.php";
-}
+require_once $_SERVER["DOCUMENT_ROOT"] . "/config.php";
 
-require_once __ROOT__ . "/head.php";
+require_once $_SERVER["DOCUMENT_ROOT"] . "/head.php";
 
 getMenu("管理员登陆");
 
-require_once __ROOT__ . "/database/DbUtil.php";
-require_once __ROOT__ . "/database/Query.php";
-require_once __ROOT__ . "/Log.php";
-require_once __ROOT__ . "/admin/Alert.php";
-require_once __ROOT__ . "/admin/Login.php";
+require_once $_SERVER["DOCUMENT_ROOT"] . "/database/DbUtil.php";
+require_once $_SERVER["DOCUMENT_ROOT"] . "/database/Query.php";
+require_once $_SERVER["DOCUMENT_ROOT"] . "/Log.php";
+require_once $_SERVER["DOCUMENT_ROOT"] . "/admin/Alert.php";
+require_once $_SERVER["DOCUMENT_ROOT"] . "/admin/Login.php";
 
 if (!check_login()) {
     if (empty($_REQUEST)) {
diff --git a/admin/Question.php b/admin/Question.php
index 3b03fe5..4f6eb96 100644
--- a/admin/Question.php
+++ b/admin/Question.php
@@ -13,12 +13,12 @@ use mysqli;
 use Question;
 use QuestionQuery;
 
-require_once "../config.php";
-require_once __ROOT__ . "/head.php";
-require_once __ROOT__ . "/database/DbUtil.php";
-require_once __ROOT__ . "/database/Query.php";
-require_once __ROOT__ . "/Log.php";
-require_once __ROOT__ . "/admin/Alert.php";
+require_once $_SERVER["DOCUMENT_ROOT"] . "/config.php";
+require_once $_SERVER["DOCUMENT_ROOT"] . "/head.php";
+require_once $_SERVER["DOCUMENT_ROOT"] . "/database/DbUtil.php";
+require_once $_SERVER["DOCUMENT_ROOT"] . "/database/Query.php";
+require_once $_SERVER["DOCUMENT_ROOT"] . "/Log.php";
+require_once $_SERVER["DOCUMENT_ROOT"] . "/admin/Alert.php";
 
 getMenu("题目管理");
 
diff --git a/admin/WasteSorting.php b/admin/WasteSorting.php
index 877e28e..8bede2f 100644
--- a/admin/WasteSorting.php
+++ b/admin/WasteSorting.php
@@ -1,11 +1,11 @@
 <?php
 
-require_once "../config.php";
-require_once __ROOT__ . "/head.php";
-require_once __ROOT__ . "/database/DbUtil.php";
-require_once __ROOT__ . "/database/Query.php";
-require_once __ROOT__ . "/Log.php";
-require_once __ROOT__ . "/admin/Alert.php";
+require_once $_SERVER["DOCUMENT_ROOT"] . "/config.php";
+require_once $_SERVER["DOCUMENT_ROOT"] . "/head.php";
+require_once $_SERVER["DOCUMENT_ROOT"] . "/database/DbUtil.php";
+require_once $_SERVER["DOCUMENT_ROOT"] . "/database/Query.php";
+require_once $_SERVER["DOCUMENT_ROOT"] . "/Log.php";
+require_once $_SERVER["DOCUMENT_ROOT"] . "/admin/Alert.php";
 
 getMenu("题目管理");
 
@@ -167,7 +167,7 @@ EOF;
       <th scope="col">垃圾名</th>
       <th scope="col">垃圾分类</th>
       <th scope="col">创建时间</th>
-      <th scope="col">修改时间</th>
+<!--      <th scope="col">修改时间</th>-->
     </tr>
   </thead>
   <tbody>
@@ -184,7 +184,7 @@ EOF;
       <th>$name</th>
       <td>$category</td>
       <td>$create_at</td>
-      <td>$update_at</td>
+<!--      <td>$update_at</td>-->
     </tr>
 EOF;
                 }
diff --git a/api/BaiduImage.php b/api/BaiduImage.php
index da079b7..1163e2c 100644
--- a/api/BaiduImage.php
+++ b/api/BaiduImage.php
@@ -1,10 +1,10 @@
 <?php
 
-require_once "../config.php";
-require_once __ROOT__ . "/baidu/BaiduAiRequest.php";
-require_once __ROOT__ . "/entity/Garbage.php";
-require_once __ROOT__ . "/database/Query.php";
-require_once __ROOT__ . "/api/JsonResponse.php";
+require_once $_SERVER["DOCUMENT_ROOT"] . "/config.php";
+require_once $_SERVER["DOCUMENT_ROOT"] . "/baidu/BaiduAiRequest.php";
+require_once $_SERVER["DOCUMENT_ROOT"] . "/entity/Garbage.php";
+require_once $_SERVER["DOCUMENT_ROOT"] . "/database/Query.php";
+require_once $_SERVER["DOCUMENT_ROOT"] . "/api/JsonResponse.php";
 
 //查询垃圾分类
 function query_waste_soring($image_res)
diff --git a/api/QueryText.php b/api/QueryText.php
index 1f9a624..53ca3c7 100644
--- a/api/QueryText.php
+++ b/api/QueryText.php
@@ -1,9 +1,9 @@
 <?php
 
-require_once "../config.php";
-require_once __ROOT__ . "/api/JsonResponse.php";
-require_once __ROOT__ . "/database/DbUtil.php";
-require_once __ROOT__ . "/database/Query.php";
+require_once $_SERVER["DOCUMENT_ROOT"] . "/config.php";
+require_once $_SERVER["DOCUMENT_ROOT"] . "/api/JsonResponse.php";
+require_once $_SERVER["DOCUMENT_ROOT"] . "/database/DbUtil.php";
+require_once $_SERVER["DOCUMENT_ROOT"] . "/database/Query.php";
 
 
 //关键字查询
diff --git a/api/QuestionAPI.php b/api/QuestionAPI.php
index 93914c0..a26f758 100644
--- a/api/QuestionAPI.php
+++ b/api/QuestionAPI.php
@@ -1,9 +1,9 @@
 <?php
 
-require_once "../config.php";
-require_once __ROOT__ . "/api/JsonResponse.php";
-require_once __ROOT__ . "/Log.php";
-require_once __ROOT__ . "/database/Query.php";
+require_once $_SERVER["DOCUMENT_ROOT"] . "/config.php";
+require_once $_SERVER["DOCUMENT_ROOT"] . "/api/JsonResponse.php";
+require_once $_SERVER["DOCUMENT_ROOT"] . "/Log.php";
+require_once $_SERVER["DOCUMENT_ROOT"] . "/database/Query.php";
 
 //题库题目数上限
 $max_count = 10;
diff --git a/baidu/BaiduAiRequest.php b/baidu/BaiduAiRequest.php
index cdc69ff..4561e43 100644
--- a/baidu/BaiduAiRequest.php
+++ b/baidu/BaiduAiRequest.php
@@ -1,7 +1,7 @@
 <?php
 
-require_once __ROOT__ . "/entity/ApiToken.php";
-require_once __ROOT__ . "/database/DbUtil.php";
+require_once $_SERVER["DOCUMENT_ROOT"] . "/entity/ApiToken.php";
+require_once $_SERVER["DOCUMENT_ROOT"] . "/database/DbUtil.php";
 
 
 //api请求
diff --git a/config.php b/config.php
index 0f96054..72286c7 100644
--- a/config.php
+++ b/config.php
@@ -9,8 +9,8 @@ define("db_config", array(
 //默认日期格式
 define("default_format", "Y-m-d H:i:s");
 //根目录
-//define("__ROOT__", dirname(__FILE__));
+//define("$_SERVER["DOCUMENT_ROOT"]", dirname(__FILE__));
 
-//define("__ROOT__", "D:/JetBrains/PhpstormProjects/WasteSorting");
+//define("$_SERVER["DOCUMENT_ROOT"]", "D:/JetBrains/PhpstormProjects/WasteSorting");
 
-//define("__ROOT__", $_SERVER["DOCUMENT_ROOT"]);
\ No newline at end of file
+//define("$_SERVER["DOCUMENT_ROOT"]", $_SERVER["DOCUMENT_ROOT"]);
\ No newline at end of file
diff --git a/database/DbUtil.php b/database/DbUtil.php
index c155342..2e49bdb 100644
--- a/database/DbUtil.php
+++ b/database/DbUtil.php
@@ -1,7 +1,7 @@
 <?php
 
-require_once __ROOT__ . "/config.php";
-require_once __ROOT__ . "/Log.php";
+require_once $_SERVER["DOCUMENT_ROOT"] . "/config.php";
+require_once $_SERVER["DOCUMENT_ROOT"] . "/Log.php";
 
 interface DoExcute
 {
diff --git a/database/Query.php b/database/Query.php
index 062fa83..8dd20f8 100644
--- a/database/Query.php
+++ b/database/Query.php
@@ -1,11 +1,11 @@
 <?php
 
-require_once __ROOT__ . "/entity/ApiToken.php";
-require_once __ROOT__ . "/entity/Garbage.php";
-require_once __ROOT__ . "/entity/Question.php";
-require_once __ROOT__ . "/entity/Answer.php";
-require_once __ROOT__ . "/entity/Manager.php";
-require_once __ROOT__ . "/database/DbUtil.php";
+require_once $_SERVER["DOCUMENT_ROOT"] . "/entity/ApiToken.php";
+require_once $_SERVER["DOCUMENT_ROOT"] . "/entity/Garbage.php";
+require_once $_SERVER["DOCUMENT_ROOT"] . "/entity/Question.php";
+require_once $_SERVER["DOCUMENT_ROOT"] . "/entity/Answer.php";
+require_once $_SERVER["DOCUMENT_ROOT"] . "/entity/Manager.php";
+require_once $_SERVER["DOCUMENT_ROOT"] . "/database/DbUtil.php";
 //Token查询
 abstract class AbstractTokenQuery implements DoExcute
 {
diff --git a/head.php b/head.php
index b91e824..c59a0db 100644
--- a/head.php
+++ b/head.php
@@ -9,7 +9,7 @@ function getMenu($menu)
         <script src="/static/js/popper.min.js"></script>
         <script src="/static/js/jquery-3.4.1.min.js"></script>
         <script src="/static/js/bootstrap.min.js"></script>
-        
+        <script src="/static/js/Cookie.js"></script>
     </head>
 EOF;
 }
diff --git a/index.php b/index.php
index 6cb68e9..bf2075f 100644
--- a/index.php
+++ b/index.php
@@ -1,11 +1,11 @@
 <?php
 
-require_once "config.php";
-require_once __ROOT__ . "/head.php";
+require_once $_SERVER["DOCUMENT_ROOT"] . "/config.php";
+require_once $_SERVER["DOCUMENT_ROOT"] . "/head.php";
 
 getMenu("后台管理");
 
-require_once __ROOT__ . "/admin/Login.php";
+require_once $_SERVER["DOCUMENT_ROOT"] . "/admin/Login.php";
 
 if (!check_login()) {
     error_res("您尚未登陆，跳转到登陆页", "/admin/Manager.php");
@@ -13,7 +13,7 @@ if (!check_login()) {
 }
 
 
-require_once __ROOT__ . "/entity/Menu.php";
+require_once $_SERVER["DOCUMENT_ROOT"] . "/entity/Menu.php";
 
 //菜单信息
 $menus = array("API" => new Menu("百度API配置", "/admin/ApiConfig.php"), new Menu("垃圾分类", "/admin/WasteSorting.php"), new Menu("题目管理", "/admin/Question.php"));
@@ -25,7 +25,9 @@ echo <<<EOF
 <script>
 function logout() {
   if(confirm("确认退出?")){
-      
+      delCookie("login_token");
+      delCookie("manager_name");
+      location.href="/admin/Manager.php"
   }
 }
 </script>
diff --git a/static/js/Cookie.js b/static/js/Cookie.js
new file mode 100644
index 0000000..44a6cc3
--- /dev/null
+++ b/static/js/Cookie.js
@@ -0,0 +1,15 @@
+function delCookie(name) {
+    var exp = new Date();
+    exp.setTime(exp.getTime() - 1);
+    var cval = getCookie(name);
+    if (cval != null)
+        document.cookie = name + "=" + cval + ";expires=" + exp.toGMTString();
+}
+
+function getCookie(name) {
+    var arr, reg = new RegExp("(^| )" + name + "=([^;]*)(;|$)");
+    if ((arr = document.cookie.match(reg)) !== null)
+        return unescape(arr[2]);
+    else
+        return null;
+}
\ No newline at end of file
diff --git a/test.php b/test.php
index 9446e11..c97f247 100644
--- a/test.php
+++ b/test.php
@@ -1,9 +1,9 @@
 <?php
-require_once "config.php";
-//require_once __ROOT__ . "/database/DbUtil.php";
-//require_once __ROOT__ . "/entity/Question.php";
-//require_once __ROOT__ . "/entity/Answer.php";
-//require_once __ROOT__ . "/Log.php";
+//require_once $_SERVER["DOCUMENT_ROOT"] ."/config.php";
+//require_once $_SERVER["DOCUMENT_ROOT"] . "/database/DbUtil.php";
+//require_once $_SERVER["DOCUMENT_ROOT"] . "/entity/Question.php";
+//require_once $_SERVER["DOCUMENT_ROOT"] . "/entity/Answer.php";
+//require_once $_SERVER["DOCUMENT_ROOT"] . "/Log.php";
 
 //echo <<<EOF
 //<html>
@@ -24,5 +24,8 @@ require_once "config.php";
 //EOF;
 
 //var_dump(array_search(new Answer(1, 2, 3, 4), array(new Answer(4, 5, 6, 7), new Answer(2, 2, 3, 4))));
-var_dump(date_create(default_format));
+$s1 = "dotcoo world!";
+$s2 = "dotcoo";
+$s3 = "hello dotcoo";
+var_dump(substr($s1, -strlen($s2)) === $s2);