发布v1.4.0版本

.env.example

@@ -0,0 +1,4 @@
+# 开发环境配置
+NEXT_PUBLIC_API_BASE_URL=http://192.168.3.42:8080
+CLIENT_ID=web
+CLIENT_SECRET=web

.gitignore

@@ -31,7 +31,7 @@ yarn-error.log*
 .pnpm-debug.log*
 
 # env files (can opt-in for committing if needed)
-.env*
+.env
 
 # vercel
 .vercel

Dockerfile

@@ -16,6 +16,7 @@ COPY . .
 
 ENV NEXT_TELEMETRY_DISABLED=1
 
+RUN mv .env.example .env
 RUN bun run build
 
 # 生产阶段

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lanhu-web",
-  "version": "1.2.2",
+  "version": "1.4.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 43.226.58.254:53000/lanhu/web:latest .
-docker build -t 43.226.58.254:53000/lanhu/web:$($args[0]) .
+docker build -t repo.lanhuip.com:8554/lanhu/web:latest .
+docker build -t repo.lanhuip.com:8554/lanhu/web:$($args[0]) .
 
-docker push 43.226.58.254:53000/lanhu/web:latest
-docker push 43.226.58.254:53000/lanhu/web:$($args[0])
+docker push repo.lanhuip.com:8554/lanhu/web:latest
+docker push repo.lanhuip.com:8554/lanhu/web:$($args[0])

src/actions/channel.ts

@@ -32,5 +32,5 @@ export async function createChannels(params: {
   city?: string
   isp?: number
 }) {
-  return callPublic<CreateChannelsResp[]>('/api/channel/create', params)
+  return callByUser<CreateChannelsResp[]>('/api/channel/create', params)
 }

src/app/(home)/_components/header/menu-help.tsx

@@ -17,8 +17,8 @@ export default function HelpMenu() {
         icon={h01}
         title="提取 IP"
         items={[
-          {lead: '短效 IP 提取', href: '/collect?type=short'},
-          {lead: '长效 IP 提取', href: '/collect?type=long'},
+          {lead: '短效/长效 IP 提取', href: '/collect?type=short'},
+          // {lead: '长效 IP 提取', href: '/collect?type=long'},
         ]}
       />
       <Column

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

@@ -16,7 +16,7 @@ export default function CollectPage(props: CollectPageProps) {
     //   </Wrap>
     // </main>
     <HomePage path={[
-      {label: '短效IP 提取', href: '/collect'},
+      {label: '短效/长效IP 提取', href: '/collect'},
     ]}>
       <Wrap>
         <Extract/>

src/app/(home)/layout.tsx

@@ -2,7 +2,7 @@ import {ReactNode} from 'react'
 import Header from './header'
 import Footer from './footer'
 import Script from 'next/script'
-
+import {MessageCircleMoreIcon} from 'lucide-react'
 export type HomeLayoutProps = {
   children: ReactNode
 }
@@ -19,7 +19,21 @@ export default function HomeLayout(props: HomeLayoutProps) {
       {/* 页脚 */}
       <Footer/>
 
-      <Script id="qd2852138148beb7882a4a6a3e5ff5b569436003e7dc" src="https://wp.qiye.qq.com/qidian/2852138148/beb7882a4a6a3e5ff5b569436003e7dc" async defer></Script>
+      {/* <Script id="qd2852138148beb7882a4a6a3e5ff5b569436003e7dc" src="https://wp.qiye.qq.com/qidian/2852138148/beb7882a4a6a3e5ff5b569436003e7dc" async defer></Script> */}
+      <a
+        href="https://wpa1.qq.com/K0s0cvwf?_type=wpa&qidian=true"
+        target="_blank"
+        rel="noopener noreferrer"
+        className="fixed bottom-6 right-6 z-50 w-14 h-14 rounded-full bg-blue-600 hover:bg-blue-700 shadow-lg hover:shadow-xl transition-all duration-300 hover:scale-110 flex items-center justify-center group"
+        aria-label="在线客服"
+      >
+        <span className="text-white font-bold text-lg">客</span>
+        <span className="text-white font-bold text-lg">服</span>
+
+        <span className="absolute -top-2 -right-2 flex items-center justify-center w-6 h-6 bg-red-500 rounded-full text-white shadow-md">
+          <MessageCircleMoreIcon size={14}/>
+        </span>
+      </a>
     </div>
   )
 }

src/app/admin/(dashboard)/_client/userCenter.tsx

@@ -59,7 +59,7 @@ export default async function UserCenter() {
               </>
             )}
         </div>
