修复主页搜索bug

static/license_info/bakup/license_info 9.11.html

@@ -1352,7 +1352,7 @@ async function initialize() {
 //获取license展示信息
 function fetchApplications(page, size) {
     
-    fetch(`http://127.0.0.1:8080/api/admin/GetAllLicenseInfo?page=${page}&pageSize=${size}`, {
+    fetch(`http://${serverIP}:${serverPort}/api/admin/GetAllLicenseInfo?page=${page}&pageSize=${size}`, {
         method: 'GET',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -1784,7 +1784,7 @@ function confirmGenerateLicense(id, isParentRow) {
 function generateLicense(id, isParentRow) {
     const payload = isParentRow ? { oa_request_id: id } : { uniqueID: id };
     
-    fetch('http://127.0.0.1:8080/api/admin/GenerateLicense', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/GenerateLicense', {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -1829,7 +1829,7 @@ function CaptureLicenseOncefunc() {
     });
 
     // 发起 GET 请求的 Promise
-    const fetchPromise = fetch('http://127.0.0.1:8080/api/admin/GetCaptureLicenseOnce', {
+    const fetchPromise = fetch('http://${serverIP}:${serverPort}/api/admin/GetCaptureLicenseOnce', {
         method: 'GET',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -2006,7 +2006,7 @@ function openUserActionModal(event, data, modalId) {
 
 // 为用户管理界面的每一行添加点击和右键事件监听器
 function fetchUsers() {
-    fetch('http://127.0.0.1:8080/api/admin/userInfoAll', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/userInfoAll', {
         method: 'GET',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -2051,7 +2051,7 @@ function fetchUsers() {
 
 //查看用户lic历史
 function showUserLicenseHistory() {
-    fetch(`http://127.0.0.1:8080/api/admin/GetlicenseRecordInfoByUser`, {
+    fetch(`http://${serverIP}:${serverPort}/api/admin/GetlicenseRecordInfoByUser`, {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -2206,7 +2206,7 @@ function confirmDelete() {
 }
 
 function deleteRow() {
-            fetch(`http://127.0.0.1:8080/api/admin/deleteLicRow`, {
+            fetch(`http://${serverIP}:${serverPort}/api/admin/deleteLicRow`, {
                 method: 'POST',
                 headers: {
                     'Authorization': `Bearer ${token}`,
@@ -2281,7 +2281,7 @@ function saveNewUser() {
         Email: email
     };
 
-    fetch('http://127.0.0.1:8080/api/register', {  // 修改为实际的API路径
+    fetch('http://${serverIP}:${serverPort}/api/register', {  // 修改为实际的API路径
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -2307,7 +2307,7 @@ function saveNewUser() {
 
 
 function deleteUser(uniqueID) {
-    fetch('http://127.0.0.1:8080/api/admin/deleteUser', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/deleteUser', {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -2354,7 +2354,7 @@ function showEmailModal(supportEmail, salesEmail, uniqueID,oa_request_id) {
     document.getElementById('userInputs').innerHTML = ''; // 清空用户输入
 
     // 获取用户信息并填充第一个用户输入框
-    fetch('http://127.0.0.1:8080/api/admin/distributeLicenseByUserInfo', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/distributeLicenseByUserInfo', {
         method: 'GET',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -2445,7 +2445,7 @@ function addUserInput() {
         .map(select => select.value);
 
     // 获取用户列表并填充到选择框中
-    fetch('http://127.0.0.1:8080/api/admin/distributeLicenseByUserInfo', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/distributeLicenseByUserInfo', {
         method: 'GET',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -2504,7 +2504,7 @@ function updateUserOptions() {
         defaultOption.textContent = '请选择用户';
         select.appendChild(defaultOption);
 
-        fetch('http://127.0.0.1:8080/api/admin/userInfoAll', {
+        fetch('http://${serverIP}:${serverPort}/api/admin/userInfoAll', {
             method: 'GET',
             headers: {
                 'Authorization': `Bearer ${token}`,
@@ -2571,7 +2571,7 @@ function saveLicenseChanges() {
         NodeCount: parseInt(form.nodeCount.value, 10), // 将 NodeCount 转换为整数
     };
     
-    fetch(`http://127.0.0.1:8080/api/admin/UpdateLicense`, {
+    fetch(`http://${serverIP}:${serverPort}/api/admin/UpdateLicense`, {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -2605,7 +2605,7 @@ function updateUserOptions() {
         const currentValue = select.value;  // 保留当前选择值
         select.innerHTML = ''; // 清空现有选项
         
-        fetch('http://127.0.0.1:8080/api/admin/distributeLicenseByUserInfo', {
+        fetch('http://${serverIP}:${serverPort}/api/admin/distributeLicenseByUserInfo', {
             method: 'GET',
             headers: {
                 'Authorization': `Bearer ${token}`,
@@ -2698,7 +2698,7 @@ function sendEmail() {
     };
     console.log('requestData:', requestData);
 
-    fetch('http://127.0.0.1:8080/api/admin/distributeLicense', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/distributeLicense', {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -2733,7 +2733,7 @@ function sendEmail() {
 
 
 function showDistributionHistory() {
-    fetch('http://127.0.0.1:8080/api/admin/GetlicenseRecord', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/GetlicenseRecord', {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -2893,7 +2893,7 @@ function showRoleManagement() {
 }
 
 function fetchRoles() {
-    fetch('http://127.0.0.1:8080/api/admin/GetRoles', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/GetRoles', {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -3235,7 +3235,7 @@ function getCheckboxOptions(selectedPermissions) {
 function fetchRoleInfo(roleName, callback) {
     console.log(`fetchRoleInfo called with roleName: ${roleName}`);
     
-    fetch('http://127.0.0.1:8080/api/admin/GetRoles', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/GetRoles', {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -3309,7 +3309,7 @@ function saveRoleChanges(roleId) {
         Permissions: selectedPermissions
     };
 
-    fetch('http://127.0.0.1:8080/api/admin/UpdateRole', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/UpdateRole', {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -3338,7 +3338,7 @@ function deleteRole(roleName) {
         return;
     }
 
-    fetch('http://127.0.0.1:8080/api/admin/DeleteRole', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/DeleteRole', {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -3448,7 +3448,7 @@ function createNewRole() {
         Permissions: selectedPermissions
     };
 
-    fetch('http://127.0.0.1:8080/api/admin/CreateRole', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/CreateRole', {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -3508,7 +3508,7 @@ function showEditUserForm() {
         form.appendChild(roleSelectDiv);
 
         // 获取角色列表并填充到选择框中
-        fetch('http://127.0.0.1:8080/api/admin/GetRoleNames', {
+        fetch('http://${serverIP}:${serverPort}/api/admin/GetRoleNames', {
             method: 'GET',
             headers: {
                 'Authorization': `Bearer ${token}`,
@@ -3554,7 +3554,7 @@ function saveUserChanges() {
                 Role: formData.get('role')
             };
 
-            fetch(`http://127.0.0.1:8080/api/admin/updateUser`, {
+            fetch(`http://${serverIP}:${serverPort}/api/admin/updateUser`, {
                 method: 'POST',
                 headers: {
                     'Authorization': `Bearer ${token}`,
@@ -3583,7 +3583,7 @@ function toggleUserInfo() {
     const windowWidth = window.innerWidth; // 浏览器窗口的宽度
 
     if (userModal.style.display === 'none' || userModal.style.display === '') {
-        fetch(`http://127.0.0.1:8080/api/admin/userInfo`, {
+        fetch(`http://${serverIP}:${serverPort}/api/admin/userInfo`, {
             method: 'GET',
             headers: {
                 'Authorization': `Bearer ${token}`,
@@ -3736,7 +3736,7 @@ function toggleSidebar() {
 
 
  function fetchUsername() {
-    fetch(`http://127.0.0.1:8080/api/admin/userInfo`, {
+    fetch(`http://${serverIP}:${serverPort}/api/admin/userInfo`, {
         method: 'GET',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -3776,7 +3776,7 @@ function toggleSidebar() {
 }
 
 function fetchPermissionsByRole(role) {
-    return fetch(`http://127.0.0.1:8080/api/admin/GetSelfRoles`, {
+    return fetch(`http://${serverIP}:${serverPort}/api/admin/GetSelfRoles`, {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,

static/license_info/bakup/license_info copy 2.html

@@ -1362,7 +1362,7 @@ async function initialize() {
 //获取license展示信息
 function fetchApplications(page, size) {
     
-    fetch(`http://127.0.0.1:8080/api/admin/GetAllLicenseInfo?page=${page}&pageSize=${size}`, {
+    fetch(`http://${serverIP}:${serverPort}/api/admin/GetAllLicenseInfo?page=${page}&pageSize=${size}`, {
         method: 'GET',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -1806,7 +1806,7 @@ function confirmGenerateLicense(id, isParentRow) {
 function generateLicense(id, isParentRow) {
     const payload = isParentRow ? { oa_request_id: id } : { uniqueID: id };
     
-    fetch('http://127.0.0.1:8080/api/admin/GenerateLicense', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/GenerateLicense', {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -1862,7 +1862,7 @@ function CaptureLicenseOncefunc() {
     });
 
     // 发起 GET 请求的 Promise
-    const fetchPromise = fetch('http://127.0.0.1:8080/api/admin/GetCaptureLicenseOnce', {
+    const fetchPromise = fetch('http://${serverIP}:${serverPort}/api/admin/GetCaptureLicenseOnce', {
         method: 'GET',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -2039,7 +2039,7 @@ function openUserActionModal(event, data, modalId) {
 
 // 为用户管理界面的每一行添加点击和右键事件监听器
 function fetchUsers() {
-    fetch('http://127.0.0.1:8080/api/admin/userInfoAll', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/userInfoAll', {
         method: 'GET',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -2084,7 +2084,7 @@ function fetchUsers() {
 
 //查看用户lic历史
 function showUserLicenseHistory() {
-    fetch(`http://127.0.0.1:8080/api/admin/GetlicenseRecordInfoByUser`, {
+    fetch(`http://${serverIP}:${serverPort}/api/admin/GetlicenseRecordInfoByUser`, {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -2239,7 +2239,7 @@ function confirmDelete() {
 }
 
 function deleteRow() {
-            fetch(`http://127.0.0.1:8080/api/admin/deleteLicRow`, {
+            fetch(`http://${serverIP}:${serverPort}/api/admin/deleteLicRow`, {
                 method: 'POST',
                 headers: {
                     'Authorization': `Bearer ${token}`,
@@ -2314,7 +2314,7 @@ function saveNewUser() {
         Email: email
     };
 
-    fetch('http://127.0.0.1:8080/api/register', {  // 修改为实际的API路径
+    fetch('http://${serverIP}:${serverPort}/api/register', {  // 修改为实际的API路径
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -2340,7 +2340,7 @@ function saveNewUser() {
 
 
 function deleteUser(uniqueID) {
-    fetch('http://127.0.0.1:8080/api/admin/deleteUser', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/deleteUser', {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -2387,7 +2387,7 @@ function showEmailModal(supportEmail, salesEmail, uniqueID,oa_request_id) {
     document.getElementById('userInputs').innerHTML = ''; // 清空用户输入
 
     // 获取用户信息并填充第一个用户输入框
-    fetch('http://127.0.0.1:8080/api/admin/distributeLicenseByUserInfo', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/distributeLicenseByUserInfo', {
         method: 'GET',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -2480,7 +2480,7 @@ function addUserInput() {
         .map(select => select.value);
 
     // 获取用户列表并填充到选择框中
-    fetch('http://127.0.0.1:8080/api/admin/distributeLicenseByUserInfo', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/distributeLicenseByUserInfo', {
         method: 'GET',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -2539,7 +2539,7 @@ function updateUserOptions() {
         defaultOption.textContent = '请选择用户';
         select.appendChild(defaultOption);
 
-        fetch('http://127.0.0.1:8080/api/admin/userInfoAll', {
+        fetch('http://${serverIP}:${serverPort}/api/admin/userInfoAll', {
             method: 'GET',
             headers: {
                 'Authorization': `Bearer ${token}`,
@@ -2606,7 +2606,7 @@ function saveLicenseChanges() {
         NodeCount: parseInt(form.nodeCount.value, 10), // 将 NodeCount 转换为整数
     };
     
-    fetch(`http://127.0.0.1:8080/api/admin/UpdateLicense`, {
+    fetch(`http://${serverIP}:${serverPort}/api/admin/UpdateLicense`, {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -2640,7 +2640,7 @@ function updateUserOptions() {
         const currentValue = select.value;  // 保留当前选择值
         select.innerHTML = ''; // 清空现有选项
         
-        fetch('http://127.0.0.1:8080/api/admin/distributeLicenseByUserInfo', {
+        fetch('http://${serverIP}:${serverPort}/api/admin/distributeLicenseByUserInfo', {
             method: 'GET',
             headers: {
                 'Authorization': `Bearer ${token}`,
@@ -2738,7 +2738,7 @@ function sendEmail() {
     };
     console.log('requestData:', requestData);
 
-    fetch('http://127.0.0.1:8080/api/admin/distributeLicense', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/distributeLicense', {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -2779,7 +2779,7 @@ function sendEmail() {
 
 
 function showDistributionHistory() {
-    fetch('http://127.0.0.1:8080/api/admin/GetlicenseRecord', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/GetlicenseRecord', {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -2939,7 +2939,7 @@ function showRoleManagement() {
 }
 
 function fetchRoles() {
-    fetch('http://127.0.0.1:8080/api/admin/GetRoles', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/GetRoles', {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -3281,7 +3281,7 @@ function getCheckboxOptions(selectedPermissions) {
 function fetchRoleInfo(roleName, callback) {
     console.log(`fetchRoleInfo called with roleName: ${roleName}`);
     
-    fetch('http://127.0.0.1:8080/api/admin/GetRoles', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/GetRoles', {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -3355,7 +3355,7 @@ function saveRoleChanges(roleId) {
         Permissions: selectedPermissions
     };
 
-    fetch('http://127.0.0.1:8080/api/admin/UpdateRole', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/UpdateRole', {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -3384,7 +3384,7 @@ function deleteRole(roleName) {
         return;
     }
 
-    fetch('http://127.0.0.1:8080/api/admin/DeleteRole', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/DeleteRole', {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -3494,7 +3494,7 @@ function createNewRole() {
         Permissions: selectedPermissions
     };
 
-    fetch('http://127.0.0.1:8080/api/admin/CreateRole', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/CreateRole', {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -3554,7 +3554,7 @@ function showEditUserForm() {
         form.appendChild(roleSelectDiv);
 
         // 获取角色列表并填充到选择框中
-        fetch('http://127.0.0.1:8080/api/admin/GetRoleNames', {
+        fetch('http://${serverIP}:${serverPort}/api/admin/GetRoleNames', {
             method: 'GET',
             headers: {
                 'Authorization': `Bearer ${token}`,
@@ -3600,7 +3600,7 @@ function saveUserChanges() {
                 Role: formData.get('role')
             };
 
-            fetch(`http://127.0.0.1:8080/api/admin/updateUser`, {
+            fetch(`http://${serverIP}:${serverPort}/api/admin/updateUser`, {
                 method: 'POST',
                 headers: {
                     'Authorization': `Bearer ${token}`,
@@ -3629,7 +3629,7 @@ function toggleUserInfo() {
     const windowWidth = window.innerWidth; // 浏览器窗口的宽度
 
     if (userModal.style.display === 'none' || userModal.style.display === '') {
-        fetch(`http://127.0.0.1:8080/api/admin/userInfo`, {
+        fetch(`http://${serverIP}:${serverPort}/api/admin/userInfo`, {
             method: 'GET',
             headers: {
                 'Authorization': `Bearer ${token}`,
@@ -3782,7 +3782,7 @@ function toggleSidebar() {
 
 
  function fetchUsername() {
-    fetch(`http://127.0.0.1:8080/api/admin/userInfo`, {
+    fetch(`http://${serverIP}:${serverPort}/api/admin/userInfo`, {
         method: 'GET',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -3822,7 +3822,7 @@ function toggleSidebar() {
 }
 
 function fetchPermissionsByRole(role) {
-    return fetch(`http://127.0.0.1:8080/api/admin/GetSelfRoles`, {
+    return fetch(`http://${serverIP}:${serverPort}/api/admin/GetSelfRoles`, {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,

static/license_info/bakup/license_info copy 主行分页展示版本.html

@@ -1352,7 +1352,7 @@ async function initialize() {
 //获取license展示信息
 function fetchApplications(page, size) {
     
-    fetch(`http://127.0.0.1:8080/api/admin/GetAllLicenseInfo?page=${page}&pageSize=${size}`, {
+    fetch(`http://${serverIP}:${serverPort}/api/admin/GetAllLicenseInfo?page=${page}&pageSize=${size}`, {
         method: 'GET',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -1784,7 +1784,7 @@ function confirmGenerateLicense(id, isParentRow) {
 function generateLicense(id, isParentRow) {
     const payload = isParentRow ? { oa_request_id: id } : { uniqueID: id };
     
-    fetch('http://127.0.0.1:8080/api/admin/GenerateLicense', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/GenerateLicense', {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -1829,7 +1829,7 @@ function CaptureLicenseOncefunc() {
     });
 
     // 发起 GET 请求的 Promise
-    const fetchPromise = fetch('http://127.0.0.1:8080/api/admin/GetCaptureLicenseOnce', {
+    const fetchPromise = fetch('http://${serverIP}:${serverPort}/api/admin/GetCaptureLicenseOnce', {
         method: 'GET',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -2029,7 +2029,7 @@ function openUserActionModal(event, data, modalId) {
 
 // 为用户管理界面的每一行添加点击和右键事件监听器
 function fetchUsers() {
-    fetch('http://127.0.0.1:8080/api/admin/userInfoAll', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/userInfoAll', {
         method: 'GET',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -2074,7 +2074,7 @@ function fetchUsers() {
 
 //查看用户lic历史
 function showUserLicenseHistory() {
-    fetch(`http://127.0.0.1:8080/api/admin/GetlicenseRecordInfoByUser`, {
+    fetch(`http://${serverIP}:${serverPort}/api/admin/GetlicenseRecordInfoByUser`, {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -2229,7 +2229,7 @@ function confirmDelete() {
 }
 
 function deleteRow() {
-            fetch(`http://127.0.0.1:8080/api/admin/deleteLicRow`, {
+            fetch(`http://${serverIP}:${serverPort}/api/admin/deleteLicRow`, {
                 method: 'POST',
                 headers: {
                     'Authorization': `Bearer ${token}`,
@@ -2304,7 +2304,7 @@ function saveNewUser() {
         Email: email
     };
 
-    fetch('http://127.0.0.1:8080/api/register', {  // 修改为实际的API路径
+    fetch('http://${serverIP}:${serverPort}/api/register', {  // 修改为实际的API路径
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -2330,7 +2330,7 @@ function saveNewUser() {
 
 
 function deleteUser(uniqueID) {
-    fetch('http://127.0.0.1:8080/api/admin/deleteUser', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/deleteUser', {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -2377,7 +2377,7 @@ function showEmailModal(supportEmail, salesEmail, uniqueID,oa_request_id) {
     document.getElementById('userInputs').innerHTML = ''; // 清空用户输入
 
     // 获取用户信息并填充第一个用户输入框
-    fetch('http://127.0.0.1:8080/api/admin/distributeLicenseByUserInfo', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/distributeLicenseByUserInfo', {
         method: 'GET',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -2468,7 +2468,7 @@ function addUserInput() {
         .map(select => select.value);
 
     // 获取用户列表并填充到选择框中
-    fetch('http://127.0.0.1:8080/api/admin/distributeLicenseByUserInfo', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/distributeLicenseByUserInfo', {
         method: 'GET',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -2527,7 +2527,7 @@ function updateUserOptions() {
         defaultOption.textContent = '请选择用户';
         select.appendChild(defaultOption);
 
-        fetch('http://127.0.0.1:8080/api/admin/userInfoAll', {
+        fetch('http://${serverIP}:${serverPort}/api/admin/userInfoAll', {
             method: 'GET',
             headers: {
                 'Authorization': `Bearer ${token}`,
@@ -2594,7 +2594,7 @@ function saveLicenseChanges() {
         NodeCount: parseInt(form.nodeCount.value, 10), // 将 NodeCount 转换为整数
     };
     
-    fetch(`http://127.0.0.1:8080/api/admin/UpdateLicense`, {
+    fetch(`http://${serverIP}:${serverPort}/api/admin/UpdateLicense`, {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -2628,7 +2628,7 @@ function updateUserOptions() {
         const currentValue = select.value;  // 保留当前选择值
         select.innerHTML = ''; // 清空现有选项
         
-        fetch('http://127.0.0.1:8080/api/admin/distributeLicenseByUserInfo', {
+        fetch('http://${serverIP}:${serverPort}/api/admin/distributeLicenseByUserInfo', {
             method: 'GET',
             headers: {
                 'Authorization': `Bearer ${token}`,
@@ -2721,7 +2721,7 @@ function sendEmail() {
     };
     console.log('requestData:', requestData);
 
-    fetch('http://127.0.0.1:8080/api/admin/distributeLicense', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/distributeLicense', {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -2756,7 +2756,7 @@ function sendEmail() {
 
 
 function showDistributionHistory() {
-    fetch('http://127.0.0.1:8080/api/admin/GetlicenseRecord', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/GetlicenseRecord', {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -2916,7 +2916,7 @@ function showRoleManagement() {
 }
 
 function fetchRoles() {
-    fetch('http://127.0.0.1:8080/api/admin/GetRoles', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/GetRoles', {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -3258,7 +3258,7 @@ function getCheckboxOptions(selectedPermissions) {
 function fetchRoleInfo(roleName, callback) {
     console.log(`fetchRoleInfo called with roleName: ${roleName}`);
     
-    fetch('http://127.0.0.1:8080/api/admin/GetRoles', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/GetRoles', {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -3332,7 +3332,7 @@ function saveRoleChanges(roleId) {
         Permissions: selectedPermissions
     };
 
-    fetch('http://127.0.0.1:8080/api/admin/UpdateRole', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/UpdateRole', {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -3361,7 +3361,7 @@ function deleteRole(roleName) {
         return;
     }
 
-    fetch('http://127.0.0.1:8080/api/admin/DeleteRole', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/DeleteRole', {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -3471,7 +3471,7 @@ function createNewRole() {
         Permissions: selectedPermissions
     };
 
-    fetch('http://127.0.0.1:8080/api/admin/CreateRole', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/CreateRole', {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -3531,7 +3531,7 @@ function showEditUserForm() {
         form.appendChild(roleSelectDiv);
 
         // 获取角色列表并填充到选择框中
-        fetch('http://127.0.0.1:8080/api/admin/GetRoleNames', {
+        fetch('http://${serverIP}:${serverPort}/api/admin/GetRoleNames', {
             method: 'GET',
             headers: {
                 'Authorization': `Bearer ${token}`,
@@ -3577,7 +3577,7 @@ function saveUserChanges() {
                 Role: formData.get('role')
             };
 
-            fetch(`http://127.0.0.1:8080/api/admin/updateUser`, {
+            fetch(`http://${serverIP}:${serverPort}/api/admin/updateUser`, {
                 method: 'POST',
                 headers: {
                     'Authorization': `Bearer ${token}`,
@@ -3606,7 +3606,7 @@ function toggleUserInfo() {
     const windowWidth = window.innerWidth; // 浏览器窗口的宽度
 
     if (userModal.style.display === 'none' || userModal.style.display === '') {
-        fetch(`http://127.0.0.1:8080/api/admin/userInfo`, {
+        fetch(`http://${serverIP}:${serverPort}/api/admin/userInfo`, {
             method: 'GET',
             headers: {
                 'Authorization': `Bearer ${token}`,
@@ -3759,7 +3759,7 @@ function toggleSidebar() {
 
 
  function fetchUsername() {
-    fetch(`http://127.0.0.1:8080/api/admin/userInfo`, {
+    fetch(`http://${serverIP}:${serverPort}/api/admin/userInfo`, {
         method: 'GET',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -3799,7 +3799,7 @@ function toggleSidebar() {
 }
 
 function fetchPermissionsByRole(role) {
-    return fetch(`http://127.0.0.1:8080/api/admin/GetSelfRoles`, {
+    return fetch(`http://${serverIP}:${serverPort}/api/admin/GetSelfRoles`, {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,

static/license_info/bakup/license_info copy.html

@@ -1290,7 +1290,7 @@ function checkPermission(permission) {
 
 //获取license展示信息
 function fetchApplications(page, size) {
-    fetch(`http://127.0.0.1:8080/api/admin/GetAllLicenseInfo?page=${page}&pageSize=${size}`, {
+    fetch(`http://${serverIP}:${serverPort}/api/admin/GetAllLicenseInfo?page=${page}&pageSize=${size}`, {
         method: 'GET',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -1650,7 +1650,7 @@ function confirmGenerateLicense(id, isParentRow) {
 function generateLicense(id, isParentRow) {
     const payload = isParentRow ? { oa_request_id: id } : { uniqueID: id };
     
-    fetch('http://127.0.0.1:8080/api/admin/GenerateLicense', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/GenerateLicense', {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -1809,7 +1809,7 @@ function openUserActionModal(event, data, modalId) {
 
 // 为用户管理界面的每一行添加点击和右键事件监听器
 function fetchUsers() {
-    fetch('http://127.0.0.1:8080/api/admin/userInfoAll', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/userInfoAll', {
         method: 'GET',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -1854,7 +1854,7 @@ function fetchUsers() {
 
 //查看用户lic历史
 function showUserLicenseHistory() {
-    fetch(`http://127.0.0.1:8080/api/admin/GetlicenseRecordInfoByUser`, {
+    fetch(`http://${serverIP}:${serverPort}/api/admin/GetlicenseRecordInfoByUser`, {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -2054,7 +2054,7 @@ function saveNewUser() {
         Email: email
     };
 
-    fetch('http://127.0.0.1:8080/api/register', {  // 修改为实际的API路径
+    fetch('http://${serverIP}:${serverPort}/api/register', {  // 修改为实际的API路径
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -2080,7 +2080,7 @@ function saveNewUser() {
 
 
 function deleteUser(uniqueID) {
-    fetch('http://127.0.0.1:8080/api/admin/deleteUser', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/deleteUser', {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -2110,7 +2110,7 @@ function confirmDeleteUser(uniqueID) {
 }
 
  function deleteRow() {
-            fetch(`http://127.0.0.1:8080/api/admin/deleteLicRow`, {
+            fetch(`http://${serverIP}:${serverPort}/api/admin/deleteLicRow`, {
                 method: 'POST',
                 headers: {
                     'Authorization': `Bearer ${token}`,
@@ -2149,7 +2149,7 @@ function showEmailModal(supportEmail, salesEmail, uniqueID) {
     document.getElementById('userInputs').innerHTML = ''; // 清空用户输入
 
     // 获取用户信息并填充第一个用户输入框
-    fetch('http://127.0.0.1:8080/api/admin/distributeLicenseByUserInfo', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/distributeLicenseByUserInfo', {
         method: 'GET',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -2240,7 +2240,7 @@ function addUserInput() {
         .map(select => select.value);
 
     // 获取用户列表并填充到选择框中
-    fetch('http://127.0.0.1:8080/api/admin/distributeLicenseByUserInfo', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/distributeLicenseByUserInfo', {
         method: 'GET',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -2299,7 +2299,7 @@ function updateUserOptions() {
         defaultOption.textContent = '请选择用户';
         select.appendChild(defaultOption);
 
-        fetch('http://127.0.0.1:8080/api/admin/userInfoAll', {
+        fetch('http://${serverIP}:${serverPort}/api/admin/userInfoAll', {
             method: 'GET',
             headers: {
                 'Authorization': `Bearer ${token}`,
@@ -2366,7 +2366,7 @@ function saveLicenseChanges() {
         NodeCount: parseInt(form.nodeCount.value, 10), // 将 NodeCount 转换为整数
     };
     
-    fetch(`http://127.0.0.1:8080/api/admin/UpdateLicense`, {
+    fetch(`http://${serverIP}:${serverPort}/api/admin/UpdateLicense`, {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -2400,7 +2400,7 @@ function updateUserOptions() {
         const currentValue = select.value;  // 保留当前选择值
         select.innerHTML = ''; // 清空现有选项
         
-        fetch('http://127.0.0.1:8080/api/admin/distributeLicenseByUserInfo', {
+        fetch('http://${serverIP}:${serverPort}/api/admin/distributeLicenseByUserInfo', {
             method: 'GET',
             headers: {
                 'Authorization': `Bearer ${token}`,
@@ -2492,7 +2492,7 @@ function sendEmail() {
     };
     console.log('requestData:', requestData);
 
-    fetch('http://127.0.0.1:8080/api/admin/distributeLicense', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/distributeLicense', {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -2527,7 +2527,7 @@ function sendEmail() {
 
 
 function showDistributionHistory() {
-    fetch('http://127.0.0.1:8080/api/admin/GetlicenseRecord', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/GetlicenseRecord', {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -2687,7 +2687,7 @@ function showRoleManagement() {
 }
 
 function fetchRoles() {
-    fetch('http://127.0.0.1:8080/api/admin/GetRoles', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/GetRoles', {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -3029,7 +3029,7 @@ function getCheckboxOptions(selectedPermissions) {
 function fetchRoleInfo(roleName, callback) {
     console.log(`fetchRoleInfo called with roleName: ${roleName}`);
     
-    fetch('http://127.0.0.1:8080/api/admin/GetRoles', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/GetRoles', {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -3103,7 +3103,7 @@ function saveRoleChanges(roleId) {
         Permissions: selectedPermissions
     };
 
-    fetch('http://127.0.0.1:8080/api/admin/UpdateRole', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/UpdateRole', {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -3132,7 +3132,7 @@ function deleteRole(roleName) {
         return;
     }
 
-    fetch('http://127.0.0.1:8080/api/admin/DeleteRole', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/DeleteRole', {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -3242,7 +3242,7 @@ function createNewRole() {
         Permissions: selectedPermissions
     };
 
-    fetch('http://127.0.0.1:8080/api/admin/CreateRole', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/CreateRole', {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -3302,7 +3302,7 @@ function showEditUserForm() {
     extraInfoContent.appendChild(form);
 
     // 获取角色列表并填充到选择框中
-    fetch('http://127.0.0.1:8080/api/admin/GetRoleNames', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/GetRoleNames', {
         method: 'GET',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -3336,7 +3336,7 @@ function saveUserChanges() {
                 Role: formData.get('role')
             };
 
-            fetch(`http://127.0.0.1:8080/api/admin/updateUser`, {
+            fetch(`http://${serverIP}:${serverPort}/api/admin/updateUser`, {
                 method: 'POST',
                 headers: {
                     'Authorization': `Bearer ${token}`,
@@ -3365,7 +3365,7 @@ function toggleUserInfo() {
     const windowWidth = window.innerWidth; // 浏览器窗口的宽度
 
     if (userModal.style.display === 'none' || userModal.style.display === '') {
-        fetch(`http://127.0.0.1:8080/api/admin/userInfo`, {
+        fetch(`http://${serverIP}:${serverPort}/api/admin/userInfo`, {
             method: 'GET',
             headers: {
                 'Authorization': `Bearer ${token}`,
@@ -3502,7 +3502,7 @@ function toggleSidebar() {
 
 
  function fetchUsername() {
-    fetch(`http://127.0.0.1:8080/api/admin/userInfo`, {
+    fetch(`http://${serverIP}:${serverPort}/api/admin/userInfo`, {
         method: 'GET',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -3538,7 +3538,7 @@ function toggleSidebar() {
 }
 
 function fetchPermissionsByRole(role) {
-    return fetch(`http://127.0.0.1:8080/api/admin/GetSelfRoles`, {
+    return fetch(`http://${serverIP}:${serverPort}/api/admin/GetSelfRoles`, {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,

static/license_info/license_info.css

@@ -52,9 +52,10 @@ header h1 {
     border: none;
     width: 60px; /* 限制宽度为60px */
     text-align: center; /* 内容居中对齐 */
-    overflow: hidden; /* 如果文字超过，隐藏多余部分 */
-    white-space: nowrap; /* 避免换行 */
-    text-overflow: ellipsis; /* 用省略号表示超出的文字 */
+    line-height: 24px; /* 设置行高为24px，与padding相同 */
+    /* overflow: hidden; 如果文字超过，隐藏多余部分 */
+   /* white-space: nowrap; /* 避免换行 */
+   /*  text-overflow: ellipsis; /* 用省略号表示超出的文字 */
     margin-left: 10px; /* 跟其他 div 保持一致的间距 */
     flex-shrink: 0; /* 确保按钮不会缩放 */
 }

static/license_info/license_info.html

@@ -62,7 +62,7 @@
         
             <!-- 搜索框 -->
             <input type="text" id="search-bar" style="display: none;" placeholder="搜索..." />
-        
+   
             <!-- 确定按钮 -->
             <button id="submit-button">确定</button>
             <button id="reset-button">返回</button>

static/license_info/license_info.js

@@ -1,4 +1,7 @@
 // 全局变量定义
+const serverIP = '127.0.0.1';
+const serverPort = '8080';
+
 let page = 21; // 初始页码为1，代表从第1条数据开始获取
 let pageSize = 30; // 初始每次固定获取10条数据
 let licenseTotal = 0; // 数据总量（从接口获取）
@@ -129,8 +132,9 @@ function CaptureLicenseOncefunc() {
         }, 10000); // 10秒超时
     });
 
+    showLoadingModal("正在主动获取 OA库 元信息...")
     // 发起 GET 请求的 Promise
-    const fetchPromise = fetch('http://127.0.0.1:8080/api/admin/GetCaptureLicenseOnce', {
+    const fetchPromise = fetch(`http://${serverIP}:${serverPort}/api/admin/GetCaptureLicenseOnce`, {
         method: 'GET',
         headers: {
             'Authorization': `Bearer ${authToken}`, // 假设 token 已定义
@@ -143,7 +147,7 @@ function CaptureLicenseOncefunc() {
     .then(data => {
         // 先关闭进度条
         document.body.removeChild(loadingModal);
-
+        hideLoadingModal();
         // 显示成功或失败提示
         if (data.success) {
             alert('License 获取成功！');
@@ -154,7 +158,7 @@ function CaptureLicenseOncefunc() {
     .catch(error => {
         // 先关闭进度条
         document.body.removeChild(loadingModal);
-        
+        hideLoadingModal();
         // 显示错误提示
         alert(error.message); // 如果超时或请求失败
     });
@@ -218,7 +222,7 @@ userManagementLink.addEventListener('click', function(event) {
 // 监听 License 信息按钮的点击事件
 licenseInfoLink.addEventListener('click', function(event) {
     event.preventDefault(); // 阻止默认的跳转行为
-
+ 
     // 将瀑布流的 License 信息内容恢复到主内容区域
     const licenseInfoHtml = `
         <!-- 包裹搜索框、下拉框、时间选择框和确定按钮的 div -->
@@ -238,14 +242,23 @@ licenseInfoLink.addEventListener('click', function(event) {
             <input type="date" id="end-date" placeholder="结束时间" />
         
             <!-- 搜索框 -->
-            <input type="text" id="search-bar" placeholder="搜索..." />
+            <input type="text" id="search-bar" style="display: none; placeholder="搜索..." />
         
             <!-- 确定按钮 -->
             <button id="submit-button">确定</button>
         </div>
-            <div class="license-info-container" style="display: none;" id="license-info-restaurant-list">   </div>
+            <div class="license-info-container" " id="license-info-restaurant-list">   </div>
     `; // 这是原来的 License 信息区域 HTML
 
+    searchBar = document.getElementById('search-bar');
+     statusFilter = document.getElementById('license-status-filter');
+     startDate = document.getElementById('start-date');
+     endDate = document.getElementById('end-date');
+     submitButton = document.getElementById('submit-button');
+     licenseInfoContainer = document.getElementById('license-info-restaurant-list');
+
+
+
     //mainContainer.innerHTML = licenseInfoHtml;
     license_info_mainElement.innerHTML  = licenseInfoHtml;
           //清楚lic信息组的数据
@@ -262,6 +275,9 @@ licenseInfoLink.addEventListener('click', function(event) {
             console.error('未加载到数据');
         }
     })();
+    
+    // 刷新页面
+    //location.reload();
 });
 
 roleManagementLink.addEventListener('click', function(event) {
@@ -287,7 +303,7 @@ roleManagementLink.addEventListener('click', function(event) {
 // 获取数据函数
 async function fetchLicenseData(page, pageSize) {
     try {
-        const response = await fetch(`http://127.0.0.1:8080/api/admin/GetAllLicenseInfo?page=${page}&pageSize=${pageSize}`, {
+        const response = await fetch(`http://${serverIP}:${serverPort}/api/admin/GetAllLicenseInfo?page=${page}&pageSize=${pageSize}`, {
             method: 'GET',
             headers: {
                 'Authorization': `Bearer ${authToken}`,
@@ -531,7 +547,7 @@ initializeScrollListeners()
 ///-----------获取登录用户信息----------------------------------------
 async function fetchUsername() {
     try {
-        const response = await fetch(`http://127.0.0.1:8080/api/admin/userInfo`, {
+        const response = await fetch(`http://${serverIP}:${serverPort}/api/admin/userInfo`, {
             method: 'GET',
             headers: {
                 'Authorization': `Bearer ${authToken}`,
@@ -563,7 +579,7 @@ fetchUsername();
 // 将 fetchPermissionsByRole 转换为异步函数
 async function fetchPermissionsByRole(role) {
     try {
-        const response = await fetch(`http://127.0.0.1:8080/api/admin/GetSelfRoles`, {
+        const response = await fetch(`http://${serverIP}:${serverPort}/api/admin/GetSelfRoles`, {
             method: 'POST',
             headers: {
                 'Authorization': `Bearer ${authToken}`,
@@ -577,17 +593,38 @@ async function fetchPermissionsByRole(role) {
         console.log('currentUserPermissions:', currentUserPermissions);
          // 检查用户是否有读取许可证的权限
          const hasReadLicensePermission = currentUserPermissions.includes("read_license");
+         const hasReadLicenseAllPermission = currentUserPermissions.includes("read_all_license");
          const hasReadUserPermission = currentUserPermissions.includes("read_user");
          const hasReadRolePermission = currentUserPermissions.includes("get_role");
-         if (hasReadUserPermission){
-             // 如果有读取许可证的权限，则触发用户管理按钮的点击事件
-             document.getElementById('user-management-link').click();
-         }else if (hasReadRolePermission) {// 根据权限触发相应的按钮点击事件
-             // 如果没有读取许可证的权限，则触发角色管理按钮的点击事件
-             document.getElementById('role-management-link').click();
-         } else if (hasReadLicensePermission) {
-            document.getElementById('license-info-link').click();
-         }
+
+ 
+
+         if (!hasReadLicensePermission || !hasReadLicenseAllPermission) {
+            document.getElementById('user-management-link').click();
+        } else if (!hasReadUserPermission) {
+            document.getElementById('role-management-link').click();
+        }
+        
+        //  if (hasReadLicensePermission || hasReadLicenseAllPermission) {
+        //     document.getElementById('license-info-link').click();
+         
+        //  }else if (hasReadRolePermission) {// 根据权限触发相应的按钮点击事件
+        //      // 如果没有读取许可证的权限，则触发角色管理按钮的点击事件
+        //      document.getElementById('role-management-link').click();
+        //  } else if ( hasReadUserPermission) {
+        //         // 如果有读取许可证的权限，则触发用户管理按钮的点击事件
+        //         document.getElementById('user-management-link').click();
+        //  }
+
+        
+        // if (hasReadRolePermission) {// 根据权限触发相应的按钮点击事件
+        //      // 如果没有读取许可证的权限，则触发角色管理按钮的点击事件
+        //      document.getElementById('role-management-link').click();
+        //  } else if ( hasReadUserPermission) {
+        //         // 如果有读取许可证的权限，则触发用户管理按钮的点击事件
+        //         document.getElementById('user-management-link').click();
+        //  }
+
 
         // 定义权限类别
         // const licensePermissions = ['upload_license', 'read_license'];
@@ -664,12 +701,12 @@ document.addEventListener('DOMContentLoaded', createLoadingModal);
 // 获取搜索框元素
 // 获取搜索框、状态下拉框、时间选择框和按钮元素
 // 获取搜索框、状态下拉框、时间选择框和按钮元素
-const searchBar = document.getElementById('search-bar');
-const statusFilter = document.getElementById('license-status-filter');
-const startDate = document.getElementById('start-date');
-const endDate = document.getElementById('end-date');
-const submitButton = document.getElementById('submit-button');
-const licenseInfoContainer = document.getElementById('license-info-restaurant-list');
+let searchBar = document.getElementById('search-bar');
+let statusFilter = document.getElementById('license-status-filter');
+let startDate = document.getElementById('start-date');
+let endDate = document.getElementById('end-date');
+let submitButton = document.getElementById('submit-button');
+let licenseInfoContainer = document.getElementById('license-info-restaurant-list');
 
 
 // 过滤功能实现
@@ -695,7 +732,7 @@ function filterContent() {
 
     console.log("requestData",requestData);
     // 发送 POST 请求到接口
-    fetch('http://127.0.0.1:8080/api/admin/GetConditionalSearch', {
+    fetch(`http://${serverIP}:${serverPort}/api/admin/GetConditionalSearch`, {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${authToken}`,
@@ -724,8 +761,10 @@ function displayLicenseInfo(data) {
       renderLicenseCards(data, true);
     
 }
+
 // 确定按钮点击事件的修改（停止滚动监听）
 submitButton.addEventListener('click', function() {
+    console.log('确定按钮点击事件触发');
       // 检查下拉框和时间选择框是否为默认值
       if (!statusFilter.value && !startDate.value && !endDate.value) {
         // 如果都是默认值，则刷新页面

static/license_info/license_info_distribution.js

@@ -7,7 +7,7 @@ function showDistributeModal(item) {
 
     let usersInfo;
     // 获取用户信息并填充第一个用户输入框
-    fetch('http://127.0.0.1:8080/api/admin/distributeLicenseByUserInfo', {
+    fetch(`http://${serverIP}:${serverPort}/api/admin/distributeLicenseByUserInfo`, {
         method: 'GET',
         headers: {
             'Authorization': `Bearer ${authToken}`, // 确保autoToken是您获取的用户授权令牌
@@ -337,7 +337,7 @@ function distributeEmails(item, emails, usersInfo) {
     console.log('即将发送的数据:', postData);
     showLoadingModal("正在分发邮箱中...");
     // 发送 POST 请求到 DistributeLicenseToEmail 接口
-    fetch('http://127.0.0.1:8080/api/admin/DistributeLicenseToEmail', {
+    fetch(`http://${serverIP}:${serverPort}/api/admin/DistributeLicenseToEmail`, {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${authToken}`, // 使用 authToken
@@ -382,7 +382,7 @@ function distributeUser(item, uniqueIDArray, usernameArray, accountArray) {
     console.log('Sending user data:', postData);
     showLoadingModal("正在分发用户中...");
     // 发送 POST 请求到 DistributeLicenseToUser 接口
-    fetch('http://127.0.0.1:8080/api/admin/DistributeLicenseToUser', {
+    fetch(`http://${serverIP}:${serverPort}/api/admin/DistributeLicenseToUser`, {
         method: 'POST',
         headers: {
             'Content-Type': 'application/json',
@@ -419,7 +419,7 @@ function distributeUser(item, uniqueIDArray, usernameArray, accountArray) {
 
 //--------------分发历史模态框------------------------
 // function showDistributionHistory(selectedRowData) {
-//     fetch('http://127.0.0.1:8080/api/admin/GetlicenseRecord', {
+//     fetch('http://${serverIP}:${serverPort}/api/admin/GetlicenseRecord', {
 //         method: 'POST',
 //         headers: {
 //             'Authorization': `Bearer ${authToken}`,
@@ -470,7 +470,7 @@ function distributeUser(item, uniqueIDArray, usernameArray, accountArray) {
 // }
 
 function showDistributionHistory(selectedRowData) {
-    fetch('http://127.0.0.1:8080/api/admin/GetlicenseRecord', {
+    fetch(`http://${serverIP}:${serverPort}/api/admin/GetlicenseRecord`, {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${authToken}`,

static/license_info/license_info_modal.js

@@ -379,7 +379,7 @@ function generateLicense(id, isParentRow) {
    : { uniqueID: parseInt(id, 10) };  // 将 id 转换为整数
 
     console.log("generateLicense",payload ,id, isParentRow)
-    fetch('http://127.0.0.1:8080/api/admin/GenerateLicense', {
+    fetch(`http://${serverIP}:${serverPort}/api/admin/GenerateLicense`, {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${authToken}`,

static/license_info/old/old_license_info.html

@@ -382,7 +382,7 @@ async function initialize() {
 //获取license展示信息
 function fetchApplications(page, size) {
     
-    fetch(`http://127.0.0.1:8080/api/admin/GetAllLicenseInfo?page=${page}&pageSize=${size}`, {
+    fetch(`http://${serverIP}:${serverPort}/api/admin/GetAllLicenseInfo?page=${page}&pageSize=${size}`, {
         method: 'GET',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -845,7 +845,7 @@ function confirmGenerateLicense(id, isParentRow) {
 function generateLicense(id, isParentRow) {
     const payload = isParentRow ? { oa_request_id: id } : { uniqueID: id };
     
-    fetch('http://127.0.0.1:8080/api/admin/GenerateLicense', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/GenerateLicense', {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -901,7 +901,7 @@ function CaptureLicenseOncefunc() {
     });
 
     // 发起 GET 请求的 Promise
-    const fetchPromise = fetch('http://127.0.0.1:8080/api/admin/GetCaptureLicenseOnce', {
+    const fetchPromise = fetch('http://${serverIP}:${serverPort}/api/admin/GetCaptureLicenseOnce', {
         method: 'GET',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -1116,7 +1116,7 @@ function openUserActionModal(event, data, modalId) {
 
 // 为用户管理界面的每一行添加点击和右键事件监听器
 function fetchUsers() {
-    fetch('http://127.0.0.1:8080/api/admin/userInfoAll', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/userInfoAll', {
         method: 'GET',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -1161,7 +1161,7 @@ function fetchUsers() {
 
 //查看用户lic历史
 function showUserLicenseHistory() {
-    fetch(`http://127.0.0.1:8080/api/admin/GetlicenseRecordInfoByUser`, {
+    fetch(`http://${serverIP}:${serverPort}/api/admin/GetlicenseRecordInfoByUser`, {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -1316,7 +1316,7 @@ function confirmDelete() {
 }
 
 function deleteRow() {
-            fetch(`http://127.0.0.1:8080/api/admin/deleteLicRow`, {
+            fetch(`http://${serverIP}:${serverPort}/api/admin/deleteLicRow`, {
                 method: 'POST',
                 headers: {
                     'Authorization': `Bearer ${token}`,
@@ -1391,7 +1391,7 @@ function saveNewUser() {
         Email: email
     };
 
-    fetch('http://127.0.0.1:8080/api/register', {  // 修改为实际的API路径
+    fetch('http://${serverIP}:${serverPort}/api/register', {  // 修改为实际的API路径
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -1417,7 +1417,7 @@ function saveNewUser() {
 
 
 function deleteUser(uniqueID) {
-    fetch('http://127.0.0.1:8080/api/admin/deleteUser', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/deleteUser', {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -1455,7 +1455,7 @@ function distributeLicense(oa_id,supportEmail, salesEmail, uniqueID,oa_request_i
     showLoadingModal('正在分发...');
 
     // 将数据作为查询参数传递给 GET 请求
-    const url = `http://127.0.0.1:8080/api/admin/GetDistributeButtenCheckController?oa_request_id=${oa_id}`;
+    const url = `http://${serverIP}:${serverPort}/api/admin/GetDistributeButtenCheckController?oa_request_id=${oa_id}`;
 
     // 向后端发送 GET 请求
     fetch(url, {
@@ -1504,7 +1504,7 @@ function showEmailModal(supportEmail, salesEmail, uniqueID,oa_request_id) {
     document.getElementById('userInputs').innerHTML = ''; // 清空用户输入
 
     // 获取用户信息并填充第一个用户输入框
-    fetch('http://127.0.0.1:8080/api/admin/distributeLicenseByUserInfo', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/distributeLicenseByUserInfo', {
         method: 'GET',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -1597,7 +1597,7 @@ function addUserInput() {
         .map(select => select.value);
 
     // 获取用户列表并填充到选择框中
-    fetch('http://127.0.0.1:8080/api/admin/distributeLicenseByUserInfo', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/distributeLicenseByUserInfo', {
         method: 'GET',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -1656,7 +1656,7 @@ function updateUserOptions() {
         defaultOption.textContent = '请选择用户';
         select.appendChild(defaultOption);
 
-        fetch('http://127.0.0.1:8080/api/admin/userInfoAll', {
+        fetch('http://${serverIP}:${serverPort}/api/admin/userInfoAll', {
             method: 'GET',
             headers: {
                 'Authorization': `Bearer ${token}`,
@@ -1723,7 +1723,7 @@ function saveLicenseChanges() {
         NodeCount: parseInt(form.nodeCount.value, 10), // 将 NodeCount 转换为整数
     };
     
-    fetch(`http://127.0.0.1:8080/api/admin/UpdateLicense`, {
+    fetch(`http://${serverIP}:${serverPort}/api/admin/UpdateLicense`, {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -1757,7 +1757,7 @@ function updateUserOptions() {
         const currentValue = select.value;  // 保留当前选择值
         select.innerHTML = ''; // 清空现有选项
         
-        fetch('http://127.0.0.1:8080/api/admin/distributeLicenseByUserInfo', {
+        fetch('http://${serverIP}:${serverPort}/api/admin/distributeLicenseByUserInfo', {
             method: 'GET',
             headers: {
                 'Authorization': `Bearer ${token}`,
@@ -1857,7 +1857,7 @@ function sendEmail() {
     };
     console.log('requestData:', requestData);
 
-    fetch('http://127.0.0.1:8080/api/admin/distributeLicense', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/distributeLicense', {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -1898,7 +1898,7 @@ function sendEmail() {
 
 
 function showDistributionHistory() {
-    fetch('http://127.0.0.1:8080/api/admin/GetlicenseRecord', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/GetlicenseRecord', {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -2082,7 +2082,7 @@ function showRoleManagement() {
 }
 
 function fetchRoles() {
-    fetch('http://127.0.0.1:8080/api/admin/GetRoles', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/GetRoles', {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -2424,7 +2424,7 @@ function getCheckboxOptions(selectedPermissions) {
 function fetchRoleInfo(roleName, callback) {
     console.log(`fetchRoleInfo called with roleName: ${roleName}`);
     
-    fetch('http://127.0.0.1:8080/api/admin/GetRoles', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/GetRoles', {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -2498,7 +2498,7 @@ function saveRoleChanges(roleId) {
         Permissions: selectedPermissions
     };
 
-    fetch('http://127.0.0.1:8080/api/admin/UpdateRole', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/UpdateRole', {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -2527,7 +2527,7 @@ function deleteRole(roleName) {
         return;
     }
 
-    fetch('http://127.0.0.1:8080/api/admin/DeleteRole', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/DeleteRole', {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -2637,7 +2637,7 @@ function createNewRole() {
         Permissions: selectedPermissions
     };
 
-    fetch('http://127.0.0.1:8080/api/admin/CreateRole', {
+    fetch('http://${serverIP}:${serverPort}/api/admin/CreateRole', {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -2697,7 +2697,7 @@ function showEditUserForm() {
         form.appendChild(roleSelectDiv);
 
         // 获取角色列表并填充到选择框中
-        fetch('http://127.0.0.1:8080/api/admin/GetRoleNames', {
+        fetch('http://${serverIP}:${serverPort}/api/admin/GetRoleNames', {
             method: 'GET',
             headers: {
                 'Authorization': `Bearer ${token}`,
@@ -2743,7 +2743,7 @@ function saveUserChanges() {
                 Role: formData.get('role')
             };
 
-            fetch(`http://127.0.0.1:8080/api/admin/updateUser`, {
+            fetch(`http://${serverIP}:${serverPort}/api/admin/updateUser`, {
                 method: 'POST',
                 headers: {
                     'Authorization': `Bearer ${token}`,
@@ -2772,7 +2772,7 @@ function toggleUserInfo() {
     const windowWidth = window.innerWidth; // 浏览器窗口的宽度
 
     if (userModal.style.display === 'none' || userModal.style.display === '') {
-        fetch(`http://127.0.0.1:8080/api/admin/userInfo`, {
+        fetch(`http://${serverIP}:${serverPort}/api/admin/userInfo`, {
             method: 'GET',
             headers: {
                 'Authorization': `Bearer ${token}`,
@@ -2925,7 +2925,7 @@ function toggleSidebar() {
 
 
  function fetchUsername() {
-    fetch(`http://127.0.0.1:8080/api/admin/userInfo`, {
+    fetch(`http://${serverIP}:${serverPort}/api/admin/userInfo`, {
         method: 'GET',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -2965,7 +2965,7 @@ function toggleSidebar() {
 }
 
 function fetchPermissionsByRole(role) {
-    return fetch(`http://127.0.0.1:8080/api/admin/GetSelfRoles`, {
+    return fetch(`http://${serverIP}:${serverPort}/api/admin/GetSelfRoles`, {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,

static/login/login.js

@@ -1,5 +1,9 @@
+// 全局变量定义
+const serverIP = '127.0.0.1';
+const serverPort = '8080';
+
 document.addEventListener('DOMContentLoaded', () => {
-    fetch('http://127.0.0.1:8080/api/image')
+    fetch(`http://${serverIP}:${serverPort}/api/image`)
         .then(response => response.blob())
         .then(imageBlob => {
             const imageObjectURL = URL.createObjectURL(imageBlob);
@@ -17,7 +21,7 @@ async function login(event) {
     const password = document.getElementById('password').value;
 
     try {
-        const response = await fetch('http://127.0.0.1:8080/api/login', {
+        const response = await fetch(`http://${serverIP}:${serverPort}/api/login`, {
             method: 'POST',
             headers: {
                 'Content-Type': 'application/json'

static/role/role.js

@@ -18,7 +18,7 @@ document.getElementById('CreateRoleModa').addEventListener('submit', function(ev
 
 function fetchRoles() {
     
-    fetch('http://127.0.0.1:8080/api/admin/GetRoles', {
+    fetch(`http://${serverIP}:${serverPort}/api/admin/GetRoles`, {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${authToken}`,
@@ -344,7 +344,7 @@ function modifyRole(roleId) {
     };
 
     // 发送修改请求
-    fetch('http://127.0.0.1:8080/api/admin/UpdateRole', {
+    fetch(`http://${serverIP}:${serverPort}/api/admin/UpdateRole`, {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${authToken}`,
@@ -376,7 +376,7 @@ function modifyRole(roleId) {
 // 示例的删除角色函数
 function deleteRole(roleName) {
     if (confirm(`确定要删除角色：${roleName} 吗？`)) {
-        fetch('http://127.0.0.1:8080/api/admin/DeleteRole', {
+        fetch(`http://${serverIP}:${serverPort}/api/admin/DeleteRole`, {
             method: 'POST',
             headers: {
                 'Authorization': `Bearer ${authToken}`,
@@ -556,7 +556,7 @@ function createRole() {
     };
     console.log("requestBody", requestBody);
 
-    fetch('http://127.0.0.1:8080/api/admin/CreateRole', {
+    fetch(`http://${serverIP}:${serverPort}/api/admin/CreateRole`, {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${authToken}`,

static/upload_xlsx/script.js

@@ -46,7 +46,7 @@ document.addEventListener('DOMContentLoaded', () => {
 
             const token = localStorage.getItem('Authorization');
 
-            const response = await fetch('http://127.0.0.1:8080/api/admin/upfile', {
+            const response = await fetch('http://${serverIP}:${serverPort}/api/admin/upfile', {
                 method: 'POST',
                 headers: {
                     'Authorization': `Bearer ${token}`

static/user/user.js

@@ -37,7 +37,7 @@ document.getElementById("addUserButton").addEventListener('click', function() {
 fetchUsers();
 function fetchUsers() {
     console.log('Fetching users...');
-    fetch('http://127.0.0.1:8080/api/admin/userInfoAll', {
+    fetch(`http://${serverIP}:${serverPort}/api/admin/userInfoAll`, {
         method: 'GET',
         headers: {
             'Authorization': `Bearer ${authToken}`,
@@ -155,7 +155,7 @@ function editUser(user) {
     // 检查权限并填充角色选择框
     if (currentUserPermissions.includes('update_role')) {
         roleSelectDiv.style.display = "block";
-        fetch('http://127.0.0.1:8080/api/admin/GetRoleNames', {
+        fetch(`http://${serverIP}:${serverPort}/api/admin/GetRoleNames`, {
             method: 'GET',
             headers: {
                 'Authorization': `Bearer ${authToken}`,
@@ -202,7 +202,7 @@ function editUser(user) {
         };
 
         // API 请求保存用户信息
-        fetch('http://127.0.0.1:8080/api/admin/updateUser', {
+        fetch(`http://${serverIP}:${serverPort}/api/admin/updateUser`, {
             method: 'POST',
             headers: {
                 'Authorization': `Bearer ${authToken}`,
@@ -238,7 +238,7 @@ document.getElementById("editUserButton").onclick = () => {
 //删除用户
 function deleteUser(user) {
     const uniqueID = user.UniqueID; // 获取用户的唯一ID
-    fetch('http://127.0.0.1:8080/api/admin/deleteUser', {
+    fetch(`http://${serverIP}:${serverPort}/api/admin/deleteUser`, {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${authToken}`,
@@ -335,7 +335,7 @@ function saveNewUser() {
     };
 
     // 发起请求保存新用户
-    fetch('http://127.0.0.1:8080/api/register', {  // 修改为实际的API路径
+    fetch(`http://${serverIP}:${serverPort}/api/register`, {  // 修改为实际的API路径
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${authToken}`,  // 确保 authToken 是有效的