Merge branch 'retiredCadresDemo_zm' of…

Merge branch 'retiredCadresDemo_zm' of http://git.xmmakeit.com/huangjiay/iot-platform-server into retiredCadresDemo_zm

server-common/src/main/java/com/makeit/module/demo/service/DemoProductDeviceService.java

@@ -56,8 +56,10 @@ public class DemoProductDeviceService extends DemoCommonService {
         try {
         try {
             DemoResponseMessage responseMessage = sendPost(url, request);
             DemoResponseMessage responseMessage = sendPost(url, request);
             if (responseMessage.getRetcode() == 0) {
             if (responseMessage.getRetcode() == 0) {
-                DemoDeviceEntity demoDeviceEntities = JSON.parseObject(responseMessage.getData().toString(),DemoDeviceEntity.class);
-                return demoDeviceEntities;
+                if(responseMessage.getData() != null){
+                    DemoDeviceEntity demoDeviceEntities = JSON.parseObject(responseMessage.getData().toString(),DemoDeviceEntity.class);
+                    return demoDeviceEntities;
+                }
             }
             }
             log.error("获取设备接口失败:{}", responseMessage.getMsg());
             log.error("获取设备接口失败:{}", responseMessage.getMsg());
         } catch (IOException e) {
         } catch (IOException e) {

server-web/platform-web.iml

@@ -27,6 +27,8 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="server-module" />
     <orderEntry type="module" module-name="server-module" />
     <orderEntry type="module" module-name="server-module" />
     <orderEntry type="module" module-name="server-module" />
+    <orderEntry type="library" name="Maven: com.huaweicloud:esdk-obs-java-bundle:3.23.5" level="project" />
+    <orderEntry type="module" module-name="server-module" />
     <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.22" level="project" />
     <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.22" level="project" />
     <orderEntry type="module" module-name="server-common" />
     <orderEntry type="module" module-name="server-common" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.5.6" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.5.6" level="project" />
@@ -168,7 +170,7 @@
     <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.3.0" level="project" />
     <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.3.0" level="project" />
     <orderEntry type="library" name="Maven: com.aliyun:alibabacloud-gateway-spi:0.0.1" level="project" />
     <orderEntry type="library" name="Maven: com.aliyun:alibabacloud-gateway-spi:0.0.1" level="project" />
     <orderEntry type="library" name="Maven: com.aliyun:openapiutil:0.1.14" level="project" />
     <orderEntry type="library" name="Maven: com.aliyun:openapiutil:0.1.14" level="project" />
-    <orderEntry type="library" name="Maven: com.huaweicloud:esdk-obs-java-bundle:3.23.5" level="project" />
+    <orderEntry type="library" name="Maven: com.huaweicloud:esdk-obs-java-bundle:3.23.9" level="project" />
     <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-core:2.14.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-core:2.14.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.14.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.14.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.12.0" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.12.0" level="project" />