1、【后端】修复后台上传类型不同导致文件夹路径问题差异化问题。 #I45QKZ

2、【后端】修复计算每月1号为设置时间时分秒不为0的问题。

CoreCms.Net.Repository/Distribution/CoreCmsDistributionOrderRepository.cs

@@ -229,6 +229,8 @@ namespace CoreCms.Net.Repository
             DateTime dt = DateTime.Now;
             //本月第一天时间      
             DateTime dtFirst = dt.AddDays(1 - (dt.Day));
+            dtFirst = new DateTime(dtFirst.Year, dtFirst.Month, dtFirst.Day, 0, 0, 0);
+
             //获得某年某月的天数    
             int dayCount = DateTime.DaysInMonth(dt.Date.Year, dt.Date.Month);
             //本月最后一天时间    
@@ -306,6 +308,7 @@ namespace CoreCms.Net.Repository
             DateTime dt = DateTime.Now;
             //本月第一天时间      
             DateTime dtFirst = dt.AddDays(1 - (dt.Day));
+            dtFirst = new DateTime(dtFirst.Year, dtFirst.Month, dtFirst.Day, 0, 0, 0);
             //获得某年某月的天数    
             int year = dt.Date.Year;
             int month = dt.Date.Month;

CoreCms.Net.Repository/User/CoreCmsUserRepository.cs

@@ -51,6 +51,7 @@ namespace CoreCms.Net.Repository
             DateTime dt = DateTime.Now;
             //本月第一天时间      
             DateTime dtFirst = dt.AddDays(1 - (dt.Day));
+            dtFirst = new DateTime(dtFirst.Year, dtFirst.Month, dtFirst.Day, 0, 0, 0);
             //获得某年某月的天数    
             int year = dt.Date.Year;
             int month = dt.Date.Month;

CoreCms.Net.Services/Distribution/CoreCmsDistributionServices.cs

@@ -92,6 +92,7 @@ namespace CoreCms.Net.Services
                 var dt = DateTime.Now;
                 //本月第一天时间
                 DateTime dtFirst = dt.AddDays(1 - (dt.Day));
+                dtFirst = new DateTime(dtFirst.Year, dtFirst.Month, dtFirst.Day, 0, 0, 0);
                 //获得某年某月的天数
                 int year = dt.Year;
                 int month = dt.Month;

CoreCms.Net.Services/Order/CoreCmsOrderServices.cs

@@ -1170,6 +1170,7 @@ namespace CoreCms.Net.Services
             {
                 //本月第一天时间      
                 DateTime dtFirst = dt.AddDays(1 - (dt.Day));
+                dtFirst = new DateTime(dtFirst.Year, dtFirst.Month, dtFirst.Day, 0, 0, 0);
                 //获得某年某月的天数    
                 int dayCount = DateTime.DaysInMonth(dt.Date.Year, dt.Date.Month);
                 //本月最后一天时间    

CoreCms.Net.Services/Shop/CoreCmsSettingServices.cs

@@ -191,6 +191,9 @@ namespace CoreCms.Net.Services
             filesStorageOptions.BucketName = GetValue(SystemSettingConstVars.FilesStorageAliYunBucketName, configs, settings);
             filesStorageOptions.Endpoint = GetValue(SystemSettingConstVars.FilesStorageAliYunEndpoint, configs, settings);
 
+            //格式化存储文件夹路径
+            filesStorageOptions.Path = UpLoadHelper.PathFormat(filesStorageOptions.StorageType, filesStorageOptions.Path);
+
             return filesStorageOptions;
         }
 

CoreCms.Net.Utility/Helper/UpLoadHelper.cs

@@ -0,0 +1,49 @@
+/***********************************************************************
+ *            Project: CoreCms
+ *        ProjectName: 核心内容管理系统                                
+ *                Web: https://www.corecms.net                      
+ *             Author: 大灰灰                                          
+ *              Email: jianweie@163.com                                
+ *         CreateTime: 2021/8/16 12:44:16
+ *        Description: 暂无
+ ***********************************************************************/
+
+
+using CoreCms.Net.Configuration;
+
+namespace CoreCms.Net.Utility.Helper
+{
+    /// <summary>
+    /// 上传帮助类
+    /// </summary>
+    public static class UpLoadHelper
+    {
+        /// <summary>
+        /// 上传路径格式化操作，防止不同类型下上传路径写入失败问题。
+        /// </summary>
+        /// <param name="storageType">上传类型</param>
+        /// <param name="oldFilePath">原始路径</param>
+        /// <returns></returns>
+        public static string PathFormat(string storageType, string oldFilePath)
+        {
+            string newPath;
+            switch (storageType)
+            {
+                case "LocalStorage":
+                    newPath = oldFilePath.StartsWith("/") ? oldFilePath : "/" + oldFilePath;
+                    break;
+                case "AliYunOSS":
+                    newPath = oldFilePath.StartsWith("/") ? oldFilePath.Substring(1) : oldFilePath;
+                    break;
+                case "QCloudOSS":
+                    newPath = oldFilePath.StartsWith("/") ? oldFilePath.Substring(1) : oldFilePath;
+                    break;
+                default:
+                    newPath = "/upload/";
+                    break;
+            }
+            newPath = newPath.EndsWith("/") ? newPath : newPath + "/";
+            return newPath;
+        }
+    }
+}

CoreCms.Net.Web.WebApi/Controllers/AgentController.cs

@@ -265,6 +265,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers
             DateTime dt = DateTime.Now;
             //本月第一天时间      
             DateTime dtFirst = dt.AddDays(1 - (dt.Day));
+            dtFirst = new DateTime(dtFirst.Year, dtFirst.Month, dtFirst.Day, 0, 0, 0);
             //获得某年某月的天数    
             int year = dt.Date.Year;
             int month = dt.Date.Month;
@@ -304,6 +305,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers
             DateTime dt = DateTime.Now;
             //本月第一天时间      
             DateTime dtFirst = dt.AddDays(1 - (dt.Day));
+            dtFirst = new DateTime(dtFirst.Year, dtFirst.Month, dtFirst.Day, 0, 0, 0);
             //获得某年某月的天数    
             int dayCount = DateTime.DaysInMonth(dt.Date.Year, dt.Date.Month);
             //本月最后一天时间