fix bug: redeploy and log

zhaojing1987 · zhaojing1987 · commit a54134428783 · 2025-09-03T08:29:49.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,7 @@
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 
 ossutil64
-node_modules
+node_modules/
 build
 myapps
 myapps-*.zip
diff --git a/node_modules/.yarn-integrity b/node_modules/.yarn-integrity
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/components/TagsInput.js b/src/components/TagsInput.js
@@ -48,7 +48,6 @@ const DeleteDomainConform = (props) => {
         try {
             // 检查被删除的域名是否正在被监控，如果是则禁用监控
             await checkAndDisableMonitoringForDeletedDomains(appId, domains);
-            console.log(`Checked monitoring for deleted domains: ${domains.join(', ')}`);
         } catch (error) {
             // 监控检查失败不应该阻止域名删除
             console.warn(`Failed to check/disable monitoring for deleted domains:`, error.message || error);
diff --git a/src/helpers/api_apphub/apiCore.js b/src/helpers/api_apphub/apiCore.js
@@ -90,7 +90,6 @@ const getApiKey = async () => {
 const clearConfigCache = () => {
     configCache.clear();
     fetchPromise.clear();
-    console.log('[ApiCore] Configuration cache cleared');
 };
 
 // 检查是否为配置错误并清除相应缓存
@@ -135,7 +134,6 @@ class APICore {
         try {
             // 优先使用 configManager 的缓存配置（避免重复初始化）
             const config = await configManager.getConfigAsync();
-            console.log('[APICore] Using cached config for axios initialization');
 
             this.axiosInstance = axios.create({
                 baseURL: config.apiURL,
@@ -220,8 +218,8 @@ class APICore {
 
     // HTTP方法的简化封装
     get = (url, params) => this.request('get', url, null, params);
-    post = (url, data, params) => this.request('post', url, data, params);
-    put = (url, data, params) => this.request('put', url, data, params);
+    post = (url, params, data) => this.request('post', url, data, params);
+    put = (url, params, data) => this.request('put', url, data, params);
     delete = (url, params) => this.request('delete', url, null, params);
 }
 
diff --git a/src/helpers/api_apphub/appHub.js b/src/helpers/api_apphub/appHub.js
@@ -6,7 +6,6 @@ let apiInstance = null;
 
 const getApiInstance = () => {
     if (!apiInstance) {
-        console.log('[AppHub] Creating new APICore instance');
         apiInstance = new APICore();
     }
     return apiInstance;
@@ -34,7 +33,7 @@ function RemoveErrorApp(app_id, params) {
 //重建App(状态为：Inactive)
 function RedeployApp(app_id, params) {
     const baseUrl = `/apps/${app_id}/redeploy`;
-    return getApiInstance().put(`${baseUrl}`, params);
+    return getApiInstance().put(`${baseUrl}`, params, {});
 }
 
 //App 卸载
@@ -76,13 +75,13 @@ function AppDomainDeleteByProxyID(proxy_id, params) {
 //根据ProxyID更新域名
 function AppDomainUpdateByProxyID(proxy_id, params, body) {
     const baseUrl = `/proxys/${proxy_id}`;
-    return getApiInstance().put(`${baseUrl}`, body, params);
+    return getApiInstance().put(`${baseUrl}`, params, body);
 }
 
 //根据app_id创建域名
 function AppDomainCreateByAppID(app_id, params, body) {
     const baseUrl = `/proxys/${app_id}`;
-    return getApiInstance().post(`${baseUrl}`, body, params);
+    return getApiInstance().post(`${baseUrl}`, params, body);
 }
 
 //创建App备份
@@ -106,13 +105,12 @@ function DeleteAppBackup(snapshot_id, params) {
 //恢复App备份
 function RestoreAppBackup(snapshot_id, app_id, params) {
     const baseUrl = `/backup/restore/${app_id}/${snapshot_id}`;
-    return getApiInstance().post(`${baseUrl}`, {}, params);
+    return getApiInstance().post(`${baseUrl}`, params, {});
 }
 
 // 重置API实例 - 用于错误恢复
 function resetApiInstance() {
     if (apiInstance) {
-        console.log('[AppHub] Resetting APICore instance');
         apiInstance = null;
     }
 }
diff --git a/src/pages/appdetail.js b/src/pages/appdetail.js
@@ -442,7 +442,7 @@ const AppDetailModal = (props) => {
             icon: 'mdi dripicons-stack',
             text: (
                 <Suspense fallback={<div className="text-center"><i className="fa fa-spinner fa-spin"></i></div>}>
-                    <AppCompose data={currentApp} />
+                    <AppCompose data={currentApp} disabledButton={setAppdetailButtonDisable} enableButton={setAppdetailButtonEnable} />
                 </Suspense>
             ),
         },
diff --git a/src/pages/appdetailtabs/appcompose.js b/src/pages/appdetailtabs/appcompose.js
@@ -12,7 +12,6 @@ import React, { useState, useEffect, useRef } from 'react';
 import { Button, Card, Col, Form, Modal, Row } from 'react-bootstrap';
 import ReactDOM from 'react-dom';
 import Spinner from '../../components/Spinner';
-import { RedeployApp } from '../../helpers';
 import configManager from '../../helpers/api_apphub/configManager';
 
 const _ = cockpit.gettext;
@@ -388,7 +387,7 @@ const AppCompose = (props): React$Element<React$FragmentType> => {
             </Row>
             {
                 showRedeployConform &&
-                <RedeployAppConform showConform={showRedeployConform} onClose={cancelredeployApp} app={props.data} handleBackToLastStep={handleBackToLastStep} />
+                <RedeployAppConform showConform={showRedeployConform} onClose={cancelredeployApp} app={props.data} handleBackToLastStep={handleBackToLastStep} enableButton={props.enableButton} disableButton={props.disabledButton} />
             }
         </>
     );
diff --git a/src/pages/appdetailtabs/appmonitor.js b/src/pages/appdetailtabs/appmonitor.js
@@ -145,6 +145,14 @@ const AppMonitor = (props) => {
     };
 
     const enableMonitoring = async () => {
+        // 检查是否有可用域名
+        if (domain_names.length === 0) {
+            setShowAlert(true);
+            setAlertMessage(_("Please bind a domain name to the application before enabling monitoring."));
+            setAlertType("warning");
+            return;
+        }
+
         if (!monitorUrl || !notificationEmail || !isEmailValid) return;
 
         setLoading(true);
@@ -183,6 +191,14 @@ const AppMonitor = (props) => {
     };
 
     const updateMonitoring = async () => {
+        // 检查是否有可用域名
+        if (domain_names.length === 0) {
+            setShowAlert(true);
+            setAlertMessage(_("Please bind a domain name to the application before updating monitoring."));
+            setAlertType("warning");
+            return;
+        }
+
         if (!monitorUrl || !notificationEmail || !isEmailValid) return;
 
         setLoading(true);
@@ -252,7 +268,18 @@ const AppMonitor = (props) => {
     // 组件挂载时查询监控状态
     useEffect(() => {
         if (app_id) {
-            // 使用统一的配置管理器并查询监控状态
+            // 检查是否有可用的域名，没有域名时不需要调用监控API
+            if (domain_names.length === 0) {
+                // 没有域名绑定时，直接设置为禁用状态，不调用API
+                setMonitorStatus('disabled');
+                setMonitorUrl('');
+                setNotificationEmail('');
+                setDashboardUrl('');
+                setLoading(false);
+                return;
+            }
+
+            // 有域名时才调用监控相关API
             const initializeAndQuery = async () => {
                 try {
                     await configManager.initialize();
@@ -267,7 +294,7 @@ const AppMonitor = (props) => {
 
             initializeAndQuery();
         }
-    }, [app_id, props.dataRefreshKey]); // 添加 dataRefreshKey 作为依赖
+    }, [app_id, props.dataRefreshKey, domain_names.length]); // 添加 domain_names.length 作为依赖
 
     const handleEnableMonitoring = () => {
         if (monitorUrl && notificationEmail && isEmailValid) {
@@ -287,8 +314,16 @@ const AppMonitor = (props) => {
 
     const handleCancelEdit = () => {
         setIsEditing(false);
-        // 恢复原来的值
-        queryMonitorStatus();
+        // 只有在有域名的情况下才恢复原来的值（调用API）
+        if (domain_names.length > 0) {
+            queryMonitorStatus();
+        } else {
+            // 没有域名时直接重置状态
+            setMonitorUrl('');
+            setNotificationEmail('');
+            setMonitorStatus('disabled');
+            setDashboardUrl('');
+        }
     };
 
     return (
@@ -339,7 +374,7 @@ const AppMonitor = (props) => {
                                             onChange={handleEmailChange}
                                             isInvalid={!isEmailValid}
                                             size="sm"
-                                            disabled={(monitorStatus === 'enabled' && !isEditing) || loading}
+                                            disabled={domain_names.length === 0 || (monitorStatus === 'enabled' && !isEditing) || loading}
                                             className="me-2"
                                         />
                                         {!isEmailValid && (
diff --git a/src/pages/appdetailtabs/appuninstall.js b/src/pages/appdetailtabs/appuninstall.js
@@ -80,7 +80,12 @@ const UninstallConform = (props) => {
                         try {
                             // 首先检查并禁用监控（如果启用了的话）
                             if (props.isMonitorApp) {
-                                await checkAndDisableMonitoring(props.app.app_id);
+                                try {
+                                    await checkAndDisableMonitoring(props.app.app_id);
+                                } catch (monitorError) {
+                                    // 监控禁用失败不应该阻断卸载流程，只记录警告
+                                    console.warn('Failed to disable monitoring, but continuing with uninstall');
+                                }
                             }
 
                             // 然后执行应用卸载
diff --git a/src/pages/myapps.js b/src/pages/myapps.js
@@ -435,7 +435,6 @@ const MyApps = () => {
                     baseURL = config.baseURL;
                     setPhpApps(config.phpApps || []);
                     setMonitorApps(config.monitorApps || []);
-                    console.log('[MyApps] Using preloaded config, skipping initialization');
                 } catch (configError) {
                     // 只有在配置获取失败时才进行初始化
                     console.warn('[MyApps] Preloaded config not available, initializing...', configError);
@@ -475,7 +474,6 @@ const MyApps = () => {
                         const hasMonitorAppsChanged = !arraysEqual(monitorApps, config.monitorApps || []);
 
                         if (hasPhpAppsChanged || hasMonitorAppsChanged) {
-                            console.log('[MyApps] Config changed during auto-refresh, updating...');
                             setPhpApps(config.phpApps || []);
                             setMonitorApps(config.monitorApps || []);
                         }
diff --git a/src/utils/monitorUtils.js b/src/utils/monitorUtils.js
@@ -83,7 +83,7 @@ class MonitorAPI {
         } catch (error) {
             // 只在非404错误时输出到控制台，避免正常的404查询被当作错误
             if (!error.message || !error.message.includes('404')) {
-                console.error("API request failed:", error);
+                console.error("Monitoring API request failed");
             }
             throw error;
         }
@@ -160,16 +160,13 @@ export const checkAndDisableMonitoring = async (appId) => {
 
         // 如果监控已启用，则禁用它
         if (monitorStatus && monitorStatus.domain && monitorStatus.email) {
-            console.log(`Disabling monitoring for app ${appId}...`);
             await monitorAPI.disableMonitoring(monitorId);
-            console.log(`Monitoring disabled successfully for app ${appId}`);
             return true; // 返回true表示成功禁用了监控
         }
         return false; // 返回false表示监控本来就没有启用
     } catch (error) {
         // 如果是404错误，说明监控本来就没有启用，这是正常情况
         if (error.message && (error.message.includes('404') || error.message.includes('Not Found'))) {
-            console.log(`No monitoring found for app ${appId}, skipping disable step`);
             return false;
         } else {
             // 其他错误记录但不阻断卸载流程
@@ -201,20 +198,16 @@ export const checkAndDisableMonitoringForDeletedDomains = async (appId, deletedD
             });
 
             if (isDomainBeingDeleted) {
-                console.log(`Monitored domain is being deleted, disabling monitoring for app ${appId}...`);
                 await monitorAPI.disableMonitoring(monitorId);
-                console.log(`Monitoring disabled successfully for app ${appId} due to domain deletion`);
                 return true;
             } else {
-                console.log(`Monitored domain ${monitoredDomain} is not being deleted, keeping monitoring enabled`);
                 return false;
             }
         }
         return false; // 监控未启用
     } catch (error) {
         // 如果是404错误，说明监控本来就没有启用，这是正常情况
         if (error.message && (error.message.includes('404') || error.message.includes('Not Found'))) {
-            console.log(`No monitoring found for app ${appId}, skipping disable step`);
             return false;
         } else {
             // 其他错误记录但不阻断域名删除流程
diff --git a/yarn.lock b/yarn.lock
