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

# Conflicts:
#	go.sum
This commit is contained in:
2026-06-08 18:02:26 +08:00
2 changed files with 5 additions and 5 deletions

View File

@@ -1,5 +1,5 @@
# 多阶段构建 - 第一阶段:编译(使用已安装的镜像) # 多阶段构建 - 第一阶段:编译(使用已安装的镜像)
FROM golang:1.26-alpine3.23 AS builder FROM golang:alpine AS builder
RUN apk add --no-cache git ca-certificates tzdata RUN apk add --no-cache git ca-certificates tzdata
@@ -24,7 +24,7 @@ RUN go mod download && go mod tidy
RUN go build -ldflags="-s -w" -o main ./main.go RUN go build -ldflags="-s -w" -o main ./main.go
# 第二阶段:运行 # 第二阶段:运行
FROM alpine:3.23 FROM alpine:3.19
ENV TIME_ZONE=Asia/Shanghai ENV TIME_ZONE=Asia/Shanghai
RUN apk add --no-cache ca-certificates tzdata && \ RUN apk add --no-cache ca-certificates tzdata && \

View File

@@ -50,14 +50,14 @@ database:
redis: redis:
default: default:
address: 192.168.3.30:6379 address: 116.204.74.41:6379
db: 0 db: 0
consul: consul:
address: 192.168.3.30:8500 address: 116.204.74.41:8500
jaeger: jaeger:
addr: 192.168.3.30:4318 addr: 116.204.74.41:4318
# 本地调试用:可选自动执行 worker/cleaner默认关闭 # 本地调试用:可选自动执行 worker/cleaner默认关闭
asynch: asynch: