清理项目所有代码，删除非必要空行和引用，引用排序。

Admin.Core.Common/Attributes/ServerTimeAttribute.cs

@@ -6,4 +6,4 @@ namespace Admin.Core.Common.Attributes
     public class ServerTimeAttribute : Attribute
     {
     }
-}
+}

Admin.Core.Common/Attributes/SingleInstanceAttribute.cs

@@ -9,4 +9,4 @@ namespace Admin.Core.Common.Attributes
     public class SingleInstanceAttribute : Attribute
     {
     }
-}
+}

Admin.Core.Common/Attributes/SnowflakeAttribute.cs

@@ -6,4 +6,4 @@ namespace Admin.Core.Common.Attributes
     public class SnowflakeAttribute : Attribute
     {
     }
-}
+}

Admin.Core.Common/Attributes/TransactionAttribute.cs

@@ -1,6 +1,6 @@
-using System;
+using FreeSql;
+using System;
 using System.Data;
-using FreeSql;
 
 namespace Admin.Core.Common.Attributes
 {
@@ -20,4 +20,4 @@ namespace Admin.Core.Common.Attributes
         /// </summary>
         public IsolationLevel? IsolationLevel { get; set; }
     }
-}
+}

Admin.Core.Common/Auth/ClaimAttributes.cs

@@ -45,4 +45,4 @@
         /// </summary>
         public const string DataIsolationType = "dit";
     }
-}
+}

Admin.Core.Common/Auth/IUser.cs

@@ -1,5 +1,4 @@
 using Admin.Core.Common.BaseModel;
-using Admin.Core.Common.Configs;
 
 namespace Admin.Core.Common.Auth
 {
@@ -36,6 +35,6 @@ namespace Admin.Core.Common.Auth
         /// <summary>
         /// 数据隔离
         /// </summary>
-       DataIsolationType? DataIsolationType { get; }
+        DataIsolationType? DataIsolationType { get; }
     }
-}
+}

Admin.Core.Common/Auth/IUserToken.cs

@@ -8,4 +8,4 @@ namespace Admin.Core.Common.Auth
 
         Claim[] Decode(string jwtToken);
     }
-}
+}

Admin.Core.Common/Auth/User.cs

@@ -1,6 +1,6 @@
-using Microsoft.AspNetCore.Http;
+using Admin.Core.Common.BaseModel;
 using Admin.Core.Common.Helpers;
-using Admin.Core.Common.BaseModel;
+using Microsoft.AspNetCore.Http;
 using System;
 
 namespace Admin.Core.Common.Auth
@@ -117,4 +117,4 @@ namespace Admin.Core.Common.Auth
             }
         }
     }
-}
+}

Admin.Core.Common/Auth/UserIdentiyServer.cs

@@ -1,5 +1,5 @@
-using Microsoft.AspNetCore.Http;
-using Admin.Core.Common.Helpers;
+using Admin.Core.Common.Helpers;
+using Microsoft.AspNetCore.Http;
 
 namespace Admin.Core.Common.Auth
 {
@@ -31,4 +31,4 @@ namespace Admin.Core.Common.Auth
             }
         }
     }
-}
+}

Admin.Core.Common/Auth/UserToken.cs

@@ -1,13 +1,12 @@
-
+using Admin.Core.Common.Attributes;
+using Admin.Core.Common.Configs;
+using Admin.Core.Common.Extensions;
+using Microsoft.IdentityModel.Tokens;
 using System;
-using System.Text;
-using System.Security.Claims;
 using System.IdentityModel.Tokens.Jwt;
-using Microsoft.IdentityModel.Tokens;
-using Admin.Core.Common.Configs;
-using Admin.Core.Common.Attributes;
 using System.Linq;
-using Admin.Core.Common.Extensions;
+using System.Security.Claims;
+using System.Text;
 
 namespace Admin.Core.Common.Auth
 {
@@ -26,7 +25,7 @@ namespace Admin.Core.Common.Auth
             var key = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(_jwtConfig.SecurityKey));
             var signingCredentials = new SigningCredentials(key, SecurityAlgorithms.HmacSha256);
             var timestamp = DateTime.Now.AddMinutes(_jwtConfig.Expires + _jwtConfig.RefreshExpires).ToTimestamp().ToString();
-             claims = claims.Append(new Claim(ClaimAttributes.RefreshExpires, timestamp)).ToArray();
+            claims = claims.Append(new Claim(ClaimAttributes.RefreshExpires, timestamp)).ToArray();
 
             var token = new JwtSecurityToken(
                 issuer: _jwtConfig.Issuer,
@@ -46,4 +45,4 @@ namespace Admin.Core.Common.Auth
             return jwtSecurityToken?.Claims?.ToArray();
         }
     }
-}
+}

Admin.Core.Common/BaseModel/DataIsolationType.cs

@@ -1,5 +1,4 @@
-
-using System.ComponentModel;
+using System.ComponentModel;
 
 namespace Admin.Core.Common.BaseModel
 {
@@ -13,20 +12,23 @@ namespace Admin.Core.Common.BaseModel
         /// </summary>
         [Description("独立数据库")]
         OwnDb = 1,
+
         /// <summary>
         /// 独立数据表
         /// </summary>
         [Description("独立数据表")]
         OwnDt = 2,
+
         /// <summary>
         /// 共享数据库，独立架构
         /// </summary>
         [Description("独立架构")]
         Schema = 3,
+
         /// <summary>
         /// 共享数据库
         /// </summary>
         [Description("共享数据库")]
         Share = 4
     }
-}
+}

Admin.Core.Common/BaseModel/Entity.cs

@@ -16,7 +16,6 @@ namespace Admin.Core.Common.BaseModel
     {
     }
 
-
     public class Entity<TKey> : IEntity<TKey>
     {
         /// <summary>
@@ -30,6 +29,5 @@ namespace Admin.Core.Common.BaseModel
 
     public class Entity : Entity<long>
     {
-
     }
-}
+}

Admin.Core.Common/BaseModel/EntityAdd.cs

@@ -1,7 +1,7 @@
-using System;
+using FreeSql.DataAnnotations;
+using System;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
-using FreeSql.DataAnnotations;
 
 namespace Admin.Core.Common.BaseModel
 {
@@ -34,6 +34,5 @@ namespace Admin.Core.Common.BaseModel
 
     public class EntityAdd : EntityAdd<long>
     {
-
     }
-}
+}

Admin.Core.Common/BaseModel/EntityFull.cs

@@ -1,7 +1,7 @@
-using System;
+using FreeSql.DataAnnotations;
+using System;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
-using FreeSql.DataAnnotations;
 
 namespace Admin.Core.Common.BaseModel
 {
@@ -72,6 +72,5 @@ namespace Admin.Core.Common.BaseModel
     /// </summary>
     public class EntityFull : EntityFull<long>
     {
-
     }
-}
+}

Admin.Core.Common/BaseModel/EntitySoftDelete.cs

@@ -6,7 +6,7 @@ namespace Admin.Core.Common.BaseModel
     /// <summary>
     /// 实体软删除
     /// </summary>
-    public class EntitySoftDelete<TKey> : Entity<TKey>,IEntitySoftDelete
+    public class EntitySoftDelete<TKey> : Entity<TKey>, IEntitySoftDelete
     {
         /// <summary>
         /// 是否删除
@@ -19,4 +19,4 @@ namespace Admin.Core.Common.BaseModel
     public class EntitySoftDelete : EntitySoftDelete<long>
     {
     }
-}
+}

Admin.Core.Common/BaseModel/EntityUpdate.cs