-        {/* <div className="flex flex-col gap-1">
+        <div className="flex flex-col gap-1">
           <h4 className="text-sm text-weak">账户余额</h4>
           <div className="flex justify-between items-baseline">
             <p className="text-xl text-accent">
@@ -68,7 +68,7 @@ export default async function UserCenter() {
             </p>
             <RechargeModal/>
           </div>
-        </div> */}
+        </div>
         <div className="flex flex-col gap-3">
           <h4 className="text-sm text-weak">快捷入口</h4>
           <div className="flex justify-around gap-2">

src/app/admin/record/page.tsx

@@ -164,16 +164,21 @@ export default function RecordPage(props: RecordPageProps) {
             cell: ({row}) => <div>{row.original.prov}</div>,
             accessorKey: 'prov',
           },
+          {
+            header: '城市',
+            cell: ({row}) => <div>{row.original.city}</div>,
+            accessorKey: 'city',
+          },
           {
             header: '提取数量',
             cell: ({row}) => <div>{row.original.count}</div>,
             accessorKey: 'count',
           },
-          {
-            header: '资源数量',
-            cell: ({row}) => <div>{row.original.resource_id}</div>,
-            accessorKey: 'resource_id',
-          },
+          // {
+          //   header: '资源数量',
+          //   cell: ({row}) => <div>{row.original.resource_id}</div>,
+          //   accessorKey: 'resource_id',
+          // },
           {
             header: '提取时间',
             cell: ({row}) => {

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

@@ -165,7 +165,7 @@ export default function ResourceList({resourceType}: ResourceListProps) {
           const live = resourceKey === 'long'
             ? (row.original as Resource<2>).long.live
             : (row.original as Resource<1>).short.live
-          return <span>{isLong ? `${live}小时` : `${live / 60}分钟`}</span>
+          return <span>{isLong ? `${live}小时` : `${live}分钟`}</span>
         },
       },
       {

src/components/composites/extract/index.tsx

@@ -337,6 +337,7 @@ function SelectResource() {
     setStatus('load')
     try {
       const resp = await allResource()
+      console.log(resp, '/api/resource/all')
 
       if (!resp.success) {
         throw new Error('获取套餐失败，请稍后再试')
@@ -381,102 +382,103 @@ function SelectResource() {
                 <Loader className="animate-spin" size={20}/>
                 <span>暂无可用套餐</span>
               </div>
-            ) : resources.map((resource, i) => (
+            ) : (
               <>
-                <SelectItem
-                  key={`${resource.id}`}
-                  value={String(resource.id)}
-                  className="p-3">
-                  <div className="flex flex-col gap-2 w-72">
-                    {resource.type === 1 && resource.short.type === 1 && (
-                      <>
-                        <div className="flex gap-2 items-center bg-green-50 w-fit px-2 py-1 rounded-md text-sm">
-                          <Timer size={20}/>
-                          <span>{name(resource)}</span>
-                        </div>
-                        <div className="flex text-xs text-weak">
-                          <span>{resource.resource_no}</span>
-                        </div>
-                        <div className="flex justify-between gap-2 text-xs text-weak">
-                          <span>
-                            到期时间：
-                            {format(resource.short.expire_at, 'yyyy-MM-dd HH:mm')}
-                          </span>
-                          <span>{intlFormatDistance(resource.short.expire_at, new Date())}</span>
-                        </div>
-                      </>
-                    )}
-                    {resource.type === 1 && resource.short.type === 2 && (
-                      <>
-                        <div className="flex gap-2 items-center bg-blue-50 w-fit px-2 py-1 rounded-md text-sm">
-                          <Box size={20}/>
-                          <span>{name(resource)}</span>
-                        </div>
-                        <div className="flex text-xs text-weak">
-                          <span>{resource.resource_no}</span>
-                        </div>
-                        <div className="flex justify-between gap-2 text-xs text-weak">
-                          <span>
-                            提取数量：
-                            {resource.short.used}
-                            {' '}
-                            /
-                            {resource.short.quota}
-                          </span>
-                          <span>
-                            剩余
-                            {resource.short.quota - resource.short.used}
-                          </span>
-                        </div>
-                      </>
-                    )}
-                    {resource.type === 2 && resource.long.type === 1 && (
-                      <>
-                        <div className="flex gap-2 items-center bg-green-50 w-fit px-2 py-1 rounded-md text-sm">
-                          <Timer size={20}/>
-                          <span>{name(resource)}</span>
-                        </div>
-                        <div className="flex text-xs text-weak">
-                          <span>{resource.resource_no}</span>
-                        </div>
-                        <div className="flex justify-between gap-2 text-xs text-weak">
-                          <span>
-                            到期时间：
-                            {format(resource.long.expire_at, 'yyyy-MM-dd HH:mm')}
-                          </span>
-                          <span>{intlFormatDistance(resource.long.expire_at, new Date())}</span>
-                        </div>
-                      </>
-                    )}
-                    {resource.type === 2 && resource.long.type === 2 && (
-                      <>
-                        <div className="flex gap-2 items-center bg-blue-50 w-fit px-2 py-1 rounded-md text-sm">
-                          <Box size={20}/>
-                          <span>{name(resource)}</span>
-                        </div>
-                        <div className="flex text-xs text-weak">
-                          <span>{resource.resource_no}</span>
-                        </div>
-                        <div className="flex justify-between gap-2 text-xs text-weak">
-                          <span>
-                            提取数量：
-                            {resource.long.used}
-                            {' '}
-                            /
-                            {resource.long.quota}
-                          </span>
-                          <span>
-                            剩余
-                            {resource.long.quota - resource.long.used}
-                          </span>
-                        </div>
-                      </>
-                    )}
-                  </div>
-                </SelectItem>
-                {i < resources.length - 1 && <SelectSeparator className="m-1"/>}
+                {resources.map(resource => (
+                  <SelectItem
+                    key={resource.id}
+                    value={String(resource.id)}
+                    className="p-3">
+                    <div className="flex flex-col gap-2 w-72">
+                      {resource.type === 1 && resource.short.type === 1 && (
+                        <>
+                          <div className="flex gap-2 items-center bg-green-50 w-fit px-2 py-1 rounded-md text-sm">
+                            <Timer size={20}/>
+                            <span>{name(resource)}</span>
+                          </div>
+                          <div className="flex text-xs text-weak">
+                            <span>{resource.resource_no}</span>
+                          </div>
+                          <div className="flex justify-between gap-2 text-xs text-weak">
+                            <span>
+                              到期时间：
+                              {format(resource.short.expire_at, 'yyyy-MM-dd HH:mm')}
+                            </span>
+                            <span>{intlFormatDistance(resource.short.expire_at, new Date())}</span>
+                          </div>
+                        </>
+                      )}
+                      {resource.type === 1 && resource.short.type === 2 && (
+                        <>
+                          <div className="flex gap-2 items-center bg-blue-50 w-fit px-2 py-1 rounded-md text-sm">
+                            <Box size={20}/>
+                            <span>{name(resource)}</span>
+                          </div>
+                          <div className="flex text-xs text-weak">
+                            <span>{resource.resource_no}</span>
+                          </div>
+                          <div className="flex justify-between gap-2 text-xs text-weak">
+                            <span>
+                              提取数量：
+                              {resource.short.used}
+                              {' '}
+                              /
+                              {resource.short.quota}
+                            </span>
+                            <span>
+                              剩余
+                              {resource.short.quota - resource.short.used}
+                            </span>
+                          </div>
+                        </>
+                      )}
+                      {resource.type === 2 && resource.long.type === 1 && (
+                        <>
+                          <div className="flex gap-2 items-center bg-green-50 w-fit px-2 py-1 rounded-md text-sm">
+                            <Timer size={20}/>
+                            <span>{name(resource)}</span>
+                          </div>
+                          <div className="flex text-xs text-weak">
+                            <span>{resource.resource_no}</span>
+                          </div>
+                          <div className="flex justify-between gap-2 text-xs text-weak">
+                            <span>
+                              到期时间：
+                              {format(resource.long.expire_at, 'yyyy-MM-dd HH:mm')}
+                            </span>
+                            <span>{intlFormatDistance(resource.long.expire_at, new Date())}</span>
+                          </div>
+                        </>
+                      )}
+                      {resource.type === 2 && resource.long.type === 2 && (
+                        <>
+                          <div className="flex gap-2 items-center bg-blue-50 w-fit px-2 py-1 rounded-md text-sm">
+                            <Box size={20}/>
+                            <span>{name(resource)}</span>
+                          </div>
+                          <div className="flex text-xs text-weak">
+                            <span>{resource.resource_no}</span>
+                          </div>
+                          <div className="flex justify-between gap-2 text-xs text-weak">
+                            <span>
+                              提取数量：
+                              {resource.long.used}
+                              {' '}
+                              /
+                              {resource.long.quota}
+                            </span>
+                            <span>
+                              剩余
+                              {resource.long.quota - resource.long.used}
+                            </span>
+                          </div>
+                        </>
+                      )}
+                    </div>
+                  </SelectItem>
+                ))}
               </>
-            ))}
+            )}
           </SelectContent>
         </Select>
       )}
