Merge branch 'main' of http://113.45.67.59:3003/qiuchenfan/test

1114/app/components/weather/WeatherSearchForm.tsx

@@ -21,91 +21,84 @@ const handleSubmit = async (e: FormEvent<HTMLFormElement>) => {
     e.preventDefault();
     const trimmed = city.trim();
 
-    if (!trimmed) {
-      setInputError('请输入城市名称');
-      return;
-    }
-    if (trimmed.length < 2) {
-      setInputError('城市名称至少需要2个字符');
-      return;
-    }
-    if (!/^[\u4e00-\u9fa5a-zA-Z\s-]+$/.test(trimmed)) {
-      setInputError('城市名称包含无效字符');
-      return;
-    }
-
-    await searchWeather(trimmed);
+//创建axios实例 统一请求头
+const apiClient: AxiosInstance = axios.create({
+  baseURL: BASE_URL,
+  timeout: 10000,
+  headers: {
+    'Content-Type': 'application/json',
+  },
+});
+//请求拦截器
+apiClient.interceptors.request.use(
+  (config) => {
+    // 在发送请求之前做些什么
+    config.params = {
+      ...config.params,
+      access_key: API_KEY,
     };
-
-
-return (
-    <div className="p-6 border-b boarder-slate-200/50 dark:border-slate-700/50"> 
-    <form onSubmit={handleSubmit} className="space-by-3">
-        <div className="relative">
-            <div className="absolute inset-y-0 left-0 flex items-center pl-3 pointer-events-none">
-                <Search className="w-5 h-5 text-slate-400 dark:text-slate-500" /> 
-            </div>
-            <input
-                type='text'
-                value={city}
-                onChange={handleInputChange}
-                placeholder="搜索城市，如北京、上海、London..."
-                disabled ={isLoading}
-                className={cn(
-                    'h-12 pl-12 pr-4 text-base rouded-xl',
-                    'bg-slate-50/50 dark:bg-slate-900/50',
-                    'focus:bg-white dark:focus:bg-slate-900',
-                    'transition-all duration-200',
-                    inputError && 'border-red-300 dark:border-red-700'
-                )}
-                />
-        </div>
-        //输入错误提示
-        {inputError && (
-            <div className="flex items-start gap-2 px-3 py-2 rouded-lg bg-red-50/80
-            dark:bg-red-900/20 animate-in slide-in-form-top-1 fade-in">
-               <AlertCircle className="w-4 h-4 text-red-500 mt-0.5" />
-               <p className="text-xs text-red-600 dark:text-red-400 font-medium"> 
-                {inputError}
-                </p>
-                </div>
-        )}
-        //搜索刷新按钮
-        <div className="flex gap-2">
-            <Button
-                type ='submit'
-                disabled ={isLoading || !city.trim()}
-                className="flex-1 h-11 rouded-xl bg-gradient-to-r from-blue-600
-                to-cyan-600 hover:from-blue-700 hover:to-cyan-700 shadow-blue-500/30
-                honer:shadow-xl hover:shadow-cyan-500/40 disabled:opacity-50 transition-all duration-300">
-                    {isLoading ? (
-                        <>
-                        <Loader2 className="w-4 h-4 animate-spin" />
-                        <span className="ml-2">搜索中...</span>
-                        </>
-                    ):(
-                        <>
-                        <Search className="w-4 h-4 animate-spin" />
-                        <span className="ml-2">搜索</span>
-                        </>
-                    
-                    )}
-                </Button>
-          {currentWeather && (
-            <Button
-                type="button"
-                variant ="outline"
-                onClick={refreshWeather}
-                disabled={isLoading}
-                className="h-11 px-4 rouded-xl"
-                title="刷新数据"
-                >
-                    <RefreshCw className={cn("w-4 h-4",isLoading && "animate-spin")} />
-                </Button>
-          )
+    //打印请求信息
+    if (process.env.NODE_ENV === 'development') {
+      console.log('API Request:', config.method, config.url, config.params);
+    }
+    return config;
+  },
+  (error) => {
+    // 对请求错误做些什么
+    console.error('Request Error:', error);
+    return Promise.reject(error);
   }
-        </div>
-    </form>
-    </div>
 );
-}
+// 添加响应拦截器
+apiClient.interceptors.response.use(
+  (response) => {
+    //状态为200时的错误
+    if (response.data && response.data.error ) {
+      const error = response.data.error;  
+      console.error('API Error:', error);
+      throw new Error(error.info || '请求失败');
+    }//打印响应
+    if (process.env.NODE_ENV === 'development') {
+      console.log('API Response:', response.status, response.data);
+    }
+    return response;
+  },
+    (error:AxiosError) => {
+      //统一错误处理
+      console.error('Response Error:', error.message);
+      if (error.response) {
+        const status = error.response.status;
+      switch (status) {
+        case 404:
+        	return Promise.reject(new Error('未找到该城市，请检查城市名称'));
+        case 401:
+        	return Promise.reject(new Error('API认证失败，请检查API密钥'));
+        case 403:
+        	return Promise.reject(new Error('访问被拒绝，请稍后再试'));
+        case 429:
+        	return Promise.reject(new Error('请求次数过多，请稍后再试'));
+        default:
+        	return Promise.reject(new Error('服务器错误，请稍后再试'));
+      } 
+    }else if(error.request){
+        return Promise.reject(new Error('网络连接失败，请检查网络状态'));
+      }else {
+        return Promise.reject(new Error('请求配置错误'));
+      }
+    } 
+);
+//WeatherAPI
+export class WeatherAPI { 
+  static async getCurrentWeather(city: string): Promise<WeatherData> {
+    try {
+      const response = await apiClient.get<WeatherData>(
+        '/current', 
+        {params : {query: city },
+    });
+      return response.data;
+    } catch (error) {
+      throw error;
+        }
+      }
+    }
+  export default apiClient;