feat(device): 更新设备管理功能并优化错误处理- 修改设备更新接口路径从 /updateExpire 到 /update- 添加设备注册时获取计算机名称功能

- 优化设备配额检查逻辑，增加账号存在性验证- 更新前端设备列表刷新逻辑，使用保存的用户名参数
- 修改账号编辑表单，禁用已存在账号的用户名和账号名编辑
-优化跟卖精灵打开功能的错误提示和异常处理- 添加页面刷新 IPC通信功能
- 限制用户名输入只能包含字母、数字和下划线
- 移除冗余的本地 IP 获取函数- 升级 erp_client_sb 模块版本至 2.4.9

electron-vue-template/src/main/main.ts

@@ -804,6 +804,9 @@ ipcMain.handle('set-launch-config', (event, launchConfig: { autoLaunch: boolean;
     return { success: true };
 });
 
+// 刷新页面
+ipcMain.handle('reload', () => mainWindow?.webContents.reload());
+
 
 async function getFileSize(url: string): Promise<number> {
     return new Promise((resolve) => {

electron-vue-template/src/main/preload.ts

@@ -34,6 +34,9 @@ const electronAPI = {
   getLaunchConfig: () => ipcRenderer.invoke('get-launch-config'),
   setLaunchConfig: (config: { autoLaunch: boolean; launchMinimized: boolean }) => ipcRenderer.invoke('set-launch-config', config),
 
+  // 刷新页面 API
+  reload: () => ipcRenderer.invoke('reload'),
+
   onDownloadProgress: (callback: (progress: any) => void) => {
     ipcRenderer.removeAllListeners('download-progress')
     ipcRenderer.on('download-progress', (event, progress) => callback(progress))

electron-vue-template/src/renderer/App.vue

@@ -150,7 +150,7 @@ function goForward() {
 }
 
 function reloadPage() {
-  window.location.reload()
+  window.electronAPI.reload()
 }
 
 function handleMenuSelect(key: string) {

electron-vue-template/src/renderer/api/device.ts

@@ -14,18 +14,6 @@ export interface DeviceQuota {
   used: number
 }
 
-/**
- * 获取本机内网IP地址
- */
-async function getLocalIP(): Promise<string> {
-  try {
-    const res = await http.get<{ data: string }>('/api/system/local-ip')
-    return res.data
-  } catch {
-    return '127.0.0.1'
-  }
-}
-
 export const deviceApi = {
   getQuota(username: string) {
     return http.get<{ data: DeviceQuota }>('/monitor/device/quota', { username })
@@ -36,8 +24,15 @@ export const deviceApi = {
   },
 
   async register(payload: { username: string; deviceId: string; os?: string }) {
-    const ip = await getLocalIP()
+    const [ipRes, nameRes] = await Promise.all([
-    return http.post('/monitor/device/register', { ...payload, ip })
+      http.get<{ data: string }>('/api/system/local-ip'),
+      http.get<{ data: string }>('/api/system/computer-name')
+    ])
+    return http.post('/monitor/device/register', { 
+      ...payload, 
+      ip: ipRes.data, 
+      computerName: nameRes.data 
+    })
   },
 
   remove(payload: { deviceId: string; username: string }) {

electron-vue-template/src/renderer/api/http.ts

@@ -1,5 +1,4 @@
 export type HttpMethod = 'GET' | 'POST' | 'DELETE';
-
 export const CONFIG = {
   CLIENT_BASE: 'http://localhost:8081',
   RUOYI_BASE: 'http://8.138.23.49:8085',

electron-vue-template/src/renderer/components/amazon/AmazonDashboard.vue

@@ -259,8 +259,10 @@ async function openGenmaiSpirit() {
     genmaiLoading.value = true
     try {
       await systemApi.openGenmaiSpirit()
+      showMessage('跟卖精灵已打开', 'success')
     } catch (error: any) {
-      showMessage(error.message || '打开跟卖精灵失败', 'error')
+      const errorMsg = error?.msg || error?.message || '打开跟卖精灵失败'
+      showMessage(errorMsg, 'error')
     } finally {
       genmaiLoading.value = false
     }

electron-vue-template/src/renderer/components/auth/RegisterDialog.vue

@@ -35,6 +35,10 @@ const canRegister = computed(() => {
          usernameCheckResult.value === true
 })
 
+function filterUsername(value: string) {
+  registerForm.value.username = value.replace(/[^a-zA-Z0-9_]/g, '')
+}
+
 async function checkUsernameAvailability() {
   if (!registerForm.value.username) {
     usernameCheckResult.value = null
@@ -123,10 +127,11 @@ function backToLogin() {
 
       <el-input
         v-model="registerForm.username"
-        placeholder="请输入用户名"
+        placeholder="请输入用户名（字母、数字、下划线）"
         size="large"
         style="margin-bottom: 15px;"
         :disabled="registerLoading"
+        @input="filterUsername"
         @blur="checkUsernameAvailability">
       </el-input>
 

erp_client_sb/pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>com.tashow.erp</groupId>
     <artifactId>erp_client_sb</artifactId>
-    <version>2.4.8</version>
+    <version>2.4.9</version>
     <name>erp_client_sb</name>
     <description>erp客户端</description>
     <properties>

erp_client_sb/src/main/java/com/tashow/erp/controller/SystemController.java

@@ -65,12 +65,13 @@ public class SystemController {
     }
 
     @GetMapping("/local-ip")
-    public JsonData getLocalIp() {
+    public JsonData getLocalIp() throws Exception {
-        try {
         return JsonData.buildSuccess(java.net.InetAddress.getLocalHost().getHostAddress());
-        } catch (Exception e) {
-            return JsonData.buildSuccess("127.0.0.1");
     }
+
+    @GetMapping("/computer-name")
+    public JsonData getComputerName() {
+        return JsonData.buildSuccess(System.getenv("COMPUTERNAME"));
     }
 
     @GetMapping("/version")
@@ -84,8 +85,14 @@ public class SystemController {
     }
 
     @PostMapping("/genmai/open")
-    public void openGenmaiWebsite() {
+    public JsonData openGenmaiWebsite() {
+        try {
             genmaiService.openGenmaiWebsite();
+            return JsonData.buildSuccess("跟卖精灵已打开");
+        } catch (Exception e) {
+            logger.error("打开跟卖精灵失败", e);
+            return JsonData.buildError(e.getMessage() != null ? e.getMessage() : "打开跟卖精灵失败");
+        }
     }
 
     @GetMapping("/proxy/image")

erp_client_sb/src/main/java/com/tashow/erp/service/impl/GenmaiServiceImpl.java

@@ -3,7 +3,6 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.qiniu.util.UrlUtils;
 import io.github.bonigarcia.wdm.WebDriverManager;
-import lombok.SneakyThrows;
 import org.openqa.selenium.JavascriptExecutor;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.chrome.ChromeDriver;
@@ -25,10 +24,12 @@ public class GenmaiServiceImpl {
     private String updateGenmaijlToken;
     private final RestTemplate restTemplate = new RestTemplate();
     ObjectMapper objectMapper = new ObjectMapper();
-    @SneakyThrows
     public void openGenmaiWebsite() {
+        try {
             // 先关闭所有Chrome进程
             Runtime.getRuntime().exec("taskkill /f /im chrome.exe");
+            Thread.sleep(1000); // 等待进程关闭
+            
             WebDriverManager.chromedriver().setup();
             ChromeOptions options = new ChromeOptions();
             String username = System.getProperty("user.name", "user");
@@ -36,15 +37,19 @@ public class GenmaiServiceImpl {
             char firstChar = username.charAt(0);
             char flippedFirstChar = Character.isUpperCase(firstChar) ? Character.toLowerCase(firstChar) : Character.toUpperCase(firstChar);
             safeUsername = flippedFirstChar + username.substring(1);
-        String chromeUserData = System.getProperty("user.home").replace(username, UrlUtils.urlEncode(safeUsername) )
+            String chromeUserData = System.getProperty("user.home").replace(username, UrlUtils.urlEncode(safeUsername))
                     + "\\AppData\\Local\\Google\\Chrome\\User Data";
             options.addArguments("user-data-dir=" + chromeUserData.toLowerCase());
             options.addArguments("profile-directory=Default");
+            
             WebDriver driver = new ChromeDriver(options);
             driver.get("https://www.genmaijl.com/#/profile");
             JavascriptExecutor js = (JavascriptExecutor) driver;
             js.executeScript(String.format("localStorage.setItem('token','%s')", checkTokenExpired()));
             driver.navigate().refresh();
+        } catch (Exception e) {
+            throw new RuntimeException("打开跟卖精灵失败，请确保已安装Chrome浏览器", e);
+        }
     }
     /**
      * 获取token验证token是否过期
@@ -67,8 +72,8 @@ public class GenmaiServiceImpl {
     /**
      * 登录
      */
-    @SneakyThrows
     public String login() {
+        try {
             Map<String, String> requestBody = new HashMap<>();
             requestBody.put("nickname", "changzhu-4");
             requestBody.put("password", "123456QWe@");
@@ -79,11 +84,14 @@ public class GenmaiServiceImpl {
             String body = response.getBody();
             JsonNode root = objectMapper.readTree(body);
             requestBody.clear();
-        String token=   root.get("result").asText();
+            String token = root.get("result").asText();
-        HttpEntity<String> updateEntity = new HttpEntity<>(token,headers);
+            HttpEntity<String> updateEntity = new HttpEntity<>(token, headers);
             ResponseEntity<String> exchange = restTemplate.exchange(serverApiUrl + updateGenmaijlToken, HttpMethod.POST, updateEntity, String.class);
             System.out.println(exchange.getBody());
             return token;
+        } catch (Exception e) {
+            throw new RuntimeException("跟卖精灵登录失败", e);
+        }
     }
 
 }

erp_client_sb/src/main/java/com/tashow/erp/utils/DeviceUtils.java

@@ -194,7 +194,6 @@ public class DeviceUtils {
             return "SYS_" + SecureUtil.md5(combined).substring(0, 16).toUpperCase();
         } catch (Exception e) {
             log.error("获取系统信息异常: {}", e.getMessage());
-            // 最终的最终降级：时间戳哈希（不推荐，但保证不返回null）
             String fallbackId = "FALLBACK_" + SecureUtil.md5(String.valueOf(System.currentTimeMillis())).substring(0, 16).toUpperCase();
             log.warn("使用最终降级方案（时间戳哈希），设备ID: {}", fallbackId);
             return fallbackId;

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ClientAccountController.java

@@ -259,7 +259,7 @@ public class ClientAccountController extends BaseController {
         clientAccount.setPermissions("{\"amazon\":true,\"rakuten\":true,\"zebra\":true}");
         clientAccount.setPassword(passwordEncoder.encode(password));
         clientAccount.setAccountType("trial");
-        clientAccount.setDeviceLimit(3);
+        clientAccount.setDeviceLimit(1);
         clientAccount.setExpireTime(new Date(System.currentTimeMillis() + 3 * 24L * 60 * 60 * 1000));
 
         int result = clientAccountService.insertClientAccount(clientAccount);

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ClientDeviceController.java

@@ -27,6 +27,10 @@ public class ClientDeviceController {
         return accountMapper.selectClientAccountByUsername(username);
     }
 
+    private int getDeviceLimit(ClientAccount account) {
+        return account.getDeviceLimit() != null ? account.getDeviceLimit() : 1;
+    }
+
     private boolean exceedDeviceLimit(Long accountId, String deviceId, int limit) {
         int count = accountDeviceMapper.countActiveDevicesByAccountId(accountId);
         ClientAccountDevice binding = accountDeviceMapper.selectByAccountIdAndDeviceId(accountId, deviceId);
@@ -37,22 +41,25 @@ public class ClientDeviceController {
     @GetMapping("/quota")
     public AjaxResult quota(@RequestParam String username) {
         ClientAccount account = getAccount(username);
+        if (account == null) return AjaxResult.error("账号不存在");
         int used = accountDeviceMapper.countActiveDevicesByAccountId(account.getId());
-        int limit = account.getDeviceLimit() != null ? account.getDeviceLimit() : 3;
+        return AjaxResult.success(Map.of("limit", getDeviceLimit(account), "used", used));
-        return AjaxResult.success(Map.of("limit", limit, "used", used));
     }
 
     @GetMapping("/list")
     public AjaxResult list(@RequestParam String username) {
-        return AjaxResult.success(accountDeviceMapper.selectDevicesByAccountId(getAccount(username).getId()));
+        ClientAccount account = getAccount(username);
+        if (account == null) return AjaxResult.error("账号不存在");
+        return AjaxResult.success(accountDeviceMapper.selectDevicesByAccountId(account.getId()));
     }
     @PostMapping("/register")
     public AjaxResult register(@RequestBody Map<String, String> data) {
         String username = data.get("username");
         String deviceId = data.get("deviceId");
         ClientAccount account = getAccount(username);
-        int limit = account.getDeviceLimit() != null ? account.getDeviceLimit() : 3;
+        if (account == null) return AjaxResult.error("账号不存在");
         
+        int limit = getDeviceLimit(account);
         if (exceedDeviceLimit(account.getId(), deviceId, limit)) {
             return AjaxResult.error("设备数量已达上限(" + limit + "个)");
         }
@@ -62,17 +69,14 @@ public class ClientDeviceController {
         if (device == null) {
             device = new ClientDevice();
             device.setDeviceId(deviceId);
-            device.setName(username + "@" + data.get("ip") + " (" + data.get("os") + ")");
-            device.setOs(data.get("os"));
-            device.setIp(data.get("ip"));
-            device.setLocation(data.get("location"));
             device.setTrialExpireTime(new Date(System.currentTimeMillis() + 3 * 24L * 60 * 60 * 1000));
             deviceMapper.insert(device);
         }
+        device.setName(username + "@" + data.get("computerName") + " (" + data.get("os") + ")");
+        device.setOs(data.get("os"));
+        device.setIp(data.get("ip"));
         device.setStatus("online");
         device.setLastActiveAt(now);
-        device.setIp(data.get("ip"));
-        device.setLocation(data.get("location"));
         deviceMapper.updateByDeviceId(device);
         
         ClientAccountDevice binding = accountDeviceMapper.selectByAccountIdAndDeviceId(account.getId(), deviceId);
@@ -90,14 +94,8 @@ public class ClientDeviceController {
         return AjaxResult.success();
     }
 
-    @PostMapping("/rename")
+    @PostMapping("/update")
-    public AjaxResult rename(@RequestBody ClientDevice device) {
+    public AjaxResult update(@RequestBody ClientDevice device) {
-        deviceMapper.updateByDeviceId(device);
-        return AjaxResult.success();
-    }
-
-    @PostMapping("/updateExpire")
-    public AjaxResult updateExpire(@RequestBody ClientDevice device) {
         deviceMapper.updateByDeviceId(device);
         return AjaxResult.success();
     }
@@ -106,9 +104,10 @@ public class ClientDeviceController {
     public AjaxResult remove(@RequestBody Map<String, String> data) {
         String deviceId = data.get("deviceId");
         String username = data.get("username");
-        Long accountId = getAccount(username).getId();
+        ClientAccount account = getAccount(username);
+        if (account == null) return AjaxResult.error("账号不存在");
         
-        accountDeviceMapper.updateStatus(accountId, deviceId, "removed");
+        accountDeviceMapper.updateStatus(account.getId(), deviceId, "removed");
         sseHubService.sendEvent(username, deviceId, "DEVICE_REMOVED", "{}");
         sseHubService.disconnectDevice(username, deviceId);
         return AjaxResult.success();
@@ -125,5 +124,3 @@ public class ClientDeviceController {
         return AjaxResult.success();
     }
 }
-
-

ruoyi-ui/src/api/monitor/account.js

@@ -79,10 +79,10 @@ export function getDeviceList(username) {
   })
 }
 
-// 修改设备试用期过期时间
+// 更新设备信息
 export function updateDeviceExpire(data) {
   return request({
-    url: '/monitor/device/updateExpire',
+    url: '/monitor/device/update',
     method: 'post',
     data: data
   })

ruoyi-ui/src/views/monitor/account/index.vue

@@ -148,16 +148,16 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="账号名称" prop="accountName">
-          <el-input v-model="form.accountName" placeholder="请输入账号名称" />
+          <el-input v-model="form.accountName" placeholder="请输入账号名称" :disabled="!!form.id" />
         </el-form-item>
         <el-form-item label="用户名" prop="username">
-          <el-input v-model="form.username" placeholder="请输入用户名" />
+          <el-input v-model="form.username" placeholder="请输入用户名" :disabled="!!form.id" />
         </el-form-item>
         <el-form-item label="密码" prop="password" v-if="!form.id">
           <el-input v-model="form.password" type="password" placeholder="请输入密码" />
         </el-form-item>
         <el-form-item label="账号状态">
-          <el-radio-group v-model="form.status">
+          <el-radio-group v-model="form.status" :disabled="!!form.id">
             <el-radio
               v-for="dict in statusOptions"
               :key="dict.dictValue"
@@ -340,6 +340,7 @@ export default {
       deviceListLoading: false,
       deviceList: [],
       currentAccountName: '',
+      currentUsername: '', // 当前账号的用户名
       // 设备过期时间编辑
       deviceExpireDialogVisible: false,
       currentDevice: {},
@@ -598,6 +599,7 @@ export default {
     /** 查看设备列表 */
     async viewDevices(row) {
       this.currentAccountName = row.accountName || row.username;
+      this.currentUsername = row.username;
       this.deviceListVisible = true;
       this.deviceListLoading = true;
       try {
@@ -620,13 +622,12 @@ export default {
       try {
         await updateDeviceExpire({
           deviceId: this.currentDevice.deviceId,
-          username: this.currentDevice.username,
           trialExpireTime: this.currentDevice.trialExpireTime
         });
         this.$modal.msgSuccess('修改成功');
         this.deviceExpireDialogVisible = false;
-        // 刷新设备列表
+        // 刷新设备列表（使用保存的 username）
-        const response = await getDeviceList(this.currentDevice.username);
+        const response = await getDeviceList(this.currentUsername);
         this.deviceList = response.data || [];
       } catch (error) {
         this.$modal.msgError('修改失败: ' + (error.message || '未知错误'));