exflower-license-server 1.0.6 → 1.0.7

package/admin/index.html

@@ -156,6 +156,7 @@
     .template-type-crew { background: #f3e5f5; color: #6a1b9a; }
     .template-type-excard { background: #e8f5e9; color: #2e7d32; }
     .template-type-workflow { background: #fff3e0; color: #ef6c00; }
+    .template-type-doc { background: #e0f7fa; color: #00838f; }
     textarea {
       width: 100%;
       padding: 8px 12px;
@@ -234,6 +235,14 @@
         <input type="number" name="max_instances" placeholder="实例数" value="1" id="new-instances">
         <input type="number" name="max_agents" placeholder="Agent数" value="5" id="new-agents">
         <input type="number" name="max_crews" placeholder="Crew数" value="3" id="new-crews">
+        <select id="new-validity">
+          <option value="1">1 个月</option>
+          <option value="3">3 个月</option>
+          <option value="6">6 个月</option>
+          <option value="12" selected>1 年</option>
+          <option value="24">2 年</option>
+          <option value="0">永久</option>
+        </select>
         <button class="btn btn-primary" onclick="createCompany()">创建</button>
       </div>
 
@@ -294,6 +303,50 @@
     </div>
   </div>
 
+  <div class="modal-overlay" id="company-edit-modal">
+    <div class="modal">
+      <h3>编辑公司授权</h3>
+      <input type="hidden" id="ce-id">
+      <div class="form-group">
+        <label>公司</label>
+        <input type="text" id="ce-name" disabled>
+      </div>
+      <div class="form-group">
+        <label>有效期</label>
+        <select id="ce-validity" onchange="document.getElementById('ce-expires').disabled = (this.value !== 'custom')">
+          <option value="1">顺延 1 个月</option>
+          <option value="3">顺延 3 个月</option>
+          <option value="6">顺延 6 个月</option>
+          <option value="12">顺延 1 年</option>
+          <option value="24">顺延 2 年</option>
+          <option value="permanent">永久</option>
+          <option value="custom">指定日期</option>
+          <option value="keep">不修改</option>
+        </select>
+      </div>
+      <div class="form-group">
+        <label>到期日期（仅"指定日期"时可用）</label>
+        <input type="date" id="ce-expires" disabled>
+      </div>
+      <div class="form-group">
+        <label>最大实例数</label>
+        <input type="number" id="ce-instances" min="1">
+      </div>
+      <div class="form-group">
+        <label>最大 Agent 数</label>
+        <input type="number" id="ce-agents" min="1">
+      </div>
+      <div class="form-group">
+        <label>最大 Crew 数</label>
+        <input type="number" id="ce-crews" min="1">
+      </div>
+      <div class="modal-actions">
+        <button class="btn" onclick="document.getElementById('company-edit-modal').classList.remove('show')">取消</button>
+        <button class="btn btn-primary" onclick="saveCompanyEdit()">保存</button>
+      </div>
+    </div>
+  </div>
+
   <div class="modal-overlay" id="import-detail-modal">
     <div class="modal">
       <h3 id="import-detail-title">导入记录</h3>
@@ -320,9 +373,10 @@
       <input type="hidden" id="tmpl-id">
       <div class="form-group">
         <label>类型</label>
-        <select id="tmpl-type">
+        <select id="tmpl-type" onchange="onTemplateTypeChange()">
           <option value="agent">Agent</option>
           <option value="excard">ExCard</option>
+          <option value="doc">文档</option>
           <option value="workflow">Workflow</option>
         </select>
       </div>
@@ -344,13 +398,17 @@
           <option value="">全局模板</option>
         </select>
       </div>
-      <div class="form-group">
-        <label>内容 (JSON)</label>
-        <textarea id="tmpl-json" rows="8" placeholder='{"id": "...", ...}'></textarea>
+      <div class="form-group" id="tmpl-md-file-group">
+        <label>Markdown 文件（Agent / ExCard / 文档直接上传客户端导出的 .md）</label>
+        <input type="file" id="tmpl-md-file" accept=".md,.markdown,text/markdown,text/plain" onchange="onTemplateFileSelected(event)">
       </div>
-      <div class="form-group">
-        <label>Markdown 内容 (可选，Agent/ExCard 需要)</label>
-        <textarea id="tmpl-md" rows="6" placeholder="YAML frontmatter + Markdown body"></textarea>
+      <div class="form-group" id="tmpl-json-group">
+        <label>内容 (JSON) <span style="color:#86868b" id="tmpl-json-hint"></span></label>
+        <textarea id="tmpl-json" rows="8"></textarea>
+      </div>
+      <div class="form-group" id="tmpl-md-group">
+        <label id="tmpl-md-label">Markdown 内容</label>
+        <textarea id="tmpl-md" rows="10" oninput="onTemplateMdInput()"></textarea>
       </div>
       <div class="modal-actions">
         <button class="btn" onclick="closeTemplateModal()">取消</button>
@@ -391,26 +449,43 @@
       document.getElementById('stat-instances').textContent = res.active_instances || 0;
     }
 
+    let companiesCache = [];
+
     async function loadCompanies() {
       const res = await api('GET', '/api/admin/companies');
+      companiesCache = res.companies || [];
       const tbody = document.getElementById('companies-body');
       tbody.innerHTML = '';
 
-      for (const c of res.companies || []) {
+      for (const c of companiesCache) {
         const tr = document.createElement('tr');
         const statusClass = c.status === 'active' ? 'badge-active' : c.status === 'suspended' ? 'badge-suspended' : 'badge-expired';
         const expired = c.expires_at && new Date(c.expires_at) < new Date();
         const finalStatus = expired ? 'expired' : c.status;
         const finalClass = expired ? 'badge-expired' : statusClass;
 
+        let expiresHtml = '永久';
+        if (c.expires_at) {
+          const dateStr = c.expires_at.split('T')[0];
+          const daysLeft = Math.ceil((new Date(c.expires_at) - Date.now()) / 86400000);
+          if (daysLeft < 0) {
+            expiresHtml = `${dateStr} <span style="color:#ff3b30">已过期</span>`;
+          } else if (daysLeft < 30) {
+            expiresHtml = `${dateStr} <span style="color:#ff9500">剩 ${daysLeft} 天</span>`;
+          } else {
+            expiresHtml = `${dateStr} <span style="color:#86868b">剩 ${daysLeft} 天</span>`;
+          }
+        }
+
         tr.innerHTML = `
           <td><strong>${c.name}</strong></td>
           <td><span class="license-key" onclick="navigator.clipboard.writeText('${c.license_key}');toast('已复制')">${c.license_key}</span></td>
           <td>${c.max_instances}实例 / ${c.max_agents}Agent / ${c.max_crews}Crew</td>
           <td><span class="badge ${finalClass}">${finalStatus}</span></td>
-          <td>${c.expires_at ? c.expires_at.split('T')[0] : '永久'}</td>
+          <td>${expiresHtml}</td>
           <td>${c.active_instances || 0}</td>
           <td>
+            <button class="btn btn-small btn-primary" onclick="openCompanyEdit('${c.id}')">编辑</button>
             <button class="btn btn-small ${c.status === 'active' ? 'btn-danger' : 'btn-primary'}" onclick="toggleStatus('${c.id}', '${c.status}')">
               ${c.status === 'active' ? '暂停' : '恢复'}
             </button>
@@ -448,12 +523,20 @@
       const name = document.getElementById('new-name').value.trim();
       if (!name) return toast('请输入公司名称');
 
+      const months = parseInt(document.getElementById('new-validity').value);
+      let expiresAt = null; // 永久
+      if (months > 0) {
+        const d = new Date();
+        d.setMonth(d.getMonth() + months);
+        expiresAt = d.toISOString().slice(0, 10);
+      }
+
       await api('POST', '/api/admin/companies', {
         name,
         max_instances: parseInt(document.getElementById('new-instances').value) || 1,
         max_agents: parseInt(document.getElementById('new-agents').value) || 5,
         max_crews: parseInt(document.getElementById('new-crews').value) || 3,
-        expires_at: new Date(Date.now() + 365 * 86400000).toISOString()
+        expires_at: expiresAt
       });
 
       document.getElementById('new-name').value = '';
@@ -462,6 +545,56 @@
       loadStats();
     }
 
+    function openCompanyEdit(id) {
+      const c = companiesCache.find(x => x.id === id);
+      if (!c) return toast('公司未找到');
+      document.getElementById('ce-id').value = c.id;
+      document.getElementById('ce-name').value = c.name;
+      document.getElementById('ce-validity').value = 'keep';
+      document.getElementById('ce-expires').value = c.expires_at ? c.expires_at.split('T')[0] : '';
+      document.getElementById('ce-expires').disabled = true;
+      document.getElementById('ce-instances').value = c.max_instances;
+      document.getElementById('ce-agents').value = c.max_agents;
+      document.getElementById('ce-crews').value = c.max_crews;
+      document.getElementById('company-edit-modal').classList.add('show');
+    }
+
+    async function saveCompanyEdit() {
+      const id = document.getElementById('ce-id').value;
+      const c = companiesCache.find(x => x.id === id);
+      const validity = document.getElementById('ce-validity').value;
+
+      const payload = {
+        max_instances: parseInt(document.getElementById('ce-instances').value) || 1,
+        max_agents: parseInt(document.getElementById('ce-agents').value) || 1,
+        max_crews: parseInt(document.getElementById('ce-crews').value) || 1,
+      };
+
+      if (validity === 'permanent') {
+        payload.expires_at = null;
+      } else if (validity === 'custom') {
+        const d = document.getElementById('ce-expires').value;
+        if (!d) return toast('请选择到期日期');
+        payload.expires_at = d;
+      } else if (validity !== 'keep') {
+        // 顺延：从当前到期日（未过期）或今天（已过期/永久）起算
+        const months = parseInt(validity);
+        const now = new Date();
+        let base = now;
+        if (c && c.expires_at) {
+          const cur = new Date(c.expires_at);
+          if (cur > now) base = cur;
+        }
+        base.setMonth(base.getMonth() + months);
+        payload.expires_at = base.toISOString().slice(0, 10);
+      }
+
+      await api('PATCH', `/api/admin/companies/${id}`, payload);
+      document.getElementById('company-edit-modal').classList.remove('show');
+      toast('已保存');
+      loadCompanies();
+    }
+
     async function toggleStatus(id, current) {
       const next = current === 'active' ? 'suspended' : 'active';
       await api('PATCH', `/api/admin/companies/${id}`, { status: next });
@@ -537,6 +670,83 @@
       }
     }
 
+    // ── Template type-driven upload ──
+    const MD_TYPES = ['agent', 'excard', 'doc'];
+    const WORKFLOW_SKELETON = `{
+  "title": "工作流程名称",
+  "description": "",
+  "type": "one-time",
+  "agent": "",
+  "steps": [
+    {
+      "stepType": "task",
+      "title": "步骤1",
+      "description": "",
+      "agent": "",
+      "excardId": "<excard模板ID>",
+      "transitions": { "pass": "next", "fail": "end" }
+    }
+  ]
+}`;
+
+    function onTemplateTypeChange() {
+      const type = document.getElementById('tmpl-type').value;
+      const isMd = MD_TYPES.includes(type);
+      document.getElementById('tmpl-json-group').classList.toggle('hidden', isMd);
+      document.getElementById('tmpl-md-file-group').classList.toggle('hidden', !isMd);
+      document.getElementById('tmpl-md-label').textContent = isMd
+        ? 'Markdown 内容（上传文件后可编辑）'
+        : 'Markdown 内容 (可选)';
+      if (type === 'workflow') {
+        const jsonEl = document.getElementById('tmpl-json');
+        jsonEl.placeholder = WORKFLOW_SKELETON;
+        document.getElementById('tmpl-json-hint').textContent = '步骤结构，excardId 引用模板库中的 ExCard 模板 ID';
+      }
+    }
+
+    function parseFrontmatter(md) {
+      if (!md || !md.startsWith('---')) return { frontmatter: {}, body: md || '' };
+      const end = md.indexOf('\n---', 3);
+      if (end === -1) return { frontmatter: {}, body: md };
+      const fmText = md.slice(3, end).trim();
+      const body = md.slice(end + 4).trim();
+      const frontmatter = {};
+      for (const line of fmText.split('\n')) {
+        const m = line.match(/^([A-Za-z_][\w]*)\s*:\s*(.*)$/);
+        if (!m) continue;
+        let val = m[2].trim();
+        if (/^[[{]/.test(val) || /^(true|false|null|-?\d+(\.\d+)?)$/.test(val)) {
+          try { val = JSON.parse(val); } catch { /* keep as string */ }
+        }
+        frontmatter[m[1]] = val;
+      }
+      return { frontmatter, body };
+    }
+
+    function onTemplateFileSelected(event) {
+      const file = event.target.files?.[0];
+      if (!file) return;
+      file.text().then(text => {
+        document.getElementById('tmpl-md').value = text;
+        onTemplateMdInput();
+      });
+    }
+
+    function onTemplateMdInput() {
+      const type = document.getElementById('tmpl-type').value;
+      if (!MD_TYPES.includes(type)) return;
+      const md = document.getElementById('tmpl-md').value;
+      const nameEl = document.getElementById('tmpl-name');
+      if (nameEl.value.trim()) return; // 不覆盖管理员手填的名称
+      const { frontmatter, body } = parseFrontmatter(md);
+      let auto = typeof frontmatter.name === 'string' ? frontmatter.name : '';
+      if (!auto) {
+        const h1 = body.match(/^#\s+(.+)$/m);
+        if (h1) auto = h1[1].trim();
+      }
+      if (auto) nameEl.value = auto;
+    }
+
     function openTemplateModal() {
       document.getElementById('modal-title').textContent = '上传模板';
       document.getElementById('tmpl-id').value = '';
@@ -546,7 +756,9 @@
       document.getElementById('tmpl-version').value = '';
       document.getElementById('tmpl-json').value = '';
       document.getElementById('tmpl-md').value = '';
+      document.getElementById('tmpl-md-file').value = '';
       populateCompanySelect();
+      onTemplateTypeChange();
       document.getElementById('template-modal').classList.add('show');
     }
 
@@ -575,6 +787,8 @@
       }
       document.getElementById('tmpl-json').value = jsonStr;
       document.getElementById('tmpl-md').value = t.content_md || '';
+      document.getElementById('tmpl-md-file').value = '';
+      onTemplateTypeChange();
       document.getElementById('template-modal').classList.add('show');
     }
 
@@ -591,16 +805,29 @@
       const version = document.getElementById('tmpl-version').value.trim() || undefined;
       const companyId = document.getElementById('tmpl-company').value || undefined;
       const jsonRaw = document.getElementById('tmpl-json').value.trim();
-      const md = document.getElementById('tmpl-md').value.trim() || undefined;
+      const md = document.getElementById('tmpl-md').value.trim();
 
       if (!name) return toast('请输入模板名称');
-      if (!jsonRaw) return toast('请输入 JSON 内容');
 
-      let contentJson;
-      try {
-        contentJson = JSON.parse(jsonRaw);
-      } catch (e) {
-        return toast('JSON 格式错误: ' + e.message);
+      let contentJson, contentMd;
+      if (type === 'workflow') {
+        if (!jsonRaw) return toast('请输入 JSON 内容');
+        try {
+          contentJson = JSON.parse(jsonRaw);
+        } catch (e) {
+          return toast('JSON 格式错误: ' + e.message);
+        }
+        contentMd = md || undefined;
+      } else {
+        // agent / excard / doc：Markdown 原生上传
+        if (!md) return toast('请上传或粘贴 Markdown 内容');
+        const { frontmatter } = parseFrontmatter(md);
+        if (type === 'agent' || type === 'excard') {
+          contentJson = frontmatter; // 客户端导入时从 frontmatter 读取字段
+        } else {
+          contentJson = { assets: [] };
+        }
+        contentMd = md;
       }
 
       if (id) {
@@ -610,7 +837,7 @@
         };
         if (version) payload.version = version;
         if (companyId !== undefined) payload.company_id = companyId;
-        if (md !== undefined) payload.content_md = md;
+        if (contentMd !== undefined) payload.content_md = contentMd;
         await api('PATCH', `/api/admin/templates/${id}`, payload);
         closeTemplateModal();
         toast('模板更新成功');
@@ -623,7 +850,7 @@
           description: desc,
           version,
           content_json: contentJson,
-          content_md: md,
+          content_md: contentMd,
         });
         closeTemplateModal();
         toast('模板上传成功');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "exflower-license-server",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "ExFlower License Server - 在线授权验证服务",
   "main": "index.js",
   "bin": {

package/routes.js

@@ -170,9 +170,10 @@ function setupRoutes(app) {
     const key = generateLicenseKey();
     const id = generateId();
 
+    // expires_at 显式传 null = 永久授权；不传则默认 1 年
     const defaultExpires = new Date();
     defaultExpires.setFullYear(defaultExpires.getFullYear() + 1);
-    const expires = expires_at || defaultExpires.toISOString().slice(0, 10);
+    const expires = expires_at === null ? null : (expires_at || defaultExpires.toISOString().slice(0, 10));
 
     queryRun(
       `INSERT INTO companies (id, name, license_key, max_instances, max_agents, max_crews, expires_at, status)
@@ -358,12 +359,19 @@ function setupRoutes(app) {
   app.post('/api/admin/templates', requireAdmin, (req, res) => {
     const { company_id, type, name, description, content_json, content_md, tags, version } = req.body;
 
-    if (!type || !name || !content_json) {
-      return res.status(400).json({ success: false, message: 'type, name, content_json are required' });
+    if (!type || !name) {
+      return res.status(400).json({ success: false, message: 'type and name are required' });
     }
     if (!['agent', 'excard', 'workflow', 'doc'].includes(type)) {
       return res.status(400).json({ success: false, message: 'type must be agent, excard, workflow, or doc' });
     }
+    // workflow 必须以 content_json 描述步骤结构；其余类型可用 content_md 原生上传
+    if (type === 'workflow' && !content_json) {
+      return res.status(400).json({ success: false, message: 'workflow templates require content_json' });
+    }
+    if (!content_json && !content_md) {
+      return res.status(400).json({ success: false, message: 'content_json or content_md is required' });
+    }
 
     // If company_id is provided, verify it exists
     if (company_id) {
@@ -397,7 +405,9 @@ function setupRoutes(app) {
         type,
         name,
         description || '',
-        typeof content_json === 'string' ? content_json : JSON.stringify(content_json),
+        content_json
+          ? (typeof content_json === 'string' ? content_json : JSON.stringify(content_json))
+          : '{}',
         content_md || null,
         tags ? JSON.stringify(tags) : '[]',
         version || '1.0',