From 784001ed4f141c250ca8a297dbd8c78f59abdaf9 Mon Sep 17 00:00:00 2001
From: 1708-huayu <57060237+1708-huayu@users.noreply.github.com>
Date: Fri, 29 Nov 2024 19:24:50 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=8F=91=E5=B8=83backup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                        |   5 +-
 .env.production                         |   3 +-
 docker/Dockerfile                       |   2 +-
 docker/nginx.conf                       |  42 ++++++
 src/app/favicon.ico                     | Bin 25931 -> 0 bytes
 src/app/layout.tsx                      |   4 +
 src/app/login/page.tsx                  | 169 ++++++++++++------------
 src/app/page.tsx                        |   2 +-
 src/lib/definitions.ts                  |   6 +-
 src/lib/task/project/data.tsx           | 141 +++++++-------------
 src/ui/task/OperationButton.tsx         |  11 +-
 src/ui/task/project/DetailModelForm.tsx |  16 +--
 src/ui/task/project/TreeTablePro.tsx    |   2 +-
 src/utils/axiosReq.ts                   |  65 +++++++--
 14 files changed, 257 insertions(+), 211 deletions(-)
 delete mode 100644 src/app/favicon.ico

diff --git a/.env.development b/.env.development
index 4ea0c46..e065a5f 100644
--- a/.env.development
+++ b/.env.development
@@ -1,4 +1,3 @@
 #  前缀为NEXT_PUBLIC_才可以被浏览器使用
-NEXT_PUBLIC_TODO_REQUEST_URL=http://localhost:8090
-NEXT_PUBLIC_SECURITY_REQUEST_URL=http://localhost:8091
-NEXT_PUBLIC_PRIVATE_KEY=
\ No newline at end of file
+NEXT_PUBLIC_TODO_REQUEST_URL=http://localhost:8092
+NEXT_PUBLIC_SECURITY_REQUEST_URL=http://localhost:8091
\ No newline at end of file
diff --git a/.env.production b/.env.production
index 4691b0d..537f3c8 100644
--- a/.env.production
+++ b/.env.production
@@ -1 +1,2 @@
-NEXT_PUBLIC_TODO_REQUEST_URL=http://taskmanagerserver.com:8090
\ No newline at end of file
+NEXT_PUBLIC_TODO_REQUEST_URL=http://www.huaruyu.com/todo-server
+NEXT_PUBLIC_SECURITY_REQUEST_URL=http://www.huaruyu.com/security-server
\ No newline at end of file
diff --git a/docker/Dockerfile b/docker/Dockerfile
index e6df779..73f2133 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -5,4 +5,4 @@ COPY out /usr/share/nginx/html
 EXPOSE 3001
 CMD ["nginx", "-g", "daemon off;"]
 # docker build -t task-manager-nginx .
-# docker run -d -p 3001:3001 --restart unless-stopped  -v ./out:/usr/share/nginx/html --name task-manager-nginx task-manager-nginx
+# docker run -d -p 3001:3001  --network task-manager --restart unless-stopped  -v ./out:/usr/share/nginx/html --name task-manager-nginx task-manager-nginx
diff --git a/docker/nginx.conf b/docker/nginx.conf
index 0056077..0a2c2bc 100644
--- a/docker/nginx.conf
+++ b/docker/nginx.conf
@@ -30,6 +30,48 @@ http {
             try_files $uri $uri.html $uri/ =404;
             # try_files $uri $uri/ =404;
         }
