From 63cb897f8cc82774b721e4c3acb96dd856a36b6d Mon Sep 17 00:00:00 2001
From: bwstudio <fenghuo@hotmail.com>
Date: Wed, 9 Sep 2026 21:54:27 +0800
Subject: [PATCH] =?UTF-8?q?fix(cookieManager):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E/=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E4=BF=9D=E5=AD=98=E6=97=A0=E5=93=8D=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

原因1：cookie 四个页面(add/edit x user/site)缺少 {% include 'system/common/footer.html' %}，
导致 layui.js/pear.js 未加载，layui.use 报错，提交按钮的 submit 事件从未绑定。
原因2：expiry 字段为空字符串时直接写入 DateTime 列，SQLite 抛
TypeError(SQLite DateTime type only accepts Python datetime and date objects)。
新增 _parse_expiry 辅助函数：空值转 None，非空按格式解析为 datetime。
已用 Playwright 真机验证：新增/编辑均返回 200 且数据落库。
---
 .../templates/system/cookie_site/add.html      |  1 +
 .../templates/system/cookie_site/edit.html     |  1 +
 .../templates/system/cookie_user/add.html      |  1 +
 .../templates/system/cookie_user/edit.html     |  1 +
 plugins/cookieManager/view/cookie_site.py      | 18 ++++++++++++++++--
 plugins/cookieManager/view/cookie_user.py      | 18 ++++++++++++++++--
 6 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/plugins/cookieManager/templates/system/cookie_site/add.html b/plugins/cookieManager/templates/system/cookie_site/add.html
index 720e781..7a7f8ea 100644
--- a/plugins/cookieManager/templates/system/cookie_site/add.html
+++ b/plugins/cookieManager/templates/system/cookie_site/add.html
@@ -77,6 +77,7 @@
     </div>
 </div>
 
