v1.3.251212

.gitignore

@@ -1 +1,2 @@
 node_modules
+dist/

dist/.env

@@ -1,4 +1,5 @@
 # Database configuration
+# DB_HOST=192.168.5.131
 DB_HOST=est_mysql
 DB_PORT=3306
 DB_USER=root
@@ -6,6 +7,7 @@ DB_PASSWORD=MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDQMYcjqnrMnr9G
 DB_NAME=login
 
 # SurveyKing_DB_NAME 
+# SurveyKing_DB_HOST=192.168.5.131
 SurveyKing_DB_HOST=est_mysql
 SurveyKing_DB_PORT=3306
 SurveyKing_DB_USER=root

dsxapi/dsxapi.js

@@ -129,56 +129,56 @@ const initialConnectionMap = {
   Industry: {
     "Device1-1": {
       type: "copper",
-      apitype:"workshop",
+      apitype:"workshop-m12",
       connectedTo: "Cabinet-A1",
       wiremapstatus: "pass",
       performancestatus: "pass"
     },
     "Device1-2": {
       type: "copper",
-      apitype:"workshop",
+      apitype:"workshop-m12",
       connectedTo: "Cabinet-A2",
       wiremapstatus: "pass",
       performancestatus: "pass"
     },
     "Device2-1": {
       type: "copper",
-      apitype:"workshop",
+      apitype:"workshop-m12",
       connectedTo: "Cabinet-A3",
       wiremapstatus: "pass",
       performancestatus: "pass"
     },
     "Device2-2": {
       type: "copper",
-      apitype:"workshop",
+      apitype:"workshop-m12",
       connectedTo: "Cabinet-A4",
       wiremapstatus: "pass",
       performancestatus: "pass"
     },
     "Device3-1": {
       type: "copper",
-      apitype:"workshop",
+      apitype:"workshop-2p",
       connectedTo: "Cabinet-R1",
       wiremapstatus: "pass",
       performancestatus: "pass"
     },
     "Device3-2": {
       type: "copper",
-      apitype:"workshop",
+      apitype:"workshop-2p",
       connectedTo: "Cabinet-R2",
       wiremapstatus: "pass",
       performancestatus: "pass"
     },
     "Device4-1": {
       type: "copper",
-      apitype:"workshop",
+      apitype:"workshop-2p",
       connectedTo: "Cabinet-R3",
       wiremapstatus: "pass",
       performancestatus: "pass"
     },
     "Device4-2": {
       type: "copper",
-      apitype:"workshop",
+      apitype:"workshop-2p",
       connectedTo: "Cabinet-R4",
       wiremapstatus: "pass",
       performancestatus: "pass"

farmeworkapi/.env

@@ -1,4 +1,5 @@
 # Database configuration
+# DB_HOST=192.168.5.131
 DB_HOST=est_mysql
 DB_PORT=3306
 DB_USER=root
@@ -6,6 +7,7 @@ DB_PASSWORD=MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDQMYcjqnrMnr9G
 DB_NAME=login
 
 # SurveyKing_DB_NAME 
+# SurveyKing_DB_HOST=192.168.5.131
 SurveyKing_DB_HOST=est_mysql
 SurveyKing_DB_PORT=3306
 SurveyKing_DB_USER=root

farmeworkapi/farmeworkapi.js

@@ -335,18 +335,20 @@ app.post('/admin/users', authenticateToken, async (req, res) => {
     if (licenseModel.includes('EST-05E')) {
       maxUsers = 10;
     } else if (licenseModel.includes('EST-10E')) {
-      maxUsers = 40;
+      maxUsers = 60;
     } else if (licenseModel.includes('EST-100E')) {
       maxUsers = 100;
     } else if (licenseModel.includes('EST-05C')) {
       maxUsers = 10;
     } else if (licenseModel.includes('EST-10C')) {
-      maxUsers = 40;
+      maxUsers = 60;
     } else if (licenseModel.includes('EST-100C')) {
       maxUsers = 100;
     } else if (licenseModel.includes('EST-10A')) {
       maxUsers = 60;
-    } else if (licenseModel.includes('EST-100')) {
+    } else if (licenseModel.includes('EST-100A')) {
+      maxUsers = 100;
+    }else if (licenseModel.includes('EST-100D')) {
       maxUsers = 100;
     }
 
@@ -975,7 +977,7 @@ app.post('/admin/toggle-scenario', authenticateToken, async (req, res) => {
         maxScenarioUsers = 5;
         break;
       case 'EST-10E':
-        maxScenarioUsers = 20;
+        maxScenarioUsers = 30;
         break;
       case 'EST-100E':
         maxScenarioUsers = 50;
@@ -984,15 +986,18 @@ app.post('/admin/toggle-scenario', authenticateToken, async (req, res) => {
         maxScenarioUsers = 5;
         break;
       case 'EST-10C':
-        maxScenarioUsers = 20;
+        maxScenarioUsers = 30;
         break;
       case 'EST-100C':
         maxScenarioUsers = 50;
         break;
       case 'EST-10A':
-        maxScenarioUsers = 20;
+        maxScenarioUsers = 30;
         break;
-      case 'EST-100':
+      case 'EST-100A':
+        maxScenarioUsers = 50;
+        break;
+      case 'EST-100D':
         maxScenarioUsers = 50;
         break;
       default:
@@ -1126,7 +1131,6 @@ app.post('/network-config', authenticateToken, async (req, res) => {
       });
     }
 
-    // 验证必需字段（仅校验 BOOTPROTO）
     if (!config.BOOTPROTO) {
       return res.status(400).json({
         success: false,
@@ -1154,7 +1158,6 @@ app.post('/network-config', authenticateToken, async (req, res) => {
       }
     }
 
-    // 仅更新指定字段，其它键保持不变
     const existingConfig = await readNetworkConfig();
     const allowedUpdateKeys = ['BOOTPROTO', 'IPADDR', 'NETMASK', 'GATEWAY', 'DNS'];
     const updatedConfig = { ...existingConfig };

farmeworkapi/license/SN-C8494BU2-466101.lic

@@ -1,4 +0,0 @@
-{
-  "payload": "eyJtb2RlbCI6IkVTVC0xMDAiLCJ1c2VyIjoi5LiK5rW35pyX5Z2k5L+h5oGv57O757uf5pyJ6ZmQ5YWs5Y+4IiwiaGFyZHdhcmVfaWQiOiJodXNreSIsInNlcmlhbCI6IlNOLUM4NDk0QlUyLTQ2NjEwMSIsImFjdGl2YXRpb25fY29kZSI6IkFDVC03NzI3OVItNFVaUCIsImFjdGl2YXRlZF9hdCI6IjIwMjUtMTAtMjJUMDc6MTc6NTYuMTU3WiIsImV4cGlyZXNfYXQiOiIyMjk5LTA4LTA2VDA3OjE3OjU2LjE1N1oiLCJnb2xkX3NlcnZpY2VfZXhwaXJlc19hdCI6IjIwMzAtMTAtMjFUMDc6MTc6NTYuMTU3WiIsImlzc3VlZF9hdCI6IjIwMjUtMTAtMjJUMDc6MTc6NTYuMTU3WiIsImlzc3VlciI6IuS4iua1t+acl+WdpOS/oeaBr+ezu+e7n+aciemZkOWFrOWPuCJ9",
-  "signature": "uZIyeXwdHEX/YmQlgUovGKCzeXHZRPzoHmzGOB/zHcNF6xx9Q3sTFR6Lqyg8x0NKJF3O7R2JsxZ9qemLVcpLdSnSamcxFMxcyNjLHGXkzQKA7hntofdCvzvlVrLZ4Y0cDLqSOmIQ62vtEgvuduqReTMAK7z4qCgmVbinff9njUSUmhnvWAXfGfnpwyfrtfg5oNntQ5iuumlJoGHq75u/x7zYOvmlILTRwt9ZVSV3/PxPF3syOwSVcBFja3NMmhdKmhPrSN2PQ3xa+iPvXr7Y2QRzn1N6AGTUtGWrV1eonk0c4Sr1yVUSzik8YJfC3L0VPCqLXWFDb7Micw2ryRlzag=="
-}

farmeworkapi/license/husky.lic

@@ -0,0 +1,4 @@
+{
+  "payload": "eyJtb2RlbCI6IkVTVC0xMDBEIiwidXNlciI6Iuemj+W7uuaKgOW4iOWtpumZoiIsImhhcmR3YXJlX2lkIjoiaHVza3kiLCJzZXJpYWwiOiJTTi1TSkZCVTZOSy02NTMwNjkiLCJhY3RpdmF0aW9uX2NvZGUiOiJBQ1QtTThBRTY2LVdONzgiLCJhY3RpdmF0ZWRfYXQiOiIyMDI1LTEyLTExVDA5OjAwOjU0Ljg1M1oiLCJleHBpcmVzX2F0IjoiMjI5OS0wOS0yNVQwOTowMDo1NC44NTNaIiwiZ29sZF9zZXJ2aWNlX2V4cGlyZXNfYXQiOiIyMDI2LTEyLTExVDA5OjAwOjU0Ljg1NFoiLCJpc3N1ZWRfYXQiOiIyMDI1LTEyLTExVDA5OjAwOjU0Ljg1NFoiLCJpc3N1ZXIiOiLkuIrmtbfmnJflnaTkv6Hmga/ns7vnu5/mnInpmZDlhazlj7gifQ==",
+  "signature": "PuQHV90aRuJ58o1+drSkBZy/yWbh3jhVuJIrxGbK0nfCH+FEZLTd4KUyrHUQ+EnHyWn3lxHJXKNkVvZ/f20cTPz57nITFf7uTD9BItFgMAaSgR6OVvM6K0hHtA1yjyYWJuqODM8ENATI/KZ7XAsfcqMI2dOochtUq1fJiEAmoGHp3B1APA5jp6/+Hjjx+HOaeEg5P74iYlkaJijfbtTSma+IWx+iz7FN5Uw6GnY3bt9MWFGCQMoXe295gV2bu00qmPo5G0tylm7oOe5A6TvkXj1D9FlZi8ZXkoV0ygvCAeswCiRqx5V0Yt08k4L93HO58Y3T6/NV5W/Jr4AB1To0Kg=="
+}

farmeworkapi/license_issuer.html

@@ -31,7 +31,8 @@
         <option value="EST-10C">EST-10C</option>
         <option value="EST-100C">EST-100C</option>
         <option value="EST-10A">EST-10A</option>
-        <option value="EST-100">EST-100</option>
+        <option value="EST-100A">EST-100A</option>
+        <option value="EST-100D">EST-100D</option>
       </select>
     </label>
 

farmeworkapi/network

@@ -1,5 +0,0 @@
-TYPE=Ethernet
-BOOTPROTO=dhcp
-DEVICE=enp3s0
-ONBOOT=yes
-