gaoxing/UNIVPLMDataIntegration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/main' into main

Browse Source
This commit is contained in:
Master 2024-07-03 18:25:00 +08:00
commit 7eb7ffa82d
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Admin.NET/Admin.NET.Application/Configuration/Upload.json
View File

@ -4,7 +4,7 @@
"Upload": { "Upload": {
"Path": "Upload/{yyyy}/{MM}/{dd}", // 文件上传目录 "Path": "Upload/{yyyy}/{MM}/{dd}", // 文件上传目录
"MaxSize": 51200, // 文件最大限制KB：1024*50 "MaxSize": 51200, // 文件最大限制KB：1024*50
"ContentType": [ "image/jpg", "image/png", "image/jpeg", "image/gif", "image/bmp", "text/plain", "application/pdf", "application/msword", "application/vnd.ms-excel", "application/vnd.ms-powerpoint", "application/vnd.openxmlformats-officedocument.presentationml.presentation", "application/vnd.openxmlformats-officedocument.wordprocessingml.document", "video/mp4", "application/wps-office.docx", "application/wps-office.xlsx", "application/wps-office.pptx" ], "ContentType": [ "image/jpg", "image/png", "image/jpeg", "image/gif", "image/bmp", "text/plain", "application/pdf", "application/msword", "application/vnd.ms-excel", "application/vnd.ms-powerpoint", "application/vnd.openxmlformats-officedocument.presentationml.presentation", "application/vnd.openxmlformats-officedocument.wordprocessingml.document", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", "video/mp4", "application/wps-office.docx", "application/wps-office.xlsx", "application/wps-office.pptx" ],
"EnableMd5": false // 启用文件MDF5验证-防止重复上传 "EnableMd5": false // 启用文件MDF5验证-防止重复上传
}, },
"OSSProvider": { "OSSProvider": {

4
Admin.NET/Admin.NET.Core/Service/File/SysFileService.cs
View File

@ -323,8 +323,8 @@ public class SysFileService : IDynamicApiController, ITransient
var suffix = Path.GetExtension(file.FileName).ToLower(); // 后缀 var suffix = Path.GetExtension(file.FileName).ToLower(); // 后缀
if (!string.IsNullOrWhiteSpace(suffix)) if (!string.IsNullOrWhiteSpace(suffix))
{ {
var contentTypeProvider = FS.GetFileExtensionContentTypeProvider(); //var contentTypeProvider = FS.GetFileExtensionContentTypeProvider();
suffix = contentTypeProvider.Mappings.FirstOrDefault(u => u.Value == file.ContentType).Key; //suffix = contentTypeProvider.Mappings.FirstOrDefault(u => u.Value == file.ContentType).Key;
// 修改 image/jpeg 类型返回的 .jpeg、jpe 后缀 // 修改 image/jpeg 类型返回的 .jpeg、jpe 后缀
if (suffix == ".jpeg" || suffix == ".jpe") if (suffix == ".jpeg" || suffix == ".jpe")
suffix = ".jpg"; suffix = ".jpg";

1
Web/src/layout/logo/index.vue
View File

@ -60,6 +60,7 @@ const onThemeConfigChange = () => {
&-medium-img { &-medium-img {
width: 15%; width: 15%;
margin-right: 5px; margin-right: 5px;
padding: 3px;
} }
} }
.layout-logo-size { .layout-logo-size {