+{% include 'system/common/footer.html' %}
 <script>
 layui.use(['form', 'layer', 'laydate'], function(){
     var form = layui.form;
diff --git a/plugins/cookieManager/templates/system/cookie_site/edit.html b/plugins/cookieManager/templates/system/cookie_site/edit.html
index a2137b8..435836b 100644
--- a/plugins/cookieManager/templates/system/cookie_site/edit.html
+++ b/plugins/cookieManager/templates/system/cookie_site/edit.html
@@ -79,6 +79,7 @@
     </div>
 </div>
 
+{% include 'system/common/footer.html' %}
 <script>
 layui.use(['form', 'layer', 'laydate'], function(){
     var form = layui.form;
diff --git a/plugins/cookieManager/templates/system/cookie_user/add.html b/plugins/cookieManager/templates/system/cookie_user/add.html
index 479b6ce..1f07110 100644
--- a/plugins/cookieManager/templates/system/cookie_user/add.html
+++ b/plugins/cookieManager/templates/system/cookie_user/add.html
@@ -71,6 +71,7 @@
     </div>
 </div>
 
+{% include 'system/common/footer.html' %}
 <script>
 layui.use(['form', 'layer', 'laydate'], function(){
     var form = layui.form;
diff --git a/plugins/cookieManager/templates/system/cookie_user/edit.html b/plugins/cookieManager/templates/system/cookie_user/edit.html
index 6378684..be40fd1 100644
--- a/plugins/cookieManager/templates/system/cookie_user/edit.html
+++ b/plugins/cookieManager/templates/system/cookie_user/edit.html
@@ -72,6 +72,7 @@
     </div>
 </div>
 
+{% include 'system/common/footer.html' %}
 <script>
 layui.use(['form', 'layer', 'laydate'], function(){
     var form = layui.form;
diff --git a/plugins/cookieManager/view/cookie_site.py b/plugins/cookieManager/view/cookie_site.py
index 942d780..4fb7d4c 100644
--- a/plugins/cookieManager/view/cookie_site.py
+++ b/plugins/cookieManager/view/cookie_site.py
@@ -4,6 +4,7 @@ Cookie管理 - 登录网站视图
 URL: /system/cookie-site
 """
 import os
+from datetime import datetime
 from flask import Blueprint, render_template, request
 from flask_login import current_user
 
@@ -22,6 +23,19 @@ bp = Blueprint('cookie_site', __name__,
                template_folder=os.path.join(dir_path, '..', 'templates'))
 
 
+def _parse_expiry(raw):
+    """过期时间：空值转 None；非空字符串按常见格式解析为 datetime；解析失败返回 None。"""
+    if not raw or not str(raw).strip():
+        return None
+    raw = str(raw).strip()
+    for fmt in ('%Y-%m-%d %H:%M:%S', '%Y-%m-%d %H:%M', '%Y-%m-%d'):
+        try:
+            return datetime.strptime(raw, fmt)
+        except ValueError:
+            continue
+    return None
+
+
 @bp.get('/')
 @authorize("system:cookie-site:main")
 def main():
@@ -72,7 +86,7 @@ def save():
             cookie_value=cookie_value,
             domain=str_escape(req_json.get('domain')),
             path=str_escape(req_json.get('path')) or '/',
-            expiry=req_json.get('expiry'),
+            expiry=_parse_expiry(req_json.get('expiry')),
             secure=int(req_json.get('secure') or 0),
             http_only=int(req_json.get('http_only') or 0),
             enable=int(req_json.get('enable') or 1),
@@ -115,7 +129,7 @@ def update():
         obj.cookie_value = cookie_value
         obj.domain = str_escape(req_json.get('domain'))
         obj.path = str_escape(req_json.get('path')) or '/'
-        obj.expiry = req_json.get('expiry')
+        obj.expiry = _parse_expiry(req_json.get('expiry'))
         obj.secure = int(req_json.get('secure') or 0)
         obj.http_only = int(req_json.get('http_only') or 0)
         obj.enable = int(req_json.get('enable') or 1)
diff --git a/plugins/cookieManager/view/cookie_user.py b/plugins/cookieManager/view/cookie_user.py
index cf76bb2..19ef97c 100644
--- a/plugins/cookieManager/view/cookie_user.py
+++ b/plugins/cookieManager/view/cookie_user.py
@@ -4,6 +4,7 @@ Cookie管理 - 登录用户视图
 URL: /system/cookie-user
 """
 import os
+from datetime import datetime
 from flask import Blueprint, render_template, request
 from flask_login import current_user
 
@@ -22,6 +23,19 @@ bp = Blueprint('cookie_user', __name__,
                template_folder=os.path.join(dir_path, '..', 'templates'))
 
 
+def _parse_expiry(raw):
+    """过期时间：空值转 None；非空字符串按常见格式解析为 datetime；解析失败返回 None。"""
+    if not raw or not str(raw).strip():
+        return None
+    raw = str(raw).strip()
+    for fmt in ('%Y-%m-%d %H:%M:%S', '%Y-%m-%d %H:%M', '%Y-%m-%d'):
+        try:
+            return datetime.strptime(raw, fmt)
+        except ValueError:
+            continue
+    return None
+
+
 @bp.get('/')
 @authorize("system:cookie-user:main")
 def main():
@@ -73,7 +87,7 @@ def save():
             website_name=str_escape(req_json.get('website_name')),
             cookie_value=cookie_value,
             domain=str_escape(req_json.get('domain')),
-            expiry=req_json.get('expiry'),
+            expiry=_parse_expiry(req_json.get('expiry')),
             enable=int(req_json.get('enable') or 1),
             create_by=current_user.username if current_user.is_authenticated else 'admin',
         )
@@ -115,7 +129,7 @@ def update():
         obj.website_name = str_escape(req_json.get('website_name'))
         obj.cookie_value = cookie_value
         obj.domain = str_escape(req_json.get('domain'))
-        obj.expiry = req_json.get('expiry')
+        obj.expiry = _parse_expiry(req_json.get('expiry'))
         obj.enable = int(req_json.get('enable') or 1)
         db.session.commit()
     except Exception as e: