npm - fogact - Versions diffs - 1.1.4 → 1.1.6 - Mend

fogact 1.1.4 → 1.1.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (14) hide show

package/README.md +40 -196
package/README.zh-CN.md +40 -196
package/frontend/activate.html +56 -17
package/frontend/admin/admin-panel-v2.js +27 -21
package/frontend/admin/index.html +21 -11
package/frontend/assets/market-ui.css +75 -1
package/frontend/index.html +66 -30
package/frontend/user/index.html +4 -4
package/install.sh +5 -14
package/lib/index.js +118 -32
package/lib/services/activation-orchestrator.js +26 -15
package/lib/services/cliproxy-api.js +1 -1
package/lib/services/newapi.js +1 -1
package/package.json +2 -2

package/frontend/activate.html CHANGED Viewed

@@ -3,13 +3,22 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>激活 CDK | FogIDC Activator</title>
-    <meta name="description" content="输入 FogIDC Activator 激活码，绑定用户并开通服务。" />
+    <title>激活 CDK | FogAct</title>
+    <meta name="description" content="输入 FogAct 激活码，完成服务绑定并查看额度与有效期。" />
+    <script>
+      ;(function () {
+        var theme = localStorage.getItem('fogact_theme') || localStorage.getItem('admin_theme') || localStorage.getItem('yunyi_user_theme') || 'system';
+        var prefersDark = window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches;
+        var isDark = theme === 'dark' || (theme === 'system' && prefersDark);
+        document.documentElement.classList.toggle('dark', isDark);
+        document.documentElement.style.colorScheme = isDark ? 'dark' : 'light';
+      })();
+    </script>
     <link rel="preconnect" href="https://fonts.googleapis.com" />
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
     <link href="https://fonts.googleapis.com/css2?family=Manrope:wght@600;700;800&family=Inter:wght@400;500;600;700;800&display=swap" rel="stylesheet" />
     <link href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@20..48,100..700,0..1,-50..200" rel="stylesheet" />
-    <link rel="stylesheet" href="/assets/market-ui.css?v=20260616-upstream2" />
+    <link rel="stylesheet" href="/assets/market-ui.css?v=20260619-theme1" />
   </head>
   <body class="market-page">
     <span class="market-mouse-light" aria-hidden="true"></span>
@@ -19,8 +28,8 @@
         <a class="market-brand" href="/">
           <span class="market-logo">F</span>
           <span>
-            <span class="market-brand-title">FogIDC Activator</span>
-            <span class="market-brand-subtitle">Redeem center</span>
+            <span class="market-brand-title">FogAct</span>
+            <span class="market-brand-subtitle">输入激活码完成服务绑定</span>
           </span>
         </a>
@@ -29,14 +38,20 @@
           <a href="/admin/">管理后台</a>
           <a href="/">首页</a>
         </nav>
+        <div class="market-actions">
+          <button type="button" class="market-button market-theme-toggle" data-theme-toggle aria-label="切换暗黑模式">
+            <span class="material-symbols-outlined" data-theme-icon>light_mode</span>
+          </button>
+        </div>
       </header>
       <main class="market-activation">
         <section class="market-activation-copy" aria-labelledby="activation-title">
-          <div class="market-kicker"><span class="market-kicker-dot"></span> fast activation flow</div>
+          <div class="market-kicker"><span class="market-kicker-dot"></span> 快速激活流程</div>
           <h1 id="activation-title" class="market-title">输入 CDK，立即开通 <span>CLI 服务</span></h1>
           <p class="market-copy">
-            保留原有激活接口，升级为更清晰的产品化表单。输入激活码后会自动校验额度、服务类型和有效期。
+            输入 CDK 后即可绑定服务；用户名和邮箱用于后台识别，可按需填写。
           </p>
           <div class="market-flow" aria-label="激活流程">
@@ -50,7 +65,7 @@
             </div>
             <div class="market-flow-step">
               <span class="market-flow-index">3</span>
-              <span><strong>点火开通</strong><span>写入服务、额度和有效期</span></span>
+              <span><strong>开通服务</strong><span>写入服务、额度和有效期</span></span>
             </div>
           </div>
@@ -61,7 +76,7 @@
                 <p class="market-mini-title">安全校验</p>
                 <p class="market-mini-copy">激活过程通过本地 API 完成，失败会返回明确提示。</p>
               </div>
-              <span class="market-status-pill">Secure</span>
+              <span class="market-status-pill">安全</span>
             </div>
             <div class="market-mini-card">
               <span class="market-icon material-symbols-outlined">rocket_launch</span>
