!2 docker-compose修复，处理日志jar冲突问题

Merge pull request !2 from 雨辰忆/dev-regan

docker-compose/docker-compose.yml

@@ -1,11 +1,15 @@
-version: '1'
+version: '3'
 services:
   redis:
-    image: redis:latest
+    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
@@ -17,6 +21,8 @@ services:
     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
@@ -24,9 +30,11 @@ services:
       - 80:80
     links:
       - iotkit:iotkit
+    volumes:
+      - "iotkit-volume:/usr/share/nginx/html/upload"
   iotkit:
-    image: uncleregan/iotkit:0.3.3
-    container_name: iotkit-cei
+    image: uncleregan/iotkit:0.3.4
+    container_name: iotkit-ce
     restart: on-failure
     ports:
       - 8086:8086 # API端口
@@ -37,4 +45,8 @@ services:
       - elasticsearch:elasticsearch
     depends_on:
       - elasticsearch
-      - redis
+      - redis
+volumes:
+  redis-volume:
+  elasticsearch-volume:
+  iotkit-volume:

iot-standalone/pom.xml

@@ -93,6 +93,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/Application.java

@@ -22,6 +22,8 @@ import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 public class Application {
 
     public static void main(String[] args) {
+        //System.setProperty("disabledEmbeddedEs","true");
+        //System.setProperty("disabledEmbeddedRedis","true");
         if (EmbeddedElasticSearchConfig.embeddedEnable()) {
             EmbeddedElasticSearchConfig.startEmbeddedElasticSearch();
         }

iot-standalone/src/main/resources/application.yml

@@ -11,6 +11,7 @@ spring:
   elasticsearch:
     rest:
       #使用内置es的配置
+      #uris: http://elasticsearch:9200
       uris: http://127.0.0.1:9200
       username:
       password:
@@ -18,6 +19,7 @@ spring:
 
   redis:
     #使用内置redis的配置
+    #host: redis
     host: 127.0.0.1
     port: 6379
     database: 0
@@ -29,10 +31,10 @@ spring:
 
 #图片存储用的是阿里云oss，如果需要上传产品图片才需要配置
 aliyun:
-  bucketId: iotkit-img
-  endpoint: oss-cn-shenzhen.aliyuncs.com
-  accessKeyId: 填写阿里云accessKeyId
-  accessKeySecret: 填写阿里云accessKeySecret
+  bucketId:
+  endpoint:
+  accessKeyId:
+  accessKeySecret:
 
 sa-token:
   # token名称 (同时也是cookie名称)