jettask 0.2.6__py3-none-any.whl → 0.2.8__py3-none-any.whl

jettask/pg_consumer/sql/modify_time_fields.sql

@@ -0,0 +1,69 @@
+-- 修改task_runs表的时间字段，改为存储秒数而不是毫秒
+-- 1. 重命名字段并修改类型
+-- 2. 将已有的毫秒数据转换为秒
+
+DO $$ 
+BEGIN
+    -- 处理duration_ms字段
+    IF EXISTS (
+        SELECT 1 FROM information_schema.columns 
+        WHERE table_name = 'task_runs' AND column_name = 'duration_ms'
+    ) THEN
+        -- 如果duration字段不存在，创建它
+        IF NOT EXISTS (
+            SELECT 1 FROM information_schema.columns 
+            WHERE table_name = 'task_runs' AND column_name = 'duration'
+        ) THEN
+            ALTER TABLE task_runs ADD COLUMN duration DOUBLE PRECISION;
+        END IF;
+        
+        -- 将毫秒转换为秒
+        UPDATE task_runs 
+        SET duration = duration_ms / 1000.0 
+        WHERE duration_ms IS NOT NULL AND duration IS NULL;
+        
+        -- 删除旧字段
+        ALTER TABLE task_runs DROP COLUMN IF EXISTS duration_ms;
+    END IF;
+    
+    -- 处理execution_time_ms字段
+    IF EXISTS (
+        SELECT 1 FROM information_schema.columns 
+        WHERE table_name = 'task_runs' AND column_name = 'execution_time_ms'
+    ) THEN
+        -- 如果execution_time字段不存在，创建它
+        IF NOT EXISTS (
+            SELECT 1 FROM information_schema.columns 
+            WHERE table_name = 'task_runs' AND column_name = 'execution_time'
+        ) THEN
+            ALTER TABLE task_runs ADD COLUMN execution_time DOUBLE PRECISION;
+        END IF;
+        
+        -- 将毫秒转换为秒
+        UPDATE task_runs 
+        SET execution_time = execution_time_ms / 1000.0 
+        WHERE execution_time_ms IS NOT NULL AND execution_time IS NULL;
+        
+        -- 删除旧字段
+        ALTER TABLE task_runs DROP COLUMN IF EXISTS execution_time_ms;
+    END IF;
+    
+    -- 如果字段已经是正确的格式，确保它们存在
+    IF NOT EXISTS (
+        SELECT 1 FROM information_schema.columns 
+        WHERE table_name = 'task_runs' AND column_name = 'duration'
+    ) THEN
+        ALTER TABLE task_runs ADD COLUMN duration DOUBLE PRECISION;
+    END IF;
+    
+    IF NOT EXISTS (
+        SELECT 1 FROM information_schema.columns 
+        WHERE table_name = 'task_runs' AND column_name = 'execution_time'
+    ) THEN
+        ALTER TABLE task_runs ADD COLUMN execution_time DOUBLE PRECISION;
+    END IF;
+END $$;
+
+-- 添加注释
+COMMENT ON COLUMN task_runs.duration IS '总耗时（秒），从任务创建到执行完成的时间';
+COMMENT ON COLUMN task_runs.execution_time IS '实际执行时间（秒），从任务开始执行到执行完成的时间';

jettask/webui/frontend/package.json

@@ -0,0 +1,30 @@
+{
+  "name": "jettask-monitor",
+  "version": "1.0.0",
+  "private": true,
+  "dependencies": {
+    "@ant-design/charts": "^2.6.1",
+    "@ant-design/colors": "^7.2.1",
+    "@ant-design/cssinjs": "^1.24.0",
+    "@ant-design/icons": "^5.0.1",
+    "@ant-design/plots": "^2.6.3",
+    "@ant-design/pro-components": "^2.8.10",
+    "@ant-design/pro-table": "^3.21.0",
+    "antd": "^5.4.0",
+    "axios": "^1.3.4",
+    "dayjs": "^1.11.7",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "react-router-dom": "^6.8.2",
+    "uuid": "^11.1.0"
+  },
+  "devDependencies": {
+    "@vitejs/plugin-react": "^3.1.0",
+    "vite": "^4.1.4"
+  },
+  "scripts": {
+    "dev": "vite",
+    "build": "vite build",
+    "preview": "vite preview"
+  }
+}

jettask/webui/frontend/src/App.css

@@ -0,0 +1,109 @@
+/* 全局样式重置 */
+* {
+  margin: 0;
+  padding: 0;
+  box-sizing: border-box;
+}
+
+html, body, #root {
+  height: 100%;
+  width: 100%;
+  overflow: hidden;
+}
+
+body {
+  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
+    'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
+    sans-serif;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+/* 页面容器样式 */
+.page-container {
+  padding: 24px;
+  height: 100%;
+  overflow: auto;
+  background: #f0f2f5;
+}
+
+/* 页面内容包装器 - 用于需要padding的页面 */
+.page-wrapper {
+  padding: 24px;
+  height: 100%;
+  overflow: auto;
+  background: #f0f2f5;
+}
+
+.page-header {
+  background: #fff;
+  padding: 16px 24px;
+  border-radius: 4px;
+  margin-bottom: 16px;
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.03);
+}
+
+.page-title {
+  margin: 0;
+  font-size: 20px;
+  font-weight: 500;
+  color: #262626;
+}
+
+/* 卡片样式优化 */
+.ant-card {
+  border-radius: 4px;
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.03);
+}
+
+/* 表格样式优化 */
+.ant-table {
+  font-size: 13px;
+}
+
+.ant-table-thead > tr > th {
+  background: #fafafa;
+  font-weight: 600;
+}
+
+/* 按钮样式优化 */
+.ant-btn {
+  border-radius: 4px;
+  font-weight: 400;
+}
+
+/* 滚动条统一样式 */
+::-webkit-scrollbar {
+  width: 8px;
+  height: 8px;
+}
+
+::-webkit-scrollbar-track {
+  background: #f0f0f0;
+  border-radius: 4px;
+}
+
+::-webkit-scrollbar-thumb {
+  background: #bfbfbf;
+  border-radius: 4px;
+}
+
+::-webkit-scrollbar-thumb:hover {
+  background: #8c8c8c;
+}
+
+/* 动画效果 */
+@keyframes fadeIn {
+  from {
+    opacity: 0;
+    transform: translateY(10px);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}
+
+.fade-in {
+  animation: fadeIn 0.3s ease-in-out;
+}

jettask/webui/frontend/src/App.jsx

@@ -0,0 +1,66 @@
+import { BrowserRouter as Router, Routes, Route, Navigate } from 'react-router-dom'
+import { ConfigProvider, theme } from 'antd'
+import zhCN from 'antd/locale/zh_CN'
+import AppLayout from './components/layout/AppLayout'
+import Dashboard from './pages/Dashboard'
+import Queues from './pages/Queues'
+import Workers from './pages/Workers'
+import QueueDetail from './pages/QueueDetail'
+import ScheduledTasks from './pages/ScheduledTasks'
+import Alerts from './pages/Alerts'
+import Settings from './pages/Settings'
+import { LoadingProvider } from './contexts/LoadingContext'
+import { NamespaceProvider } from './contexts/NamespaceContext'
+import './App.css'
+
+function App() {
+  // 自定义主题
+  const customTheme = {
+    algorithm: theme.defaultAlgorithm,
+    token: {
+      colorPrimary: '#1890ff',
+      borderRadius: 4,
+      colorBgContainer: '#ffffff',
+    },
+    components: {
+      Layout: {
+        siderBg: '#1a1d21',
+        headerBg: '#2a2d31',
+      },
+      Menu: {
+        darkItemBg: 'transparent',
+        darkItemSelectedBg: '#1890ff',
+        darkItemHoverBg: 'rgba(24, 144, 255, 0.1)',
+      },
+    },
+  }
+
+  return (
+    <ConfigProvider theme={customTheme} locale={zhCN}>
+      <LoadingProvider>
+        <NamespaceProvider>
+          <Router>
+            <Routes>
+              <Route path="/" element={<AppLayout />}>
+                <Route index element={<Navigate to="/dashboard" replace />} />
+                <Route path="dashboard" element={<Dashboard />} />
+                <Route path="queues" element={<Queues />} />
+                <Route path="queue/:queueName" element={<QueueDetail />} />
+                <Route path="scheduled-tasks" element={<ScheduledTasks />} />
+                <Route path="alerts" element={<Alerts />} />
+                {/* 新增路由 */}
+                <Route path="analytics" element={<div style={{ padding: 24 }}>数据分析页面开发中...</div>} />
+                <Route path="performance" element={<div style={{ padding: 24 }}>性能监控页面开发中...</div>} />
+                <Route path="logs" element={<div style={{ padding: 24 }}>日志查询页面开发中...</div>} />
+                <Route path="api-docs" element={<div style={{ padding: 24 }}>API文档页面开发中...</div>} />
+                <Route path="settings" element={<Settings />} />
+              </Route>
+            </Routes>
+          </Router>
+        </NamespaceProvider>
+      </LoadingProvider>
+    </ConfigProvider>
+  )
+}
+
+export default App

jettask/webui/frontend/src/components/NamespaceSelector.jsx

@@ -0,0 +1,166 @@
+/**
+ * 命名空间选择器组件
+ * 放置在页面顶部，用于切换不同的命名空间
+ */
+import React, { useState, useEffect } from 'react';
+import { Select, Space, Tag, Tooltip, message, Button, Dropdown, Modal } from 'antd';
+import { DatabaseOutlined, CloudServerOutlined, SettingOutlined, PlusOutlined, EditOutlined, ExclamationCircleOutlined } from '@ant-design/icons';
+import { useNavigate } from 'react-router-dom';
+import { useNamespace } from '../contexts/NamespaceContext';
+
+const { Option } = Select;
+
+const NamespaceSelector = ({ value, onChange, style }) => {
+  const [namespaces, setNamespaces] = useState([]);
+  const [loading, setLoading] = useState(false);
+  const navigate = useNavigate();
+  const { refreshTrigger } = useNamespace();  // 获取刷新触发器
+
+  // 获取命名空间列表
+  const fetchNamespaces = async () => {
+    setLoading(true);
+    try {
+      const response = await fetch('/api/data/namespaces');
+      if (response.ok) {
+        const data = await response.json();
+        setNamespaces(data);
+        
+        // 如果没有选中的命名空间，默认选中第一个
+        if (!value && data.length > 0) {
+          const firstNamespace = data[0].name;
+          if (onChange) {
+            onChange(firstNamespace);
+          }
+        } else if (data.length === 0) {
+          // 如果没有任何命名空间，弹出提示并引导到管理页面
+          showNoNamespaceModal();
+        }
+      } else {
+        message.error('获取命名空间列表失败');
+      }
+    } catch (error) {
+      console.error('获取命名空间失败:', error);
+      message.error('连接任务中心失败');
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  // 组件挂载时获取命名空间列表，以及当refreshTrigger变化时刷新
+  useEffect(() => {
+    fetchNamespaces();
+  }, [refreshTrigger]);  // 监听刷新触发器而不是value
+
+  // 处理命名空间切换
+  const handleNamespaceChange = (namespaceName) => {
+    console.log('🔧 NamespaceSelector切换命名空间:', namespaceName);
+    console.log('🔧 当前props.value:', value);
+    console.log('🔧 onChange函数存在:', !!onChange);
+    
+    if (onChange) {
+      onChange(namespaceName);
+      console.log('🔧 已调用onChange函数');
+    }
+    message.success(`已切换到命名空间: ${namespaceName}`);
+  };
+
+  // 显示无命名空间提示弹窗
+  const showNoNamespaceModal = () => {
+    Modal.confirm({
+      title: '暂无可用命名空间',
+      icon: <ExclamationCircleOutlined />,
+      content: '当前系统中没有配置任何命名空间，请先创建一个命名空间。',
+      okText: '去管理命名空间',
+      cancelText: '取消',
+      onOk: () => {
+        navigate('/settings');
+      },
+    });
+  };
+
+  // 获取命名空间标签颜色
+  const getNamespaceTagColor = (name) => {
+    if (name === 'default') return 'blue';
+    if (name.includes('test')) return 'orange';
+    if (name.includes('prod')) return 'green';
+    if (name.includes('dev')) return 'purple';
+    return 'default';
+  };
+
+
+  return (
+    <Space style={{ ...style }}>
+      <span style={{ color: 'rgba(255, 255, 255, 0.65)', fontSize: '14px' }}>
+        <DatabaseOutlined style={{ marginRight: '6px' }} />
+        命名空间:
+      </span>
+      
+      <Select
+        value={value}
+        onChange={handleNamespaceChange}
+        loading={loading}
+        style={{ minWidth: 200 }}
+        placeholder="请选择命名空间"
+        showSearch
+        optionFilterProp="children"
+        filterOption={(input, option) =>
+          option.children.props.children[1]?.toLowerCase().includes(input.toLowerCase())
+        }
+        dropdownRender={(menu) => (
+          <>
+            {menu}
+            <div 
+              style={{ 
+                padding: '8px 12px', 
+                textAlign: 'center', 
+                borderTop: '1px solid #f0f0f0',
+                cursor: 'pointer'
+              }}
+              onClick={(e) => {
+                e.stopPropagation();
+                e.preventDefault();
+                console.log('🔧 点击管理命名空间区域');
+                navigate('/settings');
+              }}
+            >
+              <SettingOutlined style={{ marginRight: 4 }} />
+              管理命名空间
+            </div>
+          </>
+        )}
+      >
+        {namespaces.map(ns => (
+          <Option key={ns.name} value={ns.name}>
+            <Space>
+              <Tag color={getNamespaceTagColor(ns.name)} style={{ margin: 0 }}>
+                {ns.name}
+              </Tag>
+              {ns.description && (
+                <Tooltip title={ns.description}>
+                  <span style={{ color: '#999', fontSize: '12px' }}>
+                    {ns.description.length > 20 
+                      ? `${ns.description.substring(0, 20)}...` 
+                      : ns.description}
+                  </span>
+                </Tooltip>
+              )}
+            </Space>
+          </Option>
+        ))}
+      </Select>
+
+      {value && (
+        <Tooltip title={`当前命名空间: ${value}`}>
+          <CloudServerOutlined 
+            style={{ 
+              color: '#52c41a', 
+              fontSize: '16px'
+            }} 
+          />
+        </Tooltip>
+      )}
+    </Space>
+  );
+};
+
+export default NamespaceSelector;