ci/cd调整

This commit is contained in:
2026-06-10 16:32:42 +08:00
parent b69e7386e2
commit 40abf0f606
15 changed files with 24 additions and 44 deletions

View File

@@ -1,43 +1,23 @@
# 阶段构建 - 第一阶段:编译(使用已安装的镜像) # 阶段1: 构建
FROM golang:alpine 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
ENV TZ=Asia/Shanghai
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
ENV GO111MODULE=on ENV GO111MODULE=on
ENV GOPROXY=https://goproxy.cn,direct ENV GOPROXY=https://goproxy.cn,direct
ENV CGO_ENABLED=0 ENV CGO_ENABLED=0
ENV GOTOOLCHAIN=auto 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 WORKDIR /build
# 复制父目录的 common 模块(因为 go.mod 中使用了本地 replace)
#COPY ../common /build/common
COPY . . COPY . .
RUN go mod download && go mod tidy 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.19
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 3009 EXPOSE 3009

View File

@@ -3,7 +3,7 @@ package util
import ( import (
"context" "context"
"gitea.com/red-future/common/utils" "gitea.redpowerfuture.com/red-future/common/utils"
"github.com/gogf/gf/v2/frame/g" "github.com/gogf/gf/v2/frame/g"
) )

View File

@@ -5,7 +5,7 @@ import (
"prompts-core/consts/public" "prompts-core/consts/public"
"prompts-core/model/entity" "prompts-core/model/entity"
"gitea.com/red-future/common/db/gfdb" "gitea.redpowerfuture.com/red-future/common/db/gfdb"
) )
var ComposeSession = &composeSessionDao{} var ComposeSession = &composeSessionDao{}

View File

@@ -5,7 +5,7 @@ import (
"prompts-core/consts/public" "prompts-core/consts/public"
"prompts-core/model/entity" "prompts-core/model/entity"
"gitea.com/red-future/common/db/gfdb" "gitea.redpowerfuture.com/red-future/common/db/gfdb"
"github.com/gogf/gf/v2/util/gconv" "github.com/gogf/gf/v2/util/gconv"
) )

View File

@@ -5,7 +5,7 @@ import (
"prompts-core/consts/public" "prompts-core/consts/public"
"prompts-core/model/entity" "prompts-core/model/entity"
"gitea.com/red-future/common/db/gfdb" "gitea.redpowerfuture.com/red-future/common/db/gfdb"
"github.com/gogf/gf/v2/util/gconv" "github.com/gogf/gf/v2/util/gconv"
) )

2
go.mod
View File

@@ -3,7 +3,7 @@ module prompts-core
go 1.26.1 go 1.26.1
require ( require (
gitea.com/red-future/common v0.0.21 gitea.redpowerfuture.com/red-future/common v0.0.23
github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.10.2 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/contrib/nosql/redis/v2 v2.10.2
github.com/gogf/gf/v2 v2.10.2 github.com/gogf/gf/v2 v2.10.2

4
go.sum
View File

@@ -1,6 +1,6 @@
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
gitea.com/red-future/common v0.0.21 h1:8w30HmCVmFG/hphH3ODJs1KxDEGmRpq+/PXI0pQjJKc= gitea.redpowerfuture.com/red-future/common v0.0.23 h1:xieoA00iKOCDm5SO9iXn+cSyMKBAlZwI0fuEVPWrHLg=
gitea.com/red-future/common v0.0.21/go.mod h1:6/nqIucVzmjOyqDTIq71feYBXXFNBy0rFwzaQ0/Ueoo= 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 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 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg=
github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=

View File

@@ -7,9 +7,9 @@ import (
"prompts-core/controller" "prompts-core/controller"
"syscall" "syscall"
"gitea.com/red-future/common/http" "gitea.redpowerfuture.com/red-future/common/http"
"gitea.com/red-future/common/jaeger" "gitea.redpowerfuture.com/red-future/common/jaeger"
_ "gitea.com/red-future/common/swagger" _ "gitea.redpowerfuture.com/red-future/common/swagger"
_ "github.com/gogf/gf/contrib/drivers/pgsql/v2" _ "github.com/gogf/gf/contrib/drivers/pgsql/v2"
_ "github.com/gogf/gf/contrib/nosql/redis/v2" _ "github.com/gogf/gf/contrib/nosql/redis/v2"
"github.com/gogf/gf/v2/frame/g" "github.com/gogf/gf/v2/frame/g"

View File

@@ -1,6 +1,6 @@
package entity package entity
import "gitea.com/red-future/common/beans" import "gitea.redpowerfuture.com/red-future/common/beans"
type ComposeSession struct { type ComposeSession struct {
beans.SQLBaseDO `orm:",inline"` beans.SQLBaseDO `orm:",inline"`

View File

@@ -1,6 +1,6 @@
package entity package entity
import "gitea.com/red-future/common/beans" import "gitea.redpowerfuture.com/red-future/common/beans"
type ComposeTask struct { type ComposeTask struct {
beans.SQLBaseDO `orm:",inline"` beans.SQLBaseDO `orm:",inline"`

View File

@@ -1,6 +1,6 @@
package entity package entity
import "gitea.com/red-future/common/beans" import "gitea.redpowerfuture.com/red-future/common/beans"
// ProviderProtocol 模型协议映射配置 // ProviderProtocol 模型协议映射配置
type ProviderProtocol struct { type ProviderProtocol struct {

View File

@@ -8,8 +8,8 @@ import (
"prompts-core/model/entity" "prompts-core/model/entity"
"strings" "strings"
"gitea.com/red-future/common/beans" "gitea.redpowerfuture.com/red-future/common/beans"
commonHttp "gitea.com/red-future/common/http" commonHttp "gitea.redpowerfuture.com/red-future/common/http"
"github.com/gogf/gf/v2/encoding/gjson" "github.com/gogf/gf/v2/encoding/gjson"
"github.com/gogf/gf/v2/frame/g" "github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/os/gtime" "github.com/gogf/gf/v2/os/gtime"

View File

@@ -11,7 +11,7 @@ import (
"prompts-core/model/dto" "prompts-core/model/dto"
"prompts-core/model/entity" "prompts-core/model/entity"
"gitea.com/red-future/common/utils" "gitea.redpowerfuture.com/red-future/common/utils"
"github.com/gogf/gf/v2/encoding/gjson" "github.com/gogf/gf/v2/encoding/gjson"
) )

View File

@@ -13,8 +13,8 @@ import (
"prompts-core/model/entity" "prompts-core/model/entity"
"prompts-core/service/gateway" "prompts-core/service/gateway"
"gitea.com/red-future/common/beans" "gitea.redpowerfuture.com/red-future/common/beans"
"gitea.com/red-future/common/utils" "gitea.redpowerfuture.com/red-future/common/utils"
"github.com/gogf/gf/v2/frame/g" "github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/util/gconv" "github.com/gogf/gf/v2/util/gconv"
) )

View File

@@ -4,8 +4,8 @@ import (
"context" "context"
"fmt" "fmt"
"gitea.com/red-future/common/beans" "gitea.redpowerfuture.com/red-future/common/beans"
"gitea.com/red-future/common/utils" "gitea.redpowerfuture.com/red-future/common/utils"
"github.com/gogf/gf/v2/frame/g" "github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/util/gconv" "github.com/gogf/gf/v2/util/gconv"