diff --git a/Dockerfile b/Dockerfile index c525013..56a5568 100644 --- a/Dockerfile +++ b/Dockerfile @@ -43,10 +43,6 @@ RUN apk --no-cache add tzdata curl # 设置时区 ENV TZ=Asia/Shanghai -# 创建非root用户 -RUN addgroup -g 1001 tyapi && \ - adduser -D -s /bin/sh -u 1001 -G tyapi tyapi - # 设置工作目录 WORKDIR /app @@ -57,11 +53,6 @@ COPY --from=builder /app/tyapi-server . COPY --chown=tyapi:tyapi config.yaml . COPY --chown=tyapi:tyapi configs/ ./configs/ -# 创建日志目录 -RUN mkdir -p logs && chown -R tyapi:tyapi logs - -# 使用root权限运行(注释掉非root用户) -# USER tyapi # 暴露端口 EXPOSE 8080 diff --git a/config.yaml b/config.yaml index f9dbf27..68db724 100644 --- a/config.yaml +++ b/config.yaml @@ -47,7 +47,7 @@ cache: logger: level: "info" format: "console" - output: "stdout" + output: "file" log_dir: "logs" max_size: 100 max_backups: 3 diff --git a/configs/env.development.yaml b/configs/env.development.yaml index a0a5508..1a2dd39 100644 --- a/configs/env.development.yaml +++ b/configs/env.development.yaml @@ -15,6 +15,19 @@ database: name: "tyapi_dev" # =========================================== +# 📝 日志配置 +# =========================================== +logger: + level: info + format: json + output: "file" + log_dir: "logs" + max_size: 100 + max_backups: 5 + max_age: 30 + compress: true + use_daily: true +# =========================================== # 🔐 JWT配置 # =========================================== jwt: diff --git a/configs/env.production.yaml b/configs/env.production.yaml index 5f2fbac..16b366e 100644 --- a/configs/env.production.yaml +++ b/configs/env.production.yaml @@ -38,7 +38,7 @@ redis: # 📝 日志配置 # =========================================== logger: - level: warn + level: info format: json output: "file" log_dir: "/app/logs" diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 72caff7..241920c 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -85,40 +85,6 @@ services: # 环境设置 ENV: production - - # 服务器配置 - SERVER_PORT: 8080 - SERVER_MODE: release - - # 数据库配置 - DB_HOST: postgres - DB_PORT: 5432 - DB_USER: tyapi_user - DB_PASSWORD: Pg9mX4kL8nW2rT5y - DB_NAME: tyapi - DB_SSLMODE: require - - # Redis配置 - REDIS_HOST: redis - REDIS_PORT: 6379 - REDIS_PASSWORD: "" - - # JWT配置 - JWT_SECRET: JwT8xR4mN9vP2sL7kH3oB6yC1zA5uF0qE9tW - - # 监控配置 - TRACING_ENABLED: false - METRICS_ENABLED: false - - # 日志配置 - LOG_LEVEL: warn - LOG_FORMAT: json - - # 短信配置 - SMS_ACCESS_KEY_ID: LTAI5tKGB3TVJbMHSoZN3yr9 - SMS_ACCESS_KEY_SECRET: OCQ30GWp4yENMjmfOAaagksE18bp65 - SMS_SIGN_NAME: 天远数据 - SMS_TEMPLATE_CODE: SMS_474525324 ports: - "25000:8080" volumes: