ci/cd调整

2026-06-10 15:59:10 +08:00 · 2026-06-10 15:50:08 +08:00 · 2026-06-10 15:37:11 +08:00 · 2026-06-10 10:20:53 +08:00 · 2026-06-08 16:59:03 +08:00 · 2026-06-08 16:54:12 +08:00
16 changed files with 195 additions and 87 deletions
--- a/43
+++ b/43
@@ -1,52 +1,23 @@
-FROM golang:1.25.5-alpine AS builder
+# 阶段1: 构建
+FROM golang:alpine AS builder

-# 配置Alpine国内镜像源（加速apk）
-RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories \
-    && apk add --no-cache git
+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仓库
-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
-
-# 设置GIT凭据
-RUN echo "http://x-token-auth:9b31146aa8c10a7cb4f2e49dcee0934a223be1076289810e1ad98b968066c2bc@116.204.74.41:3000" > ~/.git-credentials
-
 WORKDIR /build

 COPY . .

-RUN go mod tidy && go mod download
+RUN go mod download && go mod tidy

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

-FROM alpine:latest
-
-# 配置Alpine国内镜像源（加速apk）
-RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories \
-    && apk add --no-cache tzdata \
-    && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
-    && echo Asia/Shanghai > /etc/timezone
-
-ENV TZ=Asia/Shanghai
-
-WORKDIR /app
-
-COPY --from=builder /build/main .
-COPY --from=builder /build/manifest/config/config.yaml ./manifest/config/config.yaml
-COPY --from=builder /build/resource ./resource
-
-RUN mkdir -p /app/resource/log/run \
-    && mkdir -p /app/resource/log/server \
-    && adduser -D -u 1000 appuser \
-    && chown -R appuser:appuser /app
-
-USER appuser

 EXPOSE 8808

--- 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"
--- a/api/v1/system/sys_user.go
+++ b/api/v1/system/sys_user.go
@@ -155,6 +155,11 @@ type IsSuperAdminReq struct {
 	commonApi.Author
 }