+        location ^~ /todo-server {
+            rewrite ^/todo-server/(.*)$ /$1 break;
+            proxy_pass              http://huayu-platform-todo:8092;
+            proxy_set_header        Host $http_host;
+            proxy_set_header        X-Real-IP $remote_addr;
+            proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
+            client_body_buffer_size 16k;
+            client_max_body_size  100M;
+
+            add_header 'Access-Control-Allow-Origin' '*';
+            add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
+            add_header 'Access-Control-Allow-Headers' 'Origin, Authorization, Content-Type, Accept, X-Requested-With';
+
+            # 如果请求方法为 OPTIONS，则直接返回 204 状态码
+            if ($request_method = 'OPTIONS') {
+                add_header 'Access-Control-Allow-Origin' '*';
+                add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
+                add_header 'Access-Control-Allow-Headers' 'Origin, Authorization, Content-Type, Accept, X-Requested-With';
+                return 204;
+            }
+        }
+        location ^~ /security-server {
+            rewrite ^/security-server/(.*)$ /$1 break;
+            proxy_pass              http://huayu-platform-security:8091;
+            proxy_set_header        Host $http_host;
+            proxy_set_header        X-Real-IP $remote_addr;
+            proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
+            client_body_buffer_size 16k;
+            client_max_body_size  100M;
+
+            add_header 'Access-Control-Allow-Origin' '*';
+            add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
+            add_header 'Access-Control-Allow-Headers' 'Origin, Authorization, Content-Type, Accept, X-Requested-With';
+
+            # 如果请求方法为 OPTIONS，则直接返回 204 状态码
+            if ($request_method = 'OPTIONS') {
+                add_header 'Access-Control-Allow-Origin' '*';
+                add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
+                add_header 'Access-Control-Allow-Headers' 'Origin, Authorization, Content-Type, Accept, X-Requested-With';
+                return 204;
+            }
+        }
         location /task/ {
             rewrite ^/task/(.*)$ /task/$1.html break;
         }
diff --git a/src/app/favicon.ico b/src/app/favicon.ico
deleted file mode 100644
index 718d6fea4835ec2d246af9800eddb7ffb276240c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 25931
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
LrJugUA?W`A8`#=m

diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index b2e603d..57403f7 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -20,6 +20,10 @@ export default function RootLayout({
       <html>
       <Script src="https://cdn.jsdelivr.net/npm/dayjs@1/dayjs.min.js"/>
       <Script src="https://cdn.jsdelivr.net/npm/dayjs@1/locale/zh-cn.js"/>
+      <head>
+          <title>任务管理</title>
+          <link rel="icon" href="/favicon.ico"/>
+      </head>
       <body style={{margin: 0}}>{children}</body>
       </html>
   );
diff --git a/src/app/login/page.tsx b/src/app/login/page.tsx
index ba279aa..cd16487 100644
--- a/src/app/login/page.tsx
+++ b/src/app/login/page.tsx
@@ -8,18 +8,18 @@ import {
     WeiboOutlined,
 } from '@ant-design/icons';
 import {
+    LoginForm,
     LoginFormPage,
     ProConfigProvider,
     ProFormCaptcha,
     ProFormCheckbox,
     ProFormText,
 } from '@ant-design/pro-components';
-import {Button, Divider, Space, Tabs, message, theme} from 'antd';
+import { Divider, Space, Tabs, message, theme} from 'antd';
 import type {CSSProperties} from 'react';
 import {useState} from 'react';
 import {LoginObject} from "@/lib/login/definitions";
 import {httpReq} from "@/utils/axiosReq";
-import Cookies from 'js-cookie';
 import { useRouter } from 'next/navigation'
 type LoginType = 'phone' | 'account';
 
@@ -31,9 +31,10 @@ const iconStyles: CSSProperties = {
 };
 
 const Page = () => {
-    const [loginType, setLoginType] = useState<LoginType>('phone');
+    const [loginType, setLoginType] = useState<LoginType>('account');
     const {token} = theme.useToken();
     const router = useRouter()
+    const [messageApi, contextHolder] = message.useMessage();
     return (
         <div
             style={{
@@ -41,25 +42,26 @@ const Page = () => {
                 height: '100vh',
             }}
         >
-            <LoginFormPage
-                backgroundImageUrl="https://mdn.alipayobjects.com/huamei_gcee1x/afts/img/A*y0ZTS6WLwvgAAAAAAAAAAAAADml6AQ/fmt.webp"
-                logo="https://github.githubassets.com/favicons/favicon.png"
-                backgroundVideoUrl="https://gw.alipayobjects.com/v/huamei_gcee1x/afts/video/jXRBRK_VAwoAAAAAAAAAAAAAK4eUAQBr"
-                title="Github"
+            {contextHolder}
+            <LoginForm
+                // backgroundImageUrl="https://mdn.alipayobjects.com/huamei_gcee1x/afts/img/A*y0ZTS6WLwvgAAAAAAAAAAAAADml6AQ/fmt.webp"
+                // logo="https://github.githubassets.com/favicons/favicon.png"
+                // backgroundVideoUrl="https://gw.alipayobjects.com/v/huamei_gcee1x/afts/video/jXRBRK_VAwoAAAAAAAAAAAAAK4eUAQBr"
+                title="任务管理"
                 containerStyle={{
                     backgroundColor: 'rgba(0, 0, 0,0.65)',
                     backdropFilter: 'blur(4px)',
                 }}
-                subTitle="全球最大的代码托管平台"
-                activityConfig={{
-                    style: {
-                        boxShadow: '0px 0px 8px rgba(0, 0, 0, 0.2)',
-                        color: token.colorTextHeading,
-                        borderRadius: 8,
-                        backgroundColor: 'rgba(255,255,255,0.25)',
-                        backdropFilter: 'blur(4px)',
-                    },
-                }}
+                // subTitle="任务管理"
+                // activityConfig={{
+                //     style: {
+                //         boxShadow: '0px 0px 8px rgba(0, 0, 0, 0.2)',
+                //         color: token.colorTextHeading,
+                //         borderRadius: 8,
+                //         backgroundColor: 'rgba(255,255,255,0.25)',
+                //         backdropFilter: 'blur(4px)',
+                //     },
+                // }}
                 onFinish={(formData:LoginObject)=>{
                     console.log("登录信息："+formData.username+";"+formData.password)
                     httpReq.post(process.env.NEXT_PUBLIC_SECURITY_REQUEST_URL+"/stateless/login/username",{
@@ -73,72 +75,77 @@ const Page = () => {
                             // 删除名为 'platform-security' 的Cookie
                             // Cookies.remove('platform-security');
                             // 设置一个有效期为7天的Cookie
-                            Cookies.set('platform-security', response.data.data, { expires: 7 });
+                            // Cookies.set('platform-security', response.data.data, { expires: 7 });
                             // 登录成功，跳转到首页或者回调
                             router.push('/task/project')
+                        }else{
+                            messageApi.open({
+                                type: 'error',
+                                content: response.data.status.message,
+                            })
                         };
                     })
                 }}
-                actions={
-                    <div style={{
-                            display: 'flex',
-                            justifyContent: 'center',
-                            alignItems: 'center',
-                            flexDirection: 'column',}}>
-                        <Divider plain>
-                        <span style={{
-                              color: token.colorTextPlaceholder,
-                              fontWeight: 'normal',
-                              fontSize: 14,}}>
-                            其他登录方式
-                        </span>
-                        </Divider>
-                        <Space align="center" size={24}>
-                            <div
-                                style={{
-                                    display: 'flex',
-                                    justifyContent: 'center',
-                                    alignItems: 'center',
-                                    flexDirection: 'column',
-                                    height: 40,
-                                    width: 40,
-                                    border: '1px solid ' + token.colorPrimaryBorder,
-                                    borderRadius: '50%',
-                                }}
-                            >
-                                <AlipayOutlined style={{...iconStyles, color: '#1677FF'}}/>
-                            </div>
-                            <div
-                                style={{
-                                    display: 'flex',
-                                    justifyContent: 'center',
-                                    alignItems: 'center',
-                                    flexDirection: 'column',
-                                    height: 40,
-                                    width: 40,
-                                    border: '1px solid ' + token.colorPrimaryBorder,
-                                    borderRadius: '50%',
-                                }}
-                            >
-                                <TaobaoOutlined style={{...iconStyles, color: '#FF6A10'}}/>
-                            </div>
-                            <div
-                                style={{
-                                    display: 'flex',
-                                    justifyContent: 'center',
-                                    alignItems: 'center',
-                                    flexDirection: 'column',
-                                    height: 40,
-                                    width: 40,
-                                    border: '1px solid ' + token.colorPrimaryBorder,
-                                    borderRadius: '50%',
-                                }}
-                            >
-                                <WeiboOutlined style={{...iconStyles, color: '#1890ff'}}/>
-                            </div>
-                        </Space>
-                    </div>
-                }
+                // actions={
+                //     <div style={{
+                //             display: 'flex',
+                //             justifyContent: 'center',
+                //             alignItems: 'center',
+                //             flexDirection: 'column',}}>
+                //         <Divider plain>
+                //         <span style={{
+                //               color: token.colorTextPlaceholder,
+                //               fontWeight: 'normal',
+                //               fontSize: 14,}}>
+                //             其他登录方式
+                //         </span>
+                //         </Divider>
+                //         <Space align="center" size={24}>
+                //             <div
+                //                 style={{
+                //                     display: 'flex',
+                //                     justifyContent: 'center',
+                //                     alignItems: 'center',
+                //                     flexDirection: 'column',
+                //                     height: 40,
+                //                     width: 40,
+                //                     border: '1px solid ' + token.colorPrimaryBorder,
+                //                     borderRadius: '50%',
+                //                 }}
+                //             >
+                //                 <AlipayOutlined style={{...iconStyles, color: '#1677FF'}}/>
+                //             </div>
+                //             <div
+                //                 style={{
+                //                     display: 'flex',
+                //                     justifyContent: 'center',
+                //                     alignItems: 'center',
+                //                     flexDirection: 'column',
+                //                     height: 40,
+                //                     width: 40,
+                //                     border: '1px solid ' + token.colorPrimaryBorder,
+                //                     borderRadius: '50%',
+                //                 }}
+                //             >
+                //                 <TaobaoOutlined style={{...iconStyles, color: '#FF6A10'}}/>
+                //             </div>
+                //             <div
+                //                 style={{
+                //                     display: 'flex',
+                //                     justifyContent: 'center',
+                //                     alignItems: 'center',
+                //                     flexDirection: 'column',
+                //                     height: 40,
+                //                     width: 40,
+                //                     border: '1px solid ' + token.colorPrimaryBorder,
+                //                     borderRadius: '50%',
+                //                 }}
+                //             >
+                //                 <WeiboOutlined style={{...iconStyles, color: '#1890ff'}}/>
+                //             </div>
+                //         </Space>
+                //     </div>
+                // }
             >
                 <Tabs
                     centered
@@ -272,12 +279,12 @@ const Page = () => {
                         忘记密码
                     </a>
                 </div>
-            </LoginFormPage>
+            </LoginForm>
         </div>
     );
 };
 
-export default () => {
+export default function Login(){
     return (
         <ProConfigProvider dark>
             <Page/>
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 00b50c1..97e6b88 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -6,7 +6,7 @@ import {useEffect} from "react";
 export default function Home() {
     const {replace} = useRouter();
     useEffect(()=>{
-        replace("/task/four")
+        replace("/login")
     },[])
     dayjs.locale('zh-cn')
     return (
diff --git a/src/lib/definitions.ts b/src/lib/definitions.ts
index ae0862a..16fad12 100644
--- a/src/lib/definitions.ts
+++ b/src/lib/definitions.ts
@@ -29,9 +29,9 @@ export type ResponseVO<T>={
 
 export type  DataType ={
     key: React.ReactNode;
-    id: number;
-    pid:number;
-    pPid:number;
+    id: string;
+    pid:string;
+    pPid:string;
     code: string;
     name: string;
     description: string;
diff --git a/src/lib/task/project/data.tsx b/src/lib/task/project/data.tsx
index a757137..2eaccdb 100644
--- a/src/lib/task/project/data.tsx
+++ b/src/lib/task/project/data.tsx
@@ -2,111 +2,67 @@ import {unstable_noStore as noStore} from 'next/cache';
 import {AxiosResponse} from "axios";
 import {httpReq} from "@/utils/axiosReq";
 import {DataType, DictType, ResponseVO, ResultPage} from "@/lib/definitions";
-export async function getTaskTreeResult(requestParam:string): Promise<ResponseVO<ResultPage<DataType>>> {
+
+export async function getTaskTreeResult(requestParam: string): Promise<ResponseVO<ResultPage<DataType>>> {
     noStore();
-    try {
-        // 使用 Axios 发送 POST 请求获取数据
-        const response: AxiosResponse<ResponseVO<ResultPage<DataType>>> = await httpReq.get(
-            process.env.NEXT_PUBLIC_TODO_REQUEST_URL+'/search/task_message_tree?search='+encodeURIComponent(requestParam));
-        // 从响应中提取数据并返回
-        console.log("response.data",response.data)
-        return response.data;
-    } catch (error) {
-        // 处理错误
-        console.error('Error fetching data:', error);
-        // 返回一个默认值或者抛出错误
-        throw new Error('Failed to fetch data');
-    }
+    // 使用 Axios 发送 POST 请求获取数据
+    const response: AxiosResponse<ResponseVO<ResultPage<DataType>>> = await httpReq.get(
+        process.env.NEXT_PUBLIC_TODO_REQUEST_URL + '/search/task_message_tree?search=' + encodeURIComponent(requestParam));
+    // 从响应中提取数据并返回
+    console.log("response.data", response.data)
+    return response.data;
 }
-export async function commonUpdate(requestParam:any): Promise<ResponseVO<string>> {
+
+export async function commonUpdate(requestParam: any): Promise<ResponseVO<string>> {
     noStore();
-    try {
-        // 使用 Axios 发送 PUT 请求获取数据
-        const response: AxiosResponse<ResponseVO<string>> = await httpReq.put(
-            process.env.NEXT_PUBLIC_TODO_REQUEST_URL+'/search/task_message_tree',requestParam);
-        // 从响应中提取数据并返回
-        return response.data;
-    } catch (error) {
-        // 处理错误
-        console.error('Error fetching data:', error);
-        // 返回一个默认值或者抛出错误
-        throw new Error('Failed to fetch data');
-    }
+    // 使用 Axios 发送 PUT 请求获取数据
+    const response: AxiosResponse<ResponseVO<string>> = await httpReq.put(
+        process.env.NEXT_PUBLIC_TODO_REQUEST_URL + '/search/task_message_tree', requestParam);
+    // 从响应中提取数据并返回
+    return response.data;
 }
 
 export async function taskTreeResult(): Promise<ResponseVO<ResultPage<DataType>>> {
     noStore();
-    try {
-        // 使用 httpReq 发送 POST 请求获取数据
-        const response: AxiosResponse<ResponseVO<ResultPage<DataType>>> = await httpReq.post(process.env.NEXT_PUBLIC_TODO_REQUEST_URL+'/task/tree', {
-            pageSize: 10,
-            pageNumber: 1
-        });
-        // 从响应中提取数据并返回
-        return response.data;
-    } catch (error) {
-        // 处理错误
-        console.error('Error fetching data:', error);
-        // 返回一个默认值或者抛出错误
-        throw new Error('Failed to fetch data');
-    }
-}
-export async function getTask(id:number): Promise<ResponseVO<DataType>> {
-    noStore();
-    try {
-        // 使用 Axios 发送 GET 请求获取数据
-        const response: AxiosResponse<ResponseVO<DataType>> = await httpReq.get(process.env.NEXT_PUBLIC_TODO_REQUEST_URL+'/task/'+id);
-        // 从响应中提取数据并返回
-        return response.data;
-    } catch (error) {
-        // 处理错误
-        console.error('Error fetching data:', error);
-        // 返回一个默认值或者抛出错误
-        throw new Error('Failed to fetch data');
-    }
+    // 使用 httpReq 发送 POST 请求获取数据
+    const response: AxiosResponse<ResponseVO<ResultPage<DataType>>> = await httpReq.post(process.env.NEXT_PUBLIC_TODO_REQUEST_URL + '/task/tree', {
+        pageSize: 10,
+        pageNumber: 1
+    });
+    // 从响应中提取数据并返回
+    return response.data;
 }
 
-export async function addTask(task:DataType): Promise<ResponseVO<string>> {
+export async function getTask(id: string): Promise<ResponseVO<DataType>> {
     noStore();
-    try {
-        // 使用 Axios 发送 POST 请求添加数据
-        const response: AxiosResponse<ResponseVO<string>> = await httpReq.post(process.env.NEXT_PUBLIC_TODO_REQUEST_URL+'/task', task);
-        // 从响应中提取数据并返回
-        return response.data;
-    } catch (error) {
-        // 处理错误
-        console.error('Error fetching data:', error);
-        // 返回一个默认值或者抛出错误
-        throw new Error('Failed to fetch data');
-    }
+    // 使用 Axios 发送 GET 请求获取数据
+    const response: AxiosResponse<ResponseVO<DataType>> = await httpReq.get(process.env.NEXT_PUBLIC_TODO_REQUEST_URL + '/task/' + id);
+    // 从响应中提取数据并返回
+    return response.data;
 }
-export async function updateTask(task:DataType): Promise<ResponseVO<string>> {
+
+export async function addTask(task: DataType): Promise<ResponseVO<string>> {
     noStore();
-    try {
-        // 使用 Axios 发送 PUT 请求修改数据
-        const response: AxiosResponse<ResponseVO<string>> = await httpReq.put(process.env.NEXT_PUBLIC_TODO_REQUEST_URL+'/task', task);
-        // 从响应中提取数据并返回
-        return response.data;
-    } catch (error) {
-        // 处理错误
-        console.error('Error fetching data:', error);
-        // 返回一个默认值或者抛出错误
-        throw new Error('Failed to fetch data');
-    }
+    // 使用 Axios 发送 POST 请求添加数据
+    const response: AxiosResponse<ResponseVO<string>> = await httpReq.post(process.env.NEXT_PUBLIC_TODO_REQUEST_URL + '/task', task);
+    // 从响应中提取数据并返回
+    return response.data;
 }
-export async function deleteTask(id:number): Promise<ResponseVO<string>> {
+
+export async function updateTask(task: DataType): Promise<ResponseVO<string>> {
     noStore();
-    try {
-        // 使用 Axios 发送 DELETE 删除数据
-        const response: AxiosResponse<ResponseVO<string>> = await httpReq.delete(process.env.NEXT_PUBLIC_TODO_REQUEST_URL+'/task/'+id);
-        // 从响应中提取数据并返回
-        return response.data;
-    } catch (error) {
-        // 处理错误
-        console.error('Error fetching data:', error);
-        // 返回一个默认值或者抛出错误
-        throw new Error('Failed to fetch data');
-    }
+    // 使用 Axios 发送 PUT 请求修改数据
+    const response: AxiosResponse<ResponseVO<string>> = await httpReq.put(process.env.NEXT_PUBLIC_TODO_REQUEST_URL + '/task', task);
+    // 从响应中提取数据并返回
+    return response.data;
+}
+
+export async function deleteTask(id: string): Promise<ResponseVO<string>> {
+    noStore();
+    // 使用 Axios 发送 DELETE 删除数据
+    const response: AxiosResponse<ResponseVO<string>> = await httpReq.delete(process.env.NEXT_PUBLIC_TODO_REQUEST_URL + '/task/' + id);
+    // 从响应中提取数据并返回
+    return response.data;
 }
 
 //0，重要紧急红色，1,重要不紧急黄色，2，不重要紧急灰色，3不重要，不紧急绿色
@@ -124,7 +80,7 @@ export const taskPriorityList: DictType[] = [
         order: 1,
         color: 'yellow'
     }, {
-        id:1,
+        id: 1,
         code: '1',
         name: '不重要紧急',
         order: 2,
@@ -210,6 +166,7 @@ export const taskStateList: DictType[] = [
         color: 'YELLOW'
     }
 ]
+
 export enum OPERATION_BUTTON_TYPE {
     DETAIL,
     ADD_CHILD,
diff --git a/src/ui/task/OperationButton.tsx b/src/ui/task/OperationButton.tsx
index 256bf11..7eea369 100644
--- a/src/ui/task/OperationButton.tsx
+++ b/src/ui/task/OperationButton.tsx
@@ -1,23 +1,22 @@
 import React, {Fragment} from "react";
 import {Button, Dropdown, MenuProps, message, Modal, Popconfirm, Space} from "antd";
 import {DownOutlined, QuestionCircleOutlined} from "@ant-design/icons";
-import {DetailForm} from "@/ui/task/four/DetailForm";
 import {commonUpdate, deleteTask, OPERATION_BUTTON_TYPE} from "@/lib/task/project/data";
 import Link from "next/link";
 import {DetailModelForm} from "@/ui/task/project/DetailModelForm";
 
 export interface OperationButtonProps {
-    itemId: number,
-    pid: number,
-    pPid: number,
+    itemId: string,
+    pid: string,
+    pPid: string,
     operationId?: string,
     refreshDate?: () => void,
 }
 
 interface OperationModelProps {
     operationId: number,
-    pPid: number,
-    pid: number,
+    pPid: string,
+    pid: string,
     openModal: boolean
 }
 
diff --git a/src/ui/task/project/DetailModelForm.tsx b/src/ui/task/project/DetailModelForm.tsx
index d7b6a52..4157b95 100644
--- a/src/ui/task/project/DetailModelForm.tsx
+++ b/src/ui/task/project/DetailModelForm.tsx
@@ -20,10 +20,10 @@ import dayjs, {Dayjs} from "dayjs";
 
 export type DetailModelFormProps={
     // 当前内容id
-    itemId?: number,
-    pid?:number,
+    itemId?: string,
+    pid?:string,
     // 祖宗任务id
-    pPid?:number,
+    pPid?:string,
     // 操作id
     operationId: number,
     // 标题描述
@@ -37,12 +37,12 @@ export type DetailModelFormProps={
     // 重新加载数据
     reloadData?: () => void
 }
-export type PidSelectTree= { label: string; value: number;pid:number; children?: PidSelectTree[] }
+export type PidSelectTree= { label: string; value: string;pid:string; children?: PidSelectTree[] }
 
 export const DetailModelForm: React.FC<DetailModelFormProps> = (props) => {
     console.log("DetailModelForm:props:",props)
     const [form] = Form.useForm<DataType>();
-    const [pid, setPid] = useState<number>(props.pid?props.pid:0);
+    const [pid, setPid] = useState<string>(props.pid?props.pid:'0');
     const [editFormDisable, setEditFormDisable] = useState(props.operationId === OPERATION_BUTTON_TYPE.DETAIL)
     useEffect(() => {
         if (props.itemId!=undefined&&(
@@ -58,6 +58,7 @@ export const DetailModelForm: React.FC<DetailModelFormProps> = (props) => {
                     task.data.expectedTimeRange = [task.data.expectedStartTime ? dayjs(task.data.expectedStartTime) : undefined,
                         task.data.expectedEndTime ? dayjs(task.data.expectedEndTime) : undefined];
                     form.setFieldsValue(task.data)
+                    console.log("form.setFieldsValue(task.data)"+JSON.stringify(task.data))
                 } else {
                     message.error(task.status.message);
                     props.reloadData?.()
@@ -99,7 +100,7 @@ export const DetailModelForm: React.FC<DetailModelFormProps> = (props) => {
                     props.reloadData?.();
                 },
             }}
-            submitter={props.itemId!==undefined&&props.itemId!==-1?{
+            submitter={props.itemId!==undefined&&props.itemId!=='-1'?{
                 render: (prop, defaultDoms) => {
                     return [
                         editFormDisable?<Button
@@ -141,7 +142,7 @@ export const DetailModelForm: React.FC<DetailModelFormProps> = (props) => {
             onFinish={async (values) => {
                 console.log('Received values of form: ', values);
                 if (values.pid===undefined){
-                    values.pid=0
+                    values.pid='0'
                 }
                 if (values.expectedTimeRange?.[0]!=undefined) {
                     values.expectedStartTime=dayjs(values.expectedTimeRange[0]).toDate()
@@ -155,7 +156,6 @@ export const DetailModelForm: React.FC<DetailModelFormProps> = (props) => {
                 if (values.actualTimeRange?.[1]!=undefined) {
                     values.actualEndTime=dayjs(values.actualTimeRange[1]).toDate()
                 }
-                values.pid=pid;
                 var result:boolean=false;
 
                 let state = taskStateList.find(taskState => taskState.name === values.state?.toString());
diff --git a/src/ui/task/project/TreeTablePro.tsx b/src/ui/task/project/TreeTablePro.tsx
index 0c8b2ed..a306991 100644
--- a/src/ui/task/project/TreeTablePro.tsx
+++ b/src/ui/task/project/TreeTablePro.tsx
@@ -25,7 +25,7 @@ const TreeTablePro: React.FC = () => {
     const [switchChecked, setSwitchChecked] = React.useState(true);
     const [filterChecked, setFilterChecked] = React.useState(true);
     const [current,setCurrent] = React.useState(1);
-    const [pageSize,setPageSize] = React.useState(5);
+    const [pageSize,setPageSize] = React.useState(10);
     const { RangePicker } = DatePicker;
     const columns: ProColumns<DataType>[] = [
         {
diff --git a/src/utils/axiosReq.ts b/src/utils/axiosReq.ts
index 6e97db9..aaa23a5 100644
--- a/src/utils/axiosReq.ts
+++ b/src/utils/axiosReq.ts
@@ -1,46 +1,83 @@
 import axios, {Canceler, CancelToken, CancelTokenSource} from "axios";
+import {message} from "antd";
 
 
 export const httpReq = axios.create({
     // cancelToken: new CancelToken(function (cancel:Canceler) {
     // },),
-    // validateStatus: function (status) {
-    //     return status >= 200 && status < 300; // default
-    // },
+    validateStatus: function (status) {
+        return status >= 200 && status < 300; // default
+    },
+    timeout: 2000,
+    timeoutErrorMessage: "网络连接超时",
     withCredentials: false,
 })
-// 从cookie获取token
-
 // 创建一个取消令牌
 const cancelTokenSource: CancelTokenSource = axios.CancelToken.source();
-
+// 默认json格式
 httpReq.defaults.headers.common['Accept'] = 'application/json';
+// 请求前处理
 httpReq.interceptors.request.use((config) => {
-        const token = localStorage.getItem('platform-security'); // 从本地存储中获取 token
+        // 从本地存储中获取 token
+        const token = localStorage.getItem('platform-security');
         if (token) {
-            // config.headers.Authorization = `Bearer ${token}`;
-            config.headers.Authorization = `${token}`;
+            config.headers.Authorization = `Bearer ${token}`;
         }
         return config;
     },
     (error) => {
+        console.info("interceptors错误提示.request" + error)
         return Promise.reject(error);
     })
+// 响应前处理
 httpReq.interceptors.response.use(
     (response) => {
         // http请求最外层
         if (response.status >= 500) {
-            console.log("系统异常")
+            message.error('系统异常');
         } else if (response.status >= 400 && response.status <= 500) {
-            console.log("无权限")
+            message.warning('无权限');
         }
         return response;
     },
     (error) => {
-        if (error.response && error.response.status === 401) {
-            localStorage.removeItem('authToken');
-            window.location.href = '/login';
+        if (axios.isCancel(error)) {
+            message.error('连接取消');
+        } else if (axios.isAxiosError(error)) {
+            console.error('Axios Error:', error.message);
+            if (error.response) {
+                if (error.response.status >= 500) {
+                    message.error('系统异常');
+                } else if (error.response.status >= 400 && error.response.status <= 500) {
+                    message.warning('无权限');
+                    window.location.href = '/login';
+                }
+                // switch (error.response.status) {
+                //     case 401:
+                //         localStorage.removeItem('authToken');
+                //         window.location.href = '/login';
+                //         break;
+                //     case 403:
+                //         console.error('Forbidden:', error.response.data);
+                //         break;
+                //     case 404:
+                //         console.error('Not Found:', error.response.data);
+                //         break;
+                //     case 500:
+                //         console.error('Internal Server Error:', error.response.data);
+                //         break;
+                //     default:
+                //         console.error('Unknown Error:', error.response.data);
+                //         break;
+                // }
+            } else {
+                message.error('No Response:' + error.message);
+            }
+        } else {
+            console.error('Unknown Error:', error);
         }
+
+        console.info("interceptors.response错误提示" + error)
         return Promise.reject(error);
     }
 );
\ No newline at end of file