@@ -1,7 +1,7 @@
-using System;
+using FreeSql.DataAnnotations;
+using System;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
-using FreeSql.DataAnnotations;
 
 namespace Admin.Core.Common.BaseModel
 {
@@ -34,6 +34,5 @@ namespace Admin.Core.Common.BaseModel
 
     public class EntityUpdate : EntityUpdate<long>
     {
-
     }
-}
+}

Admin.Core.Common/BaseModel/EntityVersion.cs

@@ -19,4 +19,4 @@ namespace Admin.Core.Common.BaseModel
     public class EntityVersion : EntityVersion<long>
     {
     }
-}
+}

Admin.Core.Common/BaseModel/IEntityAdd.cs

@@ -2,10 +2,10 @@
 
 namespace Admin.Core.Common.BaseModel
 {
-    public interface IEntityAdd<TKey> where TKey: struct
+    public interface IEntityAdd<TKey> where TKey : struct
     {
         long? CreatedUserId { get; set; }
         string CreatedUserName { get; set; }
         DateTime? CreatedTime { get; set; }
     }
-}
+}

Admin.Core.Common/BaseModel/IEntitySoftDelete.cs

@@ -1,5 +1,4 @@
-
-namespace Admin.Core.Common.BaseModel
+namespace Admin.Core.Common.BaseModel
 {
     public interface IEntitySoftDelete
     {
@@ -8,4 +7,4 @@ namespace Admin.Core.Common.BaseModel
         /// </summary>
         bool IsDeleted { get; set; }
     }
-}
+}

Admin.Core.Common/BaseModel/IEntityUpdate.cs

@@ -8,4 +8,4 @@ namespace Admin.Core.Common.BaseModel
         string ModifiedUserName { get; set; }
         DateTime? ModifiedTime { get; set; }
     }
-}
+}

Admin.Core.Common/BaseModel/IEntityVersion.cs

@@ -7,4 +7,4 @@
         /// </summary>
         long Version { get; set; }
     }
-}
+}

Admin.Core.Common/BaseModel/ITenant.cs

@@ -1,5 +1,4 @@
-
-namespace Admin.Core.Common.BaseModel
+namespace Admin.Core.Common.BaseModel
 {
     public interface ITenant
     {
@@ -8,4 +7,4 @@ namespace Admin.Core.Common.BaseModel
         /// </summary>
         long? TenantId { get; set; }
     }
-}
+}

Admin.Core.Common/BaseModel/TenantType.cs

@@ -1,5 +1,4 @@
-
-namespace Admin.Core.Common.BaseModel
+namespace Admin.Core.Common.BaseModel
 {
     /// <summary>
     /// 租户类型
@@ -10,9 +9,10 @@ namespace Admin.Core.Common.BaseModel
         /// 平台
         /// </summary>
         Platform = 1,
+
         /// <summary>
         /// 租户
         /// </summary>
         Tenant = 2
     }
-}
+}

Admin.Core.Common/Cache/CacheKey.cs

@@ -1,5 +1,4 @@
-
-using System.ComponentModel;
+using System.ComponentModel;
 
 namespace Admin.Core.Common.Cache
 {
@@ -38,4 +37,4 @@ namespace Admin.Core.Common.Cache
         [Description("租户信息")]
         public const string TenantInfo = "admin:tenant:{0}:info";
     }
-}
+}

Admin.Core.Common/Cache/CacheType.cs

@@ -1,5 +1,4 @@
-
-namespace Admin.Core.Common.Cache
+namespace Admin.Core.Common.Cache
 {
     /// <summary>
     /// 缓存类型
@@ -10,9 +9,10 @@ namespace Admin.Core.Common.Cache
         /// 内存缓存
         /// </summary>
         Memory,
+
         /// <summary>
         /// Redis缓存
         /// </summary>
         Redis
     }
-}
+}

Admin.Core.Common/Cache/ICache.cs

@@ -1,5 +1,4 @@
-
-using System;
+using System;
 using System.Threading.Tasks;
 
 namespace Admin.Core.Common.Cache
@@ -115,4 +114,4 @@ namespace Admin.Core.Common.Cache
         /// <returns></returns>
         Task<T> GetOrSetAsync<T>(string key, Func<Task<T>> func, TimeSpan? expire = null);
     }
-}
+}

Admin.Core.Common/Cache/MemoryCache.cs

@@ -1,4 +1,5 @@
-
+using Admin.Core.Common.Helpers;
+using Microsoft.Extensions.Caching.Memory;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -6,8 +7,6 @@ using System.Linq;
 using System.Reflection;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
-using Microsoft.Extensions.Caching.Memory;
-using Admin.Core.Common.Helpers;
 
 namespace Admin.Core.Common.Cache
 {
@@ -17,6 +16,7 @@ namespace Admin.Core.Common.Cache
     public class MemoryCache : ICache
     {
         private readonly IMemoryCache _memoryCache;
+
         public MemoryCache(IMemoryCache memoryCache)
         {
             _memoryCache = memoryCache;
@@ -24,7 +24,7 @@ namespace Admin.Core.Common.Cache
 
         public long Del(params string[] key)
         {
-            foreach(var k in key)
+            foreach (var k in key)
             {
                 _memoryCache.Remove(k);
             }
@@ -49,8 +49,8 @@ namespace Admin.Core.Common.Cache
             pattern = Regex.Replace(pattern, @"\{.*\}", "(.*)");
 
             var keys = GetAllKeys().Where(k => Regex.IsMatch(k, pattern));
-            
-            if(keys != null && keys.Count() > 0)
+
+            if (keys != null && keys.Count() > 0)
             {
                 return await DelAsync(keys.ToArray());
             }
@@ -154,4 +154,4 @@ namespace Admin.Core.Common.Cache
             return keys;
         }
     }
-}
+}

Admin.Core.Common/Cache/RedisCache.cs

@@ -1,5 +1,4 @@
-
-using System;
+using System;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
@@ -28,7 +27,7 @@ namespace Admin.Core.Common.Cache
             pattern = Regex.Replace(pattern, @"\{.*\}", "*");
 
             var keys = (await RedisHelper.KeysAsync(pattern));
-            if(keys != null && keys.Length > 0)
+            if (keys != null && keys.Length > 0)
             {
                 return await RedisHelper.DelAsync(keys);
             }
@@ -102,7 +101,7 @@ namespace Admin.Core.Common.Cache
 
             var result = await func.Invoke();
 
-            if(expire.HasValue)
+            if (expire.HasValue)
             {
                 await RedisHelper.SetAsync(key, result, expire.Value);
             }
@@ -114,4 +113,4 @@ namespace Admin.Core.Common.Cache
             return result;
         }
     }
-}
+}

Admin.Core.Common/Configs/AppConfig.cs

@@ -60,6 +60,7 @@
         /// 启用
         /// </summary>
         public bool Enable { get; set; } = false;
+
         /// <summary>
         /// 地址
         /// </summary>
@@ -103,4 +104,4 @@
         /// </summary>
         public string[] Fonts { get; set; }// = new[] { "Times New Roman", "Verdana", "Arial", "Gungsuh", "Impact" };
     }
-}
+}

Admin.Core.Common/Configs/CacheConfig.cs

@@ -1,6 +1,4 @@
-
-
-using Admin.Core.Common.Cache;
+using Admin.Core.Common.Cache;
 
 namespace Admin.Core.Common.Configs
 {
@@ -40,4 +38,4 @@ namespace Admin.Core.Common.Configs
         /// </summary>
         public string ConnectionStringRateLimit { get; set; } = "127.0.0.1:6379,password=,defaultDatabase=1";
     }
-}
+}

Admin.Core.Common/Configs/DbConfig.cs

@@ -1,5 +1,4 @@
-
-using DataType = FreeSql.DataType;
+using DataType = FreeSql.DataType;
 
 namespace Admin.Core.Common.Configs
 {
@@ -89,4 +88,4 @@ namespace Admin.Core.Common.Configs
         /// </summary>
         public MultiDb[] Dbs { get; set; }
     }
-}
+}

Admin.Core.Common/Configs/JwtConfig.cs

@@ -1,7 +1,4 @@
-
-using DataType = FreeSql.DataType;
-
-namespace Admin.Core.Common.Configs
+namespace Admin.Core.Common.Configs
 {
     /// <summary>
     /// Jwt配置
@@ -33,4 +30,4 @@ namespace Admin.Core.Common.Configs
         /// </summary>
         public int RefreshExpires { get; set; } = 480;
     }
-}
+}

Admin.Core.Common/Configs/UploadConfig.cs

@@ -25,10 +25,11 @@ namespace Admin.Core.Common.Configs
     public class FileUploadConfig
     {
         private string _uploadPath;
+
         /// <summary>
         /// 上传路径
         /// </summary>
-        public string UploadPath 
+        public string UploadPath
         {
             get
             {
@@ -77,4 +78,4 @@ namespace Admin.Core.Common.Configs
         /// </summary>
         public string[] ContentType { get; set; }
     }
-}
+}

Admin.Core.Common/Consts/AdminConsts.cs

@@ -4,4 +4,4 @@
     {
         public const string TenantName = "Default";
     }
-}
+}

Admin.Core.Common/Dbs/MySqlDb.cs

@@ -6,4 +6,4 @@
     public class MySqlDb
     {
     }
-}
+}

Admin.Core.Common/Extensions/DateTimeExtensions.cs

@@ -33,4 +33,4 @@ namespace Admin.Core.Common.Extensions
             return week[day];
         }
     }
-}
+}

Admin.Core.Common/Extensions/EnumExtensions.cs

@@ -51,4 +51,4 @@ namespace Admin.Core.Common.Extensions
                  }).ToList();
         }
     }
-}
+}

Admin.Core.Common/Extensions/GuidExtensions.cs

@@ -23,6 +23,5 @@ namespace Admin.Core.Common.Extensions
         {
             return s != Guid.Empty;
         }
-
     }
-}
+}

Admin.Core.Common/Extensions/ListExtensions.cs

@@ -54,4 +54,4 @@ namespace Admin.Core.Common.Extensions
             return treelist;
         }
     }
-}
+}

Admin.Core.Common/Extensions/MethodInfoExtensions.cs

@@ -21,7 +21,6 @@ namespace Admin.Core.Common.Extensions
         {
             return method.ReturnType == typeof(Task)
                 || (method.ReturnType.IsGenericType && method.ReturnType.GetGenericTypeDefinition() == typeof(Task<>));
-
         }
     }
-}
+}

Admin.Core.Common/Extensions/StringExtensions.cs

@@ -1,8 +1,8 @@
-using System;
+using Admin.Core.Common.Helpers;
+using System;
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
-using Admin.Core.Common.Helpers;
 
 namespace Admin.Core
 {
@@ -128,4 +128,4 @@ namespace Admin.Core
             return s;
         }
     }
-}
+}

Admin.Core.Common/Files/FileInfo.cs

@@ -5,7 +5,9 @@
     /// </summary>
     public class FileInfo
     {
-        public FileInfo() { }
+        public FileInfo()
+        {
+        }
 
         /// <summary>
         /// 初始化文件信息
@@ -74,4 +76,4 @@
         /// </summary>
         public string FilePath => System.IO.Path.Combine(UploadPath, RelativePath, SaveName).ToPath();
     }
-}
+}

Admin.Core.Common/Files/FileSizeUnit.cs

@@ -12,16 +12,19 @@ namespace Admin.Core.Common.Files
         /// </summary>
         [Description("B")]
         Byte,
+
         /// <summary>
         /// K字节
         /// </summary>
         [Description("KB")]
         K,
+
         /// <summary>
         /// M字节
         /// </summary>
         [Description("MB")]
         M,
+
         /// <summary>
         /// G字节
         /// </summary>

Admin.Core.Common/Helpers/ConfigHelper.cs

@@ -1,6 +1,6 @@
-using System;
+using Microsoft.Extensions.Configuration;
+using System;
 using System.IO;
-using Microsoft.Extensions.Configuration;
 
 namespace Admin.Core.Common.Helpers
 {
@@ -78,4 +78,4 @@ namespace Admin.Core.Common.Helpers
             configuration.Bind(instance);
         }
     }
-}
+}

Admin.Core.Common/Helpers/ConsoleHelper.cs

@@ -4,7 +4,7 @@ namespace Admin.Core.Common.Helpers
 {
     public static class ConsoleHelper
     {
-        static void WriteColorLine(string str, ConsoleColor color)
+        private static void WriteColorLine(string str, ConsoleColor color)
         {
             ConsoleColor currentForeColor = Console.ForegroundColor;
             Console.ForegroundColor = color;
@@ -31,6 +31,7 @@ namespace Admin.Core.Common.Helpers
         {
             WriteColorLine(str, color);
         }
+
         /// <summary>
         /// 打印正常信息
         /// </summary>
@@ -40,6 +41,7 @@ namespace Admin.Core.Common.Helpers
         {
             WriteColorLine(str, color);
         }
+
         /// <summary>
         /// 打印成功的信息
         /// </summary>
@@ -49,6 +51,5 @@ namespace Admin.Core.Common.Helpers
         {
             WriteColorLine(str, color);
         }
-
     }
-}
+}

Admin.Core.Common/Helpers/DESEncrypt.cs

@@ -132,4 +132,4 @@ namespace Admin.Core.Common.Helpers
             }
         }
     }
-}
+}

Admin.Core.Common/Helpers/FileHelper.cs

@@ -11,6 +11,7 @@ namespace Admin.Core.Common.Helpers
         public FileHelper()
         {
         }
+
         ~FileHelper()
         {
             Dispose();
@@ -21,6 +22,7 @@ namespace Admin.Core.Common.Helpers
             if (_alreadyDispose) return;
             _alreadyDispose = true;
         }
+
         public void Dispose()
         {
             Dispose(true);
@@ -28,6 +30,7 @@ namespace Admin.Core.Common.Helpers
         }
 
         #region 写文件
+
         /// <summary>
         /// 写文件
         /// </summary>
@@ -62,9 +65,11 @@ namespace Admin.Core.Common.Helpers
             streamWriter.Close();
             streamWriter.Dispose();
         }
-        #endregion
+
+        #endregion 写文件
 
         #region 读文件
+
         /// <summary>
         /// 读文件
         /// </summary>
@@ -107,6 +112,7 @@ namespace Admin.Core.Common.Helpers
 
             return s;
         }
-        #endregion
+
+        #endregion 读文件
     }
-}
+}

Admin.Core.Common/Helpers/HtmlHelper.cs

@@ -1,10 +1,10 @@
+using Admin.Core.Common.Attributes;
 using System;
-using System.Text; 
-using System.Net; 
-using System.IO; 
-using System.Threading;
+using System.IO;
+using System.Net;
+using System.Text;
 using System.Text.RegularExpressions;
-using Admin.Core.Common.Attributes;
+using System.Threading;
 
 namespace Admin.Core.Common.Helpers
 {
@@ -15,22 +15,25 @@ namespace Admin.Core.Common.Helpers
     public class HtmlHelper
     {
         #region 私有字段
+
         private readonly string _ContentType = "application/json";
         private readonly string _Accept = "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, application/x-shockwave-flash, application/x-silverlight, application/vnd.ms-excel, application/vnd.ms-powerpoint, application/msword, application/x-ms-application, application/x-ms-xbap, application/vnd.ms-xpsdocument, application/xaml+xml, application/x-silverlight-2-b1, */*";
         private readonly string _UserAgent = "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; .NET CLR 2.0.50727; .NET CLR 3.0.04506.648; .NET CLR 3.5.21022)";
         private int _Delay = 1000;
         private int _CurrentTry = 0;
-        #endregion
+
+        #endregion 私有字段
 
         #region 公有属性
-        /// <summary> 
+
+        /// <summary>
         /// Cookie
-        /// </summary> 
+        /// </summary>
         public CookieContainer CookieContainer { get; } = new CookieContainer();
 
-        /// <summary> 
+        /// <summary>
         /// 语言
-        /// </summary> 
+        /// </summary>
         public Encoding Encoding { get; set; } = Encoding.GetEncoding("utf-8");
 
         public int NetworkDelay
@@ -47,9 +50,11 @@ namespace Admin.Core.Common.Helpers
         }
 
         public int MaxTry { get; set; } = 300;
-        #endregion
+
+        #endregion 公有属性
 
         #region 获取HTML
+
         /// <summary>
         /// 获取HTML
         /// </summary>
@@ -141,12 +146,14 @@ namespace Admin.Core.Common.Helpers
                 return string.Empty;
             }
         }
-        #endregion
+
+        #endregion 获取HTML
 
         #region 获取字符流
+
         //---------------------------------------------------------------------------------------------------------------
         // 示例:
-        // System.Net.CookieContainer cookie = new System.Net.CookieContainer(); 
+        // System.Net.CookieContainer cookie = new System.Net.CookieContainer();
         // Stream s = HttpHelper.GetStream("http://ptlogin2.qq.com/getimage?aid=15000102&0.43878429697395826", cookie);
         // picVerify.Image = Image.FromStream(s);
         //---------------------------------------------------------------------------------------------------------------
@@ -190,16 +197,19 @@ namespace Admin.Core.Common.Helpers
                 if (httpWebRequest != null)
                 {
                     httpWebRequest.Abort();
-                } if (httpWebResponse != null)
+                }
+                if (httpWebResponse != null)
                 {
                     httpWebResponse.Close();
                 }
                 return null;
             }
         }
-        #endregion
+
+        #endregion 获取字符流
 
         #region 清除HTML标记
+
         /// <summary>
         /// 清除HTML标记
         /// </summary>
@@ -207,10 +217,10 @@ namespace Admin.Core.Common.Helpers
         /// <returns>已经去除后的文字</returns>
         public string NoHTML(string Htmlstring)
         {
-            //删除脚本   
+            //删除脚本
             Htmlstring = Regex.Replace(Htmlstring, @"<script[^>]*?>.*?</script>", "", RegexOptions.IgnoreCase);
 
-            //删除HTML   
+            //删除HTML
             Regex regex = new Regex("<.+?>", RegexOptions.IgnoreCase);
             Htmlstring = regex.Replace(Htmlstring, "");
             Htmlstring = Regex.Replace(Htmlstring, @"<(.[^>]*)>", "", RegexOptions.IgnoreCase);
@@ -235,13 +245,15 @@ namespace Admin.Core.Common.Helpers
 
             return Htmlstring;
         }
-        #endregion
+
+        #endregion 清除HTML标记
 
         #region 删除文本中带的HTML标记
+
         /// <summary>
         /// 删除文本中带的HTML标记
         /// </summary>
-        /// <param name="InString">输入要删除带HTML的字符串</param>    
+        /// <param name="InString">输入要删除带HTML的字符串</param>
         /// <returns>返回处理过的字符串</returns>
         public string DelHtmlCode(string InString)
         {
@@ -262,9 +274,11 @@ namespace Admin.Core.Common.Helpers
             strTemp = strTemp.Trim();
             return strTemp;
         }
-        #endregion
+
+        #endregion 删除文本中带的HTML标记
 
         #region 匹配页面的链接
+
         /// <summary>
         /// 获取页面的链接正则
         /// </summary>
@@ -278,9 +292,11 @@ namespace Admin.Core.Common.Helpers
             }
             return MatchVale;
         }
-        #endregion
+
+        #endregion 匹配页面的链接
 
         #region 匹配页面的图片地址
+
         /// <summary>
         /// 匹配页面的图片地址
         /// </summary>
@@ -318,9 +334,11 @@ namespace Admin.Core.Common.Helpers
             else
                 return (imgHttp + MatchVale);
         }
-        #endregion
+
+        #endregion 匹配页面的图片地址
 
         #region 抓取远程页面内容
+
         /// <summary>
         /// 以GET方式抓取远程页面内容
         /// </summary>
@@ -380,9 +398,11 @@ namespace Admin.Core.Common.Helpers
             }
             return strResult;
         }
-        #endregion
+
+        #endregion 抓取远程页面内容
 
         #region 压缩HTML输出
+
         /// <summary>
         /// 压缩HTML输出
         /// </summary>
@@ -393,9 +413,11 @@ namespace Admin.Core.Common.Helpers
             Html = Regex.Replace(Html, @"<body([\s|\S]*?)>([\s|\S]*?)</body>", @"<body$1>$2</body>", RegexOptions.IgnoreCase);
             return Html;
         }
-        #endregion
+
+        #endregion 压缩HTML输出
 
         #region 过滤指定HTML标签
+
         /// <summary>
         /// 过滤指定HTML标签
         /// </summary>
@@ -411,6 +433,7 @@ namespace Admin.Core.Common.Helpers
             }
             return rStr;
         }
-        #endregion
+
+        #endregion 过滤指定HTML标签
     }
 }

Admin.Core.Common/Helpers/IPHelper.cs

@@ -1,7 +1,7 @@
-using System.Linq;
+using Microsoft.AspNetCore.Http;
+using System.Linq;
 using System.Net.NetworkInformation;
 using System.Text.RegularExpressions;
-using Microsoft.AspNetCore.Http;
 
 namespace Admin.Core.Common.Helpers
 {
@@ -28,7 +28,7 @@ namespace Admin.Core.Common.Helpers
             {
                 return "";
             }
-            
+
             string ip = request.Headers["X-Real-IP"].FirstOrDefault();
             if (ip.IsNull())
             {
@@ -94,4 +94,4 @@ namespace Admin.Core.Common.Helpers
             return MACIp;
         }
     }
-}
+}

Admin.Core.Common/Helpers/MD5Encrypt.cs

@@ -1,5 +1,5 @@
-using System.Text;
-using System.Security.Cryptography;
+using System.Security.Cryptography;
+using System.Text;
 
 namespace Admin.Core.Common.Helpers
 {
@@ -56,11 +56,11 @@ namespace Admin.Core.Common.Helpers
             if (password.IsNull())
                 return null;
 
-            using(var md5 = MD5.Create())
+            using (var md5 = MD5.Create())
             {
                 byte[] s = md5.ComputeHash(Encoding.UTF8.GetBytes(password));
                 return s.ToBase64();
             }
         }
     }
-}
+}

Admin.Core.Common/Helpers/Snowflake.cs

