Commit f1c3ef18b54b806d22ca7871a4e19e53780829b8
Merge branch 'cherry-pick-fc6d5841' into 'master'
fix: 修改TCP数据携带的鉴权逻辑,设备上报的HEX长度,小于产品里面设置数据携带的最小HEX长度,则丢弃 See merge request yunteng/thingskit!477
Showing
1 changed file
with
2 additions
and
1 deletions
@@ -301,7 +301,8 @@ public class DefaultTransportApiService implements TransportApiService { | @@ -301,7 +301,8 @@ public class DefaultTransportApiService implements TransportApiService { | ||
301 | for (String key : profiles.keySet()) { | 301 | for (String key : profiles.keySet()) { |
302 | TkTcpDeviceProfileTransportConfiguration profile = (TkTcpDeviceProfileTransportConfiguration) profiles.get(key); | 302 | TkTcpDeviceProfileTransportConfiguration profile = (TkTcpDeviceProfileTransportConfiguration) profiles.get(key); |
303 | TkTcpDeviceProfileTransportConfiguration.DataCombinationAuth combinationInfo = profile.getCombinationInfo(); | 303 | TkTcpDeviceProfileTransportConfiguration.DataCombinationAuth combinationInfo = profile.getCombinationInfo(); |
304 | - if(credentialsId.length() != profile.getCombinationInfo().getHexLength()){ | 304 | + //设备上报的HEX长度,小于产品里面设置数据携带的最小HEX长度,则丢弃 |
305 | + if(credentialsId.length() < profile.getCombinationInfo().getHexLength()){ | ||
305 | continue; | 306 | continue; |
306 | } | 307 | } |
307 | String filterPrefix = combinationInfo.getFilterPrefix(); | 308 | String filterPrefix = combinationInfo.getFilterPrefix(); |