发布v1.9.0版本

package.json

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

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,111 +89,122 @@ export default function LoginCard() {
   const [showPwd, setShowPwd] = useState(false)
 
   return (
-    <Card className="w-96 mx-4 shadow-lg relative z-20 py-8">
-      <CardContent className="px-8">
-        {/* 登录方式切换 */}
-        <Tabs
-          value={mode}
-          onValueChange={(val) => {
-            setMode(val as LoginMode)
-            form.reset({username: '', password: '', remember: false})
-            form.clearErrors()
-          }}
-          className="mb-6">
-          <TabsList className="w-full p-0 bg-white">
-            <Tab value="password">密码登录</Tab>
-            <Tab value="phone_code">验证码登录/注册</Tab>
-          </TabsList>
-        </Tabs>
-        <Form<LoginSchema> className="space-y-6" form={form} handler={handler}>
-          <FormField name="username" label={mode === 'phone_code' ? '手机号' : '用户名'}>
-            {({id, field}) => (
-              <Input
-                {...field}
-                id={id}
-                type="tel"
-                placeholder={mode === 'phone_code' ? '请输入手机号' : '请输入用户名/手机号/邮箱'}
-                autoComplete="tel-national"
-              />
-            )}
-          </FormField>
-          <FormField name="password" label={mode === 'phone_code' ? '验证码' : '密码'}>
-            {({id, field}) =>
-              mode === 'phone_code' ? (
-                <div className="flex space-x-4">
-                  <Input
-                    {...field}
-                    id={id}
-                    className="h-10"
-                    placeholder="请输入验证码"
-                    autoComplete="one-time-code"
-                    disabled={submitting}
-                  />
-                  <SendMsgByUsername/>
-                </div>
-              ) : (
-                <div className="relative">
-                  <Input
-                    {...field}
-                    id={id}
-                    type={showPwd ? 'text' : 'password'}
-                    className="h-10 pr-10"
-                    placeholder="至少6位密码，需包含字母和数字"
-                    autoComplete="current-password"
-                    minLength={6}
-                    disabled={submitting}
-                  />
-                  <button
-                    type="button"
-                    tabIndex={-1}
-                    className="absolute right-2 top-1/2 -translate-y-1/2 text-gray-400 hover:text-gray-600 cursor-pointer"
-                    onClick={() => setShowPwd(v => !v)}
-                    aria-label={showPwd ? '隐藏密码' : '显示密码'}
-                  >
-                    {showPwd ? (
-                      <EyeIcon size={20}/>
-                    ) : (
-                      <EyeClosedIcon size={20}/>
-                    )}
-                  </button>
-                </div>
-              )
-            }
-          </FormField>
-          <FormField name="remember">
-            {({id, field}) => (
-              <div className="flex flex-row items-start space-x-2 space-y-0">
-                <Checkbox
+    <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"
+        >
+          <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">
+          {/* 登录方式切换 */}
+          <Tabs
+            value={mode}
+            onValueChange={(val) => {
+              setMode(val as LoginMode)
+              form.reset({username: '', password: '', remember: false})
+              form.clearErrors()
+            }}
+            className="mb-6">
+            <TabsList className="w-full p-0 bg-white">
+              <Tab value="password">密码登录</Tab>
+              <Tab value="phone_code">验证码登录/注册</Tab>
+            </TabsList>
+          </Tabs>
+          <Form<LoginSchema> className="space-y-6" form={form} handler={handler}>
+            <FormField name="username" label={mode === 'phone_code' ? '手机号' : '用户名'}>
+              {({id, field}) => (
+                <Input
+                  {...field}
                   id={id}
-                  checked={field.value}
-                  onCheckedChange={field.onChange}
-                  disabled={submitting}
+                  type="tel"
+                  placeholder={mode === 'phone_code' ? '请输入手机号' : '请输入用户名/手机号/邮箱'}
+                  autoComplete="tel-national"
                 />
-                <div className="space-y-1 leading-none">
-                  <Label>保持登录</Label>
+              )}
+            </FormField>
+            <FormField name="password" label={mode === 'phone_code' ? '验证码' : '密码'}>
+              {({id, field}) =>
+                mode === 'phone_code' ? (
+                  <div className="flex space-x-4">
+                    <Input
+                      {...field}
+                      id={id}
+                      className="h-10"
+                      placeholder="请输入验证码"
+                      autoComplete="one-time-code"
+                      disabled={submitting}
+                    />
+                    <SendMsgByUsername/>
+                  </div>
+                ) : (
+                  <div className="relative">
+                    <Input
+                      {...field}
+                      id={id}
+                      type={showPwd ? 'text' : 'password'}
+                      className="h-10 pr-10"
+                      placeholder="至少6位密码，需包含字母和数字"
+                      autoComplete="current-password"
+                      minLength={6}
+                      disabled={submitting}
+                    />
+                    <button
+                      type="button"
+                      tabIndex={-1}
+                      className="absolute right-2 top-1/2 -translate-y-1/2 text-gray-400 hover:text-gray-600 cursor-pointer"
+                      onClick={() => setShowPwd(v => !v)}
+                      aria-label={showPwd ? '隐藏密码' : '显示密码'}
+                    >
+                      {showPwd ? (
+                        <EyeIcon size={20}/>
+                      ) : (
+                        <EyeClosedIcon size={20}/>
+                      )}
+                    </button>
+                  </div>
+                )
+              }
+            </FormField>
+            <FormField name="remember">
+              {({id, field}) => (
+                <div className="flex flex-row items-start space-x-2 space-y-0">
+                  <Checkbox
+                    id={id}
+                    checked={field.value}
+                    onCheckedChange={field.onChange}
+                    disabled={submitting}
+                  />
+                  <div className="space-y-1 leading-none">
+                    <Label>保持登录</Label>
+                  </div>
                 </div>
-              </div>
-            )}
-          </FormField>
-          <div className="flex flex-col gap-3">
-            <Button
-              className="w-full h-12 text-lg"
-              type="submit"
-              theme="gradient"
-              disabled={submitting}
-            >
-              {submitting ? '登录中...' : (mode === 'phone_code' ? '首次登录即注册' : '立即登录')}
-            </Button>
-            <p className="text-xs text-center text-gray-500">
-              登录即表示您同意
-              <a href="/userAgreement" className="text-blue-600 hover:text-blue-500">《用户协议》</a>
-              和
-              <a href="/privacyPolicy" className="text-blue-600 hover:text-blue-500">《隐私政策》</a>
-            </p>
-          </div>
-        </Form>
-      </CardContent>
-    </Card>
+              )}
+            </FormField>
+            <div className="flex flex-col gap-3">
+              <Button
+                className="w-full h-12 text-lg"
+                type="submit"
+                theme="gradient"
+                disabled={submitting}
+              >
+                {submitting ? '登录中...' : (mode === 'phone_code' ? '首次登录即注册' : '立即登录')}
+              </Button>
+              <p className="text-xs text-center text-gray-500">
+                登录即表示您同意
+                <a href="/userAgreement" className="text-blue-600 hover:text-blue-500">《用户协议》</a>
+                和
+                <a href="/privacyPolicy" className="text-blue-600 hover:text-blue-500">《隐私政策》</a>
+              </p>
+            </div>
+          </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'
@@ -103,9 +103,19 @@ 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"/>
@@ -116,6 +126,16 @@ export function Header() {
           <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/resources/_components/list.tsx

@@ -230,6 +230,17 @@ export default function ResourceList({resourceType}: ResourceListProps) {
           )
         },
       },
+      {
+        header: 'IP检查状态',
+        cell: ({row}) => {
+          const checkip = row.original.checkip
+          return (
+            <span className={checkip ? 'text-green-500' : 'text-red-500'}>
+              {checkip ? '启用IP检查' : '停用IP检查'}
+            </span>
+          )
+        },
+      },
     ]
 
     // 短效资源增加到期时间列

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') {
-      const current = getValues('daily_limit')
-      if (current < currentCountMin) {
-        setValue('daily_limit', currentCountMin)
-      }
-    }
-    else {
-      const current = getValues('quota')
-      if (current < currentCountMin) {
-        setValue('quota', currentCountMin)
-      }
+    if (currentCountMin <= 0) return
+    const targetField = type === '1' ? 'daily_limit' : 'quota'
+    const currentValue = getValues(targetField)
+    if (currentValue !== currentCountMin) {
+      setValue(targetField, currentCountMin, {shouldValidate: true})
     }
   }, [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,
-      daily_limit: defaultMode === '1' ? Math.max(defaultCountMin, 100) : 100,
+      quota: defaultCountMin,
+      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('daily_limit', props.timeDailyLimit)
+            setValue('expire', getValues('expire') || '0')
           }}
           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') {
-      const current = getValues('daily_limit')
-      if (current < currentCountMin) {
-        setValue('daily_limit', currentCountMin)
-      }
-    }
-    else {
-      const current = getValues('quota')
-      if (current < currentCountMin) {
-        setValue('quota', currentCountMin)
-      }
+    if (currentCountMin <= 0) return
+
+    const targetField = type === '1' ? 'daily_limit' : 'quota'
+    const currentValue = getValues(targetField)
+
+    if (currentValue !== currentCountMin) {
+      setValue(targetField, currentCountMin, {shouldValidate: true})
     }
   }, [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,
-      daily_limit: defaultMode === '1' ? defaultCountMin || 2000 : 2000,
+      quota: defaultCountMin,
+      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