vk-ssl-auto-deploy 0.8.6 → 0.8.7

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "vk-ssl-auto-deploy",
-	"version": "0.8.6",
+	"version": "0.8.7",
 	"description": "SSL证书自动部署工具 - 提供HTTP API接口，支持证书文件自动上传和部署",
 	"main": "app.js",
 	"scripts": {

package/routes/admin.js

@@ -466,44 +466,36 @@ router.post('/check-update', verifyPassword, async (req, res) => {
 	}
 });
 
-// 执行更新
+// 获取更新命令
 router.post('/execute-update', verifyPassword, async (req, res) => {
 	try {
 		const platform = process.platform;
-		let command;
+		let command, instructions;
 		
 		if (platform === 'win32') {
 			// Windows 系统
-			command = 'powershell -c "iwr -useb https://gitee.com/vk1688/vk-ssl-auto-deploy/raw/master/install.ps1 | iex"';
+			command = 'powershell -ExecutionPolicy Bypass -Command "iwr -useb https://gitee.com/vk1688/vk-ssl-auto-deploy/raw/master/install.ps1 | iex"';
+			instructions = '请以管理员身份打开 PowerShell，然后执行以下命令：';
 		} else {
 			// Linux/Unix 系统
 			command = 'curl -fsSL https://gitee.com/vk1688/vk-ssl-auto-deploy/raw/master/install.sh | sudo bash';
+			instructions = '请在服务器终端中执行以下命令：';
 		}
 		
-		// 异步执行更新命令
-		exec(command, (error, stdout, stderr) => {
-			if (error) {
-				console.error('更新失败:', error);
-				return;
-			}
-			console.log('更新输出:', stdout);
-			if (stderr) {
-				console.error('更新错误:', stderr);
-			}
-		});
-		
 		res.json({
 			code: 0,
-			msg: '更新命令已执行，程序将在更新完成后自动重启',
+			msg: '请手动在服务器上执行更新命令',
 			data: {
-				platform,
-				command
+				platform: platform === 'win32' ? 'Windows' : 'Linux/Unix',
+				instructions,
+				command,
+				note: '更新完成后程序将自动重启'
 			}
 		});
 	} catch (error) {
 		res.status(500).json({
 			code: 500,
-			msg: '执行更新失败: ' + error.message,
+			msg: '获取更新命令失败: ' + error.message,
 			data: null
 		});
 	}

package/views/admin.ejs

@@ -594,6 +594,28 @@
             }
         }
 
+        @keyframes slideIn {
+            from {
+                opacity: 0;
+                transform: translateX(100px);
+            }
+            to {
+                opacity: 1;
+                transform: translateX(0);
+            }
+        }
+
+        @keyframes slideOut {
+            from {
+                opacity: 1;
+                transform: translateX(0);
+            }
+            to {
+                opacity: 0;
+                transform: translateX(100px);
+            }
+        }
+
         .dialog-title {
             font-size: 1.5em;
             color: #00ff88;
@@ -1261,14 +1283,8 @@
                         
                         if (!silent) {
                             addLog(`✓ 发现新版本: ${remoteVersion} (当前版本: ${currentVersion})`, 'success');
-                            const confirmed = await showConfirm(
-                                `发现新版本 ${remoteVersion}`,
-                                `当前版本: ${currentVersion}\n新版本: ${remoteVersion}\n\n确定要立即更新吗？更新完成后程序将自动重启。`
-                            );
-                            
-                            if (confirmed) {
-                                await performUpdate();
-                            }
+                            // 直接显示更新命令弹窗
+                            await performUpdate(currentVersion, remoteVersion);
                         }
                     } else {
                         // 移除红点（如果有）
@@ -1302,8 +1318,8 @@
         }
 
         // 执行更新
-        async function performUpdate() {
-            addLog('→ 开始执行更新...', 'info');
+        async function performUpdate(currentVersion = '', remoteVersion = '') {
+            addLog('→ 获取更新命令...', 'info');
             
             try {
                 const response = await authenticatedFetch('/admin/execute-update', {
@@ -1312,21 +1328,149 @@
                 const result = await response.json();
                 
                 if (result.code === 0) {
-                    addLog('✓ 更新命令已执行，程序将在更新完成后自动重启', 'success');
-                    addLog('→ 请稍等片刻，更新完成后刷新页面即可', 'info');
-                    showAlert('更新中', '更新命令已执行，程序将在更新完成后自动重启。请稍等片刻后刷新页面。', 'success');
+                    const { platform, instructions, command, note } = result.data;
+                    
+                    addLog('✓ 已获取更新命令', 'success');
+                    
+                    // 显示更新命令弹窗
+                    showUpdateCommandDialog(instructions, command, note, currentVersion, remoteVersion);
                 } else {
-                    addLog('✗ 执行更新失败: ' + result.msg, 'error');
-                    showAlert('执行更新失败', result.msg, 'error');
+                    addLog('✗ 获取更新命令失败: ' + result.msg, 'error');
+                    showAlert('获取更新命令失败', result.msg, 'error');
                 }
             } catch (error) {
                 if (error.message !== '未设置密码' && error.message !== '密码验证失败') {
-                    addLog('✗ 执行更新失败: ' + error.message, 'error');
-                    showAlert('执行更新失败', error.message, 'error');
+                    addLog('✗ 获取更新命令失败: ' + error.message, 'error');
+                    showAlert('获取更新命令失败', error.message, 'error');
                 }
             }
         }
 
+        // 显示更新命令对话框
+        function showUpdateCommandDialog(instructions, command, note, currentVersion = '', remoteVersion = '') {
+            const dialog = document.getElementById('customDialog');
+            const dialogTitle = document.getElementById('dialogTitleText');
+            const dialogMessage = document.getElementById('dialogMessage');
+            const dialogButtons = document.getElementById('dialogButtons');
+            const dialogIcon = document.getElementById('dialogIcon');
+            
+            dialogIcon.textContent = '🔄';
+            dialogTitle.textContent = '手动执行更新';
+            
+            // 版本信息HTML（如果有版本号才显示）
+            let versionInfo = '';
+            if (currentVersion && remoteVersion) {
+                versionInfo = `
+                    <div style="margin-bottom: 20px; padding: 12px; background: rgba(0, 255, 136, 0.1); border-radius: 8px; border: 1px solid rgba(0, 255, 136, 0.3);">
+                        <div style="display: flex; justify-content: space-between; align-items: center;">
+                            <div>
+                                <span style="color: #888; font-size: 14px;">当前版本：</span>
+                                <span style="color: #00ff88; font-weight: bold;">${currentVersion}</span>
+                            </div>
+                            <div style="color: #00ff88; font-size: 20px;">→</div>
+                            <div>
+                                <span style="color: #888; font-size: 14px;">最新版本：</span>
+                                <span style="color: #00ff88; font-weight: bold;">${remoteVersion}</span>
+                            </div>
+                        </div>
+                    </div>
+                `;
+            }
+            
+            // 创建自定义消息内容
+            dialogMessage.innerHTML = `
+                <div style="text-align: left; line-height: 1.8;">
+                    ${versionInfo}
+                    <p style="margin-bottom: 15px; color: #aaa;">${instructions}</p>
+                    <div style="position: relative; background: rgba(0, 0, 0, 0.5); border: 1px solid rgba(0, 255, 136, 0.3); border-radius: 8px; padding: 15px 15px 50px 15px; margin: 15px 0; font-family: 'Consolas', 'Monaco', monospace;">
+                        <pre style="margin: 0; color: #00ff88; word-wrap: break-word; white-space: pre-wrap; font-size: 13px; line-height: 1.6;">${command}</pre>
+                        <button onclick="copyCommand('${command.replace(/'/g, "\\'")}')" style="position: absolute; bottom: 10px; right: 10px; padding: 8px 16px; background: rgba(0, 255, 136, 0.2); border: 1px solid rgba(0, 255, 136, 0.5); border-radius: 5px; color: #00ff88; cursor: pointer; font-size: 13px; font-weight: bold; transition: all 0.2s;" onmouseover="this.style.background='rgba(0, 255, 136, 0.3)'; this.style.transform='translateY(-2px)'; this.style.boxShadow='0 4px 12px rgba(0, 255, 136, 0.3)'" onmouseout="this.style.background='rgba(0, 255, 136, 0.2)'; this.style.transform='translateY(0)'; this.style.boxShadow='none'">📋 复制命令</button>
+                    </div>
+                    <p style="margin-top: 15px; color: #888; font-size: 14px;">💡 ${note}</p>
+                </div>
+            `;
+            
+            // 创建关闭按钮
+            dialogButtons.innerHTML = '';
+            const closeBtn = document.createElement('button');
+            closeBtn.textContent = '关闭';
+            closeBtn.onclick = () => {
+                dialog.classList.remove('show');
+            };
+            dialogButtons.appendChild(closeBtn);
+            
+            dialog.classList.add('show');
+        }
+
+        // 复制命令到剪贴板
+        function copyCommand(command) {
+            // 解码转义的单引号
+            const decodedCommand = command.replace(/\\'/g, "'");
+            
+            // 使用现代 Clipboard API
+            if (navigator.clipboard && window.isSecureContext) {
+                navigator.clipboard.writeText(decodedCommand).then(() => {
+                    addLog('✓ 命令已复制到剪贴板', 'success');
+                    showTempMessage('命令已复制！');
+                }).catch(err => {
+                    console.error('复制失败:', err);
+                    fallbackCopyCommand(decodedCommand);
+                });
+            } else {
+                // 降级方案
+                fallbackCopyCommand(decodedCommand);
+            }
+        }
+
+        // 降级复制方法
+        function fallbackCopyCommand(command) {
+            const textArea = document.createElement("textarea");
+            textArea.value = command;
+            textArea.style.position = "fixed";
+            textArea.style.left = "-999999px";
+            document.body.appendChild(textArea);
+            textArea.select();
+            
+            try {
+                document.execCommand('copy');
+                addLog('✓ 命令已复制到剪贴板', 'success');
+                showTempMessage('命令已复制！');
+            } catch (err) {
+                console.error('复制失败:', err);
+                addLog('✗ 复制失败，请手动复制', 'error');
+            }
+            
+            document.body.removeChild(textArea);
+        }
+
+        // 显示临时提示消息
+        function showTempMessage(message) {
+            const tempMsg = document.createElement('div');
+            tempMsg.textContent = message;
+            tempMsg.style.cssText = `
+                position: fixed;
+                top: 20px;
+                right: 20px;
+                background: rgba(0, 255, 136, 0.9);
+                color: #000;
+                padding: 12px 24px;
+                border-radius: 8px;
+                font-weight: bold;
+                z-index: 10001;
+                animation: slideIn 0.3s ease-out;
+                box-shadow: 0 4px 12px rgba(0, 255, 136, 0.3);
+            `;
+            
+            document.body.appendChild(tempMsg);
+            
+            setTimeout(() => {
+                tempMsg.style.animation = 'slideOut 0.3s ease-in';
+                setTimeout(() => {
+                    document.body.removeChild(tempMsg);
+                }, 300);
+            }, 2000);
+        }
+
         // 同步定时任务信息
         function startScheduleInfoSync() {
             // 立即同步一次