+type IsAdminReq struct {
+	g.Meta `path:"/user/checkIsAdmin" tags:"用户管理" method:"get" summary:"是否是管理员"`
+	commonApi.Author
+}
+
 type IsSuperAdminRes struct {
 	g.Meta       `mime:"application/json"`
 	IsSuperAdmin bool `json:"isSuperAdmin"`
--- 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.7
+	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
@@ -16,7 +16,7 @@ require (
 	github.com/tiger1103/gfast-token v1.0.10
 )

-//replace gitea.com/red-future/common v0.0.7 => ../common
+//replace gitea.redpowerfuture.com/red-future/common v0.0.23 => ../common

 require (
 	github.com/BurntSushi/toml v1.5.0 // indirect
@@ -32,6 +32,7 @@ require (
 	github.com/emirpasic/gods/v2 v2.0.0-alpha // indirect
 	github.com/fatih/color v1.18.0 // indirect
 	github.com/fsnotify/fsnotify v1.9.0 // indirect
+	github.com/go-ego/gse v1.0.2 // indirect
 	github.com/go-logr/logr v1.4.3 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
@@ -47,7 +48,7 @@ require (
 	github.com/golang/snappy v1.0.0 // indirect
 	github.com/google/flatbuffers v25.12.19+incompatible // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/gorilla/websocket v1.5.3 // indirect
+	github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
 	github.com/grokify/html-strip-tags-go v0.1.0 // indirect
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 // indirect
 	github.com/hashicorp/consul/api v1.26.1 // indirect
@@ -73,14 +74,13 @@ require (
 	github.com/olekukonko/tablewriter v1.1.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
+	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/tklauser/go-sysconf v0.3.11 // indirect
 	github.com/tklauser/numcpus v0.6.0 // indirect
-	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
-	github.com/xdg-go/scram v1.1.2 // indirect
-	github.com/xdg-go/stringprep v1.0.4 // indirect
-	github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
+	github.com/vcaesar/cedar v0.30.0 // indirect
+	github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
 	github.com/yusufpapurcu/wmi v1.2.2 // indirect
 	go.mongodb.org/mongo-driver/v2 v2.4.1 // indirect
 	go.opencensus.io v0.24.0 // indirect
@@ -92,13 +92,12 @@ require (
 	go.opentelemetry.io/otel/sdk v1.38.0 // indirect
 	go.opentelemetry.io/otel/trace v1.38.0 // indirect
 	go.opentelemetry.io/proto/otlp v1.7.1 // indirect
-	golang.org/x/crypto v0.45.0 // indirect
 	golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 // indirect
 	golang.org/x/image v0.19.0 // indirect
 	golang.org/x/net v0.47.0 // indirect
-	golang.org/x/sync v0.18.0 // indirect
 	golang.org/x/sys v0.38.0 // indirect
 	golang.org/x/text v0.31.0 // indirect
+	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20251222181119-0a764e51fe1b // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20251222181119-0a764e51fe1b // indirect
 	google.golang.org/grpc v1.75.0 // indirect
--- a/go.sum
+++ b/go.sum
@@ -1,7 +1,6 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-gitea.com/red-future/common v0.0.6 h1:2Otksfcy5V5JCBcqd2eRKh4WwZ/iAiIhJZMr6uM1x+Q=
-gitea.com/red-future/common v0.0.6/go.mod h1:UI9N5UUjilbMPF7+/lypZSnqDVHigt14300oSRrAyZg=
-gitea.com/red-future/common v0.0.7/go.mod h1:JgBczlUF8xA8S0YbvDaMLxvvpmBGgjJA6po+EbodzZA=
+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=
@@ -70,6 +69,8 @@ github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
 github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
 github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
 github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
+github.com/go-ego/gse v1.0.2 h1:+27lYFPhQEhA9igtdOsJPRKYL/k3TwYsxBF5jr6KFv4=
+github.com/go-ego/gse v1.0.2/go.mod h1:Fy35G+q7VV7Et1zIKO8o/sW1kkugV3znXap/lF/11zc=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
@@ -142,8 +143,8 @@ github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
-github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 h1:JeSE6pjso5THxAzdVpqr6/geYxZytqFMBCOtn/ujyeo=
+github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674/go.mod h1:r4w70xmWCQKmi1ONH4KIaBptdivuRPyosB9RmPlGEwA=
 github.com/grokify/html-strip-tags-go v0.1.0 h1:03UrQLjAny8xci+R+qjCce/MYnpNXCtgzltlQbOBae4=
 github.com/grokify/html-strip-tags-go v0.1.0/go.mod h1:ZdzgfHEzAfz9X6Xe5eBLVblWIxXfYSQ40S/VKrAOGpc=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 h1:8Tjv8EJ+pM1xP8mK6egEbD1OgnVTyacbefKhmbLhIhU=
@@ -282,6 +283,8 @@ github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8b
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
+github.com/r3labs/diff/v2 v2.15.1 h1:EOrVqPUzi+njlumoqJwiS/TgGgmZo83619FNDB9xQUg=
+github.com/r3labs/diff/v2 v2.15.1/go.mod h1:I8noH9Fc2fjSaMxqF3G2lhDdC0b+JXCfyx85tWFM9kc=
 github.com/redis/go-redis/v9 v9.12.1 h1:k5iquqv27aBtnTm2tIkROUDp8JBXhXZIVu1InSgvovg=
 github.com/redis/go-redis/v9 v9.12.1/go.mod h1:huWgSWd8mW6+m0VPhJjSSQ+d6Nh1VICQ6Q5lHuCH/Iw=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
@@ -304,6 +307,7 @@ github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpE
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
@@ -320,14 +324,12 @@ github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7Am
 github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYms=
 github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ5UVIcaL4=
 github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
-github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c=
-github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
-github.com/xdg-go/scram v1.1.2 h1:FHX5I5B4i4hKRVRBCFRxq1iQRej7WO3hhBuJf+UUySY=
-github.com/xdg-go/scram v1.1.2/go.mod h1:RT/sEzTbU5y00aCK8UOx6R7YryM0iF1N2MOmC3kKLN4=
-github.com/xdg-go/stringprep v1.0.4 h1:XLI/Ng3O1Atzq0oBs3TWm+5ZVgkq2aqdlvP9JtoZ6c8=
-github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM=
-github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 h1:ilQV1hzziu+LLM3zUTJ0trRztfwgjqKnBWNtSRkbmwM=
-github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78/go.mod h1:aL8wCCfTfSfmXjznFBSZNN13rSJjlIOI1fUNAtF7rmI=
+github.com/vcaesar/cedar v0.30.0 h1:9fSDpM7FTjjUdPiBUUa0MWYMRGSEcqgFXvppZcZ4d7Y=
+github.com/vcaesar/cedar v0.30.0/go.mod h1:lyuGvALuZZDPNXwpzv/9LyxW+8Y6faN7zauFezNsnik=
+github.com/vcaesar/tt v0.20.1 h1:D/jUeeVCNbq3ad8M7hhtB3J9x5RZ6I1n1eZ0BJp7M+4=
+github.com/vcaesar/tt v0.20.1/go.mod h1:cH2+AwGAJm19Wa6xvEa+0r+sXDJBT0QgNQey6mwqLeU=
+github.com/vmihailenco/msgpack v4.0.4+incompatible h1:dSLoQfGFAo3F6OoNhwUmLwVgaUXK79GlxNBwueZn0xI=
+github.com/vmihailenco/msgpack v4.0.4+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
@@ -364,11 +366,8 @@ golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q=
-golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20250128144449-3edf0e91c1ae h1:COZdc9Ut6wLq7MO9GIYxfZl4n4ScmgqQLoHocKXrxco=
-golang.org/x/exp v0.0.0-20250128144449-3edf0e91c1ae/go.mod h1:tujkw807nyEEAamNbDrEGzRav+ilXA7PCRAd6xsmwiU=
+golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 h1:nDVHiLt8aIbd/VzvPWN6kSOPE7+F/fNFDSXLVYkE/Iw=
 golang.org/x/exp v0.0.0-20250305212735-054e65f0b394/go.mod h1:sIifuuw/Yco/y6yb6+bDNfyeQ/MdPUy/hKEMYQV17cM=
 golang.org/x/image v0.13.0/go.mod h1:6mmbMOeV28HuMTgA6OSRkdXKYw/t5W9Uwn2Yv1r3Yxk=
 golang.org/x/image v0.19.0 h1:D9FX4QWkLfkeqaC62SonffIIuYdOk/UE2XKUBgRIBIQ=
@@ -389,6 +388,7 @@ golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -456,7 +456,6 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
@@ -484,6 +483,9 @@ gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
 gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
+google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
--- a/internal/app/system/consts/role.go
+++ b/internal/app/system/consts/role.go
@@ -2,6 +2,6 @@ package consts

 const (
 	SuperAdminId = 1  // 超级管理员
-	SalesAgentId = 9  // 销售代理
-	SiteAdminId  = 10 // 站点管理员
+	SalesAgentId = 9  // 租户代理管理员
+	SiteAdminId  = 10 // 租户普通管理员
 )
--- a/internal/app/system/controller/sys_user.go
+++ b/internal/app/system/controller/sys_user.go
@@ -135,3 +135,9 @@ func (c *userController) IsSuperAdmin(ctx context.Context, req *system.IsSuperAd
 	IsSuperAdminRes.IsSuperAdmin, err = service.SysUser().IsSuperAdmin(ctx, req)
 	return
 }
+
+func (c *userController) IsAdmin(ctx context.Context, req *system.IsAdminReq) (IsSuperAdminRes *system.IsSuperAdminRes, err error) {
+	IsSuperAdminRes = new(system.IsSuperAdminRes)
+	IsSuperAdminRes.IsSuperAdmin, err = service.SysUser().IsAdmin(ctx, req)
+	return
+}
--- 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"
--- 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"
--- 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"
--- a/internal/app/system/logic/sysUser/sys_user.go
+++ b/internal/app/system/logic/sysUser/sys_user.go
@@ -10,8 +10,9 @@ package sysUser
 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"
@@ -64,6 +65,9 @@ func (s *sSysUser) GetAdminUserByUsernamePassword(ctx context.Context, req *syst
 		user, err = s.GetUserByUsername(ctx, req.Username)
 		liberr.ErrIsNil(ctx, err)
 		liberr.ValueIsNil(user, "账号密码错误")
+		//验证密码复杂度
+		err = s.validatePasswordComplexity(ctx, req.Password)
+		liberr.ErrIsNil(ctx, err)
 		//验证密码
 		if libUtils.EncryptPassword(req.Password, user.UserSalt) != user.UserPassword {
 			liberr.ErrIsNil(ctx, gerror.New("账号密码错误"))
@@ -76,6 +80,101 @@ func (s *sSysUser) GetAdminUserByUsernamePassword(ctx context.Context, req *syst
 	return
 }

+// validatePasswordComplexity 验证密码复杂度
+func (s *sSysUser) validatePasswordComplexity(ctx context.Context, password string) (err error) {
+	dict, err := commonService.SysDictData().GetDictWithDataByType(ctx, &system.GetDictReq{
+		DictType: "pass_config",
+	})
+	if err != nil || dict == nil || len(dict.Values) == 0 {
+		// 如果没有配置密码复杂度，则默认放行
+		return nil
+	}
+
+	config := make(map[string]string)
+	for _, v := range dict.Values {
+		config[v.DictValue] = v.Remark
+	}
+
+	// 检查是否启用密码策略
+	if enabled, ok := config["enabled"]; ok && enabled != "true" {
+		// 未启用密码策略，直接放行
+		return nil
+	}
+
+	// 验证最小长度
+	if minLen, ok := config["min_length"]; ok {
+		if len(password) < gconv.Int(minLen) {
+			return gerror.Newf("密码长度不能少于%s位", minLen)
+		}
+	}
+
+	// 验证最大长度
+	if maxLen, ok := config["max_length"]; ok {
+		if len(password) > gconv.Int(maxLen) {
+			return gerror.Newf("密码长度不能超过%s位", maxLen)
+		}
+	}
+
+	// 验证是否需要包含数字
+	if needNumber, ok := config["need_number"]; ok && needNumber == "true" {
+		hasNumber := false
+		for _, c := range password {
+			if c >= '0' && c <= '9' {
+				hasNumber = true
+				break
+			}
+		}
+		if !hasNumber {
+			return gerror.New("密码必须包含数字")
+		}
+	}
+
+	// 验证是否需要包含小写字母
+	if needLower, ok := config["need_lower"]; ok && needLower == "true" {
+		hasLower := false
+		for _, c := range password {
+			if c >= 'a' && c <= 'z' {
+				hasLower = true
+				break
+			}
+		}
+		if !hasLower {
+			return gerror.New("密码必须包含小写字母")
+		}
+	}
+
+	// 验证是否需要包含大写字母
+	if needUpper, ok := config["need_upper"]; ok && needUpper == "true" {
+		hasUpper := false
+		for _, c := range password {
+			if c >= 'A' && c <= 'Z' {
+				hasUpper = true
+				break
+			}
+		}
+		if !hasUpper {
+			return gerror.New("密码必须包含大写字母")
+		}
+	}
+
+	// 验证是否需要包含特殊字符
+	if needSpecial, ok := config["need_special"]; ok && needSpecial == "true" {
+		hasSpecial := false
+		specialChars := "!@#$%^&*()_+-=[]{}|;':\",./<>?`~"
+		for _, c := range password {
+			if gstr.Contains(specialChars, string(c)) {
+				hasSpecial = true
+				break
+			}
+		}
+		if !hasSpecial {
+			return gerror.New("密码必须包含特殊字符")
+		}
+	}
+
+	return nil
+}
+
 // GetUserByUsername 通过用户名获取用户信息
 func (s *sSysUser) GetUserByUsername(ctx context.Context, userName string) (user *model.LoginUserRes, err error) {
 	err = g.Try(ctx, func(ctx context.Context) {
@@ -782,3 +881,28 @@ func (s *sSysUser) IsSuperAdmin(ctx context.Context, req *system.IsSuperAdminReq
 	}
 	return
 }
+
+func (s *sSysUser) IsAdmin(ctx context.Context, req *system.IsAdminReq) (isSuperAdmin bool, err error) {
+	_ = req
+	isSuperAdmin = false
+	// 获取用户id
+	getUserInfo, err := utils.GetUserInfo(ctx)
+	if err != nil {
+		return
+	}
+	userId := getUserInfo.Id
+	if !g.IsEmpty(userId) {
+		var roleIds []uint
+		roleIds, err = service.SysUser().GetAdminRoleIds(ctx, gconv.Uint64(userId))
+		liberr.ErrIsNil(ctx, err, "获取用户角色失败")
+		for _, v := range roleIds {
+			if v == consts.SuperAdminId || v == consts.SiteAdminId {
+				isSuperAdmin = true
+				return
+			} else {
+				isSuperAdmin = false
+			}
+		}
+	}
+	return
+}
--- 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"
--- a/internal/app/system/service/sys_user.go
+++ b/internal/app/system/service/sys_user.go
@@ -49,6 +49,7 @@ type (
 		Delete(ctx context.Context, ids []int) (err error)
 		GetUsers(ctx context.Context, ids []int) (users []*model.SysUserSimpleRes, err error)
 		IsSuperAdmin(ctx context.Context, req *system.IsSuperAdminReq) (isSuperAdmin bool, err error)
+		IsAdmin(ctx context.Context, req *system.IsAdminReq) (isSuperAdmin bool, err error)
 	}
 )

--- a/internal/router/router.go
+++ b/internal/router/router.go
@@ -9,9 +9,9 @@ package router

 import (
 	"context"
+
 	"github.com/gogf/gf/v2/net/ghttp"
 	commonRouter "github.com/tiger1103/gfast/v3/internal/app/common/router"
-	commonService "github.com/tiger1103/gfast/v3/internal/app/common/service"
 	systemRouter "github.com/tiger1103/gfast/v3/internal/app/system/router"
 	"github.com/tiger1103/gfast/v3/library/libRouter"
 )
@@ -22,8 +22,8 @@ type Router struct{}

 func (router *Router) BindController(ctx context.Context, group *ghttp.RouterGroup) {
 	group.Group("/api/v1", func(group *ghttp.RouterGroup) {
-		//跨域处理，安全起见正式环境请注释该行
-		group.Middleware(commonService.Middleware().MiddlewareCORS)
+		//跨域处理，安全起见正式环境请注释该行（在网关统一处理跨域问题）
+		//group.Middleware(commonService.Middleware().MiddlewareCORS)
 		group.Middleware(ghttp.MiddlewareHandlerResponse)
 		// 绑定后台路由
 		systemRouter.R.BindController(ctx, group)
--- 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"
--- a/manifest/config/config.yaml
+++ b/manifest/config/config.yaml
@@ -28,7 +28,7 @@ logger:
 database:
  default:
    - type: "pgsql"
-      host: "116.204.74.41"
+      host: "192.168.0.83"
      port: "15432"
      user: "postgres"
      pass: "Bjang09@686^*^"
@@ -41,7 +41,7 @@ database:
      debug : true
      dryRun : false #空跑
    - type: "pgsql"
-      host: "116.204.74.41"
+      host: "192.168.0.83"
      port: "15432"
      user: "postgres"
      pass: "Bjang09@686^*^"
@@ -69,7 +69,7 @@ gfToken:
 redis:
  # 单实例配置
  default:
-    address: 116.204.74.41:6379
+    address: 192.168.0.83:6379
    db: 1
    idleTimeout: "60s" #连接最大空闲时间，使用时间字符串例如30s/1m/1d
    maxConnLifetime: "90s" #连接最长存活时间，使用时间字符串例如30s/1m/1d
@@ -105,10 +105,10 @@ gfcli:
        path: "./internal/app/system"

 # 文件上传服务地址，与oss模块minio中的endpoint(filePrefix需要加http://)一致
-filePrefix: "http://116.204.74.41:9000"
+filePrefix: "http://192.168.0.83:9000"

 consul:
-  address: 116.204.74.41:8500
+  address: 192.168.0.83:8500

 jaeger: #链路追踪
-  addr: 116.204.74.41:4318
+  addr: 192.168.0.83:4318
Author	SHA1	Message	Date
张斌	13d839cea1	ci/cd调整	2026-06-10 15:59:10 +08:00
张斌	4f22296aa1	ci/cd调整	2026-06-10 15:50:08 +08:00
张斌	1b5eba34d5	ci/cd调整	2026-06-10 15:37:11 +08:00
张斌	0b5dec6965	ci/cd调整	2026-06-10 10:20:53 +08:00
张斌	a73662d2de	ci/cd调整	2026-06-08 16:59:03 +08:00
张斌	d0557f6c73	ci/cd调整	2026-06-08 16:54:12 +08:00
张斌	087fef11e0	ci/cd调整	2026-06-08 16:43:58 +08:00
张斌	e8871a75b8	登录增加密码策略校验	2026-06-08 15:36:08 +08:00
张斌	dbc473067f	ci/cd调整	2026-06-08 13:54:25 +08:00
张斌	9f8c3559b5	登录增加密码策略校验	2026-06-08 11:37:54 +08:00
qhd	50a89b6fc1	feat: 添加检查是否为管理员的接口	2026-05-09 10:30:31 +08:00
张斌	45db7f75ca	common版本更新	2026-04-22 18:00:52 +08:00
张斌	2db946160d	common版本更新	2026-04-22 18:00:32 +08:00
张斌	f8013278e8	dockerfile修复	2026-04-22 17:49:35 +08:00
张斌	fc3749e535	dockerfile修改	2026-04-22 14:54:51 +08:00
张斌	c550f395d6	dockerfile修改	2026-04-22 14:14:09 +08:00
张斌	9fe26543d2	dockerfile修改	2026-04-22 14:13:28 +08:00
张斌	9f9fcd09ae	dockerfile修改	2026-04-22 13:57:38 +08:00
张斌	8b5f5b72d2	dockerfile修改	2026-04-22 13:07:47 +08:00
张斌	3eade23d1d	网络环境调整	2026-04-20 20:04:02 +08:00
张斌	c4cac53368	网络环境调整	2026-04-20 18:42:34 +08:00
张斌	ffcd0d6b77	网络环境调整	2026-04-20 18:42:07 +08:00
张斌	e37ec0ec08	网络环境调整	2026-04-13 13:25:38 +08:00
qhd	224f130371	chore: 移除未使用的配置导入	2026-04-13 09:04:35 +08:00
qhd	26b2bfe649	chore: 移除未使用的配置导入	2026-04-11 18:40:32 +08:00
张斌	6be18249d8	增加dockerfile配置	2026-04-09 17:42:55 +08:00
张斌	454f704d6d	增加dockerfile配置	2026-04-09 17:28:08 +08:00
张斌	45570567d1	增加dockerfile配置	2026-04-09 16:55:09 +08:00
张斌	3f22bee5dd	增加dockerfile配置	2026-04-09 16:10:10 +08:00
张斌	d814ad38df	增加dockerfile配置	2026-04-09 15:58:04 +08:00
张斌	020b3ef95a	增加dockerfile配置	2026-04-09 09:07:12 +08:00
张斌	3c81ecb1e0	测试服务器IP配置变更	2026-04-08 22:14:21 +08:00
张斌	5e862b04da	golang版本升级1.26.0	2026-04-03 11:39:33 +08:00
张斌	0017eba91d	golang版本升级1.26.0	2026-04-03 11:30:12 +08:00
张斌	75bca05bcb	golang版本升级1.26.0	2026-04-03 11:05:04 +08:00
qhd	b6f9dbcbf6	feat: 去掉跨域，在网关统一做跨域处理	2026-04-02 15:17:46 +08:00
qhd	e94bcdc4fa	Merge branch 'dev' of http://116.204.74.41:3000/red-future/admin-go into dev	2026-04-02 15:16:30 +08:00
qhd	b265e2029e	feat: 去掉跨域，在网关统一做跨域处理	2026-04-02 15:16:10 +08:00