发布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.3.0",
+  "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 repo.lanhuip.com:8554/lanhu/web/lanhu/web:latest .
-docker build -t repo.lanhuip.com:8554/lanhu/web/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 repo.lanhuip.com:8554/lanhu/web/lanhu/web:latest
-docker push repo.lanhuip.com:8554/lanhu/web/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/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/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/lib/models/batch.ts

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