解决构建报错问题

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lanhu-web",
-  "version": "1.8.0",
+  "version": "1.10.0",
   "private": true,
   "scripts": {
     "dev": "next dev -H 0.0.0.0 --turbopack",

publish.ps1

@@ -9,8 +9,8 @@ if ($confrim -ne "y") {
     exit 0
 }
 
-docker build -t repo.lanhuip.com:8554/lanhu/web:latest .
+docker build -t repo.lanhuip.com/lanhu/web:latest .
-docker build -t repo.lanhuip.com:8554/lanhu/web:$($args[0]) .
+docker build -t repo.lanhuip.com/lanhu/web:$($args[0]) .
 
-docker push repo.lanhuip.com:8554/lanhu/web:latest
+docker push repo.lanhuip.com/lanhu/web:latest
-docker push repo.lanhuip.com:8554/lanhu/web:$($args[0])
+docker push repo.lanhuip.com/lanhu/web:$($args[0])

src/actions/resource.ts

@@ -103,3 +103,10 @@ export async function getPriceHome(props: CreateResourceReq) {
     discounted?: string
   }>('/api/resource/price', props)
 }
+
+export async function updateCheckip(props: {
+  id: number
+  checkip: boolean
+}) {
+  return callByUser('/api/resource/update/checkip', props)
+}

src/app/(auth)/login/login-card.tsx

@@ -6,7 +6,7 @@ import {Card, CardContent} from '@/components/ui/card'
 import {Form, FormField} from '@/components/ui/form'
 import {Label} from '@/components/ui/label'
 import {Tabs, TabsList, TabsTrigger} from '@/components/ui/tabs'
-import {EyeClosedIcon, EyeIcon} from 'lucide-react'
+import {EyeClosedIcon, EyeIcon, HomeIcon} from 'lucide-react'
 import {useState, ReactNode, useEffect, Suspense} from 'react'
 import zod from 'zod'
 import {useForm, useFormContext, useWatch} from 'react-hook-form'
@@ -16,6 +16,7 @@ import {useRouter} from 'next/navigation'
 import {login, LoginMode} from '@/actions/auth'
 import {useProfileStore} from '@/components/stores/profile'
 import dynamic from 'next/dynamic'
