code-image-backup-public/fastbee
1
0
Fork 0
mirror of https://gitee.com/beecue/fastbee.git synced 2025-12-17 16:36:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

暂时注释授权码的判断

Browse Source
This commit is contained in:
kerwincui
2022-05-15 17:40:22 +08:00
parent 85e3f1f6c8
commit 3172f37090
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/ToolController.java
View File

@@ -138,13 +138,13 @@ public class ToolController extends BaseController {
// 设备端 // 设备端
String[] clientInfo = clientid.split("&"); String[] clientInfo = clientid.split("&");
if (clientInfo.length != 2) { if (clientInfo.length != 2) {
// 设备未加密认证 // 设备简单认证
String deviceNum = clientInfo[0]; String deviceNum = clientInfo[0];
Device device = deviceService.selectShortDeviceBySerialNumber(deviceNum); Device device = deviceService.selectShortDeviceBySerialNumber(deviceNum);
if (device !=null && mqttConfig.getusername().equals(username) && mqttConfig.getpassword().equals(password)) { if (device !=null && mqttConfig.getusername().equals(username) && mqttConfig.getpassword().equals(password)) {
System.out.println("-----------认证成功,clientId:" + clientid + "---------------"); System.out.println("-----------认证成功,clientId:" + clientid + "---------------");
ProductAuthorize authorize = new ProductAuthorize(null, device.getProductId(), device.getDeviceId(), device.getSerialNumber(), 1L, "admin"); // ProductAuthorize authorize = new ProductAuthorize(null, device.getProductId(), device.getDeviceId(), device.getSerialNumber(), 1L, "admin");
authorizeService.boundProductAuthorize(authorize); // authorizeService.boundProductAuthorize(authorize);
return ResponseEntity.ok().body("ok"); return ResponseEntity.ok().body("ok");
} }
return returnUnauthorized(clientid, username, password, "认证信息有误"); return returnUnauthorized(clientid, username, password, "认证信息有误");
@@ -178,16 +178,16 @@ public class ToolController extends BaseController {
// 设备状态验证 （1-未激活，2-禁用，3-在线，4-离线） // 设备状态验证 （1-未激活，2-禁用，3-在线，4-离线）
if (model.getDeviceId() != null && model.getDeviceId() != 0 && model.getStatus() != 2) { if (model.getDeviceId() != null && model.getDeviceId() != 0 && model.getStatus() != 2) {
System.out.println("-----------认证成功,clientId:" + clientid + "---------------"); System.out.println("-----------认证成功,clientId:" + clientid + "---------------");
ProductAuthorize authorize = new ProductAuthorize(null, model.getProductId(), model.getDeviceId(), model.getSerialNumber(), 1L, "admin"); // ProductAuthorize authorize = new ProductAuthorize(null, model.getProductId(), model.getDeviceId(), model.getSerialNumber(), 1L, "admin");
authorizeService.boundProductAuthorize(authorize); // authorizeService.boundProductAuthorize(authorize);
return ResponseEntity.ok().body("ok"); return ResponseEntity.ok().body("ok");
} else { } else {
// 自动添加设备 // 自动添加设备
int result = deviceService.insertDeviceAuto(deviceNum, userId, productId); int result = deviceService.insertDeviceAuto(deviceNum, userId, productId);
if (result == 1) { if (result == 1) {
System.out.println("-----------认证成功,clientId:" + clientid + "---------------"); System.out.println("-----------认证成功,clientId:" + clientid + "---------------");
ProductAuthorize authorize = new ProductAuthorize(null, model.getProductId(), model.getDeviceId(), model.getSerialNumber(), 1L, "admin"); // ProductAuthorize authorize = new ProductAuthorize(null, model.getProductId(), model.getDeviceId(), model.getSerialNumber(), 1L, "admin");
authorizeService.boundProductAuthorize(authorize); // authorizeService.boundProductAuthorize(authorize);
return ResponseEntity.ok().body("ok"); return ResponseEntity.ok().body("ok");
} }
} }