合并master

docker-compose/docker-compose.yml

@@ -0,0 +1,52 @@
+version: '3'
+services:
+  redis:
+    image: redis:5.0.8
+    container_name: iotkit-ce-redis
+    ports:
+      - 6379:6379
+    volumes:
+      - "redis-volume:/data"
+    command: redis-server --appendonly yes
+    environment:
+      - TZ=Asia/Shanghai
+  elasticsearch:
+    image: elasticsearch:7.12.0
+    container_name: iotkit-ce-elasticsearch
+    environment:
+      ES_JAVA_OPTS: -Djava.net.preferIPv4Stack=true -Xms1g -Xmx1g
+      transport.host: 0.0.0.0
+      discovery.type: single-node
+      bootstrap.memory_lock: "true"
+    ports:
+      - 9200:9200
+      - 9300:9300
+    volumes:
+      - "elasticsearch-volume:/usr/share/elasticsearch/data"
+  ui:
+    image: uncleregan/iotkit-ui:0.3.4
+    container_name: iotkit-ce-ui
+    ports:
+      - 80:80
+    links:
+      - iotkit:iotkit
+    volumes:
+      - "iotkit-volume:/usr/share/nginx/html/upload"
+  iotkit:
+    image: uncleregan/iotkit:0.3.4
+    container_name: iotkit-ce
+    restart: on-failure
+    ports:
+      - 8086:8086 # API端口
+      - 1883-1890:1883-1890 # 预留
+      - 8000-8010:8000-8010 # 预留
+    links:
+      - redis:redis
+      - elasticsearch:elasticsearch
+    depends_on:
+      - elasticsearch
+      - redis
+volumes:
+  redis-volume:
+  elasticsearch-volume:
+  iotkit-volume:

iot-package/src/main/resources/assemblies/standalone-package.xml

@@ -3,7 +3,7 @@
           xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
     <id>standalone-package</id>
     <formats>
-        <format>zip</format>
+        <format>tar</format>
     </formats>
     <includeBaseDirectory>false</includeBaseDirectory>
     <dependencySets>

iot-standalone/pom.xml

@@ -83,6 +83,12 @@
         <dependency>
             <groupId>it.ozimov</groupId>
             <artifactId>embedded-redis</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>slf4j-simple</artifactId>
+                    <groupId>org.slf4j</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>

iot-standalone/src/main/java/cc/iotkit/manager/controller/VirtualDeviceController.java

@@ -149,7 +149,7 @@ public class VirtualDeviceController {
             @PathVariable("size") int size,
             @PathVariable("page") int page
     ) {
-        return virtualDeviceLogData.findByVirtualDeviceId(id, page - 1, size);
+        return virtualDeviceLogData.findByVirtualDeviceId(id, page, size);
     }
 
     private VirtualDevice checkOwner(String id) {