@@ -6,32 +6,41 @@ namespace Admin.Core.Common.Helpers
     {
         //基准时间
         private static long StartStmp = 1288834974657L;
+
         //private const long START_STMP = 1480166465631L;
         /*每一部分占用的位数*/
+
         //机器标识位数
-        const int MachineIdBits = 5;
+        private const int MachineIdBits = 5;
+
         //数据标志位数
-        const int DatacenterIdBits = 5;
+        private const int DatacenterIdBits = 5;
+
         //序列号识位数
-        const int SequenceBits = 12;
+        private const int SequenceBits = 12;
 
         /* 每一部分的最大值*/
+
         //机器ID最大值
-        const long MaxMachineNum = -1L ^ (-1L << MachineIdBits);
+        private const long MaxMachineNum = -1L ^ (-1L << MachineIdBits);
+
         //数据标志ID最大值
-        const long MaxDatacenterNum = -1L ^ (-1L << DatacenterIdBits);
+        private const long MaxDatacenterNum = -1L ^ (-1L << DatacenterIdBits);
+
         //序列号ID最大值
         private const long MaxSequenceNum = -1L ^ (-1L << SequenceBits);
 
         /*每一部分向左的位移*/
+
         //机器ID偏左移12位
         private const int MachineShift = SequenceBits;
+
         //数据ID偏左移17位
         private const int DatacenterIdShift = SequenceBits + MachineIdBits;
+
         //时间毫秒左移22位
         public const int TimestampLeftShift = SequenceBits + MachineIdBits + DatacenterIdBits;
 
-
         private long _sequence = 0L;//序列号
         private long _lastTimestamp = -1L;//上一次时间戳
         public long MachineId { get; protected set; }//机器标识
@@ -44,6 +53,7 @@ namespace Admin.Core.Common.Helpers
 
         private readonly DateTime Jan1st1970 = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
         private readonly object _lock = new Object();
+
         public Snowflake(long machineId, long datacenterId)
         {
             // 如果超出范围就抛出异常
@@ -65,7 +75,6 @@ namespace Admin.Core.Common.Helpers
 
         //public static Init(long machineId, long datacenterId)
         //{
-
         //}
         public long NextId()
         {
@@ -122,10 +131,10 @@ namespace Admin.Core.Common.Helpers
 
     public class IdWorkerHelper
     {
-        private static Snowflake _idWorker= null;
+        private static Snowflake _idWorker = null;
+
         private IdWorkerHelper()
         {
-
         }
 
         static IdWorkerHelper()
@@ -136,8 +145,6 @@ namespace Admin.Core.Common.Helpers
         public static long GenId64()
         {
             return _idWorker.NextId();
-
         }
     }
-
-}
+}

Admin.Core.Common/Helpers/StringHelper.cs

@@ -71,4 +71,4 @@ namespace Admin.Core.Common.Helpers
             return s;
         }
     }
-}
+}

Admin.Core.Common/Helpers/UnicodeHelper.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Text;
 using System.Text.RegularExpressions;
 
@@ -37,4 +36,4 @@ namespace Admin.Core.Common.Helpers
                  unicode, x => string.Empty + Convert.ToChar(Convert.ToUInt16(x.Result("$1"), 16)));
         }
     }
-}
+}

Admin.Core.Common/Helpers/UploadHelper.cs

@@ -83,4 +83,4 @@ namespace Admin.Core.Common.Helpers
             }
         }
     }
-}
+}

Admin.Core.Common/Helpers/UtilConvert.cs

@@ -18,7 +18,7 @@ namespace Admin.Core.Common.Helpers
             }
             return reval;
         }
-        
+
         public static int ToInt(this object thisValue, int errorValue)
         {
             int reval;
@@ -37,7 +37,7 @@ namespace Admin.Core.Common.Helpers
             long.TryParse(s.ToString(), out long result);
             return result;
         }
-        
+
         public static double ToMoney(this object thisValue)
         {
             double reval;
@@ -47,7 +47,7 @@ namespace Admin.Core.Common.Helpers
             }
             return 0;
         }
-        
+
         public static double ToMoney(this object thisValue, double errorValue)
         {
             double reval;
@@ -57,13 +57,13 @@ namespace Admin.Core.Common.Helpers
             }
             return errorValue;
         }
-        
+
         public static string ToString(this object thisValue)
         {
             if (thisValue != null) return thisValue.ToString().Trim();
             return "";
         }
-        
+
         public static string ToString(this object thisValue, string errorValue)
         {
             if (thisValue != null) return thisValue.ToString().Trim();
@@ -98,7 +98,7 @@ namespace Admin.Core.Common.Helpers
             }
             return 0;
         }
-        
+
         public static decimal ToDecimal(this object thisValue, decimal errorValue)
         {
             decimal reval;
@@ -108,7 +108,7 @@ namespace Admin.Core.Common.Helpers
             }
             return errorValue;
         }
-        
+
         public static DateTime ToDateTime(this object thisValue)
         {
             DateTime reval = DateTime.MinValue;
@@ -118,7 +118,7 @@ namespace Admin.Core.Common.Helpers
             }
             return reval;
         }
-        
+
         public static DateTime ToDateTime(this object thisValue, DateTime errorValue)
         {
             DateTime reval;
@@ -154,6 +154,7 @@ namespace Admin.Core.Common.Helpers
         }
 
         #region ==字节转换==
+
         /// <summary>
         /// 转换为16进制
         /// </summary>
@@ -208,6 +209,6 @@ namespace Admin.Core.Common.Helpers
             return Convert.ToBase64String(bytes);
         }
 
-        #endregion
+        #endregion ==字节转换==
     }
-}
+}

Admin.Core.Common/Helpers/VerifyCodeHelper.cs

@@ -1,10 +1,10 @@
-using System;
-using System.IO;
-using System.Text;
+using Admin.Core.Common.Attributes;
+using Admin.Core.Common.Configs;
+using System;
 using System.Drawing;
 using System.Drawing.Imaging;
-using Admin.Core.Common.Attributes;
-using Admin.Core.Common.Configs;
+using System.IO;
+using System.Text;
 
 namespace Admin.Core.Common.Helpers
 {
@@ -12,6 +12,7 @@ namespace Admin.Core.Common.Helpers
     public class VerifyCodeHelper
     {
         private readonly AppConfig _appConfig;
+
         public VerifyCodeHelper(AppConfig appConfig)
         {
             _appConfig = appConfig;
@@ -20,10 +21,10 @@ namespace Admin.Core.Common.Helpers
         private string GenerateRandom(int length)
         {
             var chars = new StringBuilder();
-            //验证码的字符集，去掉了一些容易混淆的字符 
+            //验证码的字符集，去掉了一些容易混淆的字符
             char[] character = { '2', '3', '4', '5', '6', '8', '9', 'a', 'b', 'd', 'e', 'f', 'h', 'k', 'm', 'n', 'r', 'x', 'y', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'J', 'K', 'L', 'M', 'N', 'P', 'R', 'S', 'T', 'W', 'X', 'Y' };
             Random rnd = new Random();
-            //生成验证码字符串 
+            //生成验证码字符串
             for (int i = 0; i < length; i++)
             {
                 chars.Append(character[rnd.Next(character.Length)]);
@@ -36,10 +37,10 @@ namespace Admin.Core.Common.Helpers
             int codeW = 110;
             int codeH = 36;
             int fontSize = 22;
-           
-            //颜色列表，用于验证码、噪线、噪点 
+
+            //颜色列表，用于验证码、噪线、噪点
             Color[] color = { Color.Black, Color.Red, Color.Blue, Color.Green, Color.Orange, Color.Brown, Color.Brown, Color.DarkBlue };
-            //字体列表，用于验证码 
+            //字体列表，用于验证码
             string[] fonts = _appConfig.VarifyCode.Fonts;
 
             code = GenerateRandom(length);
@@ -51,7 +52,7 @@ namespace Admin.Core.Common.Helpers
             {
                 g.Clear(Color.White);
                 Random rnd = new Random();
-                //画噪线 
+                //画噪线
                 for (int i = 0; i < 1; i++)
                 {
                     int x1 = rnd.Next(codeW);
@@ -62,7 +63,7 @@ namespace Admin.Core.Common.Helpers
                     g.DrawLine(new Pen(clr), x1, y1, x2, y2);
                 }
 
-                //画验证码字符串 
+                //画验证码字符串
                 {
                     string fnt;
                     Font ft;
@@ -87,4 +88,4 @@ namespace Admin.Core.Common.Helpers
             return Convert.ToBase64String(Draw(out code, length));
         }
     }
-}
+}

Admin.Core.Common/Input/PageInput.cs

@@ -25,4 +25,4 @@
         /// </summary>
         public FreeSql.Internal.Model.DynamicFilterInfo DynamicFilter { get; set; } = null;
     }
-}
+}

