Generating commit message...

This commit is contained in:
2026-03-24 16:23:04 +08:00
parent 1d6eb7a03b
commit 19d62ab927
4 changed files with 15 additions and 16 deletions

View File

@@ -13,7 +13,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: "oss" name: "oss"
role: "master" role: "master"
maxIdle: "5" maxIdle: "5"
@@ -30,7 +30,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: "oss" name: "oss"
role: "slave" role: "slave"
maxIdle: "5" maxIdle: "5"
@@ -71,7 +71,7 @@ minio:
region: "us-east-1" # 与 MinIO 服务端 REGION 一致(默认 us-east-1 region: "us-east-1" # 与 MinIO 服务端 REGION 一致(默认 us-east-1
# 文件上传服务地址与oss模块minio中的endpoint一致 # 文件上传服务地址与oss模块minio中的endpoint一致
filePrefix: "116.204.74.41:9000" filePrefix: "http://116.204.74.41:9000"
# 文件存储初始化容量大小配置 # 文件存储初始化容量大小配置
oss: oss:

View File

@@ -8,21 +8,18 @@ import (
type File struct { type File struct {
beans.SQLBaseDO `orm:",inherit"` // 嵌入基础字段Id, Bid, Creator, CreatedAt, Updater, UpdatedAt, Deleter, DeletedAt, IsDeleted 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"` FileSize int `orm:"file_size" json:"fileSize"`
} }
type fileCol struct { type fileCol struct {
beans.SQLBaseCol beans.SQLBaseCol
TenantId string
FileURL string FileURL string
FileSize string FileSize string
} }
var FileCol = fileCol{ var FileCol = fileCol{
SQLBaseCol: beans.DefSQLBaseCol, SQLBaseCol: beans.DefSQLBaseCol,
TenantId: "tenant_id",
FileURL: "file_url", FileURL: "file_url",
FileSize: "file_size", FileSize: "file_size",
} }

View File

@@ -8,21 +8,18 @@ import (
type TenantOssTotal struct { type TenantOssTotal struct {
beans.SQLBaseDO `orm:",inherit"` // 嵌入基础字段Id, Creator, CreatedAt, Updater, UpdatedAt, TenantId, IsDeleted 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"`
UsedOssSize int `orm:"used_oss_size" json:"usedOssSize"` TotalOssSize int `orm:"total_oss_size" json:"totalOssSize"`
TotalOssSize int `orm:"total_oss_size" json:"totalOssSize"`
} }
type tenantOssCol struct { type tenantOssCol struct {
beans.SQLBaseCol beans.SQLBaseCol
TenantId string
UsedOssSize string UsedOssSize string
TotalOssSize string TotalOssSize string
} }
var TenantOssCol = tenantOssCol{ var TenantOssCol = tenantOssCol{
SQLBaseCol: beans.DefSQLBaseCol, SQLBaseCol: beans.DefSQLBaseCol,
TenantId: "tenant_id",
UsedOssSize: "used_oss_size", UsedOssSize: "used_oss_size",
TotalOssSize: "total_oss_size", TotalOssSize: "total_oss_size",
} }

View File

@@ -115,8 +115,13 @@ func (f *file) UploadFile(ctx context.Context, req *dto.UploadFileReq) (res *dto
return nil, err return nil, err
} }
// 返回图片url // 返回图片url
return &dto.UploadFileRes{ res = &dto.UploadFileRes{
FileURL: fileURL, FileURL: fileURL,
FileAddressPrefix: minio.GetFileAddressPrefix(ctx), }
}, err url, err := utils.GetFileAddressPrefix(ctx)
if err != nil {
return
}
res.FileAddressPrefix = url
return
} }