重新實施機器名稱綁定功能

- 從commit 31441f0恢復完整機器名稱功能
- 資料庫新增machine_name欄位到licenses和usage_logs表
- C# plugin自動擷取並傳送Environment.MachineName
- 後端API完整支援機器名稱儲存和更新邏輯
- 前端UI顯示機器名稱於硬體ID前方（5列布局）
- 授權記錄頁面移除敏感授權碼，新增機器名稱列
- 儀表板最近活動顯示機器名稱資訊
- 開發模式包含完整機器名稱模擬資料
- 保持強制sessionStorage認證機制

app/api/license.py

@@ -33,7 +33,8 @@ async def activate_license(
     ```json
     {
         "license_code": "KS12345678",
-        "hardware_id": "HW_ABC123456789"
+        "hardware_id": "HW_ABC123456789",
+        "machine_name": "DESKTOP-DEV01"
     }
     ```
     
@@ -63,7 +64,8 @@ async def validate_license(
     ```json
     {
         "license_code": "KS12345678",
-        "hardware_id": "HW_ABC123456789"
+        "hardware_id": "HW_ABC123456789",
+        "machine_name": "DESKTOP-DEV01"
     }
     ```
     

app/models/license.py

@@ -13,11 +13,13 @@ class LicenseActivation(BaseModel):
     """授權啟用請求"""
     license_code: str
     hardware_id: str
+    machine_name: Optional[str] = None
 
 class LicenseValidation(BaseModel):
     """授權驗證請求"""
     license_code: str
     hardware_id: str
+    machine_name: Optional[str] = None
 
 class LicenseCreate(BaseModel):
     """建立授權請求"""
@@ -62,6 +64,7 @@ class License(BaseModel):
     id: UUID
     license_code: str
     hardware_id: Optional[str] = None
+    machine_name: Optional[str] = None
     user_name: str
     user_email: Optional[str] = None
     expires_at: datetime
@@ -79,6 +82,7 @@ class UsageLog(BaseModel):
     ip_address: Optional[str] = None
     user_agent: Optional[str] = None
     hardware_info: Optional[str] = None
+    machine_name: Optional[str] = None
     error_message: Optional[str] = None
     created_at: datetime
 

app/services/license_service.py

@@ -131,9 +131,10 @@ class LicenseService:
                     message="此授權已綁定其他設備"
                 )
             
-            # 更新授權 (綁定硬體ID和啟用時間)
+            # 更新授權 (綁定硬體ID、機器名稱和啟用時間)
             update_data = {
                 "hardware_id": activation.hardware_id,
+                "machine_name": activation.machine_name,
                 "activated_at": datetime.now(timezone.utc).isoformat(),
                 "last_used_at": datetime.now(timezone.utc).isoformat()
             }
@@ -141,7 +142,7 @@ class LicenseService:
             self.supabase.table("licenses").update(update_data).eq("id", license_id).execute()
             
             # 記錄使用日誌
-            await self._log_usage(license_id, "activate", client_ip, activation.hardware_id)
+            await self._log_usage(license_id, "activate", client_ip, activation.hardware_id, activation.machine_name)
             
             return ActivationResponse(
                 success=True,
@@ -194,13 +195,18 @@ class LicenseService:
                     message="授權已過期"
                 )
             
-            # 更新最後使用時間
-            self.supabase.table("licenses").update({
+            # 更新最後使用時間和機器名稱
+            update_data = {
                 "last_used_at": datetime.now(timezone.utc).isoformat()
-            }).eq("id", license_id).execute()
+            }
+            # 如果提供了機器名稱，也一併更新
+            if validation.machine_name:
+                update_data["machine_name"] = validation.machine_name
+                
+            self.supabase.table("licenses").update(update_data).eq("id", license_id).execute()
             
             # 記錄使用日誌
-            await self._log_usage(license_id, "validate", client_ip, validation.hardware_id)
+            await self._log_usage(license_id, "validate", client_ip, validation.hardware_id, validation.machine_name)
             
             return ValidationResponse(
                 valid=True,
@@ -465,7 +471,8 @@ class LicenseService:
             return {"success": False, "message": f"延長失敗: {str(e)}"}
     
     async def _log_usage(self, license_id: Optional[str], action: str, ip_address: Optional[str] = None, 
-                        hardware_info: Optional[str] = None, error_message: Optional[str] = None):
+                        hardware_info: Optional[str] = None, machine_name: Optional[str] = None, 
+                        error_message: Optional[str] = None):
         """記錄使用日誌"""
         try:
             log_data = {
@@ -473,6 +480,7 @@ class LicenseService:
                 "action": action,
                 "ip_address": ip_address,
                 "hardware_info": hardware_info,
+                "machine_name": machine_name,
                 "error_message": error_message
             }
             

frontend/css/style.css

@@ -1880,11 +1880,23 @@ body {
 }
 
 .info-column:nth-child(1) {
-    flex: 1.8;
+    flex: 1.5; /* 授權碼 */
 }
 
 .info-column:nth-child(2) {
-    flex: 1.2;
+    flex: 1.5; /* 機器名稱 */
+}
+
+.info-column:nth-child(3) {
+    flex: 1.5; /* 硬體ID - 較寬 */
+}
+
+.info-column:nth-child(4) {
+    flex: 1.3; /* 到期時間 */
+}
+
+.info-column:nth-child(5) {
+    flex: 1.0; /* 狀態 */
 }
 
 .info-column:last-child {
@@ -1998,6 +2010,32 @@ body {
     text-overflow: ellipsis;
 }
 
+/* Machine Name Styles */
+.machine-name {
+    color: var(--text-secondary);
+    font-size: 0.875rem;
+    margin-top: 0.25rem;
+}
+
+.machine-name i {
+    margin-right: 0.5rem;
+    color: var(--accent-blue);
+}
+
+.machine-name-compact {
+    display: inline-flex;
+    align-items: center;
+    font-size: 0.85rem;
+    color: var(--text-secondary);
+    gap: 4px;
+}
+
+.machine-name-compact i {
+    font-size: 0.75rem;
+    color: var(--accent-blue);
+    flex-shrink: 0;
+}
+
 /* XS Buttons for Horizontal Cards */
 .btn-xs {
     padding: 3px 6px;

frontend/js/api.js

@@ -21,6 +21,7 @@ class ApiClient {
                 id: 'lic_001',
                 user_name: '張三工程師',
                 user_email: 'zhang.san@company.com',
+                machine_name: 'DESKTOP-DEV01',
                 hardware_id: '4A1F2E3D5B6C7A8E9F0A1B2C3D4E5F6G',
                 license_key: 'KSTOOLS-2024-ABCD-EFGH-IJKL-MNOP',
                 valid_days: 365,
@@ -33,6 +34,7 @@ class ApiClient {
                 id: 'lic_002',
                 user_name: '李四設計師',
                 user_email: 'li.si@company.com',
+                machine_name: 'BIM-WORKSTATION-02',
                 hardware_id: '7G8H9I0J1K2L3M4N5O6P7Q8R9S0T1U2V',
                 license_key: 'KSTOOLS-2024-WXYZ-1234-5678-9ABC',
                 valid_days: 180,
@@ -45,6 +47,7 @@ class ApiClient {
                 id: 'lic_003',
                 user_name: '王五主管',
                 user_email: 'wang.wu@company.com',
+                machine_name: 'MANAGER-LAPTOP',
                 hardware_id: '3V4W5X6Y7Z8A9B0C1D2E3F4G5H6I7J8K',
                 license_key: 'KSTOOLS-2024-DEFG-HIJK-LMNO-PQRS',
                 valid_days: 90,
@@ -57,6 +60,7 @@ class ApiClient {
                 id: 'lic_004',
                 user_name: '趙六實習生',
                 user_email: 'zhao.liu@company.com',
+                machine_name: 'INTERN-PC-01',
                 hardware_id: '9K0L1M2N3O4P5Q6R7S8T9U0V1W2X3Y4Z',
                 license_key: 'KSTOOLS-2024-TUVW-XYZ1-2345-6789',
                 valid_days: 30,
@@ -69,6 +73,7 @@ class ApiClient {
                 id: 'lic_005',
                 user_name: '陳七顧問',
                 user_email: 'chen.qi@consultant.com',
+                machine_name: 'CONSULTANT-SURFACE',
                 hardware_id: '5Z6A7B8C9D0E1F2G3H4I5J6K7L8M9N0O',
                 license_key: 'KSTOOLS-2024-ABCD-1234-WXYZ-5678',
                 valid_days: 365,
@@ -83,7 +88,12 @@ class ApiClient {
             total_licenses: 5,
             active_licenses: 4,
             inactive_licenses: 1,
+            expired_licenses: 0,
             expiring_soon: 1,
+            today_activations: 2,
+            yesterday_activations: 1,
+            this_week_activations: 8,
+            this_month_activations: 12,
             total_users: 5
         };
         
@@ -91,32 +101,90 @@ class ApiClient {
             {
                 id: 'log_001',
                 license_id: 'lic_001',
-                action: 'license_activated',
+                action: 'activate',
                 user_name: '張三工程師',
+                machine_name: 'DESKTOP-DEV01',
                 hardware_id: '4A1F2E3D5B6C7A8E9F0A1B2C3D4E5F6G',
-                timestamp: '2024-09-10T08:30:00Z',
+                created_at: new Date(Date.now() - 5 * 60000).toISOString(), // 5分鐘前
                 ip_address: '192.168.1.100',
-                details: '授權啟動成功'
+                error_message: null
             },
             {
                 id: 'log_002',
                 license_id: 'lic_002',
-                action: 'license_checked',
+                action: 'validate',
                 user_name: '李四設計師',
+                machine_name: 'BIM-WORKSTATION-02',
                 hardware_id: '7G8H9I0J1K2L3M4N5O6P7Q8R9S0T1U2V',
-                timestamp: '2024-09-10T10:15:00Z',
+                created_at: new Date(Date.now() - 15 * 60000).toISOString(), // 15分鐘前
                 ip_address: '192.168.1.101',
-                details: '授權驗證'
+                error_message: null
             },
             {
                 id: 'log_003',
+                license_id: 'lic_005',
+                action: 'activate',
+                user_name: '陳七顧問',
+                machine_name: 'CONSULTANT-SURFACE',
+                hardware_id: '5Z6A7B8C9D0E1F2G3H4I5J6K7L8M9N0O',
+                created_at: new Date(Date.now() - 30 * 60000).toISOString(), // 30分鐘前
+                ip_address: '192.168.1.105',
+                error_message: null
+            },
+            {
+                id: 'log_004',
+                license_id: 'lic_004',
+                action: 'validate',
+                user_name: '趙六實習生',
+                machine_name: 'INTERN-PC-01',
+                hardware_id: '9K0L1M2N3O4P5Q6R7S8T9U0V1W2X3Y4Z',
+                created_at: new Date(Date.now() - 45 * 60000).toISOString(), // 45分鐘前
+                ip_address: '192.168.1.103',
+                error_message: '授權即將到期，請聯繫管理員續期'
+            },
+            {
+                id: 'log_005',
                 license_id: 'lic_003',
-                action: 'license_deactivated',
+                action: 'deactivate_license',
                 user_name: '王五主管',
+                machine_name: 'MANAGER-LAPTOP',
                 hardware_id: '3V4W5X6Y7Z8A9B0C1D2E3F4G5H6I7J8K',
-                timestamp: '2024-09-09T17:20:00Z',
+                created_at: new Date(Date.now() - 2 * 60 * 60000).toISOString(), // 2小時前
                 ip_address: '192.168.1.102',
-                details: '授權已停用'
+                error_message: null
+            },
+            {
+                id: 'log_006',
+                license_id: 'lic_001',
+                action: 'activate',
+                user_name: '張三工程師',
+                machine_name: 'DESKTOP-DEV01',
+                hardware_id: '4A1F2E3D5B6C7A8E9F0A1B2C3D4E5F6G',
+                created_at: new Date(Date.now() - 24 * 60 * 60000).toISOString(), // 1天前
+                ip_address: '192.168.1.100',
+                error_message: null
+            },
+            {
+                id: 'log_007',
+                license_id: 'lic_006',
+                action: 'create',
+                user_name: '新用戶測試',
+                machine_name: null,
+                hardware_id: null,
+                created_at: new Date(Date.now() - 3 * 24 * 60 * 60000).toISOString(), // 3天前
+                ip_address: '192.168.1.10',
+                error_message: null
+            },
+            {
+                id: 'log_008',
+                license_id: 'lic_002',
+                action: 'extend',
+                user_name: '李四設計師',
+                machine_name: 'BIM-WORKSTATION-02',
+                hardware_id: '7G8H9I0J1K2L3M4N5O6P7Q8R9S0T1U2V',
+                created_at: new Date(Date.now() - 5 * 24 * 60 * 60000).toISOString(), // 5天前
+                ip_address: '192.168.1.10',
+                error_message: null
             }
         ];
     }

frontend/js/pages/dashboard.js

@@ -340,7 +340,7 @@ class DashboardPage {
             activityArray = activities.data;
         } else if (activities && typeof activities === 'object') {
             // 如果是對象，嘗試提取可能的陣列屬性
-            const possibleArrays = ['activities', 'data', 'items', 'records'];
+            const possibleArrays = ['logs', 'activities', 'data', 'items', 'records'];
             for (const key of possibleArrays) {
                 if (Array.isArray(activities[key])) {
                     activityArray = activities[key];
@@ -364,6 +364,7 @@ class DashboardPage {
             const statusIcon = this.getActivityStatusIcon(activity);
             const actionText = this.getActionText(activity.action);
             const userName = activity.user_name || activity.licenses?.user_name || '未知用戶';
+            const machineName = activity.machine_name || activity.licenses?.machine_name || '';
             const time = Utils.getRelativeTime(activity.created_at);
             const ipAddress = activity.ip_address || '未知';
             
@@ -377,6 +378,11 @@ class DashboardPage {
                 displayText += ` - ${userName}`;
             }
             
+            // 加入機器名稱
+            if (machineName) {
+                displayText += ` (機器: ${machineName})`;
+            }
+            
             displayText += ` (IP: ${ipAddress}`;
             
             // 如果有錯誤訊息，放在IP後面

frontend/js/pages/logs.js

@@ -244,7 +244,7 @@ class LogsPage {
                             <th>時間</th>
                             <th>動作</th>
                             <th>用戶</th>
-                            <th>授權碼</th>
+                            <th>機器名稱</th>
                             <th>IP地址</th>
                             <th>狀態</th>
                             <th>詳情</th>
@@ -268,7 +268,7 @@ class LogsPage {
         
         const actionText = this.getActionText(log.action);
         const userName = log.user_name || log.licenses?.user_name || '未知用戶';
-        const licenseCode = log.license_code || log.licenses?.license_code || 'N/A';
+        const machineName = log.machine_name || '未知';
         const time = Utils.formatDateTime(log.created_at);
         const ip = log.ip_address || '未知';
         
@@ -283,10 +283,10 @@ class LogsPage {
                 </td>
                 <td>${userName}</td>
                 <td>
-                    ${licenseCode !== 'N/A' 
-                        ? `<code class="license-code-sm">${licenseCode.substring(0, 8)}...</code>`
-                        : licenseCode
-                    }
+                    <span class="machine-name-compact">
+                        <i class="fas fa-desktop"></i>
+                        ${machineName}
+                    </span>
                 </td>
                 <td>${ip}</td>
                 <td>${statusBadge}</td>
@@ -436,15 +436,6 @@ class LogsPage {
                             <label>IP地址</label>
                             <div>${log.ip_address || '未知'}</div>
                         </div>
-                        <div class="detail-item">
-                            <label>授權碼</label>
-                            <div>
-                                ${log.license_code || log.licenses?.license_code 
-                                    ? `<code>${Utils.formatLicenseCode(log.license_code || log.licenses?.license_code)}</code>`
-                                    : 'N/A'
-                                }
-                            </div>
-                        </div>
                         <div class="detail-item">
                             <label>動作類型</label>
                             <div>

frontend/js/pages/users.js

@@ -319,7 +319,7 @@ class UsersPage {
                     </div>
                 </div>
                 
-                <!-- Main Content - 4 Equal Columns -->
+                <!-- Main Content - 5 Equal Columns -->
                 <div class="card-body-horizontal">
                     <div class="info-column">
                         <div class="column-header">授權碼</div>
@@ -331,6 +331,16 @@ class UsersPage {
                         </div>
                     </div>
                     
+                    <div class="info-column">
+                        <div class="column-header">機器名稱</div>
+                        <div class="column-content">
+                            <span class="machine-name-compact">
+                                <i class="fas fa-desktop"></i>
+                                ${license.machine_name || '未綁定'}
+                            </span>
+                        </div>
+                    </div>
+                    
                     <div class="info-column">
                         <div class="column-header">硬體ID</div>
                         <div class="column-content">

revit-plugin/ApiClient.cs

@@ -58,7 +58,8 @@ namespace KSTools.Licensing
                 var request = new
                 {
                     license_code = licenseCode,
-                    hardware_id = hardwareId
+                    hardware_id = hardwareId,
+                    machine_name = Environment.MachineName
                 };
                 
                 var json = JsonSerializer.Serialize(request, new JsonSerializerOptions 
@@ -149,7 +150,8 @@ namespace KSTools.Licensing
                 var request = new
                 {
                     license_code = licenseCode,
-                    hardware_id = hardwareId
+                    hardware_id = hardwareId,
+                    machine_name = Environment.MachineName
                 };
                 
                 var json = JsonSerializer.Serialize(request, new JsonSerializerOptions 

supabase-schema.sql

@@ -13,6 +13,7 @@ CREATE TABLE licenses (
     id UUID DEFAULT gen_random_uuid() PRIMARY KEY,
     license_code VARCHAR(50) UNIQUE NOT NULL,
     hardware_id VARCHAR(100),
+    machine_name VARCHAR(255),
     user_name VARCHAR(255) NOT NULL,
     user_email VARCHAR(255),
     expires_at TIMESTAMP WITH TIME ZONE NOT NULL,
@@ -28,6 +29,7 @@ COMMENT ON TABLE licenses IS 'KSTools 授權管理表';
 COMMENT ON COLUMN licenses.id IS '唯一識別碼';
 COMMENT ON COLUMN licenses.license_code IS '授權碼 (格式: 32位隨機字符，支援XXXX-XXXX-XXXX-XXXX分段顯示)';
 COMMENT ON COLUMN licenses.hardware_id IS '硬體指紋ID';
+COMMENT ON COLUMN licenses.machine_name IS '機器名稱';
 COMMENT ON COLUMN licenses.user_name IS '授權用戶名稱';
 COMMENT ON COLUMN licenses.user_email IS '用戶電子郵件';
 COMMENT ON COLUMN licenses.expires_at IS '授權到期時間';
@@ -45,6 +47,7 @@ CREATE TABLE usage_logs (
     ip_address INET,
     user_agent TEXT,
     hardware_info TEXT,
+    machine_name VARCHAR(255),
     error_message TEXT,                 -- 錯誤訊息 (如果有)
     created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW()
 );
@@ -56,6 +59,7 @@ COMMENT ON COLUMN usage_logs.action IS '動作類型: activate/validate/error';
 COMMENT ON COLUMN usage_logs.ip_address IS '客戶端IP地址';
 COMMENT ON COLUMN usage_logs.user_agent IS '用戶代理字符串';
 COMMENT ON COLUMN usage_logs.hardware_info IS '硬體資訊';
+COMMENT ON COLUMN usage_logs.machine_name IS '機器名稱';
 COMMENT ON COLUMN usage_logs.error_message IS '錯誤訊息 (發生錯誤時)';
 
 -- =====================================================
@@ -65,6 +69,7 @@ COMMENT ON COLUMN usage_logs.error_message IS '錯誤訊息 (發生錯誤時)';
 -- 授權表索引
 CREATE INDEX idx_licenses_code ON licenses(license_code);
 CREATE INDEX idx_licenses_hardware ON licenses(hardware_id);
+CREATE INDEX idx_licenses_machine_name ON licenses(machine_name);
 CREATE INDEX idx_licenses_active ON licenses(is_active, expires_at);
 CREATE INDEX idx_licenses_user_email ON licenses(user_email);
 CREATE INDEX idx_licenses_created_at ON licenses(created_at);
@@ -137,7 +142,8 @@ SELECT
         WHEN l.is_active = false THEN 'inactive'
         WHEN l.activated_at IS NULL THEN 'not_activated'
         ELSE 'active'
-    END as status
+    END as status,
+    l.machine_name as device_name
 FROM licenses l;
 
 COMMENT ON VIEW license_details IS '授權詳細資訊視圖 (含統計)';
@@ -156,6 +162,7 @@ SELECT
     ul.ip_address,
     ul.user_agent,
     ul.hardware_info,
+    ul.machine_name,
     ul.error_message,
     ul.created_at,
     l.license_code,
@@ -261,64 +268,64 @@ COMMENT ON FUNCTION generate_license_report IS '生成指定日期範圍的授
 -- =====================================================
 
 -- 插入測試用授權 (啟用來測試系統) - 統一使用台灣時間00:00計算（-8hr）
-INSERT INTO licenses (license_code, user_name, user_email, expires_at, hardware_id, is_active, activated_at) VALUES
+INSERT INTO licenses (license_code, user_name, user_email, expires_at, hardware_id, machine_name, is_active, activated_at) VALUES
 -- 已啟用用戶 (正常使用中)
-('A1B2C3D4E5F6G7H8I9J0K1L2M3N4O5P6', '王小明', 'ming@company.com.tw', DATE_TRUNC('day', NOW()) - INTERVAL '8 hours' + INTERVAL '90 days' - INTERVAL '1 second', 'CPU123ABC456DEF789GHI012JKL345MN', true, NOW() - INTERVAL '5 days'),
-('X7Y8Z9W0Q1R2S3T4U5V6A7B8C9D0E1F2', '李美華', 'li.meihua@design.studio', DATE_TRUNC('day', NOW()) - INTERVAL '8 hours' + INTERVAL '365 days' - INTERVAL '1 second', 'CPU789XYZ012ABC345DEF678GHI901JK', true, NOW() - INTERVAL '30 days'),
+('A1B2C3D4E5F6G7H8I9J0K1L2M3N4O5P6', '王小明', 'ming@company.com.tw', DATE_TRUNC('day', NOW()) - INTERVAL '8 hours' + INTERVAL '90 days' - INTERVAL '1 second', 'CPU123ABC456DEF789GHI012JKL345MN', 'DESKTOP-MING-PC', true, NOW() - INTERVAL '5 days'),
+('X7Y8Z9W0Q1R2S3T4U5V6A7B8C9D0E1F2', '李美華', 'li.meihua@design.studio', DATE_TRUNC('day', NOW()) - INTERVAL '8 hours' + INTERVAL '365 days' - INTERVAL '1 second', 'CPU789XYZ012ABC345DEF678GHI901JK', 'DESIGN-WORKSTATION-02', true, NOW() - INTERVAL '30 days'),
 
 -- 試用用戶 (7天試用)
-('B9C8D7E6F5G4H3I2J1K0L9M8N7O6P5Q4', '張工程師', 'engineer.zhang@tech.com', DATE_TRUNC('day', NOW()) - INTERVAL '8 hours' + INTERVAL '7 days' - INTERVAL '1 second', 'CPUABC123XYZ456QWE789RTY012UIU34', true, NOW() - INTERVAL '2 days'),
+('B9C8D7E6F5G4H3I2J1K0L9M8N7O6P5Q4', '張工程師', 'engineer.zhang@tech.com', DATE_TRUNC('day', NOW()) - INTERVAL '8 hours' + INTERVAL '7 days' - INTERVAL '1 second', 'CPUABC123XYZ456QWE789RTY012UIU34', 'ENGINEER-LAPTOP-01', true, NOW() - INTERVAL '2 days'),
 
 -- 更多正常用戶
-('M5N6O7P8Q9R0S1T2U3V4W5X6Y7Z8A9B0', '陳建築師', 'chen@architect.firm', DATE_TRUNC('day', NOW()) - INTERVAL '8 hours' + INTERVAL '30 days' - INTERVAL '1 second', 'CPUARCH456BUILD789DESIGN012PROJ34', true, NOW() - INTERVAL '1 day'),
-('F3G4H5I6J7K8L9M0N1O2P3Q4R5S6T7U8', '劉設計師', 'liu.designer@studio.tw', DATE_TRUNC('day', NOW()) - INTERVAL '8 hours' + INTERVAL '60 days' - INTERVAL '1 second', 'CPUDESIGN123CREATIVE456ART789STUD', true, NOW() - INTERVAL '7 days'),
+('M5N6O7P8Q9R0S1T2U3V4W5X6Y7Z8A9B0', '陳建築師', 'chen@architect.firm', DATE_TRUNC('day', NOW()) - INTERVAL '8 hours' + INTERVAL '30 days' - INTERVAL '1 second', 'CPUARCH456BUILD789DESIGN012PROJ34', 'ARCHITECT-STUDIO-PC', true, NOW() - INTERVAL '1 day'),
+('F3G4H5I6J7K8L9M0N1O2P3Q4R5S6T7U8', '劉設計師', 'liu.designer@studio.tw', DATE_TRUNC('day', NOW()) - INTERVAL '8 hours' + INTERVAL '60 days' - INTERVAL '1 second', 'CPUDESIGN123CREATIVE456ART789STUD', 'CREATIVE-WORKSTATION', true, NOW() - INTERVAL '7 days'),
 
 -- 過期授權 (已過期15天)
-('Z0Y9X8W7V6U5T4S3R2Q1P0O9N8M7L6K5', '周老闆', 'boss.zhou@construction.co', DATE_TRUNC('day', NOW()) - INTERVAL '8 hours' - INTERVAL '15 days' - INTERVAL '1 second', 'CPU456DEF789ABC012GHI345JKL678MN', true, NOW() - INTERVAL '45 days'),
+('Z0Y9X8W7V6U5T4S3R2Q1P0O9N8M7L6K5', '周老闆', 'boss.zhou@construction.co', DATE_TRUNC('day', NOW()) - INTERVAL '8 hours' - INTERVAL '15 days' - INTERVAL '1 second', 'CPU456DEF789ABC012GHI345JKL678MN', 'BOSS-OFFICE-PC', true, NOW() - INTERVAL '45 days'),
 
 -- 已停用授權 (管理員手動停用)
-('Q2W3E4R5T6Y7U8I9O0P1A2S3D4F5G6H7', '黃違規用戶', 'huang@suspended.user', DATE_TRUNC('day', NOW()) - INTERVAL '8 hours' + INTERVAL '20 days' - INTERVAL '1 second', 'CPUXYZ789ABC012DEF345GHI678JKL90', false, NOW() - INTERVAL '10 days'),
+('Q2W3E4R5T6Y7U8I9O0P1A2S3D4F5G6H7', '黃違規用戶', 'huang@suspended.user', DATE_TRUNC('day', NOW()) - INTERVAL '8 hours' + INTERVAL '20 days' - INTERVAL '1 second', 'CPUXYZ789ABC012DEF345GHI678JKL90', 'SUSPENDED-PC', false, NOW() - INTERVAL '10 days'),
 
 -- 永久授權 (企業用戶) - 50年
-('K1L2M3N4O5P6Q7R8S9T0U1V2W3X4Y5Z6', 'KSTools管理員', 'admin@kstools.com.tw', DATE_TRUNC('day', NOW()) - INTERVAL '8 hours' + INTERVAL '18250 days' - INTERVAL '1 second', 'CPUADMIN123MASTER456CONTROL789AB', true, NOW() - INTERVAL '1 day'),
+('K1L2M3N4O5P6Q7R8S9T0U1V2W3X4Y5Z6', 'KSTools管理員', 'admin@kstools.com.tw', DATE_TRUNC('day', NOW()) - INTERVAL '8 hours' + INTERVAL '18250 days' - INTERVAL '1 second', 'CPUADMIN123MASTER456CONTROL789AB', 'ADMIN-MASTER-SERVER', true, NOW() - INTERVAL '1 day'),
 
 -- 即將過期 (今天結束就過期)
-('V8W9X0Y1Z2A3B4C5D6E7F8G9H0I1J2K3', '趙用戶', 'zhao@expires.soon', DATE_TRUNC('day', NOW()) - INTERVAL '8 hours' + INTERVAL '1 day' - INTERVAL '1 second', 'CPU999END888SOON777EXPIRE666ABC', true, NOW() - INTERVAL '28 days')
+('V8W9X0Y1Z2A3B4C5D6E7F8G9H0I1J2K3', '趙用戶', 'zhao@expires.soon', DATE_TRUNC('day', NOW()) - INTERVAL '8 hours' + INTERVAL '1 day' - INTERVAL '1 second', 'CPU999END888SOON777EXPIRE666ABC', 'EXPIRING-PC-TODAY', true, NOW() - INTERVAL '28 days')
 ON CONFLICT (license_code) DO NOTHING;
 
 -- 插入測試使用記錄
-INSERT INTO usage_logs (license_id, action, ip_address, hardware_info) VALUES
+INSERT INTO usage_logs (license_id, action, ip_address, hardware_info, machine_name) VALUES
 -- 正常用戶的使用記錄
-((SELECT id FROM licenses WHERE license_code = 'A1B2C3D4E5F6G7H8I9J0K1L2M3N4O5P6'), 'activate', '192.168.1.100', 'CPU123ABC456DEF789GHI012JKL345MN'),
-((SELECT id FROM licenses WHERE license_code = 'A1B2C3D4E5F6G7H8I9J0K1L2M3N4O5P6'), 'validate', '192.168.1.100', 'CPU123ABC456DEF789GHI012JKL345MN'),
-((SELECT id FROM licenses WHERE license_code = 'A1B2C3D4E5F6G7H8I9J0K1L2M3N4O5P6'), 'validate', '192.168.1.100', 'CPU123ABC456DEF789GHI012JKL345MN'),
+((SELECT id FROM licenses WHERE license_code = 'A1B2C3D4E5F6G7H8I9J0K1L2M3N4O5P6'), 'activate', '192.168.1.100', 'CPU123ABC456DEF789GHI012JKL345MN', 'DESKTOP-MING-PC'),
+((SELECT id FROM licenses WHERE license_code = 'A1B2C3D4E5F6G7H8I9J0K1L2M3N4O5P6'), 'validate', '192.168.1.100', 'CPU123ABC456DEF789GHI012JKL345MN', 'DESKTOP-MING-PC'),
+((SELECT id FROM licenses WHERE license_code = 'A1B2C3D4E5F6G7H8I9J0K1L2M3N4O5P6'), 'validate', '192.168.1.100', 'CPU123ABC456DEF789GHI012JKL345MN', 'DESKTOP-MING-PC'),
 
 -- 企業用戶的使用記錄
-((SELECT id FROM licenses WHERE license_code = 'X7Y8Z9W0Q1R2S3T4U5V6A7B8C9D0E1F2'), 'activate', '10.0.1.50', 'CPU789XYZ012ABC345DEF678GHI901JK'),
-((SELECT id FROM licenses WHERE license_code = 'X7Y8Z9W0Q1R2S3T4U5V6A7B8C9D0E1F2'), 'validate', '10.0.1.50', 'CPU789XYZ012ABC345DEF678GHI901JK'),
+((SELECT id FROM licenses WHERE license_code = 'X7Y8Z9W0Q1R2S3T4U5V6A7B8C9D0E1F2'), 'activate', '10.0.1.50', 'CPU789XYZ012ABC345DEF678GHI901JK', 'DESIGN-WORKSTATION-02'),
+((SELECT id FROM licenses WHERE license_code = 'X7Y8Z9W0Q1R2S3T4U5V6A7B8C9D0E1F2'), 'validate', '10.0.1.50', 'CPU789XYZ012ABC345DEF678GHI901JK', 'DESIGN-WORKSTATION-02'),
 
 -- 其他正常用戶記錄
-((SELECT id FROM licenses WHERE license_code = 'M5N6O7P8Q9R0S1T2U3V4W5X6Y7Z8A9B0'), 'activate', '192.168.50.20', 'CPUARCH456BUILD789DESIGN012PROJ34'),
-((SELECT id FROM licenses WHERE license_code = 'M5N6O7P8Q9R0S1T2U3V4W5X6Y7Z8A9B0'), 'validate', '192.168.50.20', 'CPUARCH456BUILD789DESIGN012PROJ34'),
+((SELECT id FROM licenses WHERE license_code = 'M5N6O7P8Q9R0S1T2U3V4W5X6Y7Z8A9B0'), 'activate', '192.168.50.20', 'CPUARCH456BUILD789DESIGN012PROJ34', 'ARCHITECT-STUDIO-PC'),
+((SELECT id FROM licenses WHERE license_code = 'M5N6O7P8Q9R0S1T2U3V4W5X6Y7Z8A9B0'), 'validate', '192.168.50.20', 'CPUARCH456BUILD789DESIGN012PROJ34', 'ARCHITECT-STUDIO-PC'),
 
-((SELECT id FROM licenses WHERE license_code = 'F3G4H5I6J7K8L9M0N1O2P3Q4R5S6T7U8'), 'activate', '172.20.10.15', 'CPUDESIGN123CREATIVE456ART789STUD'),
-((SELECT id FROM licenses WHERE license_code = 'F3G4H5I6J7K8L9M0N1O2P3Q4R5S6T7U8'), 'validate', '172.20.10.15', 'CPUDESIGN123CREATIVE456ART789STUD'),
+((SELECT id FROM licenses WHERE license_code = 'F3G4H5I6J7K8L9M0N1O2P3Q4R5S6T7U8'), 'activate', '172.20.10.15', 'CPUDESIGN123CREATIVE456ART789STUD', 'CREATIVE-WORKSTATION'),
+((SELECT id FROM licenses WHERE license_code = 'F3G4H5I6J7K8L9M0N1O2P3Q4R5S6T7U8'), 'validate', '172.20.10.15', 'CPUDESIGN123CREATIVE456ART789STUD', 'CREATIVE-WORKSTATION'),
 
 -- 試用用戶的記錄
-((SELECT id FROM licenses WHERE license_code = 'B9C8D7E6F5G4H3I2J1K0L9M8N7O6P5Q4'), 'activate', '203.74.123.45', 'CPUABC123XYZ456QWE789RTY012UIU34'),
-((SELECT id FROM licenses WHERE license_code = 'B9C8D7E6F5G4H3I2J1K0L9M8N7O6P5Q4'), 'validate', '203.74.123.45', 'CPUABC123XYZ456QWE789RTY012UIU34'),
+((SELECT id FROM licenses WHERE license_code = 'B9C8D7E6F5G4H3I2J1K0L9M8N7O6P5Q4'), 'activate', '203.74.123.45', 'CPUABC123XYZ456QWE789RTY012UIU34', 'ENGINEER-LAPTOP-01'),
+((SELECT id FROM licenses WHERE license_code = 'B9C8D7E6F5G4H3I2J1K0L9M8N7O6P5Q4'), 'validate', '203.74.123.45', 'CPUABC123XYZ456QWE789RTY012UIU34', 'ENGINEER-LAPTOP-01'),
 
 -- 過期用戶的歷史記錄
-((SELECT id FROM licenses WHERE license_code = 'Z0Y9X8W7V6U5T4S3R2Q1P0O9N8M7L6K5'), 'activate', '172.16.0.10', 'CPU456DEF789ABC012GHI345JKL678MN'),
-((SELECT id FROM licenses WHERE license_code = 'Z0Y9X8W7V6U5T4S3R2Q1P0O9N8M7L6K5'), 'validate', '172.16.0.10', 'CPU456DEF789ABC012GHI345JKL678MN'),
+((SELECT id FROM licenses WHERE license_code = 'Z0Y9X8W7V6U5T4S3R2Q1P0O9N8M7L6K5'), 'activate', '172.16.0.10', 'CPU456DEF789ABC012GHI345JKL678MN', 'BOSS-OFFICE-PC'),
+((SELECT id FROM licenses WHERE license_code = 'Z0Y9X8W7V6U5T4S3R2Q1P0O9N8M7L6K5'), 'validate', '172.16.0.10', 'CPU456DEF789ABC012GHI345JKL678MN', 'BOSS-OFFICE-PC'),
 
 -- 管理員測試記錄
-((SELECT id FROM licenses WHERE license_code = 'K1L2M3N4O5P6Q7R8S9T0U1V2W3X4Y5Z6'), 'activate', '127.0.0.1', 'CPUADMIN123MASTER456CONTROL789AB'),
-((SELECT id FROM licenses WHERE license_code = 'K1L2M3N4O5P6Q7R8S9T0U1V2W3X4Y5Z6'), 'validate', '127.0.0.1', 'CPUADMIN123MASTER456CONTROL789AB'),
+((SELECT id FROM licenses WHERE license_code = 'K1L2M3N4O5P6Q7R8S9T0U1V2W3X4Y5Z6'), 'activate', '127.0.0.1', 'CPUADMIN123MASTER456CONTROL789AB', 'ADMIN-MASTER-SERVER'),
+((SELECT id FROM licenses WHERE license_code = 'K1L2M3N4O5P6Q7R8S9T0U1V2W3X4Y5Z6'), 'validate', '127.0.0.1', 'CPUADMIN123MASTER456CONTROL789AB', 'ADMIN-MASTER-SERVER'),
 
 -- 即將過期用戶的記錄
-((SELECT id FROM licenses WHERE license_code = 'V8W9X0Y1Z2A3B4C5D6E7F8G9H0I1J2K3'), 'activate', '118.163.88.99', 'CPU999END888SOON777EXPIRE666ABC'),
-((SELECT id FROM licenses WHERE license_code = 'V8W9X0Y1Z2A3B4C5D6E7F8G9H0I1J2K3'), 'validate', '118.163.88.99', 'CPU999END888SOON777EXPIRE666ABC');
+((SELECT id FROM licenses WHERE license_code = 'V8W9X0Y1Z2A3B4C5D6E7F8G9H0I1J2K3'), 'activate', '118.163.88.99', 'CPU999END888SOON777EXPIRE666ABC', 'EXPIRING-PC-TODAY'),
+((SELECT id FROM licenses WHERE license_code = 'V8W9X0Y1Z2A3B4C5D6E7F8G9H0I1J2K3'), 'validate', '118.163.88.99', 'CPU999END888SOON777EXPIRE666ABC', 'EXPIRING-PC-TODAY');
 
 -- =====================================================
 -- 權限設定 (建議)