接口请求返回登录页后不再重定向

package.json

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

src/actions/base.ts

@@ -1,6 +1,7 @@
 'use server'
 import {API_BASE_URL, ApiResponse, CLIENT_ID, CLIENT_SECRET} from '@/lib/api'
 import {add, isBefore} from 'date-fns'
+import {isRedirectError} from 'next/dist/client/components/redirect-error'
 import {cookies, headers} from 'next/headers'
 import {redirect} from 'next/navigation'
 import {cache} from 'react'
@@ -125,7 +126,7 @@ async function call<R = undefined>(url: string, body: RequestInit['body'], auth?
     })
 
     if (response.status === 401) {
-      return redirect('/login?redirect=' + encodeURIComponent(url.replace(API_BASE_URL, '')))
+      return redirect('/login')
     }
 
     const type = response.headers.get('Content-Type') ?? 'text/plain'
@@ -169,6 +170,9 @@ async function call<R = undefined>(url: string, body: RequestInit['body'], auth?
   }
   catch (e) {
     console.error('后端请求失败', url, (e as Error).message)
+    if (isRedirectError(e)) {
+      throw e
+    }
     throw new Error(`请求失败，网络错误`)
   }
 }

src/components/composites/extract/index.tsx

@@ -53,7 +53,7 @@ export default function Extract(props: ExtractProps) {
       authType: '1',
       count: 1,
       distinct: '1',
-      hostFormat: 'domain',
+      hostFormat: 'ip',
       format: 'text',
       breaker: '13,10',
       separator: '124',
@@ -228,14 +228,14 @@ const FormFields = memo(() => {
             defaultValue={field.value}
             className="flex gap-4"
           >
-            <FormLabel htmlFor={`${id}-v-domain`} className="px-3 h-10 flex-1 border rounded-md flex items-center text-sm">
-              <RadioGroupItem value="domain" id={`${id}-v-domain`} className="mr-2"/>
-              <span>域名</span>
-            </FormLabel>
             <FormLabel htmlFor={`${id}-v-ip`} className="px-3 h-10 flex-1 border rounded-md flex items-center text-sm">
               <RadioGroupItem value="ip" id={`${id}-v-ip`} className="mr-2"/>
               <span>IP</span>
             </FormLabel>
+            <FormLabel htmlFor={`${id}-v-domain`} className="px-3 h-10 flex-1 border rounded-md flex items-center text-sm">
+              <RadioGroupItem value="domain" id={`${id}-v-domain`} className="mr-2"/>
+              <span>域名</span>
+            </FormLabel>
           </RadioGroup>
         )}
       </FormField>