Merge branch 'dev' of http://192.168.1.220:10080/jiwei/jw2.0 into dev

Conflicts:
	app/app-iot-server/pom.xml

app/app-iot-server/src/main/resources/application.yml

@@ -20,8 +20,8 @@ spring:
  application:
    name: app-iot-server
    message: App IOT Server
#  resources:
#    static-locations: classpath:/
  resources:
    static-locations: classpath:/
#    cache-period: 0