Upload 67 files

.env.example

@@ -8,4 +8,8 @@ SQL_PORT=21260
 SQL_DATABASE=CAM
 MYSQL_CA_FILE=ca.pem
 APP_TIMEZONE=Asia/Shanghai
-UPLOAD_ROOT=data/submissions
+DOCKER_ROOT=docker_data
+DB_POOL_SIZE=12
+DB_MAX_OVERFLOW=24
+DB_POOL_TIMEOUT=30
+DB_POOL_RECYCLE=1800

app/config.py

@@ -21,13 +21,16 @@ class Settings:
 
     mysql_user: str = os.getenv("SQL_USER", "avnadmin")
     mysql_password: str = os.getenv("SQL_PASSWORD", "")
-    mysql_host: str = os.getenv(
-        "SQL_HOST", "mysql-2bace9cd-cacode.i.aivencloud.com"
-    )
+    mysql_host: str = os.getenv("SQL_HOST", "mysql-2bace9cd-cacode.i.aivencloud.com")
     mysql_port: int = int(os.getenv("SQL_PORT", "21260"))
     mysql_db: str = os.getenv("SQL_DATABASE", "CAM")
     mysql_ca_file: Path = ROOT_DIR / os.getenv("MYSQL_CA_FILE", "ca.pem")
 
+    db_pool_size: int = int(os.getenv("DB_POOL_SIZE", "12"))
+    db_max_overflow: int = int(os.getenv("DB_MAX_OVERFLOW", "24"))
+    db_pool_timeout: int = int(os.getenv("DB_POOL_TIMEOUT", "30"))
+    db_pool_recycle: int = int(os.getenv("DB_POOL_RECYCLE", "1800"))
+
     docker_root: Path = ROOT_DIR / os.getenv("DOCKER_ROOT", "docker_data")
 
     @property
@@ -44,10 +47,7 @@ class Settings:
             return raw_url
         user = quote_plus(self.mysql_user)
         password = quote_plus(self.mysql_password)
-        return (
-            f"mysql+pymysql://{user}:{password}@{self.mysql_host}:"
-            f"{self.mysql_port}/{self.mysql_db}"
-        )
+        return f"mysql+pymysql://{user}:{password}@{self.mysql_host}:{self.mysql_port}/{self.mysql_db}"
 
     @property
     def database_connect_args(self) -> dict:
@@ -57,6 +57,23 @@ class Settings:
             return {"ssl": {"ca": str(self.mysql_ca_file)}}
         return {}
 
+    @property
+    def database_engine_kwargs(self) -> dict:
+        kwargs = {
+            "pool_pre_ping": True,
+            "connect_args": self.database_connect_args,
+        }
+        if not self.database_url.startswith("sqlite"):
+            kwargs.update(
+                {
+                    "pool_size": self.db_pool_size,
+                    "max_overflow": self.db_max_overflow,
+                    "pool_timeout": self.db_pool_timeout,
+                    "pool_recycle": self.db_pool_recycle,
+                    "pool_use_lifo": True,
+                }
+            )
+        return kwargs
+
 
-settings = Settings()
-
+settings = Settings()

app/database.py

@@ -12,11 +12,7 @@ class Base(DeclarativeBase):
     pass
 
 
-engine = create_engine(
-    settings.database_url,
-    pool_pre_ping=True,
-    connect_args=settings.database_connect_args,
-)
+engine = create_engine(settings.database_url, **settings.database_engine_kwargs)
 SessionLocal = sessionmaker(bind=engine, autoflush=False, autocommit=False)
 
 

app/main.py

@@ -9,11 +9,9 @@ from starlette.middleware.sessions import SessionMiddleware
 from app.auth import get_current_admin, get_current_user
 from app.config import ROOT_DIR, settings
 from app.database import SessionLocal
-from app.models import Admin, User
 from app.routes import admin, auth, media, user
 from app.services.bootstrap import initialize_database, seed_super_admin
-from app.services.presence import should_write_presence
-from app.web import local_now, redirect, templates
+from app.web import redirect, templates
 
 
 app = FastAPI(title=settings.app_name)
@@ -32,40 +30,10 @@ def on_startup() -> None:
 
 
 @app.middleware("http")
-async def track_presence(request: Request, call_next):
+async def apply_response_policies(request: Request, call_next):
     response = await call_next(request)
     if request.url.path.startswith("/static"):
         response.headers["Cache-Control"] = "no-store"
-        return response
-    if request.url.path.startswith("/media"):
-        return response
-    if request.url.path.startswith("/api"):
-        return response
-
-    admin_id = request.session.get("admin_id")
-    user_id = request.session.get("user_id")
-    if not admin_id and not user_id:
-        return response
-
-    now = local_now()
-    if not should_write_presence(request.session, now):
-        return response
-
-    db = SessionLocal()
-    try:
-        if admin_id:
-            admin = db.get(Admin, admin_id)
-            if admin:
-                admin.last_seen_at = now
-                db.add(admin)
-        elif user_id:
-            user = db.get(User, user_id)
-            if user:
-                user.last_seen_at = now
-                db.add(user)
-        db.commit()
-    finally:
-        db.close()
     return response
 
 
@@ -120,7 +88,4 @@ def format_timedelta(value):
 
 
 templates.env.filters["datetime_local"] = format_datetime
-templates.env.filters["duration_human"] = format_timedelta
-
-
-
+templates.env.filters["duration_human"] = format_timedelta

app/routes/admin.py

@@ -659,7 +659,6 @@ def admin_admins(request: Request, db: Session = Depends(get_db)):
     now = local_now()
     server_ts = unix_seconds(now)
     admins = db.query(Admin).order_by(Admin.created_at.desc()).all()
-    users = db.query(User).options(joinedload(User.group)).order_by(User.full_name.asc()).all()
     admin_statuses = [
         {
             **serialize_presence_entry(item.display_name, display_admin_role(item.role), item.last_seen_at, now),
@@ -667,13 +666,6 @@ def admin_admins(request: Request, db: Session = Depends(get_db)):
         }
         for item in admins
     ]
-    user_statuses = [
-        {
-            **serialize_presence_entry(item.full_name, "用户", item.last_seen_at, now),
-            "group_name": item.group.name if item.group else "未分组",
-        }
-        for item in users
-    ]
     return render(
         request,
         "admin_admins.html",
@@ -682,7 +674,6 @@ def admin_admins(request: Request, db: Session = Depends(get_db)):
             "admin": admin,
             "admins": admins,
             "admin_statuses": admin_statuses,
-            "user_statuses": user_statuses,
             "presence_server_ts": server_ts,
             "online_window_seconds": ONLINE_WINDOW_SECONDS,
         },
@@ -698,7 +689,6 @@ def presence_overview(request: Request, db: Session = Depends(get_db)):
     now = local_now()
     server_ts = unix_seconds(now)
     admins = db.query(Admin).order_by(Admin.display_name.asc()).all()
-    users = db.query(User).options(joinedload(User.group)).order_by(User.full_name.asc()).all()
     return JSONResponse(
         {
             "server_ts": server_ts,
@@ -710,13 +700,6 @@ def presence_overview(request: Request, db: Session = Depends(get_db)):
                 }
                 for item in admins
             ],
-            "users": [
-                {
-                    **serialize_presence_entry(item.full_name, "用户", item.last_seen_at, now),
-                    "group_name": item.group.name if item.group else "未分组",
-                }
-                for item in users
-            ],
         },
         headers={"Cache-Control": "no-store"},
     )
@@ -1377,3 +1360,4 @@ async def delete_managed_image(request: Request, db: Session = Depends(get_db)):
 
 
 
+

app/routes/auth.py

@@ -107,7 +107,13 @@ def admin_login_submit(
     if not admin or not admin.is_active or not verify_password(password, admin.password_hash):
         add_flash(request, "error", "管理员账号或密码错误。")
         return redirect("/admin")
+
+    admin.last_seen_at = local_now()
+    db.add(admin)
+    db.commit()
+
     sign_in_admin(request, admin)
+    rebalance_pending_reviews(db)
     add_flash(request, "success", f"管理员 {admin.display_name} 已登录。")
     return redirect("/admin/dashboard")
 
@@ -168,26 +174,24 @@ def change_password(
 @router.api_route("/api/presence/ping", methods=["GET", "POST"])
 def presence_ping(request: Request, db: Session = Depends(get_db)):
     admin = get_current_admin(request, db)
-    user = get_current_user(request, db)
-    if not admin and not user:
-        return JSONResponse({"ok": False}, status_code=401)
+    if not admin:
+        return JSONResponse(
+            {"ok": False, "skipped": True},
+            headers={"Cache-Control": "no-store"},
+        )
 
     now = local_now()
     wrote = False
-    admin_was_online = bool(admin and is_online(admin.last_seen_at, now))
+    admin_was_online = bool(is_online(admin.last_seen_at, now))
     if should_write_presence(request.session, now):
-        if admin:
-            admin.last_seen_at = now
-            db.add(admin)
-        elif user:
-            user.last_seen_at = now
-            db.add(user)
+        admin.last_seen_at = now
+        db.add(admin)
         db.commit()
         wrote = True
 
         # Only rebalance on an offline -> online transition. Fresh uploads are handled
         # at submit time, so this keeps the 5s heartbeat lightweight.
-        if admin and not admin_was_online:
+        if not admin_was_online:
             rebalance_pending_reviews(db)
 
     return JSONResponse(
@@ -201,3 +205,4 @@ def presence_ping(request: Request, db: Session = Depends(get_db)):
 
 
 
+

app/templates/activity_detail.html

@@ -320,6 +320,38 @@
           </tr>`).join('');
       };
 
+      const STATUS_POLL_INTERVAL_MS = 15000;
+      let statusTimerId = null;
+      let statusInFlight = false;
+
+      const canRefreshStatuses = () => !document.hidden && navigator.onLine;
+
+      const scheduleStatusRefresh = (delay = STATUS_POLL_INTERVAL_MS) => {
+        if (statusTimerId) {
+          window.clearTimeout(statusTimerId);
+        }
+        statusTimerId = window.setTimeout(runStatusRefresh, delay);
+      };
+
+      const runStatusRefresh = async () => {
+        if (!canRefreshStatuses()) {
+          statusTimerId = null;
+          return;
+        }
+        if (statusInFlight) {
+          scheduleStatusRefresh(1500);
+          return;
+        }
+
+        statusInFlight = true;
+        try {
+          await refreshStatuses();
+        } finally {
+          statusInFlight = false;
+          scheduleStatusRefresh(STATUS_POLL_INTERVAL_MS + Math.floor(Math.random() * 1200));
+        }
+      };
+
       const refreshStatuses = async () => {
         try {
           const statusResponse = await fetch('/api/activities/{{ activity.id }}/status', {
@@ -403,9 +435,25 @@
         }
       };
 
-      refreshStatuses();
-      window.setInterval(refreshStatuses, 10000);
+      runStatusRefresh();
+      document.addEventListener('visibilitychange', () => {
+        if (document.hidden) {
+          if (statusTimerId) {
+            window.clearTimeout(statusTimerId);
+            statusTimerId = null;
+          }
+          return;
+        }
+        runStatusRefresh();
+      });
+      window.addEventListener('focus', () => {
+        if (!document.hidden) {
+          runStatusRefresh();
+        }
+      });
+      window.addEventListener('online', runStatusRefresh);
     })();
   </script>
 {% endblock %}
 
+

app/templates/admin_admins.html

@@ -91,33 +91,22 @@
       </div>
     </article>
 
-    <article class="glass-card table-panel">
+    <article class="glass-card form-panel">
       <div class="section-head">
         <div>
-          <p class="eyebrow">Presence</p>
-          <h3>所有用户在线状态</h3>
-          <p class="mini-note">仅超级管理员可见，适合现场查看整体在线情况。</p>
+          <p class="eyebrow">Notice</p>
+          <h3>在线检测说明</h3>
         </div>
       </div>
-      <div class="stack-list" id="user-presence-list">
-        {% for item in user_statuses %}
-          <div class="stack-item presence-item">
-            <div>
-              <strong>{{ item.name }}</strong>
-              <p class="muted">{{ item.group_name }}</p>
-            </div>
-            <span
-              class="status-badge {% if item.is_online %}status-approved{% else %}status-rejected{% endif %}"
-              data-presence-badge
-              data-last-seen-ts="{{ item.last_seen_ts or '' }}"
-              title="最近心跳 {{ item.last_seen_at }}"
-            >
-              {{ '在线' if item.is_online else '离线' }} · {{ item.last_seen_at }}
-            </span>
-          </div>
-        {% else %}
-          <p class="muted">暂无用户在线状态。</p>
-        {% endfor %}
+      <div class="info-box">
+        <div class="stack-item stack-item-block">
+          <strong>普通用户在线心跳已关闭</strong>
+          <p class="muted">为降低数据库连接占用与轮询压力，系统不再维护普通用户的实时在线状态，只保留管理员在线检测与审核分发所需的心跳。</p>
+        </div>
+        <div class="stack-item stack-item-block">
+          <strong>当前策略</strong>
+          <p class="muted">管理员登录时会立即标记在线，之后仅由管理员端每 5 秒心跳续期；页面隐藏或离线时会自动暂停心跳，减少无效请求。</p>
+        </div>
       </div>
     </article>
   </section>
@@ -125,8 +114,7 @@
   <script>
     (() => {
       const adminList = document.getElementById('admin-presence-list');
-      const userList = document.getElementById('user-presence-list');
-      if (!adminList || !userList) return;
+      if (!adminList) return;
 
       let serverTs = Number('{{ presence_server_ts or 0 }}') || Math.floor(Date.now() / 1000);
       let syncClientTs = Date.now();
@@ -197,31 +185,6 @@
         }).join('');
       };
 
-      const renderUserItems = (items) => {
-        if (!items.length) {
-          userList.innerHTML = '<p class="muted">暂无用户在线状态。</p>';
-          return;
-        }
-        userList.innerHTML = items.map((item) => {
-          const status = getStatusMeta(Number(item.last_seen_ts || 0));
-          return `
-            <div class="stack-item presence-item">
-              <div>
-                <strong>${escapeHtml(item.name)}</strong>
-                <p class="muted">${escapeHtml(item.group_name)}</p>
-              </div>
-              <span
-                class="status-badge ${status.online ? 'status-approved' : 'status-rejected'}"
-                data-presence-badge
-                data-last-seen-ts="${item.last_seen_ts || ''}"
-                title="最近心跳 ${escapeHtml(item.last_seen_at || '-') }"
-              >
-                ${status.text}
-              </span>
-            </div>`;
-        }).join('');
-      };
-
       const refreshPresenceBadges = () => {
         if (document.hidden) return;
         document.querySelectorAll('[data-presence-badge]').forEach((badge) => {
@@ -248,7 +211,6 @@
           syncClientTs = Date.now();
           onlineWindowSeconds = Number(payload.online_window_seconds || 0) || onlineWindowSeconds;
           renderAdminItems(payload.admins || []);
-          renderUserItems(payload.users || []);
           refreshPresenceBadges();
         } catch (error) {
           console.debug('presence refresh skipped', error);
@@ -269,7 +231,4 @@
       window.addEventListener('focus', refreshPresence);
     })();
   </script>
-{% endblock %}
-
-
-
+{% endblock %}

app/templates/admin_reviews.html

@@ -112,6 +112,9 @@
       const recentList = document.getElementById('recent-review-list');
       const onlineAdminPill = document.getElementById('online-admin-pill');
       const activityFilter = '{{ activity_filter }}';
+      const FEED_POLL_INTERVAL_MS = 5000;
+      let feedTimerId = null;
+      let feedInFlight = false;
       const selectedIds = new Set(
         Array.from(document.querySelectorAll('input[name="submission_ids"]:checked')).map((item) => item.value)
       );
@@ -196,6 +199,28 @@
         });
       };
 
+      const scheduleFeedRefresh = (delay = FEED_POLL_INTERVAL_MS) => {
+        if (feedTimerId) {
+          window.clearTimeout(feedTimerId);
+        }
+        feedTimerId = window.setTimeout(runFeedRefresh, delay);
+      };
+
+      const runFeedRefresh = async () => {
+        if (document.hidden || feedInFlight) {
+          scheduleFeedRefresh(document.hidden ? FEED_POLL_INTERVAL_MS : 1000);
+          return;
+        }
+
+        feedInFlight = true;
+        try {
+          await refreshFeed();
+        } finally {
+          feedInFlight = false;
+          scheduleFeedRefresh(FEED_POLL_INTERVAL_MS + Math.floor(Math.random() * 800));
+        }
+      };
+
       const refreshFeed = async () => {
         try {
           const search = activityFilter ? `?activity_id=${activityFilter}` : '';
@@ -229,8 +254,20 @@
       };
 
       attachReviewForms();
-      refreshFeed();
-      window.setInterval(refreshFeed, 5000);
+      runFeedRefresh();
+      document.addEventListener('visibilitychange', () => {
+        if (document.hidden) {
+          if (feedTimerId) {
+            window.clearTimeout(feedTimerId);
+            feedTimerId = null;
+          }
+          return;
+        }
+        runFeedRefresh();
+      });
+      window.addEventListener('focus', runFeedRefresh);
+      window.addEventListener('online', runFeedRefresh);
     })();
   </script>
 {% endblock %}
+

app/templates/base.html

@@ -46,7 +46,7 @@
       </main>
     </div>
 
-    {% if user or admin %}
+    {% if admin %}
       <script>
         (() => {
           const PRESENCE_INTERVAL_MS = 5000;
@@ -124,3 +124,4 @@
 
 
 
+