Merge remote-tracking branch 'origin/dev' into satoken

疯狂的狮子li

2021-10-27 695cb6d76b838b1e4cb161bae335faa948dca12a

 script/docker/docker-compose.yml

文件名从 docker/docker-compose.yml 修改
@@ -138,12 +138,30 @@
    environment:
      # 鏃跺尯涓婃捣
      TZ: Asia/Shanghai
    volumes:
      # 閰嶇疆鏂囦欢
      - /docker/monitor/logs/:/ruoyi/monitor/logs
    privileged: true
    restart: always
    networks:
      ruoyi_net:
        ipv4_address: 172.30.0.90

  ruoyi-xxl-job-admin:
    image: "ruoyi/ruoyi-xxl-job-admin:3.2.0"
    container_name: ruoyi-xxl-job-admin
    environment:
      # 鏃跺尯涓婃捣
      TZ: Asia/Shanghai
    volumes:
      # 閰嶇疆鏂囦欢
      - /docker/xxljob/logs/:/ruoyi/xxljob/logs
    privileged: true
    restart: always
    networks:
      ruoyi_net:
        ipv4_address: 172.30.0.92

networks:
  ruoyi_net:
    driver: bridge