diff --git a/admin-client/src/components.d.ts b/admin-client/src/components.d.ts index 3d51c86..d88b37b 100644 --- a/admin-client/src/components.d.ts +++ b/admin-client/src/components.d.ts @@ -8,23 +8,16 @@ export {} declare module 'vue' { export interface GlobalComponents { 404: typeof import('./core/components/404.vue')['default'] - AAlert: typeof import('ant-design-vue/es')['Alert'] AAvatar: typeof import('ant-design-vue/es')['Avatar'] - ABackTop: typeof import('ant-design-vue/es')['BackTop'] ABadge: typeof import('ant-design-vue/es')['Badge'] ABreadcrumb: typeof import('ant-design-vue/es')['Breadcrumb'] ABreadcrumbItem: typeof import('ant-design-vue/es')['BreadcrumbItem'] AButton: typeof import('ant-design-vue/es')['Button'] - ACalendar: typeof import('ant-design-vue/es')['Calendar'] ACard: typeof import('ant-design-vue/es')['Card'] ACardGrid: typeof import('ant-design-vue/es')['CardGrid'] ACardMeta: typeof import('ant-design-vue/es')['CardMeta'] ACheckbox: typeof import('ant-design-vue/es')['Checkbox'] - ACheckboxGroup: typeof import('ant-design-vue/es')['CheckboxGroup'] ACol: typeof import('ant-design-vue/es')['Col'] - ACollapse: typeof import('ant-design-vue/es')['Collapse'] - ACollapsePanel: typeof import('ant-design-vue/es')['CollapsePanel'] - ADatePicker: typeof import('ant-design-vue/es')['DatePicker'] ADescriptions: typeof import('ant-design-vue/es')['Descriptions'] ADescriptionsItem: typeof import('ant-design-vue/es')['DescriptionsItem'] ADivider: typeof import('ant-design-vue/es')['Divider'] @@ -32,10 +25,7 @@ declare module 'vue' { ADropdown: typeof import('ant-design-vue/es')['Dropdown'] AForm: typeof import('ant-design-vue/es')['Form'] AFormItem: typeof import('ant-design-vue/es')['FormItem'] - AImage: typeof import('ant-design-vue/es')['Image'] AInput: typeof import('ant-design-vue/es')['Input'] - AInputGroup: typeof import('ant-design-vue/es')['InputGroup'] - AInputNumber: typeof import('ant-design-vue/es')['InputNumber'] AInputPassword: typeof import('ant-design-vue/es')['InputPassword'] AInputSearch: typeof import('ant-design-vue/es')['InputSearch'] ALayout: typeof import('ant-design-vue/es')['Layout'] @@ -53,8 +43,6 @@ declare module 'vue' { ARadio: typeof import('ant-design-vue/es')['Radio'] ARadioButton: typeof import('ant-design-vue/es')['RadioButton'] ARadioGroup: typeof import('ant-design-vue/es')['RadioGroup'] - ARangePicker: typeof import('ant-design-vue/es')['RangePicker'] - AResult: typeof import('ant-design-vue/es')['Result'] ARow: typeof import('ant-design-vue/es')['Row'] ASelect: typeof import('ant-design-vue/es')['Select'] ASelectOption: typeof import('ant-design-vue/es')['SelectOption'] @@ -73,12 +61,7 @@ declare module 'vue' { ATimeline: typeof import('ant-design-vue/es')['Timeline'] ATimelineItem: typeof import('ant-design-vue/es')['TimelineItem'] ATooltip: typeof import('ant-design-vue/es')['Tooltip'] - ATransfer: typeof import('ant-design-vue/es')['Transfer'] - ATree: typeof import('ant-design-vue/es')['Tree'] - ATreeSelect: typeof import('ant-design-vue/es')['TreeSelect'] ATypographyLink: typeof import('ant-design-vue/es')['TypographyLink'] - AUpload: typeof import('ant-design-vue/es')['Upload'] - AUploadDragger: typeof import('ant-design-vue/es')['UploadDragger'] BarChartTransverse: typeof import('./core/components/charts/BarChartTransverse.vue')['default'] ColumnSetting: typeof import('./core/components/curd/components/ColumnSetting.vue')['default'] ExternalJump: typeof import('./core/components/ExternalJump.vue')['default'] diff --git a/admin-client/src/core/utils/Tools.ts b/admin-client/src/core/utils/Tools.ts index 55a2375..f9315ce 100644 --- a/admin-client/src/core/utils/Tools.ts +++ b/admin-client/src/core/utils/Tools.ts @@ -7,7 +7,7 @@ import NProgress from "nprogress"; import Cookies from "universal-cookie"; import AppConsts from "../../utils/AppConsts"; -import TImageConfigService from "@/services/apps/T_Image_Configs/TImageConfigService"; + import CosService from "@/services/system/CosService"; import COS from "cos-js-sdk-v5"; import { log } from "@antv/g2plot/lib/utils"; @@ -528,26 +528,10 @@ class Tools { if (imgaeId == undefined || imgaeId == null) { imgaeId = 0; } - const fromData = await TImageConfigService.findForm(imgaeId); - const _data = fromData.data; - //#region 处理数据 - _data.form.url = fileInfo.imageUrl; - if (_data.form.name == null || _data.form.name == "") { - _data.form.name = Tools.getFileNameWithoutExtension(file); - } - _data.form.ossPath = fileInfo._cosData.filePath; - _data.form.region = fileInfo._cosData.bucket; - // _data.form.imageId = imgaeId; - _data.form.imageType = imageType; - if (tenantId != null) { - console.log('租户==》', tenantId); - _data.form.tenantId = tenantId; - } - //#endregion - const result = await TImageConfigService.saveForm(_data.id, _data.form); + AntdvMessage.success({ content: "上传成功", key, duration: 2 }); - return { imageId: result.data, imageUrl: fileInfo.imageUrl }; + return { imageUrl: fileInfo.imageUrl }; } catch (error) { console.log(error); AntdvMessage.error({ content: "上传失败", key, duration: 2 }); diff --git a/admin-client/src/views/Login.vue b/admin-client/src/views/Login.vue index 1754430..0a55f03 100644 --- a/admin-client/src/views/Login.vue +++ b/admin-client/src/views/Login.vue @@ -11,7 +11,7 @@ import i18n from "@/locale/Main.js"; const state = reactive({ // userName: "admin", // userPassword: "123456", - userName: "MiaoYu", + userName: "admin", userPassword: "MiaoYu", }); const inputPassword = ref(null); diff --git a/admin-server/MiaoYu.Api.Admin/ApplicationServices/Systems/Cos/CosService.cs b/admin-server/MiaoYu.Api.Admin/ApplicationServices/Systems/Cos/CosService.cs index 225b1aa..75343b4 100644 --- a/admin-server/MiaoYu.Api.Admin/ApplicationServices/Systems/Cos/CosService.cs +++ b/admin-server/MiaoYu.Api.Admin/ApplicationServices/Systems/Cos/CosService.cs @@ -75,7 +75,7 @@ public class CosService : ApplicationService generateTemporaryModel.Prefixes = t.Prefixes; // 修复日期格式：yyyMMdd -> yyyyMMdd generateTemporaryModel.FilePath = $"{t.Prefixes}/{modelName}/{DateTime.Now.ToString("yyyyMMdd")}/{tempFile}"; - generateTemporaryModel.DomainName = "https://cos.shhuanmeng.com/"; + generateTemporaryModel.DomainName = cosConfig.DomainName; return generateTemporaryModel; } diff --git a/admin-server/MiaoYu.Api.Admin/appsettings.json b/admin-server/MiaoYu.Api.Admin/appsettings.json index 51a0f7c..d6e326a 100644 --- a/admin-server/MiaoYu.Api.Admin/appsettings.json +++ b/admin-server/MiaoYu.Api.Admin/appsettings.json @@ -1,4 +1,4 @@ -{ +{ "Logging": { "LogLevel": { "Default": "Information", @@ -66,7 +66,8 @@ "SecretKey": "89GWr7JPWYTL8ueHlAYowGZnvzKZjqs9", "DurationSecond": "300", "Region": "ap-shanghai", - "Bucket": "miaoyu" + "Bucket": "miaoyu", + "DomainName": "miaoyu-1259071413.cos.ap-shanghai.myqcloud.com" } }, //服务器配置 diff --git a/admin-server/MiaoYu.Core.Cos/Configs/TencentCosConfig.cs b/admin-server/MiaoYu.Core.Cos/Configs/TencentCosConfig.cs index 2534027..86de94f 100644 --- a/admin-server/MiaoYu.Core.Cos/Configs/TencentCosConfig.cs +++ b/admin-server/MiaoYu.Core.Cos/Configs/TencentCosConfig.cs @@ -26,5 +26,10 @@ namespace MiaoYu.Core.Cos.Configs /// /// public string Bucket { get; set; } + + /// + /// 域名 + /// + public string DomainName { get; set; } } }