BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 572a3d10516bc5b98ef0d133d2d2beaa3a282736

Authored by YunaiV
1 parent 91dcd922

feat：【iot】COAP 协议：合并最新代码和冲突

Inline Side-by-side
Showing 2 changed files with 4 additions and 4 deletions
yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/coap/router/IotCoapAuthHandler.java
  View file @572a3d1
... ... @@ -10,7 +10,7 @@ import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
10 10 import cn.iocoder.yudao.module.iot.core.biz.IotDeviceCommonApi;
11 11 import cn.iocoder.yudao.module.iot.core.biz.dto.IotDeviceAuthReqDTO;
12 12 import cn.iocoder.yudao.module.iot.core.mq.message.IotDeviceMessage;
13   -import cn.iocoder.yudao.module.iot.core.util.IotDeviceAuthUtils;
  13 +import cn.iocoder.yudao.module.iot.core.topic.IotDeviceIdentity;
14 14 import cn.iocoder.yudao.module.iot.gateway.protocol.coap.IotCoapUpstreamProtocol;
15 15 import cn.iocoder.yudao.module.iot.gateway.protocol.coap.util.IotCoapUtils;
16 16 import cn.iocoder.yudao.module.iot.gateway.service.auth.IotDeviceTokenService;
... ... @@ -94,7 +94,7 @@ public class IotCoapAuthHandler {
94 94 return;
95 95 }
96 96 // 2.2 生成 Token
97   - IotDeviceAuthUtils.DeviceInfo deviceInfo = deviceTokenService.parseUsername(username);
  97 + IotDeviceIdentity deviceInfo = deviceTokenService.parseUsername(username);
98 98 Assert.notNull(deviceInfo, "设备信息不能为空");
99 99 String token = deviceTokenService.createToken(deviceInfo.getProductKey(), deviceInfo.getDeviceName());
100 100 Assert.notBlank(token, "生成 token 不能为空");
... ...
yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/coap/router/IotCoapUpstreamHandler.java
  View file @572a3d1
... ... @@ -9,7 +9,7 @@ import cn.hutool.core.util.ObjUtil;
9 9 import cn.hutool.core.util.StrUtil;
10 10 import cn.hutool.extra.spring.SpringUtil;
11 11 import cn.iocoder.yudao.module.iot.core.mq.message.IotDeviceMessage;
12   -import cn.iocoder.yudao.module.iot.core.util.IotDeviceAuthUtils;
  12 +import cn.iocoder.yudao.module.iot.core.topic.IotDeviceIdentity;
13 13 import cn.iocoder.yudao.module.iot.gateway.protocol.coap.IotCoapUpstreamProtocol;
14 14 import cn.iocoder.yudao.module.iot.gateway.protocol.coap.util.IotCoapUtils;
15 15 import cn.iocoder.yudao.module.iot.gateway.service.auth.IotDeviceTokenService;
... ... @@ -75,7 +75,7 @@ public class IotCoapUpstreamHandler {
75 75 return;
76 76 }
77 77 // 验证 token
78   - IotDeviceAuthUtils.DeviceInfo deviceInfo = deviceTokenService.verifyToken(token);
  78 + IotDeviceIdentity deviceInfo = deviceTokenService.verifyToken(token);
79 79 if (deviceInfo == null) {
80 80 IotCoapUtils.respondError(exchange, CoAP.ResponseCode.UNAUTHORIZED, "token 无效或已过期");
81 81 return;
... ...