Merge branch 'retiredCadresDemo_zm' of…

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

# Conflicts:
#	server-service/src/main/java/com/makeit/task/DemoDeviceTask.java

server-web/platform-web.iml

@@ -25,6 +25,8 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="server-module" />
+    <orderEntry type="module" module-name="server-module" />
     <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.22" level="project" />
     <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" />

server-web/src/main/resources/application-dev.yml

@@ -145,10 +145,10 @@ voice-sms:
     pwd: xmksyy123456
 
 demo:
-  url: https://dev-api.yunmaolink.com/
+  url: https://test-api.yunmaolink.com/
   brand: kuangshi
-  accessKey: 0db02e998b2f422dad2a30e40efd9a0c
-  secretKey: 4978bee40e5245338c9df0fe7dac5a68
+  accessKey: 389a05bf1bd24cdfa3a8be97708ba586
+  secretKey: 5d37ecc971ee400db4e30391902d3564