111
This commit is contained in:
parent
d8ae9c87ef
commit
9c515c7197
2874
admin/package-lock.json
generated
2874
admin/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
|
|
@ -9,6 +9,7 @@ export default defineConfig(({ mode }) => {
|
|||
const env = loadEnv(mode, process.cwd(), '')
|
||||
|
||||
return {
|
||||
base: '/xyqj/admin/',
|
||||
plugins: [
|
||||
vue()
|
||||
// 暂时禁用自动导入插件来解决兼容性问题
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@ public class AdminUploadController : ControllerBase
|
|||
private readonly IStorageProvider _storageProvider;
|
||||
private readonly ILogger<AdminUploadController> _logger;
|
||||
private readonly IWebHostEnvironment _environment;
|
||||
private readonly IConfiguration _configuration;
|
||||
|
||||
// 允许的图片类型
|
||||
private static readonly string[] AllowedImageTypes = { ".jpg", ".jpeg", ".png", ".gif", ".webp" };
|
||||
|
|
@ -25,11 +26,13 @@ public class AdminUploadController : ControllerBase
|
|||
public AdminUploadController(
|
||||
IStorageProvider storageProvider,
|
||||
ILogger<AdminUploadController> logger,
|
||||
IWebHostEnvironment environment)
|
||||
IWebHostEnvironment environment,
|
||||
IConfiguration configuration)
|
||||
{
|
||||
_storageProvider = storageProvider;
|
||||
_logger = logger;
|
||||
_environment = environment;
|
||||
_configuration = configuration;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -120,8 +123,16 @@ public class AdminUploadController : ControllerBase
|
|||
|
||||
_logger.LogInformation("文件保存到: {FilePath}", filePath);
|
||||
|
||||
// 返回相对URL
|
||||
return $"/uploads/{folder}/{fileName}";
|
||||
// 构建完整URL
|
||||
var relativeUrl = $"/uploads/{folder}/{fileName}";
|
||||
var domain = _configuration["Storage:Local:Domain"];
|
||||
|
||||
if (!string.IsNullOrEmpty(domain))
|
||||
{
|
||||
return $"{domain.TrimEnd('/')}{relativeUrl}";
|
||||
}
|
||||
|
||||
return relativeUrl;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -38,7 +38,8 @@
|
|||
"Provider": "Local",
|
||||
"Local": {
|
||||
"BasePath": "../XiangYi.AppApi/wwwroot/uploads",
|
||||
"BaseUrl": "/uploads"
|
||||
"BaseUrl": "/uploads",
|
||||
"Domain": ""
|
||||
},
|
||||
"TencentCos": {
|
||||
"SecretId": "",
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user