From 0bee3685fb42ccd373aee9d169dcdb25da2f052b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=96=8C?= <259278618@qq.com> Date: Mon, 8 Jun 2026 13:39:20 +0800 Subject: [PATCH 1/3] =?UTF-8?q?ci/cd=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 4 ++-- config.yml | 10 +++++----- go.mod | 2 +- go.sum | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index e7af5f8..5d60cef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 @@ -24,7 +24,7 @@ RUN go mod download && go mod tidy RUN go build -ldflags="-s -w" -o main ./main.go # 第二阶段：运行 -FROM alpine:3.23 +FROM alpine:3.19 ENV TIME_ZONE=Asia/Shanghai RUN apk add --no-cache ca-certificates tzdata && \ diff --git a/config.yml b/config.yml index e7d2193..81c8732 100644 --- a/config.yml +++ b/config.yml @@ -7,7 +7,7 @@ server: database: default: - type: "pgsql" - host: "116.204.74.41" + host: "192.168.0.169" port: "15432" user: "postgres" pass: "Bjang09@686^*^" @@ -28,7 +28,7 @@ database: timeMaintainDisabled: false # (可选)是否完全关闭时间更新特性，为true时CreatedAt/UpdatedAt/DeletedAt都将失效 model_gateway: - type: "pgsql" - host: "116.204.74.41" + host: "192.168.0.169" port: "15432" user: "postgres" pass: "Bjang09@686^*^" @@ -50,14 +50,14 @@ database: redis: default: - address: 192.168.3.30:6379 + address: 192.168.0.169:6379 db: 0 consul: - address: 192.168.3.30:8500 + address: 192.168.0.169:8500 jaeger: - addr: 192.168.3.30:4318 + addr: 192.168.0.169:4318 # 本地调试用：可选自动执行 worker/cleaner（默认关闭） asynch: diff --git a/go.mod b/go.mod index b7b70f9..1820043 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module model-gateway go 1.26.1 require ( - gitea.com/red-future/common v0.0.20 + gitea.com/red-future/common v0.0.21 github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.10.2 github.com/gogf/gf/contrib/nosql/redis/v2 v2.10.2 github.com/gogf/gf/v2 v2.10.2 diff --git a/go.sum b/go.sum index 82cd765..bfd90c9 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,6 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -gitea.com/red-future/common v0.0.20 h1:KlKINnJFmOVkDzgkptEAFsdpMUZb0zK9BTdiXRxVfAo= -gitea.com/red-future/common v0.0.20/go.mod h1:6/nqIucVzmjOyqDTIq71feYBXXFNBy0rFwzaQ0/Ueoo= +gitea.com/red-future/common v0.0.21 h1:8w30HmCVmFG/hphH3ODJs1KxDEGmRpq+/PXI0pQjJKc= +gitea.com/red-future/common v0.0.21/go.mod h1:6/nqIucVzmjOyqDTIq71feYBXXFNBy0rFwzaQ0/Ueoo= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg= github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= From 26de41d04efda79aa370bf4424905a3be14ba0f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=96=8C?= <259278618@qq.com> Date: Mon, 8 Jun 2026 13:44:54 +0800 Subject: [PATCH 2/3] =?UTF-8?q?ci/cd=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.yml b/config.yml index 81c8732..5838bb8 100644 --- a/config.yml +++ b/config.yml @@ -54,7 +54,7 @@ redis: db: 0 consul: - address: 192.168.0.169:8500 + address: 116.204.74.41:8500 jaeger: addr: 192.168.0.169:4318 From 96e8bdfe62d55163f0f822a5d954ce12c57f0e7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=96=8C?= <259278618@qq.com> Date: Mon, 8 Jun 2026 15:37:11 +0800 Subject: [PATCH 3/3] =?UTF-8?q?ci/cd=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config.yml b/config.yml index 5838bb8..aa1f962 100644 --- a/config.yml +++ b/config.yml @@ -7,7 +7,7 @@ server: database: default: - type: "pgsql" - host: "192.168.0.169" + host: "116.204.74.41" port: "15432" user: "postgres" pass: "Bjang09@686^*^" @@ -28,7 +28,7 @@ database: timeMaintainDisabled: false # (可选)是否完全关闭时间更新特性，为true时CreatedAt/UpdatedAt/DeletedAt都将失效 model_gateway: - type: "pgsql" - host: "192.168.0.169" + host: "116.204.74.41" port: "15432" user: "postgres" pass: "Bjang09@686^*^" @@ -50,14 +50,14 @@ database: redis: default: - address: 192.168.0.169:6379 + address: 116.204.74.41:6379 db: 0 consul: address: 116.204.74.41:8500 jaeger: - addr: 192.168.0.169:4318 + addr: 116.204.74.41:4318 # 本地调试用：可选自动执行 worker/cleaner（默认关闭） asynch: