update util

Helpers/SimApiStorage.cs

@@ -41,7 +41,6 @@ namespace SimApi.Helpers
 
             ServeUrl = options.ServeUrl;
             Bucket = options.Bucket;
-            Console.WriteLine($"{endpoint} == {options.AccessKey} == {options.SecretKey}");
             var mcb = new MinioClient().WithEndpoint(endpoint)
                 .WithCredentials(options.AccessKey, options.SecretKey);
             if (useSsl)
@@ -71,12 +70,12 @@ namespace SimApi.Helpers
             }
         }
 
-        public string UploadFile(string path, Stream stream)
+        public string UploadFile(string path, Stream stream,string contentType = "image/png")
         {
             try
             {
-                Mc.PutObjectAsync(new PutObjectArgs().WithBucket(Bucket).WithObject(path).WithStreamData(stream))
+                Mc.PutObjectAsync(new PutObjectArgs().WithBucket(Bucket).WithObject(path).
-                    .Wait();
+                    WithObjectSize(stream.Length).WithStreamData(stream).WithContentType(contentType)).Wait();
                 return null;
             }
             catch (MinioException e)

Helpers/SimApiUtil.cs

@@ -1,11 +1,31 @@
-using System.Security.Cryptography;
+using System;
+using System.Security.Cryptography;
 using System.Text;
+using System.Text.Encodings.Web;
+using System.Text.Json;
 using System.Text.RegularExpressions;
+using System.Text.Unicode;
 
 namespace SimApi.Helpers
 {
     public static class SimApiUtil
     {
+        /// <summary>
+        /// 当前CST时间
+        /// </summary>
+        public static DateTime CstNow
+        {
+            get => DateTime.UtcNow.AddHours(8);
+        }
+
+        /// <summary>
+        /// 当前秒级时间戳
+        /// </summary>
+        public static double TimestampNow
+        {
+            get => (DateTime.UtcNow - new DateTime(1970, 1, 1, 0, 0, 0, 0)).TotalSeconds;
+        }
+
         /// <summary>
         /// 检测手机号是否正确
         /// </summary>
@@ -36,5 +56,18 @@ namespace SimApi.Helpers
 
             return strbul.ToString();
         }
+
+        /// <summary>
+        /// 将对象序列化成JSON （控制台输出中文不会被编码）
+        /// </summary>
+        /// <param name="obj"></param>
+        /// <returns></returns>
+        public static string Json(object obj)
+        {
+            return JsonSerializer.Serialize(obj, new JsonSerializerOptions
+            {
+                Encoder = JavaScriptEncoder.Create(UnicodeRanges.All)
+            });
+        }
     }
 }

Logger/SimApiLogger.cs

@@ -1,5 +1,6 @@
 using System;
 using Microsoft.Extensions.Logging;
+using SimApi.Helpers;
 
 namespace SimApi.Logger
 {
@@ -30,7 +31,7 @@ namespace SimApi.Logger
                 _ => defautColor
             };
             Console.WriteLine(
-                $"[ {Name} ][ {DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff")} ][ {logLevel.ToString()} ]");
+                $"[ {Name} ][ {SimApiUtil.CstNow.ToString("yyyy-MM-dd HH:mm:ss:ffff")} ][ {logLevel.ToString()} ]");
             Console.ForegroundColor = defautColor;
             Console.WriteLine($"{state}");
             if (exception != null)

Models/SimApiBaseModel.cs

@@ -1,23 +1,36 @@
 using System;
 using System.Linq;
 using System.Text.Json;
+using SimApi.Helpers;
 
 namespace SimApi.Models
 {
     public class SimApiBaseModel
     {
-        protected virtual string[] MapperIgnoreField { get; set; } = {"Id", "CreatedAt", "UpdatedAt"};
+        protected virtual string[] MapperIgnoreField { get; set; } =
+        {
+            "Id", "CreatedAt", "UpdatedAt"
+        };
+
         protected virtual string UpdatedTimeField { get; set; } = "UpdatedAt";
 
         public void MapData<TS>(TS source, bool mapAll = false)
         {
             //获取要赋值的源数据不为null的项目
             var sourceProps = source.GetType().GetProperties().Where(x => x.GetValue(source) != null)
-                .Select(x => new {x.Name, x.PropertyType})
+                .Select(x => new
+                {
+                    x.Name,
+                    x.PropertyType
+                })
                 .ToDictionary(x => x.Name, x => x.PropertyType);
 
             //获取目标对象的属性信息
-            var targetProps = GetType().GetProperties().Select(x => new {x.Name, x.PropertyType})
+            var targetProps = GetType().GetProperties().Select(x => new
+                {
+                    x.Name,
+                    x.PropertyType
+                })
                 .ToDictionary(x => x.Name, x => x.PropertyType);
             foreach (var sp in sourceProps)
             {
@@ -37,11 +50,19 @@ namespace SimApi.Models
         {
             //获取要赋值的源数据不为null的项目
             var sourceProps = source.GetType().GetProperties().Where(x => x.GetValue(source) != null)
-                .Select(x => new {x.Name, x.PropertyType})
+                .Select(x => new
+                {
+                    x.Name,
+                    x.PropertyType
+                })
                 .ToDictionary(x => x.Name, x => x.PropertyType);
 
             //获取目标对象的属性信息
-            var targetProps = GetType().GetProperties().Select(x => new {x.Name, x.PropertyType})
+            var targetProps = GetType().GetProperties().Select(x => new
+                {
+                    x.Name,
+                    x.PropertyType
+                })
                 .ToDictionary(x => x.Name, x => x.PropertyType);
             foreach (var sp in sourceProps)
             {
@@ -63,7 +84,7 @@ namespace SimApi.Models
         /// <returns></returns>
         public void UpdateTime()
         {
-            GetType().GetProperty(UpdatedTimeField)?.SetValue(this, DateTime.Now);
+            GetType().GetProperty(UpdatedTimeField)?.SetValue(this, SimApiUtil.CstNow);
         }
     }
 }