Admin.Core.Common/Output/IResponseOutput.cs

@@ -16,7 +16,7 @@ namespace Admin.Core.Common.Output
         /// <summary>
         /// 消息
         /// </summary>
-        public string Msg { get;}
+        public string Msg { get; }
     }
 
     /// <summary>
@@ -30,4 +30,4 @@ namespace Admin.Core.Common.Output
         /// </summary>
         T Data { get; }
     }
-}
+}

Admin.Core.Common/Output/OptionOutput.cs

@@ -15,4 +15,4 @@
         /// </summary>
         public object Value { get; set; }
     }
-}
+}

Admin.Core.Common/Output/PageOutput.cs

@@ -17,4 +17,4 @@ namespace Admin.Core.Common.Output
         /// </summary>
         public IList<T> List { get; set; }
     }
-}
+}

Admin.Core.Common/Output/ResponseOutput.cs

@@ -89,7 +89,7 @@ namespace Admin.Core.Common.Output
         /// <param name="msg">消息</param>
         /// <param name="data">数据</param>
         /// <returns></returns>
-        public static IResponseOutput NotOk<T>(string msg = null,T data = default(T))
+        public static IResponseOutput NotOk<T>(string msg = null, T data = default(T))
         {
             return new ResponseOutput<T>().NotOk(msg, data);
         }
@@ -124,4 +124,4 @@ namespace Admin.Core.Common.Output
             return success ? Ok() : NotOk();
         }
     }
-}
+}

Admin.Core.Model/Admin/ApiEntity.cs

@@ -1,7 +1,7 @@
-using System;
-using System.Collections.Generic;
 using Admin.Core.Common.BaseModel;
 using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
 
 namespace Admin.Core.Model.Admin
 {
@@ -59,6 +59,5 @@ namespace Admin.Core.Model.Admin
         /// 启用
         /// </summary>
         public bool Enabled { get; set; } = true;
-
     }
-}
+}

Admin.Core.Model/Admin/DictionaryEntity.cs

@@ -2,14 +2,14 @@ using Admin.Core.Common.BaseModel;
 using FreeSql.DataAnnotations;
 using System.Collections.Generic;
 
-namespace Admin.Core.Model.Admin 
+namespace Admin.Core.Model.Admin
 {
     /// <summary>
     /// 数据字典
     /// </summary>
 	[Table(Name = "ad_dictionary")]
     [Index("idx_{tablename}_01", nameof(ParentId) + "," + nameof(Name) + "," + nameof(TenantId), true)]
-    public class DictionaryEntity: EntityFull, ITenant
+    public class DictionaryEntity : EntityFull, ITenant
     {
         /// <summary>
         /// 租户Id
@@ -59,4 +59,4 @@ namespace Admin.Core.Model.Admin
         /// </summary>
 		public int Sort { get; set; }
     }
-}
+}

Admin.Core.Model/Admin/DocumentEntity.cs

@@ -30,7 +30,7 @@ namespace Admin.Core.Model.Admin
         /// <summary>
         /// 类型
         /// </summary>
-        [Column(MapType = typeof(int),CanUpdate = false)]
+        [Column(MapType = typeof(int), CanUpdate = false)]
         public DocumentType Type { get; set; }
 
         /// <summary>
@@ -72,4 +72,4 @@ namespace Admin.Core.Model.Admin
         [Column(StringLength = 100)]
         public string Description { get; set; }
     }
-}
+}

Admin.Core.Model/Admin/DocumentImageEntity.cs

@@ -8,18 +8,18 @@ namespace Admin.Core.Model.Admin
     /// </summary>
 	[Table(Name = "ad_document_image")]
     [Index("idx_{tablename}_01", nameof(DocumentId) + "," + nameof(Url), true)]
-    public class DocumentImageEntity: EntityAdd
+    public class DocumentImageEntity : EntityAdd
     {
         /// <summary>
         /// 文档Id
         /// </summary>
         public long DocumentId { get; set; }
-        
+
         public DocumentEntity Document { get; set; }
-        
+
         /// <summary>
         /// 请求路径
         /// </summary>
         public string Url { get; set; }
     }
-}
+}

Admin.Core.Model/Admin/DocumentType.cs

@@ -1,5 +1,4 @@
-
-namespace Admin.Core.Model.Admin
+namespace Admin.Core.Model.Admin
 {
     /// <summary>
     /// 文档类型
@@ -10,9 +9,10 @@ namespace Admin.Core.Model.Admin
         /// 分组
         /// </summary>
         Group = 1,
+
         /// <summary>
         /// Markdown文档
         /// </summary>
         Markdown = 2
     }
-}
+}

Admin.Core.Model/Admin/DualEntity.cs

@@ -15,4 +15,4 @@ namespace Admin.Core.Model.Admin
         [Column(Position = 1, IsPrimary = true, IsNullable = false)]
         public Guid Id { get; set; }
     }
-}
+}

Admin.Core.Model/Admin/LogAbstract.cs

@@ -72,4 +72,4 @@ namespace Admin.Core.Model.Admin
         [Column(StringLength = -1)]
         public string Result { get; set; }
     }
-}
+}

Admin.Core.Model/Admin/LoginLogEntity.cs

@@ -9,4 +9,4 @@ namespace Admin.Core.Model.Admin
     public class LoginLogEntity : LogAbstract
     {
     }
-}
+}

Admin.Core.Model/Admin/OprationLogEntity.cs

@@ -6,7 +6,7 @@ namespace Admin.Core.Model.Admin
     /// 操作日志
     /// </summary>
 	[Table(Name = "ad_opration_log")]
-    public class OprationLogEntity: LogAbstract
+    public class OprationLogEntity : LogAbstract
     {
         /// <summary>
         /// 接口名称
@@ -32,4 +32,4 @@ namespace Admin.Core.Model.Admin
         [Column(StringLength = -1)]
         public string Params { get; set; }
     }
-}
+}

Admin.Core.Model/Admin/PermissionEntity.cs

@@ -34,19 +34,21 @@ namespace Admin.Core.Model.Admin
         /// <summary>
         /// 权限类型
         /// </summary>
-        [Column(MapType = typeof(int),CanUpdate = false)]
+        [Column(MapType = typeof(int), CanUpdate = false)]
         public PermissionType Type { get; set; }
 
         /// <summary>
         /// 视图
         /// </summary>
         public long? ViewId { get; set; }
