From f6c859c05c7ff18d259c07affcbffb3522d04584 Mon Sep 17 00:00:00 2001 From: qhd <1766646056@qq.com> Date: Tue, 24 Mar 2026 16:13:42 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=92=8C=E4=BE=9D=E8=B5=96=E5=BC=95=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/app/system/logic/tenant/tenant.go | 5 +++-- manifest/config/config.yaml | 13 ++++++++----- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/internal/app/system/logic/tenant/tenant.go b/internal/app/system/logic/tenant/tenant.go index c0de9d4..4056658 100644 --- a/internal/app/system/logic/tenant/tenant.go +++ b/internal/app/system/logic/tenant/tenant.go @@ -12,8 +12,8 @@ import ( "database/sql" "errors" "fmt" + "gitea.com/red-future/common/beans" - "gitea.com/red-future/common/minio" "gitea.com/red-future/common/utils" "github.com/gogf/gf/v2/container/gset" "github.com/gogf/gf/v2/database/gdb" @@ -45,7 +45,8 @@ func New() *sTenant { func (s *sTenant) GetTenantListSearch(ctx context.Context, req *system.TenantListReq) (res *system.TenantListRes, err error) { res = new(system.TenantListRes) err = g.Try(ctx, func(ctx context.Context) { - res.ImgAddressPrefix = minio.GetFileAddressPrefix(ctx) + res.ImgAddressPrefix, err = utils.GetFileAddressPrefix(ctx) + liberr.ErrIsNil(ctx, err, "获取文件地址前缀失败") model := dao.TenantDao.Ctx(ctx) // 根据toke获取用户id userId := service.Context().GetUserId(ctx) diff --git a/manifest/config/config.yaml b/manifest/config/config.yaml index 911e6df..76516da 100644 --- a/manifest/config/config.yaml +++ b/manifest/config/config.yaml @@ -31,7 +31,7 @@ database: host: "116.204.74.41" port: "15432" user: "postgres" - pass: "123456" + pass: "Bjang09@686^*^" name: "admin" role: "master" maxIdle: "5" @@ -44,7 +44,7 @@ database: host: "116.204.74.41" port: "15432" user: "postgres" - pass: "123456" + pass: "Bjang09@686^*^" name: "admin" role: "slave" maxIdle: "5" @@ -104,8 +104,11 @@ gfcli: noModelComment: true path: "./internal/app/system" -# 文件上传服务地址,与oss模块minio中的endpoint一致 -filePrefix: "116.204.74.41:9000" +# 文件上传服务地址,与oss模块minio中的endpoint(filePrefix需要加http://)一致 +filePrefix: "http://116.204.74.41:9000" consul: - address: 116.204.74.41:8500 \ No newline at end of file + address: 116.204.74.41:8500 + +jaeger: #链路追踪 + addr: 116.204.74.41:4318 \ No newline at end of file