diff --git a/app/api/auth/[...nextauth]/route.ts b/app/api/auth/[...nextauth]/route.ts
index 09ecd12..90f49f0 100644
--- a/app/api/auth/[...nextauth]/route.ts
+++ b/app/api/auth/[...nextauth]/route.ts
@@ -1,7 +1,7 @@
 import { handlers } from "@/app/auth"
 import { NextResponse } from 'next/server'
 import { NextRequest } from 'next/server'
-import { getProxyConfig } from "@/proxy-config"
+import { getProxyConfig, disableProxy } from "@/proxy-config"
 import { HttpsProxyAgent } from "https-proxy-agent"
 
 const TIMEOUT_DURATION = 60000;
@@ -12,24 +12,63 @@ interface ExtendedRequestInit extends RequestInit {
     timeout?: number;
 }
 
-// 定义超时 Promise 的类型
-type TimeoutPromise = Promise<never>
-
 export async function GET(request: NextRequest): Promise<Response> {
     try {
         const { isEnabled, httpsAgent } = getProxyConfig();
+        const nextauthUrl = process.env.NEXTAUTH_URL || '';
+
+        // 检查是否是回调请求
+        if (request.url.includes('/api/auth/callback')) {
+            console.log('Callback request detected:', request.url);
+
+            // 处理请求
+            const response = await handlers.GET(request);
+
+            // 如果是成功的回调（通常是 302 重定向）
+            if (response instanceof Response && response.status === 302) {
+                const location = response.headers.get('location');
+
+                // 检查重定向 URL 是否匹配 NEXTAUTH_URL
+                if (location && (
+                    location === nextauthUrl ||
+                    location.startsWith(nextauthUrl + '/') ||
+                    location === '/' ||
+                    !location.includes('/api/auth')
+                )) {
+                    console.log('Redirecting to app URL, disabling proxy:', location);
+                    // 在响应发送后禁用代理
+                    setTimeout(() => {
+                        disableProxy();
+                    }, 100);
+                }
+            }
+
+            return response instanceof Response ? response : NextResponse.json(response);
+        }
 
-        // 只在认证请求时使用代理
+        // 处理其他认证请求
         if (isEnabled && request.url.includes('/api/auth')) {
-            console.log('originalFetch!!!!!!!!!!:', global.fetch);
+            console.log('Auth request with proxy:', request.url);
             const originalFetch = global.fetch;
+
             global.fetch = async (input: RequestInfo | URL, init?: RequestInit) => {
-                const extendedInit: ExtendedRequestInit = {
-                    ...init,
-                    agent: httpsAgent,
-                    timeout: TIMEOUT_DURATION,
-                };
-                return originalFetch(input, extendedInit);
+                const inputStr = typeof input === 'string' ? input : input.toString();
+
+                // 只对 GitHub OAuth 相关 URL 使用代理
+                if (inputStr.includes('github.com/login/oauth') ||
+                    inputStr.includes('api.github.com/user')) {
+
+                    console.log('Using proxy for fetch request:', inputStr);
+                    const extendedInit: ExtendedRequestInit = {
+                        ...init,
+                        agent: httpsAgent,
+                        timeout: TIMEOUT_DURATION,
+                    };
+                    return originalFetch(input, extendedInit);
+                } else {
+                    // 其他请求不使用代理
+                    return originalFetch(input, init);
+                }
             };
 
             try {
@@ -40,7 +79,7 @@ export async function GET(request: NextRequest): Promise<Response> {
                 global.fetch = originalFetch;
             }
         } else {
-            // 非认证请求使用普通 fetch
+            // 非认证请求或代理未启用
             const response = await handlers.GET(request);
             return response instanceof Response ? response : NextResponse.json(response);
         }
@@ -59,17 +98,72 @@ export async function GET(request: NextRequest): Promise<Response> {
 
 export async function POST(request: NextRequest): Promise<Response> {
     try {
-        const { isEnabled } = getProxyConfig();
-
-        if (isEnabled) {
-            // 使用超时机制
-            const timeoutPromise: TimeoutPromise = new Promise((_, reject) =>
-                setTimeout(() => reject(new Error('Request timeout')), TIMEOUT_DURATION)
-            );
-            const response = await Promise.race([handlers.POST(request), timeoutPromise]);
+        const { isEnabled, httpsAgent } = getProxyConfig();
+        const nextauthUrl = process.env.NEXTAUTH_URL || '';
+
+        // 检查是否是回调请求
+        if (request.url.includes('/api/auth/callback')) {
+            console.log('Callback POST request detected:', request.url);
+
+            // 处理请求
+            const response = await handlers.POST(request);
+
+            // 如果是成功的回调（通常是 302 重定向）
+            if (response instanceof Response && response.status === 302) {
+                const location = response.headers.get('location');
+
+                // 检查重定向 URL 是否匹配 NEXTAUTH_URL
+                if (location && (
+                    location === nextauthUrl ||
+                    location.startsWith(nextauthUrl + '/') ||
+                    location === '/' ||
+                    !location.includes('/api/auth')
+                )) {
+                    console.log('POST: Redirecting to app URL, disabling proxy:', location);
+                    // 在响应发送后禁用代理
+                    setTimeout(() => {
+                        disableProxy();
+                    }, 100);
+                }
+            }
+
             return response instanceof Response ? response : NextResponse.json(response);
+        }
+
+        // 处理其他认证请求
+        if (isEnabled && request.url.includes('/api/auth')) {
+            console.log('Auth POST request with proxy:', request.url);
+            const originalFetch = global.fetch;
+
+            global.fetch = async (input: RequestInfo | URL, init?: RequestInit) => {
+                const inputStr = typeof input === 'string' ? input : input.toString();
+
+                // 只对 GitHub OAuth 相关 URL 使用代理
+                if (inputStr.includes('github.com/login/oauth') ||
+                    inputStr.includes('api.github.com/user')) {
+
+                    console.log('Using proxy for POST fetch request:', inputStr);
+                    const extendedInit: ExtendedRequestInit = {
+                        ...init,
+                        agent: httpsAgent,
+                        timeout: TIMEOUT_DURATION,
+                    };
+                    return originalFetch(input, extendedInit);
+                } else {
+                    // 其他请求不使用代理
+                    return originalFetch(input, init);
+                }
+            };
+
+            try {
+                const response = await handlers.POST(request);
+                return response instanceof Response ? response : NextResponse.json(response);
+            } finally {
+                // 请求完成后恢复原始的 fetch
+                global.fetch = originalFetch;
+            }
         } else {
-            // 不使用超时机制
+            // 非认证请求或代理未启用
             const response = await handlers.POST(request);
             return response instanceof Response ? response : NextResponse.json(response);
         }
diff --git a/app/api/auth/enable-proxy/route.tsx b/app/api/auth/enable-proxy/route.tsx
new file mode 100644
index 0000000..aabdacf
--- /dev/null
+++ b/app/api/auth/enable-proxy/route.tsx
@@ -0,0 +1,17 @@
+import { NextResponse } from 'next/server';
+import { enableProxy } from "@/proxy-config";
+
+export async function POST() {
+    try {
+        const config = enableProxy();
+        return NextResponse.json({
+            success: true,
+            proxyEnabled: config.isEnabled
+        });
+    } catch (error) {
+        return NextResponse.json({
+            success: false,
+            error: error instanceof Error ? error.message : 'Unknown error'
+        }, { status: 500 });
+    }
+} 
\ No newline at end of file
diff --git a/app/api/proxy-image/route.tsx b/app/api/proxy-image/route.tsx
new file mode 100644
index 0000000..d4fd913
--- /dev/null
+++ b/app/api/proxy-image/route.tsx
@@ -0,0 +1,40 @@
+import { NextRequest, NextResponse } from 'next/server';
+import { getProxyConfig } from '@/proxy-config';
+
+export async function GET(request: NextRequest) {
+    try {
+        const url = request.nextUrl.searchParams.get('url');
+
+        if (!url) {
+            return new NextResponse('Missing URL parameter', { status: 400 });
+        }
+
+        const { isEnabled, httpsAgent } = getProxyConfig();
+
+        const fetchOptions: RequestInit = {};
+        if (isEnabled && url.includes('githubusercontent.com')) {
+            // 使用 @ts-expect-error 代替 @ts-ignore
+            // @ts-expect-error - agent 属性在浏览器端 RequestInit 类型中不存在
+            fetchOptions.agent = httpsAgent;
+        }
+
+        const response = await fetch(url, fetchOptions);
+
+        if (!response.ok) {
+            return new NextResponse('Failed to fetch image', { status: response.status });
+        }
+
+        const buffer = await response.arrayBuffer();
+        const headers = new Headers();
+        headers.set('Content-Type', response.headers.get('Content-Type') || 'image/jpeg');
+        headers.set('Cache-Control', 'public, max-age=86400');
+
+        return new NextResponse(buffer, {
+            status: 200,
+            headers
+        });
+    } catch (error) {
+        console.error('Error proxying image:', error);
+        return new NextResponse('Error fetching image', { status: 500 });
+    }
+} 
\ No newline at end of file
diff --git a/app/auth.ts b/app/auth.ts
index b54e3c4..f72c2b3 100644
--- a/app/auth.ts
+++ b/app/auth.ts
@@ -1,6 +1,9 @@
 import NextAuth from "next-auth"
 import GitHub from "next-auth/providers/github"
-// import { getProxyConfig } from "@/proxy-config"
+import { setupGlobalFetch } from "@/proxy-config"
+
+// 设置全局 fetch 拦截器（但不启用代理）
+setupGlobalFetch();
 
 // 打印环境变量（开发环境调试用）
 console.log('Environment Config:', {
@@ -31,32 +34,34 @@ export const { handlers, signIn, signOut, auth } = NextAuth({
     debug: true,
     callbacks: {
         async signIn({ user, account, profile, email, credentials }) {
-            console.log('Sign in attempt:', { user, account, profile, email, credentials });
-
+            console.log('signIn!!!!!!!!!!:', user, account, profile, email, credentials);
+            console.log('Sign in callback executed');
             return true;
         },
         async redirect({ url, baseUrl }) {
-            console.log('Redirect:', { url, baseUrl });
+
+            console.log('redirect!!!!!!!!!!:', url, baseUrl);
             return baseUrl;
         },
         async session({ session, user, token }) {
-            console.log('Session:', { session, user, token });
+            console.log('session!!!!!!!!!!:', session, user, token);
             return session;
         },
         async jwt({ token, user, account, profile }) {
-            console.log('JWT:', { token, user, account, profile });
+            console.log('jwt!!!!!!!!!!:', token, user, account, profile);
             return token;
         }
     },
     events: {
-        async signIn(message) { console.log('signIn:', message) },
-        async signOut(message) { console.log('signOut:', message) },
+        async signIn(message) {
+            console.log('signIn event:', message);
+        },
+        async signOut(message) {
+            console.log('signOut:', message);
+        },
     },
     pages: {
         signIn: '/auth/signin',
         error: '/auth/error',
     }
-})
-
-
-
+})
\ No newline at end of file
diff --git a/components/sign-in.tsx b/components/sign-in.tsx
index b04e578..6160670 100644
--- a/components/sign-in.tsx
+++ b/components/sign-in.tsx
@@ -2,7 +2,7 @@
 
 import { useEffect } from 'react';
 import { signIn, signOut, useSession } from 'next-auth/react';
-import Image from 'next/image';
+// import Image from 'next/image';
 import Link from 'next/link';
 import { Dropdown } from 'antd';
 import type { MenuProps } from 'antd';
@@ -32,6 +32,36 @@ export default function SignInButton() {
         }
     }, [session]); // 依赖于 session
 
+    // 处理 GitHub 登录
+    const handleGitHubSignIn = async () => {
+        try {
+            // 先启用代理
+            await fetch('/api/auth/enable-proxy', {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json',
+                },
+            });
+
+            console.log('已启用代理用于 GitHub 登录');
+
+            // 然后进行 GitHub 登录
+            await signIn("github");
+        } catch (error) {
+            console.error('登录过程中出错:', error);
+        }
+    };
+
+    // 在组件内部添加一个函数来处理图片 URL
+    // const getProxiedImageUrl = (imageUrl: string) => {
+    //     if (!imageUrl) return '';
+    //     // 检查是否是 GitHub 头像
+    //     if (imageUrl.includes('githubusercontent.com')) {
+    //         return `/api/proxy-image?url=${encodeURIComponent(imageUrl)}`;
+    //     }
+    //     return imageUrl;
+    // };
+
     if (status === 'loading') {
         return (
             <button className="bg-gray-200 text-gray-400 px-4 py-2 rounded-md cursor-not-allowed">
@@ -56,8 +86,17 @@ export default function SignInButton() {
             <Dropdown menu={{ items }} placement="bottomRight">
                 <div className="flex items-center gap-2 cursor-pointer">
                     <div className="flex items-center gap-2 px-2 py-1 rounded-full bg-gray-100 hover:bg-gray-200 transition-colors duration-200">
-                        {session.user?.image && (
+                        {/* {session.user?.image && (
                             <Image
+                                src={getProxiedImageUrl(session.user.image)}
+                                alt={session.user.name || 'User avatar'}
+                                width={32}
+                                height={32}
+                                className="rounded-full"
+                            />
+                        )} */}
+                        {session.user?.image && (
+                            <img
                                 src={session.user.image}
                                 alt={session.user.name || 'User avatar'}
                                 width={32}
@@ -74,10 +113,7 @@ export default function SignInButton() {
 
     return (
         <button
-            onClick={async () => {
-
-                await signIn("github")
-            }}
+            onClick={handleGitHubSignIn}
             className="flex items-center gap-2 px-4 py-2 bg-gray-800 hover:bg-gray-700 text-white rounded-md transition-colors duration-200"
         >
             <svg
diff --git a/lib/github-auth.tsx b/lib/github-auth.tsx
new file mode 100644
index 0000000..cb4f6b8
--- /dev/null
+++ b/lib/github-auth.tsx
@@ -0,0 +1,150 @@
+import { HttpsProxyAgent } from "https-proxy-agent";
+import https from 'https';
+import querystring from 'querystring';
+
+// 定义类型
+type TokenResponse = {
+    access_token: string;
+    token_type: string;
+    scope: string;
+};
+
+type UserResponse = {
+    id: number;
+    login: string;
+    name: string;
+    email: string;
+    avatar_url: string;
+};
+
+// 使用 Node.js 原生 HTTPS 请求获取令牌
+export async function getGitHubToken(code: string): Promise<TokenResponse> {
+    return new Promise((resolve, reject) => {
+        const proxyUrl = process.env.HTTPS_PROXY;
+        const clientId = process.env.AUTH_GITHUB_ID;
+        const clientSecret = process.env.AUTH_GITHUB_SECRET;
+        const redirectUri = `${process.env.NEXTAUTH_URL}/api/auth/callback/github`;
+
+        console.log(`Getting GitHub token with code: ${code.substring(0, 5)}...`);
+        console.log(`Redirect URI: ${redirectUri}`);
+
+        const postData = querystring.stringify({
+            client_id: clientId,
+            client_secret: clientSecret,
+            code: code,
+            redirect_uri: redirectUri
+        });
+
+        const options: https.RequestOptions = {
+            hostname: 'github.com',
+            port: 443,
+            path: '/login/oauth/access_token',
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/x-www-form-urlencoded',
+                'Accept': 'application/json',
+                'Content-Length': Buffer.byteLength(postData),
+                'User-Agent': 'Node.js GitHub OAuth Client'
+            }
+        };
+
+        // 如果有代理，使用代理
+        if (proxyUrl) {
+            console.log(`Using proxy: ${proxyUrl}`);
+            options.agent = new HttpsProxyAgent(proxyUrl);
+        }
+
+        const req = https.request(options, (res) => {
+            let data = '';
+
+            res.on('data', (chunk) => {
+                data += chunk;
+            });
+
+            res.on('end', () => {
+                try {
+                    console.log(`GitHub token response status: ${res.statusCode}`);
+
+                    if (res.statusCode !== 200) {
+                        console.error(`GitHub token error: ${data}`);
+                        return reject(new Error(`GitHub returned status ${res.statusCode}: ${data}`));
+                    }
+
+                    const response = JSON.parse(data);
+                    console.log('Successfully obtained GitHub token');
+                    resolve(response);
+                } catch (error) {
+                    console.error('Error parsing GitHub token response:', error);
+                    reject(error);
+                }
+            });
+        });
+
+        req.on('error', (error) => {
+            console.error('Error requesting GitHub token:', error);
+            reject(error);
+        });
+
+        req.write(postData);
+        req.end();
+    });
+}
+
+// 获取用户信息
+export async function getGitHubUser(token: string): Promise<UserResponse> {
+    return new Promise((resolve, reject) => {
+        const proxyUrl = process.env.HTTPS_PROXY;
+
+        console.log('Getting GitHub user info');
+
+        const options: https.RequestOptions = {
+            hostname: 'api.github.com',
+            port: 443,
+            path: '/user',
+            method: 'GET',
+            headers: {
+                'Authorization': `token ${token}`,
+                'User-Agent': 'Node.js GitHub OAuth Client',
+                'Accept': 'application/json'
+            }
+        };
+
+        // 如果有代理，使用代理
+        if (proxyUrl) {
+            options.agent = new HttpsProxyAgent(proxyUrl);
+        }
+
+        const req = https.request(options, (res) => {
+            let data = '';
+
+            res.on('data', (chunk) => {
+                data += chunk;
+            });
+
+            res.on('end', () => {
+                try {
+                    console.log(`GitHub user response status: ${res.statusCode}`);
+
+                    if (res.statusCode !== 200) {
+                        console.error(`GitHub user error: ${data}`);
+                        return reject(new Error(`GitHub returned status ${res.statusCode}: ${data}`));
+                    }
+
+                    const response = JSON.parse(data);
+                    console.log('Successfully obtained GitHub user info');
+                    resolve(response);
+                } catch (error) {
+                    console.error('Error parsing GitHub user response:', error);
+                    reject(error);
+                }
+            });
+        });
+
+        req.on('error', (error) => {
+            console.error('Error requesting GitHub user:', error);
+            reject(error);
+        });
+
+        req.end();
+    });
+} 
\ No newline at end of file
diff --git a/next.config.mjs b/next.config.mjs
index 6331698..68b3283 100644
--- a/next.config.mjs
+++ b/next.config.mjs
@@ -13,5 +13,11 @@ export default {
                 pathname: '/**',
             },
         ],
+        domains: [
+            'avatars.githubusercontent.com',  // GitHub 头像域名
+            'github.com',
+            'avatar.vercel.sh',
+            'githubusercontent.com'
+        ],
     },
 };
\ No newline at end of file
diff --git a/proxy-config.ts b/proxy-config.ts
index 5674e70..3ebb4ca 100644
--- a/proxy-config.ts
+++ b/proxy-config.ts
@@ -1,5 +1,10 @@
 import { HttpsProxyAgent } from "https-proxy-agent"
-import { setGlobalDispatcher, ProxyAgent as UndiciProxyAgent } from 'undici'
+import { setGlobalDispatcher, ProxyAgent as UndiciProxyAgent, Dispatcher } from 'undici'
+
+// 保存原始的 dispatcher 以便恢复
+let originalDispatcher: Dispatcher | null = null;
+// 代理状态标志
+let proxyEnabled = false;
 
 // 代理配置类型
 export type ProxyConfig = {
@@ -12,10 +17,20 @@ export type ProxyConfig = {
 export function getProxyConfig(): ProxyConfig {
     const proxyUrl = process.env.HTTPS_PROXY;
 
-    if (!proxyUrl) {
+    if (!proxyUrl || !proxyEnabled) {
         return { isEnabled: false };
     }
 
+    // 保存当前的 dispatcher 如果还没保存
+    if (!originalDispatcher) {
+        try {
+            // @ts-ignore - 获取当前的 dispatcher
+            originalDispatcher = globalThis[Symbol.for('undici.globalDispatcher.1')];
+        } catch (e) {
+            console.warn('Failed to save original dispatcher:', e);
+        }
+    }
+
     // 配置 undici 代理
     setGlobalDispatcher(new UndiciProxyAgent({
         uri: proxyUrl,
@@ -36,39 +51,93 @@ export function getProxyConfig(): ProxyConfig {
     };
 }
 
+// 启用代理
+export function enableProxy() {
+    console.log('Enabling proxy for GitHub OAuth...');
+    proxyEnabled = true;
+    return getProxyConfig();
+}
+
+// 禁用代理
+export function disableProxy() {
+    console.log('Disabling proxy...');
+    proxyEnabled = false;
+
+    try {
+        // 恢复原始的 dispatcher
+        if (originalDispatcher) {
+            try {
+                setGlobalDispatcher(originalDispatcher);
+                console.log('Restored original dispatcher');
+            } catch (e) {
+                console.warn('Failed to restore original dispatcher:', e);
+                // 创建一个新的默认 dispatcher
+                setGlobalDispatcher(new UndiciProxyAgent({ uri: '' }));
+            }
+        } else {
+            // 如果没有原始 dispatcher，创建一个新的默认 dispatcher
+            setGlobalDispatcher(new UndiciProxyAgent({ uri: '' }));
+        }
+
+        // 重置全局 fetch 如果它被修改了
+        if (typeof globalThis !== 'undefined' && globalThis.fetch) {
+            // 尝试恢复原始的 fetch
+            try {
+                // @ts-ignore - 访问可能存在的原始 fetch
+                if (globalThis._originalFetch) {
+                    // @ts-ignore
+                    globalThis.fetch = globalThis._originalFetch;
+                    console.log('Restored original fetch');
+                }
+            } catch (e) {
+                console.warn('Failed to restore original fetch:', e);
+            }
+        }
+    } catch (error) {
+        console.error('Error disabling proxy:', error);
+    }
+
+    return { isEnabled: false };
+}
+
 // 扩展的请求配置类型
 export interface ExtendedRequestInit extends RequestInit {
     agent?: HttpsProxyAgent;
     timeout?: number;
 }
 
-// 配置全局 fetch
+// 配置全局 fetch - 不再自动启用代理
 export function setupGlobalFetch() {
-    const { isEnabled, httpsAgent } = getProxyConfig();
-
-    if (typeof globalThis !== 'undefined' && globalThis.fetch && isEnabled && httpsAgent) {
+    // 初始化时不启用代理，只保存原始 fetch
+    if (typeof globalThis !== 'undefined' && globalThis.fetch) {
         const originalFetch = globalThis.fetch;
+        // 保存原始的 fetch 以便恢复
+        // @ts-ignore
+        globalThis._originalFetch = originalFetch;
+
         globalThis.fetch = async (input: RequestInfo | URL, init?: RequestInit) => {
-            // 将 input 转换为 URL 对象以检查 hostname
-            let url: URL;
-            try {
-                url = input instanceof URL ? input : new URL(input.toString());
-                console.log('url.hostname!!!!!!!!!!:', url.hostname);
-                // 如果是内部服务地址，不使用代理
-                if (url.hostname === '172.17.0.1') {
-                    return originalFetch(input, init);
-                }
-            } catch (error) {
-                console.warn('URL parsing failed:', error);
-                // URL 解析失败时使用默认代理配置
-            }
+            // 获取当前代理配置
+            const { isEnabled, httpsAgent } = getProxyConfig();
 
-            const extendedInit: ExtendedRequestInit = {
-                ...init,
-                agent: httpsAgent,
-                timeout: 60000,
-            };
-            return originalFetch(input, extendedInit as RequestInit);
+            // 将 input 转换为字符串以检查 URL
+            const inputStr = input instanceof URL ? input.toString() : input.toString();
+
+            // 只有当代理启用且是 GitHub OAuth 相关请求时才使用代理
+            if (isEnabled && (
+                inputStr.includes('github.com/login/oauth') ||
+                inputStr.includes('api.github.com/user')
+            )) {
+                console.log('Using proxy for GitHub OAuth request:', inputStr);
+                const extendedInit: ExtendedRequestInit = {
+                    ...init,
+                    agent: httpsAgent,
+                    timeout: 60000,
+                };
+                return originalFetch(input, extendedInit as RequestInit);
+            } else {
+                // 其他请求不使用代理
+                return originalFetch(input, init);
+            }
         };
     }
-}
+}
\ No newline at end of file