From 4f880d500cc9dcc185ec672c1b321319f41cd29c 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] =?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 | 8 ++++---- go.mod | 8 +------- go.sum | 10 ++-------- 4 files changed, 9 insertions(+), 21 deletions(-) diff --git a/Dockerfile b/Dockerfile index a5218b6..4b1cb3a 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 fd4b23d..59fd265 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^*^" @@ -29,14 +29,14 @@ database: redis: default: - address: 116.204.74.41:6379 + address: 192.168.0.169:6379 db: 0 consul: - address: 116.204.74.41:8500 + address: 192.168.0.169:8500 jaeger: - addr: 116.204.74.41:4318 + addr: 192.168.0.169:4318 task: waitTimeoutSeconds: 300 # /composeMessages 同步等待最终结果的最长时间(秒) diff --git a/go.mod b/go.mod index 5dfab77..4844845 100644 --- a/go.mod +++ b/go.mod @@ -3,17 +3,12 @@ module prompts-core go 1.26.0 require ( - gitea.com/red-future/common v0.0.19 + gitea.com/red-future/common v0.0.21 github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.10.0 github.com/gogf/gf/contrib/nosql/redis/v2 v2.10.0 github.com/gogf/gf/v2 v2.10.0 ) -require ( - github.com/tidwall/match v1.1.1 // indirect - github.com/tidwall/pretty v1.2.0 // indirect -) - require ( github.com/BurntSushi/toml v1.5.0 // indirect github.com/armon/go-metrics v0.4.1 // indirect @@ -68,7 +63,6 @@ require ( github.com/r3labs/diff/v2 v2.15.1 // indirect github.com/redis/go-redis/v9 v9.12.1 // indirect github.com/rivo/uniseg v0.4.7 // indirect - github.com/tidwall/gjson v1.19.0 github.com/tiger1103/gfast-token v1.0.10 // indirect github.com/vcaesar/cedar v0.30.0 // indirect github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect diff --git a/go.sum b/go.sum index 97621ce..8debb7a 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.19 h1:9/WrfCFUCeFUYwuhBYF+JOQi5F5xuOy+gVnf2ZvHZu4= -gitea.com/red-future/common v0.0.19/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= @@ -288,12 +288,6 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= -github.com/tidwall/gjson v1.19.0 h1:xwxm7n691Uf3u5OFjzngavjGTh55KX5q/9w9xHW88JU= -github.com/tidwall/gjson v1.19.0/go.mod h1:V37/opeE/JbLUOfH0QTXiNez2l0RUjYUhpT4szFQAfc= -github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= -github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= -github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs= -github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= github.com/tiger1103/gfast-token v1.0.10 h1:fNiBE/Dq5iTHvTGlCx3DmXa2o4hr0NtumFpffZ39k6s= github.com/tiger1103/gfast-token v1.0.10/go.mod h1:a/21mxmj7zFeNvjhZSC0XpEAFHfb1aT2k6DXnufFU1s= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=