Merge branch 'main' into LJH

main/manager-web/src/apis/httpRequest.js

@@ -2,6 +2,7 @@ import Fly from 'flyio/dist/npm/fly';
 import store from '../store/index';
 import Constant from '../utils/constant';
 import { goToPage, isNotNull, showDanger, showWarning } from '../utils/index';
+import i18n from '../i18n/index';
 
 const fly = new Fly()
 // 设置超时
@@ -27,6 +28,16 @@ function sendRequest() {
         _url: '',
         _responseType: undefined, // 新增响应类型字段
         'send'() {
+            // 设置语言请求头
+            const currentLang = i18n.locale;
+            // 转换语言代码格式，将zh_CN转换为zh-CN
+            let acceptLanguage = currentLang.replace('_', '-');
+            // 为英语添加默认地区代码
+            if (acceptLanguage === 'en') {
+                acceptLanguage = 'en-US';
+            }
+            this._header['Accept-Language'] = acceptLanguage;
+            
             if (isNotNull(store.getters.getToken)) {
                 this._header.Authorization = 'Bearer ' + (JSON.parse(store.getters.getToken)).token
             }
@@ -116,10 +127,13 @@ function httpHandlerError(info, failCallback, networkFailCallback) {
             goToPage(Constant.PAGE.LOGIN, true);
             return true
         } else {
+            // 直接使用后端返回的国际化消息
+            let errorMessage = info.data.msg;
+            
             if (failCallback) {
                 failCallback(info)
             } else {
-                showDanger(info.data.msg)
+                showDanger(errorMessage)
             }
             return true
         }

main/manager-web/src/apis/module/device.js

@@ -85,4 +85,38 @@ export default {
                 });
             }).send();
     },
+    // 获取设备状态
+    getDeviceStatus(agentId, callback) {
+        RequestService.sendRequest()
+            .url(`${getServiceUrl()}/device/bind/${agentId}`)
+            .method('POST')
+            .data({}) // 发送空对象作为请求体
+            .success((res) => {
+                RequestService.clearRequestTime();
+                callback(res);
+            })
+            .networkFail((err) => {
+                console.error('获取设备状态失败:', err);
+                RequestService.reAjaxFun(() => {
+                    this.getDeviceStatus(agentId, callback);
+                });
+            }).send();
+    },
+    // 发送设备指令
+    sendDeviceCommand(deviceId, mcpData, callback) {
+        RequestService.sendRequest()
+            .url(`${getServiceUrl()}/device/commands/${deviceId}`)
+            .method('POST')
+            .data(mcpData)
+            .success((res) => {
+                RequestService.clearRequestTime();
+                callback(res);
+            })
+            .networkFail((err) => {
+                console.error('发送设备指令失败:', err);
+                RequestService.reAjaxFun(() => {
+                    this.sendDeviceCommand(deviceId, mcpData, callback);
+                });
+            }).send();
+    },
 }