Merge remote-tracking branch 'origin/main' into feature/0909_主agent优化

# Conflicts:
#	src/views/home/components/history-conversation-drawer/index.vue

src/api/axiosHandler.ts

@@ -8,7 +8,7 @@
 
 import router from '@/router';
 import { clearToken } from '@/utils/auth';
-import { Message } from '@arco-design/web-vue';
+import { message } from 'ant-design-vue';
 
 /**
  * 处理业务逻辑定义的错误code
@@ -28,5 +28,5 @@ export const handleCodeError = (error: any) => {
     default:
       errMessage = error.msg || `未知错误-${error.code}`;
   }
-  Message.error(errMessage);
+  message.error(errMessage);
 };

src/api/index.ts

@@ -7,6 +7,7 @@
  */
 
 import axios from 'axios';
+import { message } from 'ant-design-vue';
 import type { AxiosInstance, AxiosRequestConfig, AxiosResponse } from 'axios';
 import { handleUserLogout, goUserLogin } from '@/utils/user';
 import { useEnterpriseStore } from '@/stores/modules/enterprise';
@@ -84,7 +85,7 @@ export class Request {
             break;
         }
 
-        AMessage.error(errMessage);
+        message.error(errMessage);
         return Promise.reject(err.response);
       },
     );