Merge remote-tracking branch 'origin/dev' into dev

server-service/src/main/java/com/makeit/service/platform/device/impl/PlatDeviceServiceImpl.java

@@ -691,7 +691,7 @@ public class PlatDeviceServiceImpl extends ServiceImpl<PlatDeviceMapper, PlatDev
             PlatDeviceOther platDeviceOther = platDeviceOtherList.get(0);
             UserServerInfo existInfo = new UserServerInfo();
             existInfo.setAddr(platDeviceOther.getProtocolAddress());
-            existInfo.setPort(platDeviceOther.getProtocolPort() != null ? Integer.valueOf(platDeviceOther.getProtocolPort()) : null);
+            existInfo.setPort(StringUtils.isNotBlank(platDeviceOther.getProtocolPort()) ? Integer.valueOf(platDeviceOther.getProtocolPort()) : null);
             existInfo.setUsername(platDeviceOther.getProtocolAccount());
             existInfo.setPassword(platDeviceOther.getProtocolPassword());
             String jsonString = JSON.toJSONString(existInfo);