diff --git a/app/page.tsx b/app/page.tsx
index 1a02752..4230f13 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -6,7 +6,7 @@ import { useEffect } from "react"
export default function Home() {
const router = useRouter()
useEffect(() => {
- router.push("/show")
+ router.push("/management")
}, [router])
return <>>
}
diff --git a/app/show/layout.tsx b/app/show/layout.tsx
deleted file mode 100644
index 11900c0..0000000
--- a/app/show/layout.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import AppLayout from "@/components/layout/AppLayout"
-import { PathnameRecorder } from "@/components/layout/PathnameRecorder"
-import { componentList, showList } from "@/components/layout/common"
-
-async function getMenu() {
- return [...componentList, ...showList]
-}
-
-export default async function Layout({
- children,
-}: {
- children: React.ReactNode
-}) {
- const menu = await getMenu()
- return (
-
- {children}
-
-
- )
-}
diff --git a/app/show/page.tsx b/app/show/page.tsx
deleted file mode 100644
index 72e979c..0000000
--- a/app/show/page.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-"use client"
-
-import { useRouter } from "next/navigation"
-import { useEffect } from "react"
-
-export default function ComponentPage() {
- const router = useRouter()
- useEffect(() => {
- router.push("/show/user")
- }, [router])
- return <>>
-}
diff --git a/app/show/user/page.tsx b/app/show/user/page.tsx
deleted file mode 100644
index 14b115b..0000000
--- a/app/show/user/page.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-"use client"
-
-export default function ShowUserPage() {
- return <>ShowUserPage>
-}
diff --git a/components/login/api/index.ts b/components/login/api/index.ts
index e5bd63b..a1c10c0 100644
--- a/components/login/api/index.ts
+++ b/components/login/api/index.ts
@@ -5,7 +5,7 @@ import { Login } from "./types"
// 获取验证码
export const getVerifyCode = (params: { phone: string }) => {
return httpFetch>({
- url: `/api/v1/front/login/get_verify_code`,
+ url: `/api/v1/basis/login/get_verify_code`,
method: "POST",
body: JSON.stringify(params),
})
@@ -14,7 +14,7 @@ export const getVerifyCode = (params: { phone: string }) => {
// 账户登录
export const passwdLogin = (params: Login.ReqPasswdLogin) => {
return httpFetch>({
- url: `/api/v1/front/login/passwd`,
+ url: `/api/v1/basis/login/passwd`,
method: "POST",
body: JSON.stringify(params),
isLogin: true,
@@ -24,7 +24,7 @@ export const passwdLogin = (params: Login.ReqPasswdLogin) => {
// 验证码登录
export const verificationLogin = (params: Login.ReqVerificationLogin) => {
return httpFetch>({
- url: `/api/v1/front/login/verification`,
+ url: `/api/v1/basis/login/verification`,
method: "POST",
body: JSON.stringify(params),
isLogin: true,
@@ -34,7 +34,7 @@ export const verificationLogin = (params: Login.ReqVerificationLogin) => {
// 飞书登录
export const fetchFeishuLogin = (params: Login.ReqFeishuLogin) => {
return httpFetch>({
- url: `/api/v1/front/login/feishu`,
+ url: `/api/v1/basis/login/feishu`,
method: "POST",
body: JSON.stringify(params),
isLogin: true,
@@ -44,7 +44,7 @@ export const fetchFeishuLogin = (params: Login.ReqFeishuLogin) => {
// 刷新token
export const refreshKey = (params: { token: string }) => {
return httpFetch>({
- url: `/api/v1/front/key/refresh`,
+ url: `/api/v1/basis/key/refresh`,
method: "POST",
body: JSON.stringify(params),
isRefresh: true,
diff --git a/components/login/index.tsx b/components/login/index.tsx
index 4563287..156961e 100644
--- a/components/login/index.tsx
+++ b/components/login/index.tsx
@@ -1,44 +1,44 @@
"use client"
-import { useCallback, useEffect, useMemo, useState } from "react"
-import {
- Box,
- TextInput,
- PasswordInput,
- Paper,
- Text,
- Group,
- Button,
- LoadingOverlay,
- Stack,
- Modal,
- Flex,
- BackgroundImage,
- Tabs,
- FloatingIndicator,
- Input,
- useComputedColorScheme,
-} from "@mantine/core"
-import { useForm } from "@mantine/form"
-import { useDisclosure } from "@mantine/hooks"
-import { DigitalIcon } from "./resource/icons/digital"
-import tabClasses from "./Tab.module.css"
import {
getQueryVariable,
validatePhoneNumber,
} from "@/components/login/libs/common"
+import FingerprintJS from "@fingerprintjs/fingerprintjs"
+import {
+ BackgroundImage,
+ Box,
+ Button,
+ Flex,
+ FloatingIndicator,
+ Group,
+ Input,
+ LoadingOverlay,
+ Modal,
+ Paper,
+ PasswordInput,
+ Stack,
+ Tabs,
+ Text,
+ TextInput,
+ useComputedColorScheme,
+} from "@mantine/core"
+import { useForm } from "@mantine/form"
+import { useDisclosure } from "@mantine/hooks"
+import { useCallback, useEffect, useMemo, useState } from "react"
import { getVerifyCode, passwdLogin, verificationLogin } from "./api"
import QrLogin from "./feishu/qr-login"
import { APP, PLATFORM, TENANT } from "./libs/common"
-import FingerprintJS from "@fingerprintjs/fingerprintjs"
+import { DigitalIcon } from "./resource/icons/digital"
import { useLoginStore } from "./store"
+import tabClasses from "./Tab.module.css"
// import { useSearchParams } from "next/navigation"
import Feishu from "./feishu/auto-login"
-import LightBgImage from "./resource/images/light-login-bg.png"
import DarkBgImage from "./resource/images/dark-login-bg.png"
-import LogoDigImage from "./resource/images/logo-dig.png"
-import loginBg2Light from "./resource/images/login-bg2-light.png"
+import LightBgImage from "./resource/images/light-login-bg.png"
import loginBg2Dark from "./resource/images/login-bg2-dark.png"
+import loginBg2Light from "./resource/images/login-bg2-light.png"
+import LogoDigImage from "./resource/images/logo-dig.png"
const HeaderIcon = DigitalIcon
diff --git a/middleware.ts b/middleware.ts
index 81d01b2..a3229eb 100644
--- a/middleware.ts
+++ b/middleware.ts
@@ -46,9 +46,9 @@ export default async function middleware(req: NextRequest) {
}
}
// 5. Redirect to /dashboard if the user is authenticated
- if (isPublicRoute && session && !path.startsWith("/show")) {
+ if (isPublicRoute && session && !path.startsWith("/management")) {
return NextResponse.redirect(
- new URL(`${process.env.NEXT_PUBLIC_BASE_PATH}/show`, req.nextUrl)
+ new URL(`${process.env.NEXT_PUBLIC_BASE_PATH}/management`, req.nextUrl)
)
}
diff --git a/package.json b/package.json
index 1152c86..0bd59aa 100644
--- a/package.json
+++ b/package.json
@@ -4,15 +4,15 @@
"private": true,
"scripts": {
"dev": "NEXT_PUBLIC_URL=https://frontside2.soft.cowarobot.com NEXT_PUBLIC_OUTPUT_TYPE=standalone next dev --turbopack -p 5521",
- "dev:export": "NEXT_PUBLIC_URL=https://frontside.soft.cowarobot.com NEXT_PUBLIC_OUTPUT_TYPE=export next dev --turbopack -p 5521",
+ "dev:export": "NEXT_PUBLIC_URL=https://basis.softtest.cowarobot.com NEXT_PUBLIC_OUTPUT_TYPE=export next dev --turbopack -p 5521",
"dev:standalone": "NEXT_PUBLIC_URL=https://frontside2.soft.cowarobot.com NEXT_PUBLIC_OUTPUT_TYPE=standalone next dev next dev --turbopack -p 5521",
"build:standalone-stage": "NEXT_PUBLIC_URL=https://frontside2.soft.cowarobot.com NEXT_PUBLIC_OUTPUT_TYPE=standalone env-cmd -f .env.staging next build --turbopack",
"prebuild:export-stage": "node scripts/disable-api-route.mjs",
- "build:export-stage": "NEXT_PUBLIC_URL=https://frontside.soft.cowarobot.com NEXT_PUBLIC_OUTPUT_TYPE=export env-cmd -f .env.staging next build --turbopack",
+ "build:export-stage": "NEXT_PUBLIC_URL=https://basis.softtest.cowarobot.com NEXT_PUBLIC_OUTPUT_TYPE=export env-cmd -f .env.staging next build --turbopack",
"postbuild:export-stage": "node scripts/restore-api-route.mjs",
"build:standalone-prod": "NEXT_PUBLIC_URL=https://frontside2.soft.cowarobot.com NEXT_PUBLIC_OUTPUT_TYPE=standalone env-cmd -f .env.production next build --turbopack",
"prebuild:export-prod": "node scripts/disable-api-route.mjs",
- "build:export-prod": "NEXT_PUBLIC_URL=https://frontside.soft.cowarobot.com NEXT_PUBLIC_OUTPUT_TYPE=export env-cmd -f .env.production next build --turbopack",
+ "build:export-prod": "NEXT_PUBLIC_URL=https://basis.softtest.cowarobot.com NEXT_PUBLIC_OUTPUT_TYPE=export env-cmd -f .env.production next build --turbopack",
"postbuild:export-prod": "node scripts/restore-api-route.mjs",
"start": "next start",
"test": "jest",