From 3f81d5d91b96597a55f127e39accbdf536352153 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=96=8C?= <259278618@qq.com> Date: Wed, 10 Jun 2026 15:51:41 +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 | 32 ++++------------------ config.yml | 2 +- controller/account_controller.go | 2 +- controller/account_websocket_controller.go | 2 +- controller/scripted_speech_controller.go | 2 +- dao/account_dao.go | 2 +- dao/account_user_dialog_dao.go | 2 +- dao/scripted_speech_dao.go | 2 +- go.mod | 4 +-- go.sum | 4 +-- main.go | 6 ++-- model/dto/account_dto.go | 2 +- model/dto/scripted_speech_dto.go | 2 +- model/dto/websocket_dto.go | 2 +- model/entity/account.go | 2 +- model/entity/account_user_dialog.go | 2 +- model/entity/scripted_speech.go | 2 +- service/account_websocket_service.go | 4 +-- service/session_tool_service.go | 8 +++--- 19 files changed, 31 insertions(+), 53 deletions(-) diff --git a/Dockerfile b/Dockerfile index fefb467..8f00606 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,44 +1,24 @@ -# 多阶段构建 - 第一阶段：编译（使用已安装的镜像） -FROM golang:1.26-alpine3.23 AS builder +# 阶段1: 构建 +FROM golang:alpine AS builder RUN apk add --no-cache git ca-certificates tzdata +ENV TZ=Asia/Shanghai +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone + ENV GO111MODULE=on ENV GOPROXY=https://goproxy.cn,direct ENV CGO_ENABLED=0 ENV GOTOOLCHAIN=auto -ENV GOPRIVATE=gitea.com/red-future/common - -# 配置git使用私有Gitea仓库（带Token认证） -RUN git config --global url."http://x-token-auth:619679cd366aefea3a50f0622d842a41f2209e08595767bba49c3836ef57d415@116.204.74.41:3000/red-future/common.git".insteadOf "https://gitea.com/red-future/common.git" && \ - git config --global credential.helper store - WORKDIR /build -# 复制父目录的 common 模块(因为 go.mod 中使用了本地 replace) -#COPY ../common /build/common COPY . . RUN go mod download && go mod tidy RUN go build -ldflags="-s -w" -o main ./main.go -# 第二阶段：运行 -FROM alpine:3.23 -ENV TIME_ZONE=Asia/Shanghai -RUN apk add --no-cache ca-certificates tzdata && \ - ln -sf /usr/share/zoneinfo/$TIME_ZONE /etc/localtime - -WORKDIR /app - -# 复制编译好的二进制文件 -COPY --from=builder /build/main . -COPY --from=builder /build/config.yml ./ - -# 创建日志目录 -RUN mkdir -p /logs /app/resource/log/run /app/resource/log/server - -EXPOSE 3000 +EXPOSE 3012 CMD ["./main"] diff --git a/config.yml b/config.yml index 0bf874b..5ad2088 100644 --- a/config.yml +++ b/config.yml @@ -1,5 +1,5 @@ server: - address: ":3000" + address: ":3012" name: "customer-server" cache: localTTL: 60 diff --git a/controller/account_controller.go b/controller/account_controller.go index f6d7699..b35fc39 100644 --- a/controller/account_controller.go +++ b/controller/account_controller.go @@ -7,7 +7,7 @@ import ( "customer-server/model/dto" "customer-server/service" - "gitea.com/red-future/common/beans" + "gitea.redpowerfuture.com/red-future/common/beans" "github.com/gogf/gf/v2/frame/g" ) diff --git a/controller/account_websocket_controller.go b/controller/account_websocket_controller.go index 1a8523f..a9642d9 100644 --- a/controller/account_websocket_controller.go +++ b/controller/account_websocket_controller.go @@ -7,7 +7,7 @@ import ( "customer-server/model/dto" "customer-server/service" - "gitea.com/red-future/common/beans" + "gitea.redpowerfuture.com/red-future/common/beans" "github.com/gogf/gf/v2/frame/g" ) diff --git a/controller/scripted_speech_controller.go b/controller/scripted_speech_controller.go index c1436c0..f31a256 100644 --- a/controller/scripted_speech_controller.go +++ b/controller/scripted_speech_controller.go @@ -7,7 +7,7 @@ import ( "customer-server/model/dto" "customer-server/service" - "gitea.com/red-future/common/beans" + "gitea.redpowerfuture.com/red-future/common/beans" "github.com/gogf/gf/v2/frame/g" ) diff --git a/dao/account_dao.go b/dao/account_dao.go index baecc5c..1d7cf4b 100644 --- a/dao/account_dao.go +++ b/dao/account_dao.go @@ -6,7 +6,7 @@ import ( "customer-server/model/dto" "customer-server/model/entity" - "gitea.com/red-future/common/db/gfdb" + "gitea.redpowerfuture.com/red-future/common/db/gfdb" "github.com/gogf/gf/v2/frame/g" "github.com/gogf/gf/v2/util/gconv" ) diff --git a/dao/account_user_dialog_dao.go b/dao/account_user_dialog_dao.go index 6db5413..368e45a 100644 --- a/dao/account_user_dialog_dao.go +++ b/dao/account_user_dialog_dao.go @@ -6,7 +6,7 @@ import ( "customer-server/model/dto" "customer-server/model/entity" - "gitea.com/red-future/common/db/gfdb" + "gitea.redpowerfuture.com/red-future/common/db/gfdb" "github.com/gogf/gf/v2/database/gdb" "github.com/gogf/gf/v2/util/gconv" ) diff --git a/dao/scripted_speech_dao.go b/dao/scripted_speech_dao.go index d5e85c3..cad7e79 100644 --- a/dao/scripted_speech_dao.go +++ b/dao/scripted_speech_dao.go @@ -6,7 +6,7 @@ import ( "customer-server/model/dto" "customer-server/model/entity" - "gitea.com/red-future/common/db/gfdb" + "gitea.redpowerfuture.com/red-future/common/db/gfdb" "github.com/gogf/gf/v2/util/gconv" ) diff --git a/go.mod b/go.mod index 21b734a..bb7d437 100644 --- a/go.mod +++ b/go.mod @@ -2,12 +2,10 @@ module customer-server go 1.26.0 -//replace gitea.com/red-future/common v0.0.18 => ../common - //replace github.com/bjang03/gmq => ../gmq require ( - gitea.com/red-future/common v0.0.18 + gitea.redpowerfuture.com/red-future/common v0.0.23 github.com/bjang03/gmq v0.0.1 github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.10.0 github.com/gogf/gf/contrib/nosql/redis/v2 v2.10.0 diff --git a/go.sum b/go.sum index f316e55..0f1b112 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.18 h1:RwpnnWmDTCnFtKfmlp9BOnDd4r9eUnx7YT6Zst3VJqY= -gitea.com/red-future/common v0.0.18/go.mod h1:6/nqIucVzmjOyqDTIq71feYBXXFNBy0rFwzaQ0/Ueoo= +gitea.redpowerfuture.com/red-future/common v0.0.23 h1:xieoA00iKOCDm5SO9iXn+cSyMKBAlZwI0fuEVPWrHLg= +gitea.redpowerfuture.com/red-future/common v0.0.23/go.mod h1:50U1Xi+Ie56z09S5LQbZvaken0Mxv3OeS9LgR7U/ZRY= 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= diff --git a/main.go b/main.go index 29b8f61..7507e49 100644 --- a/main.go +++ b/main.go @@ -9,9 +9,9 @@ import ( "os/signal" "syscall" - "gitea.com/red-future/common/http" - "gitea.com/red-future/common/jaeger" - "gitea.com/red-future/common/utils" + "gitea.redpowerfuture.com/red-future/common/http" + "gitea.redpowerfuture.com/red-future/common/jaeger" + "gitea.redpowerfuture.com/red-future/common/utils" gmq "github.com/bjang03/gmq/core/gmq" "github.com/bjang03/gmq/mq" "github.com/bjang03/gmq/types" diff --git a/model/dto/account_dto.go b/model/dto/account_dto.go index 077ce85..e667065 100644 --- a/model/dto/account_dto.go +++ b/model/dto/account_dto.go @@ -5,7 +5,7 @@ package dto import ( "customer-server/consts/account" - "gitea.com/red-future/common/beans" + "gitea.redpowerfuture.com/red-future/common/beans" "github.com/gogf/gf/v2/frame/g" ) diff --git a/model/dto/scripted_speech_dto.go b/model/dto/scripted_speech_dto.go index 423680b..3fc6309 100644 --- a/model/dto/scripted_speech_dto.go +++ b/model/dto/scripted_speech_dto.go @@ -5,7 +5,7 @@ package dto import ( "customer-server/consts/scriptedSpeech" - "gitea.com/red-future/common/beans" + "gitea.redpowerfuture.com/red-future/common/beans" "github.com/gogf/gf/v2/frame/g" ) diff --git a/model/dto/websocket_dto.go b/model/dto/websocket_dto.go index 3b5467d..d0037cc 100644 --- a/model/dto/websocket_dto.go +++ b/model/dto/websocket_dto.go @@ -1,7 +1,7 @@ package dto import ( - "gitea.com/red-future/common/beans" + "gitea.redpowerfuture.com/red-future/common/beans" "github.com/gogf/gf/v2/frame/g" ) diff --git a/model/entity/account.go b/model/entity/account.go index b98c263..b221f12 100644 --- a/model/entity/account.go +++ b/model/entity/account.go @@ -3,7 +3,7 @@ package entity import ( "customer-server/consts/account" - "gitea.com/red-future/common/beans" + "gitea.redpowerfuture.com/red-future/common/beans" ) type accountCol struct { diff --git a/model/entity/account_user_dialog.go b/model/entity/account_user_dialog.go index 83e6bc7..671c9aa 100644 --- a/model/entity/account_user_dialog.go +++ b/model/entity/account_user_dialog.go @@ -1,7 +1,7 @@ package entity import ( - "gitea.com/red-future/common/beans" + "gitea.redpowerfuture.com/red-future/common/beans" ) type accountUserDialogCol struct { diff --git a/model/entity/scripted_speech.go b/model/entity/scripted_speech.go index ce0fca2..35c7755 100644 --- a/model/entity/scripted_speech.go +++ b/model/entity/scripted_speech.go @@ -3,7 +3,7 @@ package entity import ( "customer-server/consts/scriptedSpeech" - "gitea.com/red-future/common/beans" + "gitea.redpowerfuture.com/red-future/common/beans" ) type scriptedSpeechCol struct { diff --git a/service/account_websocket_service.go b/service/account_websocket_service.go index 5e0bb90..d8b2852 100644 --- a/service/account_websocket_service.go +++ b/service/account_websocket_service.go @@ -7,8 +7,8 @@ import ( "fmt" netHttp "net/http" - "gitea.com/red-future/common/beans" - "gitea.com/red-future/common/jaeger" + "gitea.redpowerfuture.com/red-future/common/beans" + "gitea.redpowerfuture.com/red-future/common/jaeger" "github.com/gogf/gf/v2/container/gmap" "github.com/gogf/gf/v2/encoding/gjson" "github.com/gogf/gf/v2/frame/g" diff --git a/service/session_tool_service.go b/service/session_tool_service.go index 8aac4e7..ce05450 100644 --- a/service/session_tool_service.go +++ b/service/session_tool_service.go @@ -14,10 +14,10 @@ import ( "strings" "time" - "gitea.com/red-future/common/beans" - "gitea.com/red-future/common/http" - "gitea.com/red-future/common/jaeger" - "gitea.com/red-future/common/utils" + "gitea.redpowerfuture.com/red-future/common/beans" + "gitea.redpowerfuture.com/red-future/common/http" + "gitea.redpowerfuture.com/red-future/common/jaeger" + "gitea.redpowerfuture.com/red-future/common/utils" gmq "github.com/bjang03/gmq/core/gmq" "github.com/bjang03/gmq/mq" "github.com/bjang03/gmq/types"