@@ -651,9 +653,9 @@ function name(resource: Resource) {
     // 短效套餐
     switch (resource.short.type) {
     case 1:
-      return `短效包时 ${resource.short.live / 60} 分钟`
+      return `短效包时 ${resource.short.live} 分钟`
     case 2:
-      return `短效包量 ${resource.short.live / 60} 分钟`
+      return `短效包量 ${resource.short.live} 分钟`
     }
     break
 

src/components/composites/payment/desktop-payment.tsx

@@ -46,7 +46,7 @@ export function DesktopPayment(props: PaymentModalProps) {
         <p className="text-sm text-gray-600">
           请使用
           {decoration.text}
-          扫码支付
+          {/* 扫码支付 */}
         </p>
 
         <div className="w-full text-center space-y-2">

src/components/composites/payment/payment-modal.tsx

@@ -62,12 +62,12 @@ export function PaymentModal(props: PaymentModalProps) {
         if (!open) handleClose()
       }}>
 
-      {/* {props.platform === TradePlatform.Mobile
+      {props.platform === TradePlatform.Mobile
         ? <MobilePayment {...props} onClose={handleClose}/>
         : <DesktopPayment {...props} onClose={handleClose}/>
-      } */}
+      }
 
-      <UniversalDesktopPayment {...props} onClose={handleClose}/>
+      {/* <UniversalDesktopPayment {...props} onClose={handleClose}/> */}
     </Dialog>
   )
 }

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

@@ -28,7 +28,7 @@ export default function LongForm() {
       quota: 500,
       expire: '30', // 天
       daily_limit: 100,
-      pay_type: 'wechat', // 余额支付
+      pay_type: 'balance', // 余额支付
     },
   })
 

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

@@ -32,12 +32,13 @@ export default function Right() {
         const resp = await getPrice({
           type: 2,
           long: {
-            live: Number(live),
+            live: Number(live) * 60,
             mode: Number(mode),
             quota: mode === '1' ? Number(dailyLimit) : Number(quota),
             expire: mode === '1' ? Number(expire) : undefined,
           },
         })
+
         if (!resp.success) {
           throw new Error('获取价格失败')
         }
@@ -49,6 +50,7 @@ export default function Right() {
         })
       }
       catch (error) {
+        console.error('获取价格失败:', error)
         setPriceData({
           price: '0.00',
           discounted_price: '0.00',
@@ -114,19 +116,19 @@ export default function Right() {
               </span>
             </li>
             <li className="flex justify-between items-center">
-              <span className="text-sm text-gray-500">原价</span>
+              <span className="text-sm text-gray-500">实价</span>
               <span className="text-sm">
                 ￥{price}
               </span>
             </li>
-            {discounted === 1 ? '' : (
+            {/* {discounted === 1 ? '' : (
               <li className="flex justify-between items-center">
                 <span className="text-sm text-gray-500">总折扣</span>
                 <span className="text-sm">
                   -￥{discounted}
                 </span>
               </li>
-            )}
+            )} */}
           </>
         )}
       </ul>
@@ -156,7 +158,7 @@ function BalanceOrLogin(props: {
   const profile = use(useProfileStore(store => store.profile))
   return profile ? (
     <>
-      {/* <FieldPayment/> */}
+      <FieldPayment/>
       <Pay
         method={props.method}
         balance={profile.balance}
@@ -165,9 +167,9 @@ function BalanceOrLogin(props: {
           type: 2,
           long: {
             mode: Number(props.mode),
-            live: Number(props.live),
-            expire: Number(props.expire),
-            quota: props.mode === '1' ? props.dailyLimit : props.quota,
+            live: Number(props.live) * 60,
+            expire: props.mode === '1' ? Number(props.expire) : undefined,
+            quota: props.mode === '1' ? Number(props.dailyLimit) : Number(props.quota),
           },
         }}/>
     </>

src/components/composites/purchase/pay.tsx

@@ -47,6 +47,7 @@ export default function Pay(props: PayProps) {
       payment_method: method,
       payment_platform: TradePlatform.Desktop,
     }
+    console.log(req, 'req')
 
     const resp = await prepareResource(req)
 

src/components/composites/purchase/shared/field-payment.tsx

@@ -4,9 +4,17 @@ import {FormField} from '@/components/ui/form'
 import Image from 'next/image'
 import alipay from '../_assets/alipay.svg'
 import wechat from '../_assets/wechat.svg'
+import balance from '../_assets/balance.svg'
+import RechargeModal from '@/components/composites/recharge'
+import {useProfileStore} from '@/components/stores/profile'
+import {use} from 'react'
+import Link from 'next/link'
+import {buttonVariants} from '@/components/ui/button'
 
 export function FieldPayment() {
-  return (
+  const profile = use(useProfileStore(store => store.profile))
+
+  return profile ? (
     <FormField name="pay_type" label="支付方式" className="flex flex-col gap-6">
       {({id, field}) => (
         <RadioGroup
@@ -15,7 +23,7 @@ export function FieldPayment() {
           onValueChange={field.onChange}
           className="flex flex-col gap-3">
 
-          {/* <div className="w-full p-3 flex flex-col gap-4 bg-gray-100 rounded-md">
+          <div className="w-full p-3 flex flex-col gap-4 bg-gray-100 rounded-md">
             <p className="flex items-center gap-3">
               <Image src={balance} alt="余额icon"/>
               <span className="text-sm text-gray-500">账户余额</span>
@@ -24,16 +32,15 @@ export function FieldPayment() {
               <span className="text-xl">{profile.balance}</span>
               <RechargeModal/>
             </p>
-          </div> */}
-
-          {/* <FormOption
+          </div>
+          <FormOption
             id={`${id}-balance`}
             value="balance"
             compare={field.value}
             className="p-3 w-full flex-row gap-2 justify-center">
             <Image src={balance} alt="余额 icon"/>
             <span>余额</span>
-          </FormOption> */}
+          </FormOption>
           <FormOption
             id={`${id}-wechat`}
             value="wechat"
@@ -53,5 +60,9 @@ export function FieldPayment() {
         </RadioGroup>
       )}
     </FormField>
+  ) : (
+    <Link href="/login" className={buttonVariants()}>
+      登录后支付
+    </Link>
   )
 }

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

@@ -68,11 +68,11 @@ export default function Center() {
             onValueChange={field.onChange}
             className="grid grid-cols-[repeat(auto-fill,minmax(120px,1fr))] gap-4">
 
-            <FormOption id={`${id}-3`} value="180" label="3 分钟" description="￥0.005/IP" compare={field.value}/>
-            <FormOption id={`${id}-5`} value="300" label="5 分钟" description="￥0.01/IP" compare={field.value}/>
-            <FormOption id={`${id}-10`} value="600" label="10 分钟" description="￥0.02/IP" compare={field.value}/>
-            <FormOption id={`${id}-20`} value="1200" label="20 分钟" description="￥0.03/IP" compare={field.value}/>
-            <FormOption id={`${id}-30`} value="1800" label="30 分钟" description="￥0.06/IP" compare={field.value}/>
+            <FormOption id={`${id}-3`} value="3" label="3 分钟" description="￥0.005/IP" compare={field.value}/>
+            <FormOption id={`${id}-5`} value="5" label="5 分钟" description="￥0.01/IP" compare={field.value}/>
+            <FormOption id={`${id}-10`} value="10" label="10 分钟" description="￥0.02/IP" compare={field.value}/>
+            <FormOption id={`${id}-20`} value="15" label="15 分钟" description="￥0.03/IP" compare={field.value}/>
+            <FormOption id={`${id}-30`} value="30" label="30 分钟" description="￥0.06/IP" compare={field.value}/>
           </RadioGroup>
         )}
       </FormField>

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

@@ -9,7 +9,7 @@ import {zodResolver} from '@hookform/resolvers/zod'
 // 定义表单验证架构
 const schema = z.object({
   type: z.enum(['1', '2']).default('2'),
-  live: z.enum(['180', '300', '600', '1200', '1800']),
+  live: z.enum(['3', '5', '10', '15', '30']),
   quota: z.number().min(10000, '购买数量不能少于10000个'),
   expire: z.enum(['7', '15', '30', '90', '180', '365']),
   daily_limit: z.number().min(2000, '每日限额不能少于2000个'),
@@ -24,11 +24,11 @@ export default function ShortForm() {
     resolver: zodResolver(schema),
     defaultValues: {
       type: '2', // 默认为包量套餐
-      live: '180', // 分钟
+      live: '3', // 分钟
       quota: 10_000, // >= 10000
       expire: '30', // 天
       daily_limit: 2_000, // >= 2000
-      pay_type: 'wechat', // 余额支付
+      pay_type: 'balance', // 余额支付
     },
   })
 

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

@@ -38,6 +38,7 @@ export default function Right() {
             expire: mode === '1' ? Number(expire) : undefined,
           },
         })
+
         if (!priceResponse.success) {
           throw new Error('获取价格失败')
         }
@@ -78,7 +79,7 @@ export default function Right() {
         <li className="flex justify-between items-center">
           <span className="text-sm text-gray-500">IP 时效</span>
           <span className="text-sm">
-            {Number(live) / 60}
+            {live}
             {' '}
             分钟
           </span>
@@ -116,19 +117,19 @@ export default function Right() {
               </span>
             </li>
             <li className="flex justify-between items-center">
-              <span className="text-sm text-gray-500">原价</span>
+              <span className="text-sm text-gray-500">实价</span>
               <span className="text-sm">
                 ￥{price}
               </span>
             </li>
-            {discounted === 1 ? '' : (
+            {/* {discounted === 1 ? '' : (
               <li className="flex justify-between items-center">
                 <span className="text-sm text-gray-500">总折扣</span>
                 <span className="text-sm">
                   -￥{discounted === 1 ? '' : discounted}
                 </span>
               </li>
-            )}
+            )} */}
           </>
         )}
       </ul>
@@ -158,7 +159,7 @@ function BalanceOrLogin(props: {
   const profile = use(useProfileStore(store => store.profile))
   return profile ? (
     <>
-      {/* <FieldPayment/> */}
+      <FieldPayment/>
       <Pay
         method={props.method}
         balance={profile.balance}
@@ -168,8 +169,8 @@ function BalanceOrLogin(props: {
           short: {
             mode: Number(props.mode),
             live: Number(props.live),
-            expire: Number(props.expire),
-            quota: props.mode === '1' ? props.dailyLimit : props.quota,
+            expire: props.mode === '1' ? Number(props.expire) : undefined,
+            quota: props.mode === '1' ? Number(props.dailyLimit) : Number(props.quota),
           },
         }}/>
     </>

src/lib/models/batch.ts

@@ -8,4 +8,5 @@ export type Batch = {
   time: string
   user_id: number
   prov: string
+  city: string
 }