From 493446099707d57143bc838b52f4ed4aab92c415 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9F=B3=E6=B8=85=E7=88=BD?= <eison.icu@gmail.com>
Date: Fri, 16 May 2025 10:11:08 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=81=E5=9F=9F=E6=93=8D=E7=9B=98=E6=89=8B?=
 =?UTF-8?q?=20-=20=E5=A2=9E=E5=8A=A0=E8=B7=AF=E7=94=B1=E5=AE=88=E5=8D=AB?=
 =?UTF-8?q?=EF=BC=8C=E6=8B=A6=E6=88=AA=E6=89=80=E6=9C=89=E6=9C=AA=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E7=9A=84=E9=A1=B5=E9=9D=A2=E5=8F=8A=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Cunkebao/app/components/auth-check.tsx | 27 ++++++++++++++++++++++++++
 Cunkebao/app/components/ui/toast.ts    | 14 +++++++++++++
 Cunkebao/app/devices/[id]/page.tsx     | 11 +++++++++++
 Cunkebao/app/layout.tsx                | 11 ++++++++---
 Cunkebao/package-lock.json             |  3 ++-
 Cunkebao/package.json                  |  2 +-
 6 files changed, 63 insertions(+), 5 deletions(-)
 create mode 100644 Cunkebao/app/components/auth-check.tsx
 create mode 100644 Cunkebao/app/components/ui/toast.ts

diff --git a/Cunkebao/app/components/auth-check.tsx b/Cunkebao/app/components/auth-check.tsx
new file mode 100644
index 000000000..114002b90
--- /dev/null
+++ b/Cunkebao/app/components/auth-check.tsx
@@ -0,0 +1,27 @@
+"use client"
+
+import { useEffect } from "react"
+import { useRouter, usePathname } from "next/navigation"
+
+export function AuthCheck({ children }: { children: React.ReactNode }) {
+  const router = useRouter()
+  const pathname = usePathname()
+
+  useEffect(() => {
+    // 排除不需要登录的页面
+    const publicPaths = ['/login', '/register', '/forgot-password']
+    if (publicPaths.includes(pathname)) {
+      return
+    }
+
+    const token = localStorage.getItem('token')
+    if (!token) {
+      // 如果没有token，重定向到登录页面，并携带当前页面URL作为回调
+      const currentPath = window.location.pathname + window.location.search
+      router.push(`/login?redirect=${encodeURIComponent(currentPath)}`)
+      return
+    }
+  }, [router, pathname])
+
+  return <>{children}</>
+} 
\ No newline at end of file
diff --git a/Cunkebao/app/components/ui/toast.ts b/Cunkebao/app/components/ui/toast.ts
new file mode 100644
index 000000000..c24286d76
--- /dev/null
+++ b/Cunkebao/app/components/ui/toast.ts
@@ -0,0 +1,14 @@
+const ToastViewport = React.forwardRef<
+  React.ElementRef<typeof ToastPrimitives.Viewport>,
+  React.ComponentPropsWithoutRef<typeof ToastPrimitives.Viewport>
+>(({ className, ...props }, ref) => (
+  <ToastPrimitives.Viewport
+    ref={ref}
+    className={cn(
+      "fixed top-0 z-[100] flex max-h-screen w-full flex-col-reverse p-4 sm:bottom-0 sm:right-0 sm:top-auto sm:flex-col md:max-w-[420px]",
+      className
+    )}
+    {...props}
+  />
+))
+ToastViewport.displayName = ToastPrimitives.Viewport.displayName 
\ No newline at end of file
diff --git a/Cunkebao/app/devices/[id]/page.tsx b/Cunkebao/app/devices/[id]/page.tsx
index e94f9ba95..8058b7f5b 100644
--- a/Cunkebao/app/devices/[id]/page.tsx
+++ b/Cunkebao/app/devices/[id]/page.tsx
@@ -95,6 +95,17 @@ export default function DeviceDetailPage() {
   })
   const [tabChangeLoading, setTabChangeLoading] = useState(false)
 
+  // 添加登录检查
+  useEffect(() => {
+    const token = localStorage.getItem('token')
+    if (!token) {
+      // 如果没有token，重定向到登录页面，并携带当前页面URL作为回调
+      const currentPath = window.location.pathname + window.location.search
+      router.push(`/login?redirect=${encodeURIComponent(currentPath)}`)
+      return
+    }
+  }, [router])
+
   useEffect(() => {
     if (!params.id) return
 
diff --git a/Cunkebao/app/layout.tsx b/Cunkebao/app/layout.tsx
index 482ed3213..b678c2dea 100644
--- a/Cunkebao/app/layout.tsx
+++ b/Cunkebao/app/layout.tsx
@@ -5,6 +5,8 @@ import type React from "react"
 import ErrorBoundary from "./components/ErrorBoundary"
 import { AuthProvider } from "@/app/components/AuthProvider"
 import LayoutWrapper from "./components/LayoutWrapper"
+import { AuthCheck } from "@/app/components/auth-check"
+import { Toaster } from "sonner"
 
 export const metadata: Metadata = {
   title: "存客宝",
@@ -21,10 +23,13 @@ export default function RootLayout({
     <html lang="zh-CN" suppressHydrationWarning>
       <body className="bg-gray-100">
         <AuthProvider>
-          <ErrorBoundary>
-            <LayoutWrapper>{children}</LayoutWrapper>
-          </ErrorBoundary>
+          <AuthCheck>
+            <ErrorBoundary>
+              <LayoutWrapper>{children}</LayoutWrapper>
+            </ErrorBoundary>
+          </AuthCheck>
         </AuthProvider>
+        <Toaster />
       </body>
     </html>
   )
diff --git a/Cunkebao/package-lock.json b/Cunkebao/package-lock.json
index 7c3729c0c..ddce715f6 100644
--- a/Cunkebao/package-lock.json
+++ b/Cunkebao/package-lock.json
@@ -58,7 +58,7 @@
         "react-resizable-panels": "^2.1.7",
         "recharts": "latest",
         "regenerator-runtime": "latest",
-        "sonner": "^1.7.1",
+        "sonner": "^1.7.4",
         "tailwind-merge": "^2.5.5",
         "tailwindcss-animate": "^1.0.7",
         "vaul": "^0.9.6",
@@ -6084,6 +6084,7 @@
       "version": "1.7.4",
       "resolved": "https://registry.npmjs.org/sonner/-/sonner-1.7.4.tgz",
       "integrity": "sha512-DIS8z4PfJRbIyfVFDVnK9rO3eYDtse4Omcm6bt0oEr5/jtLgysmjuBl1frJ9E/EQZrFmKx2A8m/s5s9CRXIzhw==",
+      "license": "MIT",
       "peerDependencies": {
         "react": "^18.0.0 || ^19.0.0 || ^19.0.0-rc",
         "react-dom": "^18.0.0 || ^19.0.0 || ^19.0.0-rc"
diff --git a/Cunkebao/package.json b/Cunkebao/package.json
index 334e73080..7c299a71f 100644
--- a/Cunkebao/package.json
+++ b/Cunkebao/package.json
@@ -59,7 +59,7 @@
     "react-resizable-panels": "^2.1.7",
     "recharts": "latest",
     "regenerator-runtime": "latest",
-    "sonner": "^1.7.1",
+    "sonner": "^1.7.4",
     "tailwind-merge": "^2.5.5",
     "tailwindcss-animate": "^1.0.7",
     "vaul": "^0.9.6",