diff --git a/Dockerfile b/Dockerfile index 47cd6a5..91d9c75 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,27 +1,24 @@ -# 最小化Docker镜像 -FROM busybox:uclibc +# 阶段1: 构建 +FROM golang:alpine AS builder -WORKDIR /app +RUN apk add --no-cache git ca-certificates tzdata -# 复制时区数据 -COPY timezone/localtime /etc/localtime -COPY timezone/timezone /etc/timezone -COPY timezone/Shanghai /usr/share/zoneinfo/Asia/Shanghai +ENV TZ=Asia/Shanghai +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone -# 复制预构建的二进制文件和配置文件 -COPY app ./main -COPY manifest/config/config.yaml ./manifest/config/config.yaml -COPY manifest/config/config-dev.yaml ./manifest/config/config-dev.yaml -COPY manifest/config/config-master.yaml ./manifest/config/config-master.yaml -COPY resource ./resource +ENV GO111MODULE=on +ENV GOPROXY=https://goproxy.cn,direct +ENV CGO_ENABLED=0 +ENV GOTOOLCHAIN=auto +WORKDIR /build -# 创建日志目录 -RUN mkdir -p /logs /app/resource/log/run /app/resource/log/server +COPY . . + +RUN go mod download && go mod tidy + +RUN go build -ldflags="-s -w" -o main ./main.go -# 添加执行权限 -RUN chmod +x /app/main EXPOSE 8808 -# 使用root用户运行 CMD ["./main"] diff --git a/api/v1/system/module_tenant.go b/api/v1/system/module_tenant.go index 904befe..b4cded3 100644 --- a/api/v1/system/module_tenant.go +++ b/api/v1/system/module_tenant.go @@ -8,7 +8,7 @@ package system import ( - "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/os/gtime" commonApi "github.com/tiger1103/gfast/v3/api/v1/common" diff --git a/app b/app deleted file mode 100755 index 25b2611..0000000 Binary files a/app and /dev/null differ diff --git a/go.mod b/go.mod index 6fe8ab6..7cb65b7 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/tiger1103/gfast/v3 go 1.26.0 require ( - gitea.com/red-future/common v0.0.21 + gitea.redpowerfuture.com/red-future/common v0.0.23 github.com/asaskevich/EventBus v0.0.0-20200907212545-49d423059eef github.com/casbin/casbin/v2 v2.42.0 github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.10.0 diff --git a/go.sum b/go.sum index fa30b1d..b0756ef 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.21 h1:8w30HmCVmFG/hphH3ODJs1KxDEGmRpq+/PXI0pQjJKc= -gitea.com/red-future/common v0.0.21/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/internal/app/system/logic/moduleTenant/module_tenant.go b/internal/app/system/logic/moduleTenant/module_tenant.go index 8af0819..03a8da8 100644 --- a/internal/app/system/logic/moduleTenant/module_tenant.go +++ b/internal/app/system/logic/moduleTenant/module_tenant.go @@ -12,9 +12,9 @@ import ( "fmt" "time" - "gitea.com/red-future/common/beans" - "gitea.com/red-future/common/http" - "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/utils" "github.com/gogf/gf/v2/database/gdb" "github.com/gogf/gf/v2/frame/g" "github.com/gogf/gf/v2/os/gtime" diff --git a/internal/app/system/logic/sysDept/sys_dept.go b/internal/app/system/logic/sysDept/sys_dept.go index 5ef4e65..d46d302 100644 --- a/internal/app/system/logic/sysDept/sys_dept.go +++ b/internal/app/system/logic/sysDept/sys_dept.go @@ -10,8 +10,8 @@ package sysDept import ( "context" "database/sql" - "gitea.com/red-future/common/beans" - "gitea.com/red-future/common/utils" + "gitea.redpowerfuture.com/red-future/common/beans" + "gitea.redpowerfuture.com/red-future/common/utils" "github.com/gogf/gf/v2/frame/g" "github.com/gogf/gf/v2/text/gstr" "github.com/gogf/gf/v2/util/gconv" diff --git a/internal/app/system/logic/sysRole/sys_role.go b/internal/app/system/logic/sysRole/sys_role.go index dcd75e4..8dd92f7 100644 --- a/internal/app/system/logic/sysRole/sys_role.go +++ b/internal/app/system/logic/sysRole/sys_role.go @@ -9,8 +9,8 @@ package sysRole import ( "context" - "gitea.com/red-future/common/beans" - "gitea.com/red-future/common/utils" + "gitea.redpowerfuture.com/red-future/common/beans" + "gitea.redpowerfuture.com/red-future/common/utils" "github.com/gogf/gf/v2/database/gdb" "github.com/gogf/gf/v2/frame/g" "github.com/gogf/gf/v2/util/gconv" diff --git a/internal/app/system/logic/sysUser/sys_user.go b/internal/app/system/logic/sysUser/sys_user.go index ac61266..e871fab 100644 --- a/internal/app/system/logic/sysUser/sys_user.go +++ b/internal/app/system/logic/sysUser/sys_user.go @@ -11,8 +11,8 @@ import ( "context" "fmt" - "gitea.com/red-future/common/beans" - "gitea.com/red-future/common/utils" + "gitea.redpowerfuture.com/red-future/common/beans" + "gitea.redpowerfuture.com/red-future/common/utils" "github.com/gogf/gf/v2/container/gset" "github.com/gogf/gf/v2/database/gdb" "github.com/gogf/gf/v2/errors/gerror" diff --git a/internal/app/system/logic/tenant/tenant.go b/internal/app/system/logic/tenant/tenant.go index 4056658..904fd69 100644 --- a/internal/app/system/logic/tenant/tenant.go +++ b/internal/app/system/logic/tenant/tenant.go @@ -13,8 +13,8 @@ import ( "errors" "fmt" - "gitea.com/red-future/common/beans" - "gitea.com/red-future/common/utils" + "gitea.redpowerfuture.com/red-future/common/beans" + "gitea.redpowerfuture.com/red-future/common/utils" "github.com/gogf/gf/v2/container/gset" "github.com/gogf/gf/v2/database/gdb" "github.com/gogf/gf/v2/frame/g" diff --git a/main.go b/main.go index 5d4ce7c..9d35f9d 100644 --- a/main.go +++ b/main.go @@ -1,7 +1,7 @@ package main import ( - _ "gitea.com/red-future/common/http" + _ "gitea.redpowerfuture.com/red-future/common/http" _ "github.com/gogf/gf/contrib/drivers/pgsql/v2" _ "github.com/gogf/gf/contrib/nosql/redis/v2" "github.com/gogf/gf/v2/os/gctx" diff --git a/timezone/Shanghai b/timezone/Shanghai deleted file mode 100644 index 91f6f8b..0000000 Binary files a/timezone/Shanghai and /dev/null differ diff --git a/timezone/localtime b/timezone/localtime deleted file mode 100644 index 91f6f8b..0000000 Binary files a/timezone/localtime and /dev/null differ diff --git a/timezone/timezone b/timezone/timezone deleted file mode 100644 index 421b7a4..0000000 --- a/timezone/timezone +++ /dev/null @@ -1 +0,0 @@ -Asia/Shanghai