Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0

648540858

2021-12-02 a1398a56cc3587f08c28032a5c00f4c71b48e4f7

 docker/docker-compose.yml

@@ -13,7 +13,7 @@
    build:
      context: ./wvp
      args:
        gitUrl: "https://gitee.com/xieyu1989"
        gitUrl: "https://gitee.com/pan648540858"
        zlmGitUrl: "https://gitee.com/xia-chu/ZLMediaKit"
    restart: always
    ports:
@@ -41,6 +41,8 @@
      REDIS_PORT: 6379
      REDIS_DB: 6
      REDIS_PWD: root
      ASSIST_JVM_CONFIG: -Xms128m -Xmx256m
      WVP_JVM_CONFIG: -Xms128m -Xmx256m
      ASSIST_CONFIG:
      WVP_CONFIG:
    depends_on: