red-future/admin-go
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: 更新配置文件和依赖引用

Browse Source
This commit is contained in:
曲皓东
2026-03-24 16:13:42 +08:00
parent 43750b4538
commit f6c859c05c
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
internal/app/system/logic/tenant/tenant.go
View File

@@ -12,8 +12,8 @@ import (
"database/sql" "database/sql"
"errors" "errors"
"fmt" "fmt"
"gitea.com/red-future/common/beans" "gitea.com/red-future/common/beans"
"gitea.com/red-future/common/minio"
"gitea.com/red-future/common/utils" "gitea.com/red-future/common/utils"
"github.com/gogf/gf/v2/container/gset" "github.com/gogf/gf/v2/container/gset"
"github.com/gogf/gf/v2/database/gdb" "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) { func (s *sTenant) GetTenantListSearch(ctx context.Context, req *system.TenantListReq) (res *system.TenantListRes, err error) {
res = new(system.TenantListRes) res = new(system.TenantListRes)
err = g.Try(ctx, func(ctx context.Context) { 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) model := dao.TenantDao.Ctx(ctx)
// 根据toke获取用户id // 根据toke获取用户id
userId := service.Context().GetUserId(ctx) userId := service.Context().GetUserId(ctx)

11
manifest/config/config.yaml
View File

@@ -31,7 +31,7 @@ database:
host: "116.204.74.41" host: "116.204.74.41"
port: "15432" port: "15432"
user: "postgres" user: "postgres"
pass: "123456" pass: "Bjang09@686^*^"
name: "admin" name: "admin"
role: "master" role: "master"
maxIdle: "5" maxIdle: "5"
@@ -44,7 +44,7 @@ database:
host: "116.204.74.41" host: "116.204.74.41"
port: "15432" port: "15432"
user: "postgres" user: "postgres"
pass: "123456" pass: "Bjang09@686^*^"
name: "admin" name: "admin"
role: "slave" role: "slave"
maxIdle: "5" maxIdle: "5"
@@ -104,8 +104,11 @@ gfcli:
noModelComment: true noModelComment: true
path: "./internal/app/system" path: "./internal/app/system"
# 文件上传服务地址，与oss模块minio中的endpoint一致 # 文件上传服务地址，与oss模块minio中的endpoint(filePrefix需要加http://)一致
filePrefix: "116.204.74.41:9000" filePrefix: "http://116.204.74.41:9000"
consul: consul:
address: 116.204.74.41:8500 address: 116.204.74.41:8500
jaeger: #链路追踪
addr: 116.204.74.41:4318