+
         public ViewEntity View { get; set; }
 
         /// <summary>
         /// 接口
         /// </summary>
         public long? ApiId { get; set; }
+
         public ApiEntity Api { get; set; }
 
         /// <summary>
@@ -102,4 +104,4 @@ namespace Admin.Core.Model.Admin
         [Column(StringLength = 100)]
         public string Description { get; set; }
     }
-}
+}

Admin.Core.Model/Admin/PermissionType.cs

@@ -1,5 +1,4 @@
-
-namespace Admin.Core.Model.Admin
+namespace Admin.Core.Model.Admin
 {
     /// <summary>
     /// 权限类型
@@ -10,17 +9,20 @@ namespace Admin.Core.Model.Admin
         /// 分组
         /// </summary>
         Group = 1,
+
         /// <summary>
         /// 菜单
         /// </summary>
         Menu = 2,
+
         /// <summary>
         /// 接口
         /// </summary>
         Api = 3,
+
         /// <summary>
         /// 权限点
         /// </summary>
         Dot = 4
     }
-}
+}

Admin.Core.Model/Admin/RoleEntity.cs

@@ -1,7 +1,7 @@
-using System;
-using System.Collections.Generic;
 using Admin.Core.Common.BaseModel;
 using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
 
 namespace Admin.Core.Model.Admin
 {
@@ -11,7 +11,7 @@ namespace Admin.Core.Model.Admin
 	[Table(Name = "ad_role")]
     [Index("idx_{tablename}_01", nameof(Name) + "," + nameof(TenantId), true)]
     [Index("idx_{tablename}_02", nameof(Code) + "," + nameof(TenantId), true)]
-    public class RoleEntity: EntityFull, ITenant
+    public class RoleEntity : EntityFull, ITenant
     {
         /// <summary>
         /// 租户Id
@@ -35,7 +35,7 @@ namespace Admin.Core.Model.Admin
         /// 说明
         /// </summary>
         [Column(StringLength = 200)]
-		public string Description { get; set; }
+        public string Description { get; set; }
 
         /// <summary>
         /// 启用
@@ -53,5 +53,4 @@ namespace Admin.Core.Model.Admin
         [Navigate(ManyToMany = typeof(RolePermissionEntity))]
         public ICollection<PermissionEntity> Permissions { get; set; }
     }
-
-}
+}

Admin.Core.Model/Admin/RolePermissionEntity.cs

@@ -8,7 +8,7 @@ namespace Admin.Core.Model.Admin
     /// </summary>
 	[Table(Name = "ad_role_permission")]
     [Index("idx_{tablename}_01", nameof(RoleId) + "," + nameof(PermissionId), true)]
-    public class RolePermissionEntity: EntityAdd
+    public class RolePermissionEntity : EntityAdd
     {
         /// <summary>
         /// 角色Id
@@ -30,5 +30,4 @@ namespace Admin.Core.Model.Admin
         /// </summary>
         public PermissionEntity Permission { get; set; }
     }
-
-}
+}

Admin.Core.Model/Admin/TenantEntity.cs

@@ -1,8 +1,7 @@
-using System;
 using Admin.Core.Common.BaseModel;
-using Admin.Core.Common.Configs;
 using FreeSql;
 using FreeSql.DataAnnotations;
+using System;
 
 namespace Admin.Core.Model.Admin
 {
@@ -42,7 +41,7 @@ namespace Admin.Core.Model.Admin
         /// 手机号码
         /// </summary>
         [Column(StringLength = 20)]
-        public string  Phone { get; set; }
+        public string Phone { get; set; }
 
         /// <summary>
         /// 邮箱地址
@@ -102,5 +101,4 @@ namespace Admin.Core.Model.Admin
         [Column(StringLength = 500)]
         public string Description { get; set; }
     }
-
-}
+}

Admin.Core.Model/Admin/UserEntity.cs

@@ -1,7 +1,7 @@
-using System;
-using System.Collections.Generic;
 using Admin.Core.Common.BaseModel;
 using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
 
 namespace Admin.Core.Model.Admin
 {
@@ -10,7 +10,7 @@ namespace Admin.Core.Model.Admin
     /// </summary>
 	[Table(Name = "ad_user")]
     [Index("idx_{tablename}_01", nameof(UserName) + "," + nameof(TenantId), true)]
-    public class UserEntity: EntityFull, ITenant
+    public class UserEntity : EntityFull, ITenant
     {
         /// <summary>
         /// 租户Id
@@ -18,7 +18,7 @@ namespace Admin.Core.Model.Admin
         [Column(Position = -10)]
         public long? TenantId { get; set; }
 
-        public TenantEntity  Tenant { get; set; }
+        public TenantEntity Tenant { get; set; }
 
         /// <summary>
         /// 账号
@@ -41,7 +41,7 @@ namespace Admin.Core.Model.Admin
         /// <summary>
         /// 头像
         /// </summary>
-       [Column(StringLength = 100)]
+        [Column(StringLength = 100)]
         public string Avatar { get; set; }
 
         /// <summary>
@@ -58,4 +58,4 @@ namespace Admin.Core.Model.Admin
         [Navigate(ManyToMany = typeof(UserRoleEntity))]
         public ICollection<RoleEntity> Roles { get; set; }
     }
-}
+}

Admin.Core.Model/Admin/UserRoleEntity.cs

@@ -8,20 +8,20 @@ namespace Admin.Core.Model.Admin
     /// </summary>
 	[Table(Name = "ad_user_role")]
     [Index("idx_{tablename}_01", nameof(UserId) + "," + nameof(RoleId), true)]
-    public class UserRoleEntity: EntityAdd
+    public class UserRoleEntity : EntityAdd
     {
         /// <summary>
         /// 用户Id
         /// </summary>
         public long UserId { get; set; }
-        
+
         public UserEntity User { get; set; }
-        
+
         /// <summary>
         /// 角色Id
         /// </summary>
         public long RoleId { get; set; }
 
-		public RoleEntity Role { get; set; }
+        public RoleEntity Role { get; set; }
     }
-}
+}

Admin.Core.Model/Admin/ViewEntity.cs

@@ -1,7 +1,7 @@
-using System;
-using System.Collections.Generic;
 using Admin.Core.Common.BaseModel;
 using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
 
 namespace Admin.Core.Model.Admin
 {
@@ -54,4 +54,4 @@ namespace Admin.Core.Model.Admin
         /// </summary>
         public int Sort { get; set; }
     }
-}
+}

Admin.Core.Repository/Admin/Api/ApiRepository.cs

@@ -1,13 +1,11 @@
 using Admin.Core.Model.Admin;
-using Admin.Core.Common.Auth;
 
 namespace Admin.Core.Repository.Admin
 {
-
     public class ApiRepository : RepositoryBase<ApiEntity>, IApiRepository
     {
         public ApiRepository(MyUnitOfWorkManager muowm) : base(muowm)
         {
         }
     }
-}
+}

Admin.Core.Repository/Admin/Api/IApiRepository.cs

@@ -2,10 +2,7 @@ using Admin.Core.Model.Admin;
 
 namespace Admin.Core.Repository.Admin
 {
-	public interface IApiRepository : IRepositoryBase<ApiEntity>
+    public interface IApiRepository : IRepositoryBase<ApiEntity>
     {
     }
-}
-
-
-	
+}

Admin.Core.Repository/Admin/Api/Output/ApiDataOutput.cs

@@ -1,5 +1,4 @@
-using Newtonsoft.Json;
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace Admin.Core.Repository.Admin.Output
 {
@@ -57,4 +56,4 @@ namespace Admin.Core.Repository.Admin.Output
 
         public List<ApiDataOutput> Childs { get; set; }
     }
-}
+}

Admin.Core.Repository/Admin/Dictionary/DictionaryRepository.cs

@@ -1,5 +1,4 @@
 using Admin.Core.Model.Admin;
-using Admin.Core.Common.Auth;
 
 namespace Admin.Core.Repository.Admin
 {
@@ -9,4 +8,4 @@ namespace Admin.Core.Repository.Admin
         {
         }
     }
-}
+}

Admin.Core.Repository/Admin/Dictionary/IDictionaryRepository.cs

@@ -1,5 +1,4 @@
-
-using Admin.Core.Model.Admin;
+using Admin.Core.Model.Admin;
 
 namespace Admin.Core.Repository.Admin
 {

Admin.Core.Repository/Admin/Document/DocumentRepository.cs

@@ -1,5 +1,4 @@
 using Admin.Core.Model.Admin;
-using Admin.Core.Common.Auth;
 
 namespace Admin.Core.Repository.Admin
 {
@@ -9,4 +8,4 @@ namespace Admin.Core.Repository.Admin
         {
         }
     }
-}
+}

Admin.Core.Repository/Admin/Document/IDocumentRepository.cs

@@ -1,5 +1,4 @@
-
-using Admin.Core.Model.Admin;
+using Admin.Core.Model.Admin;
 
 namespace Admin.Core.Repository.Admin
 {

Admin.Core.Repository/Admin/DocumentImage/DocumentImageRepository.cs

@@ -1,5 +1,4 @@
 using Admin.Core.Model.Admin;
-using Admin.Core.Common.Auth;
 
 namespace Admin.Core.Repository.Admin
 {
@@ -9,4 +8,4 @@ namespace Admin.Core.Repository.Admin
         {
         }
     }
-}
+}

Admin.Core.Repository/Admin/DocumentImage/IDocumentImageRepository.cs

@@ -1,5 +1,4 @@
-
-using Admin.Core.Model.Admin;
+using Admin.Core.Model.Admin;
 
 namespace Admin.Core.Repository.Admin
 {

Admin.Core.Repository/Admin/LoginLog/ILoginLogRepository.cs

@@ -2,10 +2,7 @@ using Admin.Core.Model.Admin;
 
 namespace Admin.Core.Repository.Admin
 {
-	public interface ILoginLogRepository : IRepositoryBase<LoginLogEntity>
+    public interface ILoginLogRepository : IRepositoryBase<LoginLogEntity>
     {
     }
-}
-
-
-	
+}

Admin.Core.Repository/Admin/LoginLog/LoginLogRepository.cs

@@ -1,5 +1,4 @@
 using Admin.Core.Model.Admin;
-using Admin.Core.Common.Auth;
 
 namespace Admin.Core.Repository.Admin
 {
@@ -9,4 +8,4 @@ namespace Admin.Core.Repository.Admin
         {
         }
     }
-}
+}

Admin.Core.Repository/Admin/OprationLog/IOprationLogRepository.cs

@@ -5,7 +5,4 @@ namespace Admin.Core.Repository.Admin
     public interface IOprationLogRepository : IRepositoryBase<OprationLogEntity>
     {
     }
-}
-
-
-	
+}

Admin.Core.Repository/Admin/OprationLog/OprationLogRepository.cs

@@ -1,5 +1,4 @@
 using Admin.Core.Model.Admin;
-using Admin.Core.Common.Auth;
 
 namespace Admin.Core.Repository.Admin
 {
@@ -9,4 +8,4 @@ namespace Admin.Core.Repository.Admin
         {
         }
     }
-}
+}

Admin.Core.Repository/Admin/Permission/IPermissionRepository.cs

@@ -1,5 +1,4 @@
-
-using Admin.Core.Model.Admin;
+using Admin.Core.Model.Admin;
 
 namespace Admin.Core.Repository.Admin
 {

Admin.Core.Repository/Admin/Permission/Output/PermissionDataOutput.cs

@@ -1,5 +1,4 @@
 using Admin.Core.Model.Admin;
-using Newtonsoft.Json;
 using System.Collections.Generic;
 
 namespace Admin.Core.Repository.Admin.Permission.Output

Admin.Core.Repository/Admin/Permission/PermissionRepository.cs

@@ -1,5 +1,4 @@
 using Admin.Core.Model.Admin;
-using Admin.Core.Common.Auth;
 
 namespace Admin.Core.Repository.Admin
 {
@@ -9,4 +8,4 @@ namespace Admin.Core.Repository.Admin
         {
         }
     }
-}
+}

Admin.Core.Repository/Admin/Role/IRoleRepository.cs

@@ -1,8 +1,8 @@
 using Admin.Core.Model.Admin;
 
 namespace Admin.Core.Repository.Admin
-{	
-	public interface IRoleRepository : IRepositoryBase<RoleEntity>
+{
+    public interface IRoleRepository : IRepositoryBase<RoleEntity>
     {
     }
-}
+}

Admin.Core.Repository/Admin/Role/RoleRepository.cs

@@ -1,12 +1,11 @@
 using Admin.Core.Model.Admin;
-using Admin.Core.Common.Auth;
 
 namespace Admin.Core.Repository.Admin
-{	
-	public  class RoleRepository : RepositoryBase<RoleEntity>, IRoleRepository
+{
+    public class RoleRepository : RepositoryBase<RoleEntity>, IRoleRepository
     {
         public RoleRepository(MyUnitOfWorkManager muowm) : base(muowm)
         {
         }
     }
-}
+}

Admin.Core.Repository/Admin/RolePermission/IRolePermissionRepository.cs

@@ -2,7 +2,7 @@ using Admin.Core.Model.Admin;
 
 namespace Admin.Core.Repository.Admin
 {
-	public interface IRolePermissionRepository : IRepositoryBase<RolePermissionEntity>
+    public interface IRolePermissionRepository : IRepositoryBase<RolePermissionEntity>
     {
     }
-}
+}

Admin.Core.Repository/Admin/RolePermission/RolePermissionRepository.cs

@@ -1,5 +1,4 @@
 using Admin.Core.Model.Admin;
-using Admin.Core.Common.Auth;
 
 namespace Admin.Core.Repository.Admin
 {
@@ -9,6 +8,4 @@ namespace Admin.Core.Repository.Admin
         {
         }
     }
-
-}
-
+}

Admin.Core.Repository/Admin/Tenant/ITenantRepository.cs

@@ -1,8 +1,8 @@
 using Admin.Core.Model.Admin;
 
 namespace Admin.Core.Repository.Admin
-{	
-	public interface ITenantRepository : IRepositoryBase<TenantEntity>
+{
+    public interface ITenantRepository : IRepositoryBase<TenantEntity>
     {
     }
-}
+}

Admin.Core.Repository/Admin/Tenant/TenantRepository.cs

@@ -1,12 +1,11 @@
 using Admin.Core.Model.Admin;
-using Admin.Core.Common.Auth;
 
 namespace Admin.Core.Repository.Admin
-{	
-	public  class TenantRepository : RepositoryBase<TenantEntity>, ITenantRepository
+{
+    public class TenantRepository : RepositoryBase<TenantEntity>, ITenantRepository
     {
         public TenantRepository(MyUnitOfWorkManager muowm) : base(muowm)
         {
         }
     }
-}
+}