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

😎1、修复腾讯云OSS上传文件支持配置CustomHost 2、url租户参数优化及升级依赖

Browse Source
This commit is contained in:
zuohuaijun 2025-01-31 19:32:52 +08:00
parent 3b592be4a9
commit 5998b371b1
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
View File

@ -46,7 +46,7 @@
<PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="3.10.0" />
<PackageReference Include="SqlSugarCore" Version="5.1.4.175" />
<PackageReference Include="SSH.NET" Version="2024.2.0" />
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.0" />
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.0.1" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1172" />
<PackageReference Include="UAParser" Version="3.1.47" />

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

@ -352,7 +352,10 @@ public class SysFileService : IDynamicApiController, ITransient
break;
case OSSProvider.QCloud:
newFile.Url = $"{(_OSSProviderOptions.IsEnableHttps ? "https" : "http")}://{newFile.BucketName}-{_OSSProviderOptions.Endpoint}.cos.{_OSSProviderOptions.Region}.myqcloud.com/{filePath}";
var protocol = _OSSProviderOptions.IsEnableHttps ? "https" : "http";
newFile.Url = !string.IsNullOrWhiteSpace(_OSSProviderOptions.CustomHost)
? $"{protocol}://{_OSSProviderOptions.CustomHost}/{filePath}"
: $"{protocol}://{newFile.BucketName}-{_OSSProviderOptions.Endpoint}.cos.{_OSSProviderOptions.Region}.myqcloud.com/{filePath}";
break;
case OSSProvider.Minio:

10
Web/package.json
View File

@ -2,7 +2,7 @@
"name": "admin.net.pro",
"type": "module",
"version": "2.4.33",
"lastBuildTime": "2025.01.28",
"lastBuildTime": "2025.01.31",
"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
"author": "zuohuaijun",
"license": "MIT",
@ -50,7 +50,7 @@
"monaco-editor": "^0.52.2",
"mqtt": "^5.10.3",
"nprogress": "^0.2.0",
"ol": "^10.3.1",
"ol": "^10.4.0",
"pinia": "^2.3.1",
"print-js": "^1.6.0",
"push.js": "^1.0.12",
@ -68,7 +68,7 @@
"vue-demi": "0.14.10",
"vue-draggable-plus": "^0.6.0",
"vue-grid-layout": "3.0.0-beta1",
"vue-i18n": "^11.0.1",
"vue-i18n": "^11.1.0",
"vue-json-pretty": "^2.4.0",
"vue-plugin-hiprint": "^0.0.59-beta2",
"vue-router": "^4.5.0",
@ -88,8 +88,8 @@
"@types/node": "^20.17.16",
"@types/nprogress": "^0.2.3",
"@types/sortablejs": "^1.15.8",
"@typescript-eslint/eslint-plugin": "^8.21.0",
"@typescript-eslint/parser": "^8.21.0",
"@typescript-eslint/eslint-plugin": "^8.22.0",
"@typescript-eslint/parser": "^8.22.0",
"@vitejs/plugin-vue": "^5.2.1",
"@vitejs/plugin-vue-jsx": "^4.1.1",
"@vue/compiler-sfc": "^3.5.13",

2
Web/src/views/system/infoSetting/index.vue
View File

@ -20,7 +20,7 @@
</template>
{{ state.sysInfo.tenantId }}
<p>
<el-tag style="border: 1 solid var(--el-border-color)">访问地址：{{ host }}/#/login?tenantid={{ state.sysInfo.tenantId }}</el-tag>
<el-tag style="border: 1 solid var(--el-border-color)">访问地址：{{ host }}/#/login?tid={{ state.sysInfo.tenantId }}</el-tag>
</p>
</el-descriptions-item>
<el-descriptions-item label="系统主标题">