+import Link from 'next/link'
 
 const smsSchema = zod.object({
   username: zod.string().length(11, '请输入正确的手机号码'),
@@ -88,6 +89,16 @@ export default function LoginCard() {
   const [showPwd, setShowPwd] = useState(false)
 
   return (
+    <div className="relative flex flex-col items-center">
+      <div className="relative w-96 mx-4">
+        <Link
+          href="/"
+          className="absolute -top-8 right-0 inline-flex items-center text-sm transition-colors px-10"
+        >
+          <HomeIcon size={18} className="mr-1"/>
+          返回首页
+        </Link>
+      </div>
       <Card className="w-96 mx-4 shadow-lg relative z-20 py-8">
         <CardContent className="px-8">
           {/* 登录方式切换 */}
@@ -193,6 +204,7 @@ export default function LoginCard() {
           </Form>
         </CardContent>
       </Card>
+    </div>
   )
 }
 

src/app/(home)/custom/page.tsx

@@ -237,7 +237,7 @@ export default function CustomPage() {
         <section className="relative rounded-lg overflow-hidden h-48 lg:h-56">
           <Image
             src={group}
-            alt="免费试用背景"
+            alt="立即试用背景"
             fill
             className="object-cover"
             priority
@@ -251,9 +251,9 @@ export default function CustomPage() {
                 className={merge(
                   'bg-blue-600 hover:bg-blue-700 text-white px-8 py-3 rounded-md whitespace-nowrap',
                 )}
-                onClick={() => router.push('/login')}
+                onClick={() => router.push('/product')}
               >
-                免费试用
+                立即试用
               </Button>
             </div>
           </div>

src/app/admin/clients.tsx

@@ -6,7 +6,7 @@ import {RealnameAuthDialog} from '@/components/composites/dialogs/realname-auth-
 import UserCenter from '@/components/composites/user-center'
 import {Button} from '@/components/ui/button'
 import {Tooltip, TooltipContent, TooltipProvider, TooltipTrigger} from '@/components/ui/tooltip'
-import {Archive, ArchiveRestore, Eye, HardDriveUpload, IdCard, LockKeyhole, Package, PanelLeftCloseIcon, PanelLeftOpenIcon, ShoppingCart, UserRound, UserRoundPen, Wallet} from 'lucide-react'
+import {Archive, ArchiveRestore, Eye, HardDriveUpload, IdCard, LockKeyhole, MessageCircleMoreIcon, Package, PanelLeftCloseIcon, PanelLeftOpenIcon, ShoppingCart, UserRound, UserRoundPen, Wallet} from 'lucide-react'
 import {merge} from '@/lib/utils'
 import logoAvatar from '@/assets/logo-avatar.svg'
 import logoText from '@/assets/logo-text.svg'
@@ -93,7 +93,8 @@ function ContentResolved() {
 export function Header() {
   const navbar = useLayoutStore(store => store.navbar)
   const toggleNavbar = useLayoutStore(store => store.toggleNavbar)
-
+  const profile = use(useProfileStore(store => store.profile))
+  const showRealnameAuth = profile?.id_type === 0
   return (
     <header className={merge(
       `flex-none h-16 overflow-hidden`,
@@ -103,12 +104,23 @@ export function Header() {
       <div className="flex-auto flex items-center gap-2">
         <Button
           theme="ghost"
-          className="w-9 h-9 ml-4 md:ml-0"
+          className="h-9 ml-4 md:ml-0"
           onClick={toggleNavbar}>
-          {navbar ? <PanelLeftCloseIcon/> : <PanelLeftOpenIcon/>}
+          {navbar ? (
+            <>
+              <PanelLeftCloseIcon/>
+              <span className="text-foreground/90">关闭菜单</span>
+            </>
+          ) : (
+            <>
+              <PanelLeftOpenIcon/>
+              <span className="text-foreground/90">打开菜单</span>
+            </>
+          )}
         </Button>
         <span className="max-md:hidden">欢迎来到，蓝狐代理</span>
         <div className="max-md:hidden h-5 w-px bg-gray-300 mx-2"/>
+        {showRealnameAuth ? (
           <Link
             href="/admin/identify"
             className="max-md:hidden flex items-center gap-1.5 text-sm text-blue-600 hover:text-blue-800 transition-colors"
@@ -116,6 +128,25 @@ export function Header() {
             <IdCard size={16}/>
             <span>实名认证</span>
           </Link>
+        ) : (
+          <Link
+            href=""
+            className="max-md:hidden flex items-center gap-1.5 text-sm text-green-400 hover:text-green-400 transition-colors"
+          >
+            <IdCard size={16}/>
+            <span>已实名</span>
+          </Link>
+        )}
+        <div className="max-md:hidden h-5 w-px bg-gray-300 mx-2"/>
+        <a
+          href="https://wpa1.qq.com/K0s0cvwf?_type=wpa&qidian=true"
+          target="_blank"
+          rel="noopener noreferrer"
+          className="max-md:hidden flex items-center gap-1.5 text-sm text-blue-600 hover:text-blue-800 transition-colors mr-2"
+        >
+          <MessageCircleMoreIcon size={16}/>
+          <span>联系专属客服</span>
+        </a>
       </div>
 
       <div className="flex-none flex items-center justify-end pr-4 max-md:hidden gap-3">

src/app/admin/layout.tsx

@@ -1,4 +1,4 @@
-import {ReactNode} from 'react'
+import {ReactNode, Suspense} from 'react'
 import {Shell, Content, Header, Navbar, Mask} from './clients'
 
 export default function Template(props: {
@@ -13,7 +13,9 @@ export default function Template(props: {
         </div>
 
         <div className="col-start-2 row-start-1 bg-card overflow-hidden relative z-20">
+          <Suspense>
             <Header/>
+          </Suspense>
         </div>
 
         <svg className="col-start-2 row-start-2 w-full h-full z-20 pointer-events-none" preserveAspectRatio="none">

src/app/admin/resources/_components/list.tsx

@@ -8,7 +8,7 @@ import zod from 'zod'
 import {toast} from 'sonner'
 import {useStatus} from '@/lib/states'
 import {ExtraResp} from '@/lib/api'
-import {listResourceLong, listResourceShort} from '@/actions/resource'
+import {listResourceLong, listResourceShort, updateCheckip} from '@/actions/resource'
 import DataTable from '@/components/data-table'
 import {ColumnDef} from '@tanstack/react-table'
 import {Resource} from '@/lib/models/resource'
@@ -21,6 +21,7 @@ import {
   isValidResourceType,
   ResourceTypeBadge,
 } from './utils'
+import {Button} from '@/components/ui/button'
 
 const filterSchema = zod.object({
   resource_no: zod.string().optional().default(''),
@@ -130,11 +131,32 @@ export default function ResourceList({resourceType}: ResourceListProps) {
     })
   }
 
+  const handleCheckipChange = async (id: number, currentCheckip: boolean) => {
+    try {
+      const result = await updateCheckip({
+        id: id,
+        checkip: !currentCheckip,
+      })
+
+      if (result.success) {
+        toast.success(`IP检查已${!currentCheckip ? '启用' : '停用'}`)
+        await refresh(data.page, data.size)
+      }
+      else {
+        throw new Error(result.message || '操作失败')
+      }
+    }
+    catch (e) {
+      toast.error(e instanceof Error ? e.message : '更新IP检查状态失败')
+    }
+  }
+  console.log(data.list, 'data.list')
+
   // 表格列定义
   const columns = useMemo<ColumnDef<Resource<1> | Resource<2>>[]>(() => {
     const resourceKey = isLong ? 'long' : 'short'
 
-    const baseColumns: ColumnDef<Resource<1> | Resource<2>>[] = [
+    const baseColumns = ([
       {
         header: '套餐编号',
         cell: ({row}) => {
@@ -218,7 +240,11 @@ export default function ResourceList({resourceType}: ResourceListProps) {
       {
         header: '开通时间',
         cell: ({row}) => formatDateTime(row.original.created_at),
-      },
+      }, // 短效资源增加到期时间列
+      !isLong ? {
+        header: '到期时间',
+        cell: ({row}) => formatDateTime((row.original as Resource<1>).short.expire_at),
+      } : undefined,
       {
         header: '状态',
         cell: ({row}) => {
@@ -230,15 +256,22 @@ export default function ResourceList({resourceType}: ResourceListProps) {
           )
         },
       },
-    ]
+      {
-
+        header: '操作',
-    // 短效资源增加到期时间列
+        cell: ({row}) => {
-    if (!isLong) {
+          const checkip = row.original.checkip
-      baseColumns.push({
+          return (
-        header: '到期时间',
+            <Button
-        cell: ({row}) => formatDateTime((row.original as Resource<1>).short.expire_at),
+              theme="default"
-      })
+              className="h-7 px-3 text-sm"
-    }
+              onClick={() => handleCheckipChange(row.original.id, row.original.checkip)}
+            >
+              {checkip ? '停用IP检查' : '启用IP检查'}
+            </Button>
+          )
+        },
+      },
+    ] satisfies ((ColumnDef<Resource<1> | Resource<2>> | undefined)[])).filter(Boolean) as ColumnDef<Resource<1> | Resource<2>>[]
 
     return baseColumns
   }, [isLong])

src/app/admin/whitelist/page.tsx

@@ -34,7 +34,7 @@ type SchemaType = z.infer<typeof schema>
 
 export type WhitelistPageProps = {}
 
-const MAX_WHITELIST_COUNT = 5
+const MAX_WHITELIST_COUNT = 10
 
 export default function WhitelistPage(props: WhitelistPageProps) {
   const [wait, setWait] = useState(false)

src/components/composites/extract/index.tsx

@@ -379,12 +379,10 @@ function SelectResource() {
               </div>
             ) : !profile ? (
               <div className="p-4 flex gap-1 items-center">
-                {/* <Loader className="animate-spin" size={20}/> */}
                 <span className="text-gray-600">请先登录账号，<Link href="/login" className="text-blue-600 hover:text-blue-700 font-medium">去登录</Link></span>
               </div>
             ) : resources.length === 0 ? (
               <div className="p-4 flex gap-1 items-center">
-                <Loader className="animate-spin" size={20}/>
                 <span>暂无可用套餐</span>
               </div>
             ) : (

src/components/composites/purchase/index.tsx

@@ -30,7 +30,6 @@ export default function Purchase() {
       const res = profile
         ? await listProduct({})
         : await listProductHome({})
-      console.log(res, 'res')
 
       if (res.success) {
         setProductList(res.data)

src/components/composites/purchase/long/center.tsx

@@ -29,36 +29,32 @@ export default function Center({skuData}: {
   const currentCountMin = useMemo(() => {
     if (!type || !live) return 0
     const expireValue = type === '1' ? expire : '0'
-    return getPurchaseSkuCountMin(skuData, {mode: type, live, expire: expireValue})
+    const countMin = getPurchaseSkuCountMin(skuData, {
+      mode: type,
+      live,
+      expire: expireValue,
+    })
+    return countMin
   }, [type, live, expire, skuData])
 
   useEffect(() => {
-    if (type === '1') {
+    if (currentCountMin <= 0) return
-      const current = getValues('daily_limit')
+    const targetField = type === '1' ? 'daily_limit' : 'quota'
-      if (current < currentCountMin) {
+    const currentValue = getValues(targetField)
-        setValue('daily_limit', currentCountMin)
+    if (currentValue !== currentCountMin) {
-      }
+      setValue(targetField, currentCountMin, {shouldValidate: true})
-    }
-    else {
-      const current = getValues('quota')
-      if (current < currentCountMin) {
-        setValue('quota', currentCountMin)
-      }
     }
   }, [currentCountMin, type, setValue, getValues])
 
   useEffect(() => {
     const nextType = modeList.includes(type) ? type : modeList[0]
-
     if (!nextType) {
       return
     }
-
     if (nextType !== type) {
       setValue('type', nextType)
       return
     }
-
     const nextLiveList = nextType === '1'
       ? getAvailablePurchaseLives(skuData, {mode: nextType, expire})
       : getAvailablePurchaseLives(skuData, {mode: nextType})
@@ -167,14 +163,14 @@ export default function Center({skuData}: {
         <NumberStepperField
           name="daily_limit"
           label="每日提取上限"
-          min={currentCountMin || 100}
+          min={currentCountMin}
           step={100}
         />
       ) : (
         <NumberStepperField
           name="quota"
           label="IP 购买数量"
-          min={currentCountMin || 500}
+          min={currentCountMin}
           step={100}
         />
       )}

src/components/composites/purchase/long/form.tsx

@@ -11,9 +11,9 @@ import {PurchaseSidePanel} from '../shared/side-panel'
 const schema = z.object({
   type: z.enum(['1', '2']).default('2'),
   live: z.string(),
-  quota: z.number().min(500, '购买数量不能少于 500 个'),
+  quota: z.number().min(1, '购买数量不能少于 1 个'),
   expire: z.string(),
-  daily_limit: z.number().min(100, '每日限额不能少于 100 个'),
+  daily_limit: z.number().min(1, '每日限额不能少于 1 个'),
   pay_type: z.enum(['wechat', 'alipay', 'balance']),
 })
 export type Schema = z.infer<typeof schema>
@@ -37,8 +37,8 @@ export default function LongForm({skuList}: {skuList: ProductItem['skus']}) {
       type: defaultMode,
       live: defaultLive,
       expire: defaultExpire,
-      quota: defaultMode === '2' ? Math.max(defaultCountMin, 500) : 500,
+      quota: defaultCountMin,
-      daily_limit: defaultMode === '1' ? Math.max(defaultCountMin, 100) : 100,
+      daily_limit: defaultCountMin,
       pay_type: 'balance', // 余额支付
     },
   })

src/components/composites/purchase/shared/billing-method-field.tsx

@@ -11,7 +11,7 @@ export function BillingMethodField(props: {
   modeList: PurchaseMode[]
   timeDailyLimit: number
 }) {
-  const {setValue} = useFormContext<PurchaseFormValues>()
+  const {setValue, getValues} = useFormContext<PurchaseFormValues>()
 
   return (
     <FormField<PurchaseFormValues, 'type'>
@@ -30,8 +30,7 @@ export function BillingMethodField(props: {
               setValue('expire', '0')
               return
             }
-
+            setValue('expire', getValues('expire') || '0')
-            setValue('daily_limit', props.timeDailyLimit)
           }}
           className="flex gap-4 max-md:flex-col"
         >

src/components/composites/purchase/short/center.tsx

@@ -16,7 +16,6 @@ export default function Center({
 }: {
   skuData: PurchaseSkuData
 }) {
-  // const {setValue} = useFormContext<Schema>()
   const {setValue, getValues} = useFormContext<Schema>()
   const type = useWatch<Schema>({name: 'type'}) as Schema['type']
   const live = useWatch<Schema>({name: 'live'}) as Schema['live']
@@ -34,18 +33,15 @@ export default function Center({
     const expireValue = type === '1' ? expire : '0'
     return getPurchaseSkuCountMin(skuData, {mode: type, live, expire: expireValue})
   }, [type, live, expire, skuData])
+
   useEffect(() => {
-    if (type === '1') {
+    if (currentCountMin <= 0) return
-      const current = getValues('daily_limit')
+
-      if (current < currentCountMin) {
+    const targetField = type === '1' ? 'daily_limit' : 'quota'
-        setValue('daily_limit', currentCountMin)
+    const currentValue = getValues(targetField)
-      }
+
-    }
+    if (currentValue !== currentCountMin) {
-    else {
+      setValue(targetField, currentCountMin, {shouldValidate: true})
-      const current = getValues('quota')
-      if (current < currentCountMin) {
-        setValue('quota', currentCountMin)
-      }
     }
   }, [currentCountMin, type, setValue, getValues])
   useEffect(() => {
@@ -171,14 +167,14 @@ export default function Center({
         <NumberStepperField
           name="daily_limit"
           label="每日提取上限"
-          min={currentCountMin || 2000}
+          min={currentCountMin}
           step={1000}
         />
       ) : (
         <NumberStepperField
           name="quota"
           label="IP 购买数量"
-          min={currentCountMin || 10000}
+          min={currentCountMin}
           step={5000}
         />
       )}

src/components/composites/purchase/short/form.tsx

@@ -11,9 +11,9 @@ import {PurchaseSidePanel} from '../shared/side-panel'
 const schema = z.object({
   type: z.enum(['1', '2']).default('2'),
   live: z.string(),
-  quota: z.number().min(10000, '购买数量不能少于 10000 个'),
+  quota: z.number(),
   expire: z.string(),
-  daily_limit: z.number().min(2000, '每日限额不能少于 2000 个'),
+  daily_limit: z.number(),
   pay_type: z.enum(['wechat', 'alipay', 'balance']).default('balance'),
 })
 export type Schema = z.infer<typeof schema>
@@ -30,14 +30,15 @@ export default function ShortForm({skuList}: {skuList: ProductItem['skus']}) {
     live: defaultLive,
     expire: defaultExpire,
   })
+
   const form = useForm<Schema>({
     resolver: zodResolver(schema),
     defaultValues: {
       type: defaultMode,
       live: defaultLive,
       expire: defaultExpire,
-      quota: defaultMode === '2' ? defaultCountMin || 10000 : 10000,
+      quota: defaultCountMin,
-      daily_limit: defaultMode === '1' ? defaultCountMin || 2000 : 2000,
+      daily_limit: defaultCountMin,
       pay_type: 'balance', // 余额支付
     },
   })

src/components/free-trial.tsx

@@ -26,7 +26,7 @@ function Resolved(props: {
         router.push(profile ? '/admin/purchase' : '/product')
       }}
     >
-      免费试用
+      立即试用
     </button>
   )
 }
@@ -42,7 +42,7 @@ function Pending(props: {
         router.push('/product')
       }}
     >
-      免费试用
+      立即试用
     </button>
   )
 }

src/lib/models/resource.ts

@@ -29,6 +29,7 @@ export type Resource<T extends 1 | 2 = 1 | 2> = {
   active: boolean
   created_at: Date
   updated_at: Date
+  checkip: boolean
 } & (
   T extends 1 ? {
     type: 1