4 files changed, 53 insertions, 10 deletions
diff --git a/ATRI/plugins/console/__init__.py b/ATRI/plugins/console/__init__.py
index ea109dc..c6f37c6 100644
--- a/ATRI/plugins/console/__init__.py
+++ b/ATRI/plugins/console/__init__.py
@@ -1,25 +1,59 @@
 import json
+from datetime import datetime, timedelta
 
 from nonebot.params import ArgPlainText
 from nonebot.adapters.onebot.v11 import PrivateMessageEvent, GroupMessageEvent
 
 from ATRI import conf
+from ATRI.log import log
 from ATRI.message import MessageBuilder
 from ATRI.exceptions import WriteFileError
+from ATRI.utils.apscheduler import scheduler
 
 from .data_source import Console, CONSOLE_DIR
 from .models import AuthData
 
 
+__AUTH_FILE_PATH = CONSOLE_DIR / "data.json"
+
+
+def __del_auth_key():
+    with open(__AUTH_FILE_PATH, "w", encoding="utf-8") as w:
+        w.write(json.dumps({}))
+    log.warning("控制台验证密钥已过期")
+
+
 gen_console_key = Console().cmd_as_group("auth", "获取进入网页后台的凭证")
 
 
 @gen_console_key.got("is_pub_n", "咱的运行环境是否有公网(y/n)")
 async def _(event: PrivateMessageEvent, is_pub_n: str = ArgPlainText("is_pub_n")):
-    data_path = CONSOLE_DIR / "data.json"
-    if not data_path.is_file():
-        with open(data_path, "w", encoding="utf-8") as w:
+    is_access_key = conf.BotConfig.access_token
+    if not is_access_key:
+        await gen_console_key.finish(
+            MessageBuilder("缺少设置: access_token")
+            .text("请先填写该内容, 以保证ATRI与协议端链接的安全性")
+            .text("填写并重启, 方可启用控制台")
+            .text("Tip: 该内容请尽可能地复杂, 请勿使用中文")
+        )
+
+    if not __AUTH_FILE_PATH.is_file():
+        with open(__AUTH_FILE_PATH, "w", encoding="utf-8") as w:
             w.write(json.dumps(dict()))
+    else:
+        now_time = datetime.now().timestamp()
+        data = json.loads(__AUTH_FILE_PATH.read_bytes())["data"]
+        if now_time < data["dead_time"]:
+            raw_last_time = data["dead_time"] - now_time
+            last_time = datetime.fromtimestamp(raw_last_time).minute
+            await gen_console_key.finish(
+                MessageBuilder("之前生成的密钥还在有效时间内奥")
+                .text(f"Token: {data['token']}")
+                .text(f"剩余有效时间: {last_time} min")
+            )
+        else:
+            with open(__AUTH_FILE_PATH, "w", encoding="utf-8") as w:
+                w.write(json.dumps(dict()))
 
     if is_pub_n != "y":
         host = str(await Console().get_host_ip(False))
@@ -29,10 +63,11 @@ async def _(event: PrivateMessageEvent, is_pub_n: str = ArgPlainText("is_pub_n")
 
     port = conf.BotConfig.port
     token = Console().get_random_str(20)
+    dead_time = datetime.now() + timedelta(minutes=15)
 
-    data = json.loads(data_path.read_bytes())
-    data["data"] = AuthData(token=token).dict()
-    with open(data_path, "w", encoding="utf-8") as w:
+    data = json.loads(__AUTH_FILE_PATH.read_bytes())
+    data["data"] = AuthData(token=token, dead_time=dead_time.timestamp()).dict()
+    with open(__AUTH_FILE_PATH, "w", encoding="utf-8") as w:
         w.write(json.dumps(data))
 
     msg = (
@@ -42,6 +77,13 @@ async def _(event: PrivateMessageEvent, is_pub_n: str = ArgPlainText("is_pub_n")
         .text("该 token 有效时间为 15min")
     )
 
+    scheduler.add_job(
+        __del_auth_key(),
+        name="清除后台验证凭证",
+        next_run_time=dead_time,
+        misfire_grace_time=15,
+    )
+
     await gen_console_key.finish(msg)
 
 
@@ -60,10 +102,10 @@ async def _(is_sure: str = ArgPlainText("is_sure_d")):
 
     df = CONSOLE_DIR / "data.json"
     if not df.is_file():
-        await del_console_key.finish("你还没向咱索取凭证呢.../con.auth 以获取")
+        await del_console_key.finish("你还没向咱索取凭证呢...私戳咱键入 /con.auth 以获取")
 
     try:
-        data: dict = json.loads(df.read_bytes())
+        data = json.loads(df.read_bytes())
 
         del data["data"]
 
diff --git a/ATRI/plugins/console/data_source.py b/ATRI/plugins/console/data_source.py
index 4d97a30..79a15b8 100644
--- a/ATRI/plugins/console/data_source.py
+++ b/ATRI/plugins/console/data_source.py
@@ -56,7 +56,7 @@ class Console(Service):
         if not df.is_file():
             try:
                 with open(df, "w", encoding="utf-8") as w:
-                    w.write(json.dumps({}))
+                    w.write(json.dumps(dict()))
             except Exception:
                 raise WriteFileError("Writing file: " + str(df) + " failed!")
 
diff --git a/ATRI/plugins/console/driver/__init__.py b/ATRI/plugins/console/driver/__init__.py
index e4f8f71..e5dfdc6 100644
--- a/ATRI/plugins/console/driver/__init__.py
+++ b/ATRI/plugins/console/driver/__init__.py
@@ -38,7 +38,7 @@ def register_routes(driver: Driver):
         CORSMiddleware,
         allow_origins=origins,
         allow_credentials=True,
-        allow_methods=["GET", "POST", "PUT"],
+        allow_methods=["GET", "POST"],
         allow_headers=["Content-Type"],
     )
 
diff --git a/ATRI/plugins/console/models.py b/ATRI/plugins/console/models.py
index acbf916..92371f8 100644
--- a/ATRI/plugins/console/models.py
+++ b/ATRI/plugins/console/models.py
@@ -3,6 +3,7 @@ from pydantic import BaseModel
 
 class AuthData(BaseModel):
     token: str
+    dead_time: float
 
 
 class PlatformRuntimeInfo(BaseModel):