@@ -69,7 +84,7 @@
                 <p class="market-mini-title">多服务支持</p>
                 <p class="market-mini-copy">适配 Codex、Claude Code、OpenCode 与 OpenClaw 场景。</p>
               </div>
-              <span class="market-status-pill">Multi</span>
+              <span class="market-status-pill">多平台</span>
             </div>
           </div>
         </section>
@@ -84,22 +99,22 @@
             <div class="market-form-header">
               <span class="market-icon material-symbols-outlined">vpn_key</span>
               <h1>激活 CDK</h1>
-              <p>填写激活码，用户名和邮箱可选。成功后会展示服务类型、额度和过期时间。</p>
+              <p>输入 CDK 后即可绑定服务；用户名和邮箱用于后台识别，可按需填写。</p>
             </div>
             <form id="activate-form" class="market-form">
               <div class="market-field">
-                <label for="activation-code">激活码 <span>Required</span></label>
+                <label for="activation-code">激活码 <span>必填</span></label>
                 <input type="text" id="activation-code" placeholder="例如 XXXX-XXXX-XXXX-XXXX" required />
               </div>
               <div class="market-field">
-                <label for="username">用户名 <span>Optional</span></label>
+                <label for="username">用户名 <span>选填</span></label>
                 <input type="text" id="username" placeholder="用于后台识别的用户名" />
               </div>
               <div class="market-field">
-                <label for="email">邮箱 <span>Optional</span></label>
+                <label for="email">邮箱 <span>选填</span></label>
                 <input type="email" id="email" placeholder="name@example.com" />
               </div>
@@ -107,7 +122,7 @@
               <button type="submit" id="submit-btn" class="market-button market-button-primary" style="width: 100%; min-height: 50px;">
                 <span class="material-symbols-outlined">bolt</span>
-                激活服务
+                立即激活
               </button>
             </form>
@@ -127,7 +142,7 @@
               </div>
               <h2>激活成功</h2>
-              <p>您的激活码已绑定，下面是本次开通详情。</p>
+              <p>服务已开通，以下是本次激活详情。</p>
               <div class="market-result-list">
                 <div class="market-result-row"><span>激活码</span><span id="result-code"></span></div>
@@ -175,6 +190,8 @@
         });
       });
+      initThemeToggle();
       form.addEventListener('submit', async (event) => {
         event.preventDefault();
@@ -210,10 +227,32 @@
           showError('网络错误，请稍后重试');
         } finally {
           submitBtn.disabled = false;
-          submitBtn.innerHTML = '<span class="material-symbols-outlined">bolt</span> 激活服务';
+          submitBtn.innerHTML = '<span class="material-symbols-outlined">bolt</span> 立即激活';
         }
       });
+      function initThemeToggle() {
+        const button = document.querySelector('[data-theme-toggle]');
+        const icon = document.querySelector('[data-theme-icon]');
+        if (!button || !icon) return;
+        const sync = () => {
+          const isDark = document.documentElement.classList.contains('dark');
+          icon.textContent = isDark ? 'dark_mode' : 'light_mode';
+          button.setAttribute('aria-label', isDark ? '切换浅色模式' : '切换暗黑模式');
+        };
+        button.addEventListener('click', () => {
+          const isDark = !document.documentElement.classList.contains('dark');
+          document.documentElement.classList.toggle('dark', isDark);
+          document.documentElement.style.colorScheme = isDark ? 'dark' : 'light';
+          localStorage.setItem('fogact_theme', isDark ? 'dark' : 'light');
+          sync();
+        });
+        sync();
+      }
       function showError(message) {
         errorMessage.textContent = message;
         errorMessage.classList.remove('hidden');

package/frontend/admin/admin-panel-v2.js CHANGED Viewed

@@ -229,7 +229,7 @@ function getServiceOptionsForScope(currentValue = '') {
 const DEFAULT_SETTINGS = {
   site: {
-    siteName: 'FogIDC Activator',
+    siteName: 'FogAct',
     siteDescription: '统一管理用户、激活码与订阅配置。',
     siteUrl: 'https://example.com',
     logoUrl: '',
@@ -259,7 +259,7 @@ const DEFAULT_SETTINGS = {
   email: {
     smtpHost: '',
     smtpPort: 587,
-    senderName: 'FogIDC Activator',
+    senderName: 'FogAct',
     senderEmail: '',
     enableTls: true
   },
@@ -356,18 +356,22 @@ const UI = {
   initThemeToggle() {
     const button = document.getElementById('theme-toggle');
     const html = document.documentElement;
-    const savedTheme = localStorage.getItem('admin_theme') || 'light';
+    const savedTheme = localStorage.getItem('fogact_theme') || localStorage.getItem('admin_theme') || 'system';
+    const prefersDark = window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches;
+    const initialDark = savedTheme === 'dark' || (savedTheme === 'system' && prefersDark);
-    if (savedTheme === 'dark') {
-      html.classList.add('dark');
-      button.querySelector('.material-symbols-outlined').textContent = 'dark_mode';
-    }
+    html.classList.toggle('dark', initialDark);
+    html.style.colorScheme = initialDark ? 'dark' : 'light';
+    button.querySelector('.material-symbols-outlined').textContent = initialDark ? 'dark_mode' : 'light_mode';
+    button.setAttribute('aria-label', initialDark ? '切换浅色模式' : '切换暗黑模式');
     button.addEventListener('click', () => {
       html.classList.toggle('dark');
       const isDark = html.classList.contains('dark');
       button.querySelector('.material-symbols-outlined').textContent = isDark ? 'dark_mode' : 'light_mode';
-      localStorage.setItem('admin_theme', isDark ? 'dark' : 'light');
+      button.setAttribute('aria-label', isDark ? '切换浅色模式' : '切换暗黑模式');
+      html.style.colorScheme = isDark ? 'dark' : 'light';
+      localStorage.setItem('fogact_theme', isDark ? 'dark' : 'light');
     });
   },
@@ -375,13 +379,15 @@ const UI = {
     const palette = {
       success: 'bg-green-50 border-green-500 text-green-800',
       error: 'bg-error-container border-error text-on-error-container',
-      info: 'bg-primary-fixed border-primary text-on-primary-fixed'
+      info: 'bg-primary-fixed border-primary text-on-primary-fixed',
+      warning: 'bg-warning-container border-warning text-on-surface'
     };
     const icons = {
       success: 'check_circle',
       error: 'error',
-      info: 'info'
+      info: 'info',
+      warning: 'warning'
     };
     const node = document.createElement('div');
@@ -569,7 +575,7 @@ const UserManagement = {
   renderTable() {
     const container = document.getElementById('users-table-container');
     if (!AppState.users.length) {
-      container.innerHTML = '<p class="text-on-surface-variant text-center py-8">暂无用户数据</p>';
+      container.innerHTML = '<p class="text-on-surface-variant text-center py-8">暂无用户数据，可点击右上角添加用户。</p>';
       return;
     }
@@ -700,7 +706,7 @@ const UserManagement = {
     try {
       const result = await API.deleteUser(id);
       if (!result.success) {
-        UI.showNotification(result.message || '删除失败', 'error');
+        UI.showNotification(result.message || '用户删除失败', 'error');
         return;
       }
       UI.showNotification('用户已删除', 'success');
@@ -712,7 +718,7 @@ const UserManagement = {
         return;
       }
       console.error(error);
-      UI.showNotification('删除失败', 'error');
+      UI.showNotification('用户删除失败', 'error');
     }
   }
 };
@@ -761,7 +767,7 @@ const CodeManagement = {
   renderTable() {
     const container = document.getElementById('codes-table-container');
     if (!AppState.codes.length) {
-      container.innerHTML = '<p class="text-on-surface-variant text-center py-8">暂无激活码数据</p>';
+      container.innerHTML = '<p class="text-on-surface-variant text-center py-8">暂无激活码数据，可点击右上角生成 CDK。</p>';
       return;
     }
@@ -1196,7 +1202,7 @@ const CodeManagement = {
     try {
       const result = await API.createCode(payload);
       if (!result.success) {
-        UI.showNotification(result.message || '创建失败', 'error');
+        UI.showNotification(result.message || '激活码创建失败', 'error');
         return;
       }
       UI.hideModal();
@@ -1209,7 +1215,7 @@ const CodeManagement = {
         return;
       }
       console.error(error);
-      UI.showNotification('创建失败', 'error');
+      UI.showNotification('激活码创建失败', 'error');
     }
   },
@@ -1225,7 +1231,7 @@ const CodeManagement = {
     try {
       const result = await API.updateCode(id, payload);
       if (!result.success) {
-        UI.showNotification(result.message || '更新失败', 'error');
+        UI.showNotification(result.message || '激活码更新失败', 'error');
         return;
       }
       UI.hideModal();
@@ -1238,7 +1244,7 @@ const CodeManagement = {
         return;
       }
       console.error(error);
-      UI.showNotification('更新失败', 'error');
+      UI.showNotification('激活码更新失败', 'error');
     }
   },
@@ -1247,7 +1253,7 @@ const CodeManagement = {
     try {
       const result = await API.deleteCode(id);
       if (!result.success) {
-        UI.showNotification(result.message || '删除失败', 'error');
+        UI.showNotification(result.message || '激活码删除失败', 'error');
         return;
       }
       UI.showNotification('激活码已删除', 'success');
@@ -1259,14 +1265,14 @@ const CodeManagement = {
         return;
       }
       console.error(error);
-      UI.showNotification('删除失败', 'error');
+      UI.showNotification('激活码删除失败', 'error');
     }
   }
 };
 const LogsManagement = {
   render() {
-    document.getElementById('logs-container').innerHTML = '<p class="text-on-surface-variant text-center py-8">日志功能开发中...</p>';
+    document.getElementById('logs-container').innerHTML = '<p class="text-on-surface-variant text-center py-8">暂无日志记录，后续操作会在这里展示。</p>';
   }
 };

package/frontend/admin/index.html CHANGED Viewed

@@ -1,9 +1,19 @@
 <!DOCTYPE html>
-<html class="light" lang="zh-CN">
+<html lang="zh-CN">
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>管理中心 | FogIDC Activator</title>
+    <title>管理中心 | FogAct</title>
+    <script>
+      ;(function () {
+        var theme = localStorage.getItem('fogact_theme') || localStorage.getItem('admin_theme') || localStorage.getItem('yunyi_user_theme') || 'system';
+        var prefersDark = window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches;
+        var isDark = theme === 'dark' || (theme === 'system' && prefersDark);
+        document.documentElement.classList.toggle('dark', isDark);
+        document.documentElement.style.colorScheme = isDark ? 'dark' : 'light';
+      })();
+    </script>
     <!-- Fonts -->
     <link href="https://fonts.googleapis.com/css2?family=Manrope:wght@600;700;800&family=Inter:wght@400;500;600;700;800&display=swap" rel="stylesheet">
@@ -381,7 +391,7 @@
             height: 80%;
         }
     </style>
-    <link rel="stylesheet" href="/assets/market-ui.css?v=20260617-platform-scope1">
+    <link rel="stylesheet" href="/assets/market-ui.css?v=20260619-theme1">
 </head>
 <body class="market-admin bg-surface text-on-surface min-h-screen flex overflow-hidden">
     <span class="market-mouse-light" aria-hidden="true"></span>
@@ -394,8 +404,8 @@
                     <div class="w-16 h-16 bg-primary rounded-2xl flex items-center justify-center mx-auto mb-4">
                         <span class="material-symbols-outlined text-on-primary text-3xl">shield</span>
                     </div>
-                    <h1 class="text-2xl font-bold text-on-surface mb-2">管理后台登录</h1>
-                    <p class="text-sm text-on-surface-variant">FogIDC Activator 企业版</p>
+                    <h1 class="text-2xl font-bold text-on-surface mb-2">登录管理中心</h1>
+                    <p class="text-sm text-on-surface-variant">FogAct 管理中心</p>
                 </div>
                 <div id="login-alert" class="hidden mb-4 p-3 rounded-xl text-sm bg-error-container border border-error text-on-error-container"></div>
@@ -421,7 +431,7 @@
                 </form>
                 <div class="text-center mt-6 text-xs text-on-surface-variant">
-                    默认密码: admin123 (可通过环境变量 ADMIN_PASSWORD 修改)
+                    管理密码可通过 ADMIN_PASSWORD 环境变量配置
                 </div>
             </div>
         </div>
@@ -435,8 +445,8 @@
             <div class="text-xl font-black text-on-surface mb-8 px-4 flex items-center gap-3">
                 <span class="market-logo">F</span>
                 <span>
-                    <span class="block leading-none">FogIDC</span>
-                    <span class="block text-xs font-bold text-on-surface-variant mt-1">Admin console</span>
+                    <span class="block leading-none">FogAct</span>
+                    <span class="block text-xs font-bold text-on-surface-variant mt-1">管理中心</span>
                 </span>
             </div>
@@ -661,7 +671,7 @@
                     <div class="bg-surface-container-lowest rounded-2xl p-6 border border-outline-variant/20">
                         <h3 class="text-lg font-bold text-on-surface mb-6">系统日志</h3>
                         <div id="logs-container">
-                            <p class="text-on-surface-variant text-center py-8">日志功能开发中...</p>
+                            <p class="text-on-surface-variant text-center py-8">暂无日志记录，后续操作会在这里展示。</p>
                         </div>
                     </div>
                 </div>
@@ -671,7 +681,7 @@
                     <div class="bg-surface-container-lowest rounded-2xl p-6 border border-outline-variant/20">
                         <h3 class="text-lg font-bold text-on-surface mb-6">系统设置</h3>
                         <div id="settings-container">
-                            <p class="text-on-surface-variant text-center py-8">设置功能开发中...</p>
+                            <p class="text-on-surface-variant text-center py-8">请选择需要维护的系统配置。</p>
                         </div>
                     </div>
                 </div>
@@ -684,7 +694,7 @@
     <div id="modal-root"></div>
     <!-- JavaScript -->
-    <script src="/admin/admin-panel-v2.js?v=20260617-platform-scope1"></script>
+    <script src="/admin/admin-panel-v2.js?v=20260619-theme1"></script>
     <script>
         let marketPointerRaf = 0;
         window.addEventListener('load', () => {

package/frontend/assets/market-ui.css CHANGED Viewed

@@ -211,6 +211,16 @@ body.market-user::after {
   box-shadow: var(--market-shadow-soft);
 }
+.market-theme-toggle {
+  width: 40px;
+  min-width: 40px;
+  padding: 0;
+}
+.market-theme-toggle .material-symbols-outlined {
+  font-size: 20px;
+}
 .market-button-primary {
   border-color: color-mix(in srgb, var(--market-primary) 70%, transparent);
   color: #fff;
@@ -222,6 +232,11 @@ body.market-user::after {
   color: #fff;
 }
+html.dark .market-button:not(.market-button-primary),
+body.market-dark .market-button:not(.market-button-primary) {
+  box-shadow: 0 1px 0 rgba(255, 255, 255, 0.08) inset;
+}
 .market-hero {
   display: grid;
   grid-template-columns: minmax(0, 1.05fr) minmax(320px, 0.75fr);
@@ -263,7 +278,13 @@ body.market-user::after {
 html.dark .market-hero-main::before,
 html.dark .market-card::before,
-html.dark .market-auth-card::before {
+html.dark .market-auth-card::before,
+body.market-dark .market-hero-main::before,
+body.market-dark .market-card::before,
+body.market-dark .market-auth-card::before {
+  background:
+    radial-gradient(circle at 12% 0%, rgba(255, 255, 255, 0.12), transparent 25%),
+    linear-gradient(135deg, rgba(255, 255, 255, 0.08), transparent 36%);
   opacity: 0.09;
 }
@@ -1041,6 +1062,59 @@ body.market-admin {
   background-color: color-mix(in srgb, var(--market-danger) 14%, transparent) !important;
 }
+html.dark .market-admin .bg-green-50,
+body.market-dark .market-admin .bg-green-50 {
+  background-color: color-mix(in srgb, var(--market-success) 18%, transparent) !important;
+}
+html.dark .market-admin .text-green-700,
+html.dark .market-admin .text-green-800,
+body.market-dark .market-admin .text-green-700,
+body.market-dark .market-admin .text-green-800 {
+  color: color-mix(in srgb, var(--market-success) 82%, #fff 18%) !important;
+}
+html.dark .market-admin .bg-amber-50,
+body.market-dark .market-admin .bg-amber-50 {
+  background-color: color-mix(in srgb, var(--market-warning) 18%, transparent) !important;
+}
+html.dark .market-admin .text-amber-700,
+body.market-dark .market-admin .text-amber-700 {
+  color: color-mix(in srgb, var(--market-warning) 82%, #fff 18%) !important;
+}
+html.dark .market-admin tbody tr,
+body.market-dark .market-admin tbody tr {
+  box-shadow: 0 10px 24px rgba(0, 0, 0, 0.24);
+}
+html.dark .market-admin option,
+body.market-dark .market-admin option {
+  color: var(--market-ink);
+  background: var(--market-bg-soft);
+}
+html.dark .market-admin .modal-backdrop,
+body.market-dark .market-admin .modal-backdrop {
+  background: rgba(0, 0, 0, 0.68) !important;
+}
+html.dark .market-admin .border-b,
+body.market-dark .market-admin .border-b {
+  border-color: var(--market-line) !important;
+}
+html.dark .market-admin [class*="bg-error-container"],
+body.market-dark .market-admin [class*="bg-error-container"] {
+  background-color: color-mix(in srgb, var(--market-danger) 16%, transparent) !important;
+}
+html.dark .market-admin [class*="text-on-error-container"],
+body.market-dark .market-admin [class*="text-on-error-container"] {
+  color: color-mix(in srgb, var(--market-danger) 76%, #fff 24%) !important;
+}
 /* Built user app polish */
 body.market-user {
   overflow-x: hidden;