diff --git a/dc3-transfer/dc3-rtmp/Dockerfile b/dc3-transfer/dc3-rtmp/Dockerfile index e6e6c61bb..4c44129e8 100755 --- a/dc3-transfer/dc3-rtmp/Dockerfile +++ b/dc3-transfer/dc3-rtmp/Dockerfile @@ -18,11 +18,18 @@ FROM registry.cn-beijing.aliyuncs.com/dc3/alpine-java:1.8.251 AS base MAINTAINER pnoker pnokers.icloud.com ENV JAVA_OPS -server -Xms128m -Xmx1024m -XX:CompressedClassSpaceSize=128m -XX:MetaspaceSize=200m -XX:MaxMetaspaceSize=200m -ENV GC_LOG -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+PrintTenuringDistribution -XX:+PrintHeapAtGC -XX:+PrintReferenceGC -XX:+PrintGCApplicationStoppedTime -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 -XX:GCLogFileSize=10M -Xloggc:/dc3-transfer/dc3-rtmp/dc3/logs/gc/transfer/dc3-rtmp-gc-%t.log +ENV GC_LOG -XX:+PrintGCDetails \ + -XX:+PrintGCDateStamps \ + -XX:+PrintTenuringDistribution \ + -XX:+PrintHeapAtGC \ + -XX:+PrintReferenceGC \ + -XX:+PrintGCApplicationStoppedTime \ + -XX:+UseGCLogFileRotation \ + -XX:NumberOfGCLogFiles=10 \ + -XX:GCLogFileSize=10M \ + -Xloggc:dc3/logs/transfer/rtmp/gc/dc3-rtmp-gc.log -RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \ - && mkdir -p /dc3-transfer/dc3-rtmp \ - && mkdir -p /dc3-transfer/dc3-rtmp/dc3/logs +RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime FROM jrottenberg/ffmpeg:4.1-alpine AS build @@ -36,5 +43,6 @@ COPY --from=build /usr/local /usr/local EXPOSE 8803 VOLUME /dc3-transfer/dc3-rtmp/dc3/logs -CMD java ${JAVA_OPS} ${GC_LOG} -Djava.security.egd=file:/dev/./urandom -jar dc3-rtmp.jar +CMD mkdir -p /dc3-transfer/dc3-rtmp/dc3/logs/transfer/rtmp/gc \ + && java ${JAVA_OPS} ${GC_LOG} -Djava.security.egd=file:/dev/./urandom -jar dc3-rtmp.jar diff --git a/dc3-transfer/dc3-rtmp/src/main/resources/application.yml b/dc3-transfer/dc3-rtmp/src/main/resources/application.yml index 3146f4797..da91a1595 100644 --- a/dc3-transfer/dc3-rtmp/src/main/resources/application.yml +++ b/dc3-transfer/dc3-rtmp/src/main/resources/application.yml @@ -34,4 +34,4 @@ logging: level: com.dc3: DEBUG file: - name: dc3/logs/transfer/${spring.application.name}.log \ No newline at end of file + name: dc3/logs/transfer/rtmp/${spring.application.name}.log \ No newline at end of file diff --git a/dc3/api/dc3-auth/dc3-auth-token.http b/dc3/api/dc3-auth/dc3-auth-token.http index d8f847843..5992c20af 100644 --- a/dc3/api/dc3-auth/dc3-auth-token.http +++ b/dc3/api/dc3-auth/dc3-auth-token.http @@ -19,10 +19,10 @@ #/auth/token/salt POST http://localhost:8300/auth/token/salt Accept: */* -Content-Type: text/plain +Content-Type: application/json Cache-Control: no-cache -pnoker +"pnoker" ### 生成用户 Token 令牌 @@ -60,7 +60,7 @@ Cache-Control: no-cache #/auth/token/cancel POST http://localhost:8300/auth/token/cancel Accept: */* -Content-Type: text/plain +Content-Type: application/json Cache-Control: no-cache -pnoker \ No newline at end of file +"pnoker" \ No newline at end of file diff --git a/docs/home.md b/docs/home.md index abc79e4e4..45f6198c2 100644 --- a/docs/home.md +++ b/docs/home.md @@ -17,6 +17,8 @@ ![iot-dc3-architecture](images/dc3/architecture1.jpg) + + #### DC3 模块划分,四层架构 * [x] 驱动层:用于提供标准或者私有协议连接物理设备的 `SDK`,负责南向设备的数据采集和指令控制,基于 `SDK` 可实现驱动的快速开发;