Просмотр исходного кода

😎调整文件夹名称为小写打头

zuohuaijun 1 год назад
Родитель
Сommit
c288b4295f
21 измененных файлов с 14 добавлено и 14 удалено
  1. 1 1
      Admin.NET/Admin.NET.Application/Configuration/Upload.json
  2. 1 1
      Admin.NET/Admin.NET.Application/Configuration/Wechat.json
  3. 1 1
      Admin.NET/Admin.NET.Core/SeedData/SysConfigSeedData.cs
  4. 2 2
      Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs
  5. 1 1
      Admin.NET/Admin.NET.Core/Service/Common/SysProcService.cs
  6. 1 1
      Admin.NET/Admin.NET.Core/Service/Config/SysConfigService.cs
  7. 2 2
      Admin.NET/Admin.NET.Core/Service/DataBase/SysDatabaseService.cs
  8. 2 2
      Admin.NET/Admin.NET.Core/Service/File/SysFileService.cs
  9. 3 3
      Admin.NET/Admin.NET.Web.Entry/Admin.NET.Web.Entry.csproj
  10. 0 0
      Admin.NET/Admin.NET.Web.Entry/wwwroot/template/Dto.cs.vm
  11. 0 0
      Admin.NET/Admin.NET.Web.Entry/wwwroot/template/Entity.cs.vm
  12. 0 0
      Admin.NET/Admin.NET.Web.Entry/wwwroot/template/Input.cs.vm
  13. 0 0
      Admin.NET/Admin.NET.Web.Entry/wwwroot/template/Manage.js.vm
  14. 0 0
      Admin.NET/Admin.NET.Web.Entry/wwwroot/template/Output.cs.vm
  15. 0 0
      Admin.NET/Admin.NET.Web.Entry/wwwroot/template/SeedData.cs.vm
  16. 0 0
      Admin.NET/Admin.NET.Web.Entry/wwwroot/template/Service.cs.vm
  17. 0 0
      Admin.NET/Admin.NET.Web.Entry/wwwroot/template/data.data.ts.vm
  18. 0 0
      Admin.NET/Admin.NET.Web.Entry/wwwroot/template/dataModal.vue.vm
  19. 0 0
      Admin.NET/Admin.NET.Web.Entry/wwwroot/template/editDialog.vue.vm
  20. 0 0
      Admin.NET/Admin.NET.Web.Entry/wwwroot/template/index.vue.vm
  21. 0 0
      Admin.NET/Admin.NET.Web.Entry/wwwroot/upload/logo.png

+ 1 - 1
Admin.NET/Admin.NET.Application/Configuration/Upload.json

@@ -2,7 +2,7 @@
   "$schema": "https://gitee.com/dotnetchina/Furion/raw/v4/schemas/v4/furion-schema.json",
 
   "Upload": {
-    "Path": "Upload/{yyyy}/{MM}/{dd}", // 文件上传目录
+    "Path": "upload/{yyyy}/{MM}/{dd}", // 文件上传目录
     "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", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", "video/mp4", "application/wps-office.docx", "application/wps-office.xlsx", "application/wps-office.pptx", "application/vnd.android.package-archive" ],
     "EnableMd5": false // 启用文件MDF5验证-防止重复上传

+ 1 - 1
Admin.NET/Admin.NET.Application/Configuration/Wechat.json

@@ -12,7 +12,7 @@
     "WxOpenAppSecret": "",
     "WxToken": "", // 小程序消息推送中的令牌(Token)
     "WxEncodingAESKey": "", // 小程序消息推送中的消息加解密密钥(EncodingAESKey)
-    "QRImagePath": "" //小程序生成带参数二维码保存位置(绝对路径 eg: D:\\Web\\wwwroot\\Upload\\QRImage)
+    "QRImagePath": "" //小程序生成带参数二维码保存位置(绝对路径 eg: D:\\Web\\wwwroot\\upload\\QRImage)
   },
   // 微信支付
   "WechatPay": {

+ 1 - 1
Admin.NET/Admin.NET.Core/SeedData/SysConfigSeedData.cs

@@ -38,7 +38,7 @@ public class SysConfigSeedData : ISqlSugarEntitySeedData<SysConfig>
             new SysConfig{ Id=1300000000321, Name="系统描述", Code=ConfigConst.SysWebViceDesc, Value="站在巨人肩膀上的 .NET 通用权限开发框架", SysFlag=YesNoEnum.Y, Remark="系统描述", OrderNo=320, GroupCode="WebConfig", CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
             new SysConfig{ Id=1300000000331, Name="水印内容", Code=ConfigConst.SysWebWatermark, Value="Admin.NET", SysFlag=YesNoEnum.Y, Remark="水印内容", OrderNo=330, GroupCode="WebConfig", CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
             new SysConfig{ Id=1300000000341, Name="版权说明", Code=ConfigConst.SysWebCopyright, Value="Copyright © 2021-present Admin.NET All rights reserved.", SysFlag=YesNoEnum.Y, Remark="版权说明", OrderNo=340, GroupCode="WebConfig", CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-            new SysConfig{ Id=1300000000351, Name="系统图标", Code=ConfigConst.SysWebLogo, Value="/Upload/logo.png", SysFlag=YesNoEnum.Y, Remark="系统图标", OrderNo=350, GroupCode="WebConfig", CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysConfig{ Id=1300000000351, Name="系统图标", Code=ConfigConst.SysWebLogo, Value="/upload/logo.png", SysFlag=YesNoEnum.Y, Remark="系统图标", OrderNo=350, GroupCode="WebConfig", CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
             new SysConfig{ Id=1300000000361, Name="ICP备案号", Code=ConfigConst.SysWebIcp, Value="省ICP备12345678号", SysFlag=YesNoEnum.Y, Remark="ICP备案号", OrderNo=360, GroupCode="WebConfig", CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
             new SysConfig{ Id=1300000000371, Name="ICP地址", Code=ConfigConst.SysWebIcpUrl, Value="https://beian.miit.gov.cn", SysFlag=YesNoEnum.Y, Remark="ICP地址", OrderNo=370, GroupCode="WebConfig", CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
         };

+ 2 - 2
Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs

@@ -356,7 +356,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient
         };
         // 模板目录
         var templatePathList = GetTemplatePathList(input);
-        var templatePath = Path.Combine(App.WebHostEnvironment.WebRootPath, "Template");
+        var templatePath = Path.Combine(App.WebHostEnvironment.WebRootPath, "template");
 
         for (var i = 0; i < templatePathList.Count; i++)
         {
@@ -422,7 +422,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient
 
         // 获取模板文件并替换
         var templatePathList = GetTemplatePathList();
-        var templatePath = Path.Combine(App.WebHostEnvironment.WebRootPath, "Template");
+        var templatePath = Path.Combine(App.WebHostEnvironment.WebRootPath, "template");
 
         var result = new Dictionary<string, string>();
         for (var i = 0; i < templatePathList.Count; i++)

+ 1 - 1
Admin.NET/Admin.NET.Core/Service/Common/SysProcService.cs

@@ -51,7 +51,7 @@ public class SysProcService : IDynamicApiController, ITransient
         var dt = await db.Ado.UseStoredProcedure().GetDataTableAsync(input.ProcId, input.ProcParams);
 
         var excelExporter = new ExcelExporter();
-        string template = AppDomain.CurrentDomain.BaseDirectory + "/wwwroot/Template/" + input.Template + ".xlsx";
+        string template = AppDomain.CurrentDomain.BaseDirectory + "/wwwroot/template/" + input.Template + ".xlsx";
         var bs = await excelExporter.ExportBytesByTemplate(dt, template);
         return new FileContentResult(bs, "application/octet-stream") { FileDownloadName = input.ProcId + ".xlsx" };
     }

+ 1 - 1
Admin.NET/Admin.NET.Core/Service/Config/SysConfigService.cs

@@ -285,7 +285,7 @@ public class SysConfigService : IDynamicApiController, ITransient
             // 根据文件名取扩展名
             var ext = string.IsNullOrWhiteSpace(input.SysLogoFileName) ? ".png" : Path.GetExtension(input.SysLogoFileName);
             // 本地图标保存路径
-            var path = "Upload";
+            var path = "upload";
             var absoluteFilePath = Path.Combine(App.WebHostEnvironment.WebRootPath, path, $"logo{ext}");
 
             // 删除已存在文件

+ 2 - 2
Admin.NET/Admin.NET.Core/Service/DataBase/SysDatabaseService.cs

@@ -468,7 +468,7 @@ public class SysDatabaseService : IDynamicApiController, ITransient
     /// <returns></returns>
     private static string GetEntityTemplatePath()
     {
-        var templatePath = Path.Combine(App.WebHostEnvironment.WebRootPath, "Template");
+        var templatePath = Path.Combine(App.WebHostEnvironment.WebRootPath, "template");
         return Path.Combine(templatePath, "Entity.cs.vm");
     }
 
@@ -478,7 +478,7 @@ public class SysDatabaseService : IDynamicApiController, ITransient
     /// <returns></returns>
     private static string GetSeedDataTemplatePath()
     {
-        var templatePath = Path.Combine(App.WebHostEnvironment.WebRootPath, "Template");
+        var templatePath = Path.Combine(App.WebHostEnvironment.WebRootPath, "template");
         return Path.Combine(templatePath, "SeedData.cs.vm");
     }
 

+ 2 - 2
Admin.NET/Admin.NET.Core/Service/File/SysFileService.cs

@@ -436,7 +436,7 @@ public class SysFileService : IDynamicApiController, ITransient
     [DisplayName("上传头像")]
     public async Task<SysFile> UploadAvatar([Required] IFormFile file)
     {
-        var sysFile = await HandleUploadFile(file, "Upload/Avatar", _imageType);
+        var sysFile = await HandleUploadFile(file, "upload/avatar", _imageType);
 
         var sysUserRep = _sysFileRep.ChangeRepository<SqlSugarRepository<SysUser>>();
         var user = sysUserRep.GetFirst(u => u.Id == _userManager.UserId);
@@ -458,7 +458,7 @@ public class SysFileService : IDynamicApiController, ITransient
     [DisplayName("上传电子签名")]
     public async Task<SysFile> UploadSignature([Required] IFormFile file)
     {
-        var sysFile = await HandleUploadFile(file, "Upload/Signature", _imageType);
+        var sysFile = await HandleUploadFile(file, "upload/signature", _imageType);
 
         var sysUserRep = _sysFileRep.ChangeRepository<SqlSugarRepository<SysUser>>();
         var user = sysUserRep.GetFirst(u => u.Id == _userManager.UserId);

+ 3 - 3
Admin.NET/Admin.NET.Web.Entry/Admin.NET.Web.Entry.csproj

@@ -23,12 +23,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Content Update="wwwroot\Avatar\**" CopyToPublishDirectory="Never" />
+    <Content Update="wwwroot\avatar\**" CopyToPublishDirectory="Never" />
     <Content Update="wwwroot\upload\**" CopyToPublishDirectory="Never" />
   </ItemGroup>
 
   <ItemGroup>
-    <Content Update="wwwroot\Template\**">
+    <Content Update="wwwroot\template\**">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
@@ -49,7 +49,7 @@
   </ItemGroup>
 	
   <ItemGroup>
-    <Content Update="wwwroot\Upload\logo.png">
+    <Content Update="wwwroot\upload\logo.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>

+ 0 - 0
Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/Dto.cs.vm → Admin.NET/Admin.NET.Web.Entry/wwwroot/template/Dto.cs.vm


+ 0 - 0
Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/Entity.cs.vm → Admin.NET/Admin.NET.Web.Entry/wwwroot/template/Entity.cs.vm


+ 0 - 0
Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/Input.cs.vm → Admin.NET/Admin.NET.Web.Entry/wwwroot/template/Input.cs.vm


+ 0 - 0
Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/Manage.js.vm → Admin.NET/Admin.NET.Web.Entry/wwwroot/template/Manage.js.vm


+ 0 - 0
Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/Output.cs.vm → Admin.NET/Admin.NET.Web.Entry/wwwroot/template/Output.cs.vm


+ 0 - 0
Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/SeedData.cs.vm → Admin.NET/Admin.NET.Web.Entry/wwwroot/template/SeedData.cs.vm


+ 0 - 0
Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/Service.cs.vm → Admin.NET/Admin.NET.Web.Entry/wwwroot/template/Service.cs.vm


+ 0 - 0
Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/data.data.ts.vm → Admin.NET/Admin.NET.Web.Entry/wwwroot/template/data.data.ts.vm


+ 0 - 0
Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/dataModal.vue.vm → Admin.NET/Admin.NET.Web.Entry/wwwroot/template/dataModal.vue.vm


+ 0 - 0
Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/editDialog.vue.vm → Admin.NET/Admin.NET.Web.Entry/wwwroot/template/editDialog.vue.vm


+ 0 - 0
Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/index.vue.vm → Admin.NET/Admin.NET.Web.Entry/wwwroot/template/index.vue.vm


+ 0 - 0
Admin.NET/Admin.NET.Web.Entry/wwwroot/Upload/logo.png → Admin.NET/Admin.NET.Web.Entry/wwwroot/upload/logo.png