From 19d62ab927dfe4bdf952ab9a2e800640e68c342d Mon Sep 17 00:00:00 2001 From: qhd <1766646056@qq.com> Date: Tue, 24 Mar 2026 16:23:04 +0800 Subject: [PATCH] Generating commit message... --- config.yml | 6 +++--- model/entity/file.go | 5 +---- model/entity/tenant_oss_total.go | 7 ++----- service/file_service.go | 13 +++++++++---- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/config.yml b/config.yml index 3e50bef..74bd2a5 100644 --- a/config.yml +++ b/config.yml @@ -13,7 +13,7 @@ database: host: "116.204.74.41" port: "15432" user: "postgres" - pass: "123456" + pass: "Bjang09@686^*^" name: "oss" role: "master" maxIdle: "5" @@ -30,7 +30,7 @@ database: host: "116.204.74.41" port: "15432" user: "postgres" - pass: "123456" + pass: "Bjang09@686^*^" name: "oss" role: "slave" maxIdle: "5" @@ -71,7 +71,7 @@ minio: region: "us-east-1" # 与 MinIO 服务端 REGION 一致(默认 us-east-1) # 文件上传服务地址,与oss模块minio中的endpoint一致 -filePrefix: "116.204.74.41:9000" +filePrefix: "http://116.204.74.41:9000" # 文件存储初始化容量大小配置 oss: diff --git a/model/entity/file.go b/model/entity/file.go index 596416f..b7a2bbd 100644 --- a/model/entity/file.go +++ b/model/entity/file.go @@ -8,21 +8,18 @@ import ( type File struct { beans.SQLBaseDO `orm:",inherit"` // 嵌入基础字段:Id, Bid, Creator, CreatedAt, Updater, UpdatedAt, Deleter, DeletedAt, IsDeleted // 业务字段 - TenantId uint64 `orm:"tenant_id" json:"tenantId"` // 租户ID - FileURL string `orm:"file_url" json:"fileURL"` // 文件URL + FileURL string `orm:"file_url" json:"fileURL"` // 文件URL FileSize int `orm:"file_size" json:"fileSize"` } type fileCol struct { beans.SQLBaseCol - TenantId string FileURL string FileSize string } var FileCol = fileCol{ SQLBaseCol: beans.DefSQLBaseCol, - TenantId: "tenant_id", FileURL: "file_url", FileSize: "file_size", } diff --git a/model/entity/tenant_oss_total.go b/model/entity/tenant_oss_total.go index c0508f9..0ed3168 100644 --- a/model/entity/tenant_oss_total.go +++ b/model/entity/tenant_oss_total.go @@ -8,21 +8,18 @@ import ( type TenantOssTotal struct { beans.SQLBaseDO `orm:",inherit"` // 嵌入基础字段:Id, Creator, CreatedAt, Updater, UpdatedAt, TenantId, IsDeleted // 基础信息 - TenantId uint64 `orm:"tenant_id" json:"tenantId"` // 租户ID - UsedOssSize int `orm:"used_oss_size" json:"usedOssSize"` - TotalOssSize int `orm:"total_oss_size" json:"totalOssSize"` + UsedOssSize int `orm:"used_oss_size" json:"usedOssSize"` + TotalOssSize int `orm:"total_oss_size" json:"totalOssSize"` } type tenantOssCol struct { beans.SQLBaseCol - TenantId string UsedOssSize string TotalOssSize string } var TenantOssCol = tenantOssCol{ SQLBaseCol: beans.DefSQLBaseCol, - TenantId: "tenant_id", UsedOssSize: "used_oss_size", TotalOssSize: "total_oss_size", } diff --git a/service/file_service.go b/service/file_service.go index 12ac8f3..79382f7 100644 --- a/service/file_service.go +++ b/service/file_service.go @@ -115,8 +115,13 @@ func (f *file) UploadFile(ctx context.Context, req *dto.UploadFileReq) (res *dto return nil, err } // 返回图片url - return &dto.UploadFileRes{ - FileURL: fileURL, - FileAddressPrefix: minio.GetFileAddressPrefix(ctx), - }, err + res = &dto.UploadFileRes{ + FileURL: fileURL, + } + url, err := utils.GetFileAddressPrefix(ctx) + if err != nil { + return + } + res.FileAddressPrefix = url + return }