diff --git a/docker-compose.yaml b/docker-compose.yaml index 9fccc28..8b233b4 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,36 +1,35 @@ version: '3.4' services: - sql-runner: - build: - context: . - dockerfile: Dockerfile - restart: always - container_name: douyin - image: registry.cn-hangzhou.aliyuncs.com/yinzhou_docker_hub/douyin:yz1 - #环境变量需要替换成自己的 - environment: - DASHSCOPE_API_KEY: ****** - ENVIRONMENT: pro + douyin: + build: + context: . + dockerfile: Dockerfile + restart: always + container_name: douyin + image: registry.cn-hangzhou.aliyuncs.com/yinzhou_docker_hub/douyin:yz1 + #环境变量需要替换成自己的 + environment: + DASHSCOPE_API_KEY: sk-063b48fffb914d558ddcddc5166fd34d - ports: - - "1314:1314" - depends_on: - - douyin_tiktok_download_api + ports: + - "1314:1314" + depends_on: + - douyin_tiktok_download_api - douyin_tiktok_download_api: # 服务名称 - image: registry.cn-hangzhou.aliyuncs.com/yinzhou_docker_hub/douyin_tiktok_download_api # 使用的 Docker 镜像 - container_name: douyin_tiktok_download_api # 容器名称 - hostname: douyin_tiktok_download_api - restart: always # 容器退出后总是重启 - volumes: # 挂载卷配置 - - ./douyin_tiktok_download_api/douyin_web/config.yaml:/app/crawlers/douyin/web/config.yaml - - ./douyin_tiktok_download_api/tiktok_web/config.yaml:/app/crawlers/tiktok/web/config.yaml - - ./douyin_tiktok_download_api/tiktok_app/config.yaml:/app/crawlers/tiktok/app/config.yaml - environment: # 环境变量配置 - TZ: Asia/Shanghai # 设置时区为亚洲/上海 -# 需要调试可以打开80端口 - ports: - - 9579:80 + douyin_tiktok_download_api: # 服务名称 + image: registry.cn-hangzhou.aliyuncs.com/yinzhou_docker_hub/douyin_tiktok_download_api # 使用的 Docker 镜像 + container_name: douyin_tiktok_download_api # 容器名称 + hostname: douyin_tiktok_download_api + restart: always # 容器退出后总是重启 + volumes: # 挂载卷配置 + - ./douyin_tiktok_download_api/douyin_web/config.yaml:/app/crawlers/douyin/web/config.yaml + - ./douyin_tiktok_download_api/tiktok_web/config.yaml:/app/crawlers/tiktok/web/config.yaml + - ./douyin_tiktok_download_api/tiktok_app/config.yaml:/app/crawlers/tiktok/app/config.yaml + environment: # 环境变量配置 + TZ: Asia/Shanghai # 设置时区为亚洲/上海 + # 需要调试可以打开80端口 + ports: + - 9579:80 # docker-compose up --build \ No newline at end of file diff --git a/utils/__init__.py b/utils/__init__.py index f95e4c5..1810cce 100644 --- a/utils/__init__.py +++ b/utils/__init__.py @@ -1,17 +1,17 @@ # -*- coding: utf-8 -*- -import os -from configparser import ConfigParser - -ENVIRONMENT=os.getenv("ENVIRONMENT", "test") -print(f"当前环境为:{ENVIRONMENT}") -conf = ConfigParser() -path=os.path.dirname(__file__).replace("\\utils", "") -conf.read(f"{path}\\config\\config.ini") -config = conf[ENVIRONMENT] -# 遍历conf -for k, v in config.items(): - config[k] = v.strip() - os.environ[k] = v.strip() - -print(f"加载配置文件完成") +# import os +# from configparser import ConfigParser +# +# ENVIRONMENT=os.getenv("ENVIRONMENT", "test") +# print(f"当前环境为:{ENVIRONMENT}") +# conf = ConfigParser() +# path=os.path.dirname(__file__).replace("\\utils", "") +# conf.read(f"{path}\\config\\config.ini") +# config = conf[ENVIRONMENT] +# # 遍历conf +# for k, v in config.items(): +# config[k] = v.strip() +# os.environ[k] = v.strip() +# +# print(f"加载配置文件完成")