ci/cd调整

2026-06-10 15:41:58 +08:00
parent ce420a54a7
commit c96f8e0fb3
13 changed files with 16 additions and 44 deletions
--- a/27
+++ b/27
@@ -1,5 +1,5 @@
 # 阶段1: 构建
-FROM golang:1.26-alpine AS builder
+FROM golang:alpine AS builder

 RUN apk add --no-cache git ca-certificates tzdata

@@ -10,12 +10,6 @@ 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仓库
-RUN git config --global url."http://x-token-auth:9b31146aa8c10a7cb4f2e49dcee0934a223be1076289810e1ad98b968066c2bc@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

 COPY . .
@@ -24,25 +18,6 @@ RUN go mod download && go mod tidy

 RUN go build -ldflags="-s -w" -o main ./main.go

-# 阶段2: 运行
-FROM alpine:3.19
-
-RUN apk add --no-cache ca-certificates tzdata
-
-ENV TZ=Asia/Shanghai
-RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-
-WORKDIR /app
-
-COPY --from=builder /build/main .
-COPY --from=builder /build/config.yml ./
-
-RUN mkdir -p /app/resource/log/run \
-             /app/resource/log/server \
-    && adduser -D -u 1000 appuser \
-    && chown -R appuser:appuser /app
-
-USER appuser

 EXPOSE 3001

--- a/controller/yidun/content_check_controller.go
+++ b/controller/yidun/content_check_controller.go
@@ -5,7 +5,7 @@ import (
 	serviceDataengine "cid/service/dataengine"
 	"context"

-	"gitea.com/red-future/common/beans"
+	"gitea.redpowerfuture.com/red-future/common/beans"
 )

 // ContentCheckController 内容送检控制器
--- a/controller/yidun/yidun_callback_controller.go
+++ b/controller/yidun/yidun_callback_controller.go
@@ -5,7 +5,7 @@ import (
 	"context"
 	"fmt"

-	"gitea.com/red-future/common/beans"
+	"gitea.redpowerfuture.com/red-future/common/beans"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/net/ghttp"
 )
--- a/controller/yidun/yidun_controller.go
+++ b/controller/yidun/yidun_controller.go
@@ -4,7 +4,7 @@ import (
 	"cid/service/yidun"
 	"context"

-	"gitea.com/red-future/common/beans"
+	"gitea.redpowerfuture.com/red-future/common/beans"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/net/ghttp"
 	"github.com/yidun/yidun-golang-sdk/yidun/service/antispam/text/v5/check/async/single"
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,7 @@ module cid
 go 1.26.0

 require (
-	gitea.com/red-future/common v0.0.19
+	gitea.redpowerfuture.com/red-future/common v0.0.23
 	github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.10.0
 	github.com/gogf/gf/contrib/nosql/redis/v2 v2.9.5
 	github.com/gogf/gf/v2 v2.10.0
@@ -15,7 +15,6 @@ require (
 require (
 	github.com/BurntSushi/toml v1.5.0 // indirect
 	github.com/armon/go-metrics v0.4.1 // indirect
-	github.com/bwmarrin/snowflake v0.3.0 // indirect
 	github.com/cenkalti/backoff/v5 v5.0.3 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/clbanning/mxj/v2 v2.7.0 // indirect
--- 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.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=
@@ -23,8 +23,6 @@ github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
 github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c=
 github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
 github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
-github.com/bwmarrin/snowflake v0.3.0 h1:xm67bEhkKh6ij1790JB83OujPR5CzNe8QuQqAgISZN0=
-github.com/bwmarrin/snowflake v0.3.0/go.mod h1:NdZxfVWX+oR6y2K0o6qAYv6gIOP9rjG0/E9WsDpxqwE=
 github.com/cenkalti/backoff/v5 v5.0.3 h1:ZN+IMa753KfX5hd8vVaMixjnqRZ3y8CuJKRKj1xcsSM=
 github.com/cenkalti/backoff/v5 v5.0.3/go.mod h1:rkhZdG3JZukswDf7f0cwqPNk4K0sa+F97BxZthm/crw=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
--- a/main.go
+++ b/main.go
@@ -11,9 +11,9 @@ import (
 	"path/filepath"
 	"time"

-	_ "gitea.com/red-future/common/consul"
-	"gitea.com/red-future/common/http"
-	"gitea.com/red-future/common/jaeger"
+	_ "gitea.redpowerfuture.com/red-future/common/consul"
+	"gitea.redpowerfuture.com/red-future/common/http"
+	"gitea.redpowerfuture.com/red-future/common/jaeger"
 	_ "github.com/gogf/gf/contrib/drivers/pgsql/v2"
 	_ "github.com/gogf/gf/contrib/nosql/redis/v2"
 	"github.com/gogf/gf/v2/frame/g"
--- a/model/entity/dataengine/material_verify_log.go
+++ b/model/entity/dataengine/material_verify_log.go
@@ -1,7 +1,7 @@
 package dataengine

 import (
-	"gitea.com/red-future/common/beans"
+	"gitea.redpowerfuture.com/red-future/common/beans"
 )

 // MaterialVerifyLog 素材校验日志实体
--- a/model/entity/dataengine/tencent_account_relation.go
+++ b/model/entity/dataengine/tencent_account_relation.go
@@ -1,7 +1,7 @@
 package dataengine

 import (
-	"gitea.com/red-future/common/beans"
+	"gitea.redpowerfuture.com/red-future/common/beans"
 )

 // TencentAccountRelation 腾讯广告账户关系实体（来源：data-engine.tencent_account_relation）
--- a/model/entity/dataengine/tencent_content_check_log.go
+++ b/model/entity/dataengine/tencent_content_check_log.go
@@ -1,7 +1,7 @@
 package dataengine

 import (
-	"gitea.com/red-future/common/beans"
+	"gitea.redpowerfuture.com/red-future/common/beans"
 )

 // TencentContentCheckLog 送检日志实体（来源：data-engine.tencent_content_check_log）
--- a/model/entity/dataengine/tencent_image.go
+++ b/model/entity/dataengine/tencent_image.go
@@ -1,7 +1,7 @@
 package dataengine

 import (
-	"gitea.com/red-future/common/beans"
+	"gitea.redpowerfuture.com/red-future/common/beans"
 )

 // TencentImage 图片素材实体（来源：data-engine.tencent_image）
--- a/model/entity/dataengine/tencent_video.go
+++ b/model/entity/dataengine/tencent_video.go
@@ -1,7 +1,7 @@
 package dataengine

 import (
-	"gitea.com/red-future/common/beans"
+	"gitea.redpowerfuture.com/red-future/common/beans"
 )

 // TencentVideo 视频素材实体（来源：data-engine.tencent_video）
--- a/service/dataengine/tencent_content_check_service.go
+++ b/service/dataengine/tencent_content_check_service.go
@@ -10,7 +10,7 @@ import (
 	"fmt"
 	"time"

-	"gitea.com/red-future/common/beans"
+	"gitea.redpowerfuture.com/red-future/common/beans"
 	"github.com/gogf/gf/v2/frame/g"
 )