Sfoglia il codice sorgente

🛠修正显著的拼写错误(已审查所有文件)

LionelZhao 2 anni fa
parent
commit
564e161b5c

+ 3 - 3
Admin.NET/Admin.NET.Core/Service/APIJSON/SelectTable.cs

@@ -497,7 +497,7 @@ public class SelectTable : ISingleton
             {
                 ConditionQuery(subtable, conModels, va);
             }
-            else if (vakey.EndsWith("%"))//bwtween查询
+            else if (vakey.EndsWith("%"))//between查询
             {
                 ConditionBetween(subtable, conModels, va);
             }
@@ -527,7 +527,7 @@ public class SelectTable : ISingleton
         ProcessOrder(subtable, values, tb);
 
         //分组
-        PrccessGroup(subtable, values, tb);
+        ProcessGroup(subtable, values, tb);
 
         //Having
         ProcessHaving(values, tb);
@@ -637,7 +637,7 @@ public class SelectTable : ISingleton
     //"@group":"column0,column1...",分组方式。如果 @column里声明了Table的id,则id也必须在 @group中声明;其它情况下必须满足至少一个条件:
     //1.分组的key在 @column里声明
     //2.Table主键在 @group中声明
-    private void PrccessGroup(string subtable, JObject values, ISugarQueryable<ExpandoObject> tb)
+    private void ProcessGroup(string subtable, JObject values, ISugarQueryable<ExpandoObject> tb)
     {
         if (!values["@group"].IsNullOrEmpty())
         {

+ 1 - 1
Admin.NET/Admin.NET.Core/Service/Auth/SysAuthService.cs

@@ -126,7 +126,7 @@ public class SysAuthService : IDynamicApiController, ITransient
     public async Task<LoginOutput> CreateToken(SysUser user)
     {
         // 单用户登录
-        await _sysOnlineUserService.SignleLogin(user.Id);
+        await _sysOnlineUserService.SingleLogin(user.Id);
 
         // 生成Token令牌
         var tokenExpire = await _sysConfigService.GetTokenExpire();

+ 4 - 4
Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenConfigService.cs

@@ -81,16 +81,16 @@ public class SysCodeGenConfigService : IDynamicApiController, ITransient
     /// <summary>
     /// 批量增加代码生成配置
     /// </summary>
-    /// <param name="tableColumnOuputList"></param>
+    /// <param name="tableColumnOutputList"></param>
     /// <param name="codeGenerate"></param>
     [NonAction]
-    public void AddList(List<ColumnOuput> tableColumnOuputList, SysCodeGen codeGenerate)
+    public void AddList(List<ColumnOuput> tableColumnOutputList, SysCodeGen codeGenerate)
     {
-        if (tableColumnOuputList == null) return;
+        if (tableColumnOutputList == null) return;
 
         var codeGenConfigs = new List<SysCodeGenConfig>();
         var orderNo = 100;
-        foreach (var tableColumn in tableColumnOuputList)
+        foreach (var tableColumn in tableColumnOutputList)
         {
             var codeGenConfig = new SysCodeGenConfig();
 

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

@@ -123,8 +123,8 @@ public class SysCodeGenService : IDynamicApiController, ITransient
     [DisplayName("获取数据库库集合")]
     public async Task<List<DatabaseOutput>> GetDatabaseList()
     {
-        var dbCongigs = App.GetOptions<DbConnectionOptions>().ConnectionConfigs;
-        return await Task.FromResult(dbCongigs.Adapt<List<DatabaseOutput>>());
+        var dbConfigs = App.GetOptions<DbConnectionOptions>().ConnectionConfigs;
+        return await Task.FromResult(dbConfigs.Adapt<List<DatabaseOutput>>());
     }
 
     /// <summary>

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

@@ -138,12 +138,12 @@ public class SysDatabaseService : IDynamicApiController, ITransient
 
         var config = App.GetOptions<DbConnectionOptions>().ConnectionConfigs.FirstOrDefault(u => u.ConfigId == input.ConfigId);
         var db = _db.AsTenant().GetConnectionScope(input.ConfigId);
-        var typeBilder = db.DynamicBuilder().CreateClass(input.TableName, new SugarTable() { TableName = input.TableName, TableDescription = input.Description });
+        var typeBuilder = db.DynamicBuilder().CreateClass(input.TableName, new SugarTable() { TableName = input.TableName, TableDescription = input.Description });
         input.DbColumnInfoList.ForEach(m =>
         {
             var dbColumnName = config.DbSettings.EnableUnderLine ? UtilMethods.ToUnderLine(m.DbColumnName.Trim()) : m.DbColumnName.Trim();
             // 虚拟类都默认string类型,具体以列数据类型为准
-            typeBilder.CreateProperty(dbColumnName, typeof(string), new SugarColumn()
+            typeBuilder.CreateProperty(dbColumnName, typeof(string), new SugarColumn()
             {
                 IsPrimaryKey = m.IsPrimarykey == 1,
                 IsIdentity = m.IsIdentity == 1,
@@ -154,7 +154,7 @@ public class SysDatabaseService : IDynamicApiController, ITransient
                 ColumnDescription = m.ColumnDescription,
             });
         });
-        db.CodeFirst.InitTables(typeBilder.BuilderType());
+        db.CodeFirst.InitTables(typeBuilder.BuilderType());
     }
 
     /// <summary>
@@ -253,22 +253,22 @@ public class SysDatabaseService : IDynamicApiController, ITransient
         var tableInfo = db.DbMaintenance.GetTableInfoList(false).FirstOrDefault(u => u.Name == input.TableName); // 表名
         List<DbColumnInfo> dbColumnInfos = db.DbMaintenance.GetColumnInfosByTableName(input.TableName, false); // 所有字段
         IEnumerable<EntityInfo> entityInfos = await GetEntityInfos();
-        Type enityType = null;
+        Type entityType = null;
         foreach (var item in entityInfos)
         {
             if (tableInfo.Name.ToLower() != (config.DbSettings.EnableUnderLine ? UtilMethods.ToUnderLine(item.DbTableName) : item.DbTableName).ToLower()) continue;
-            enityType = item.Type;
+            entityType = item.Type;
             break;
         }
 
-        input.EntityName = enityType.Name;
-        input.SeedDataName = enityType.Name + "SeedData";
+        input.EntityName = entityType.Name;
+        input.SeedDataName = entityType.Name + "SeedData";
         if (!string.IsNullOrWhiteSpace(input.Suffix))
             input.SeedDataName += input.Suffix;
         var targetPath = GetSeedDataTargetPath(input);
 
         // 查询所有数据
-        var query = db.QueryableByObject(enityType);
+        var query = db.QueryableByObject(entityType);
         DbColumnInfo orderField = null; // 排序字段
         // 优先用创建时间排序
         orderField = dbColumnInfos.Where(u => u.DbColumnName.ToLower() == "create_time" || u.DbColumnName.ToLower() == "createtime").FirstOrDefault();
@@ -283,7 +283,7 @@ public class SysDatabaseService : IDynamicApiController, ITransient
         var recordsJSON = JsonConvert.SerializeObject(records, Formatting.Indented, timeConverter);
 
         // 检查有没有 System.Text.Json.Serialization.JsonIgnore 的属性
-        var jsonIgnoreProperties = enityType.GetProperties().Where(p =>
+        var jsonIgnoreProperties = entityType.GetProperties().Where(p =>
             p.GetAttribute<System.Text.Json.Serialization.JsonIgnoreAttribute>() != null ||
             p.GetAttribute<JsonIgnoreAttribute>() != null).ToList();
         var jsonIgnoreInfo = new List<List<JsonIgnoredPropertyData>>();
@@ -316,7 +316,7 @@ public class SysDatabaseService : IDynamicApiController, ITransient
         var data = new
         {
             NameSpace = $"{input.Position}.SeedData",
-            EntityNameSpace = enityType.Namespace,
+            EntityNameSpace = entityType.Namespace,
             input.TableName,
             input.EntityName,
             input.SeedDataName,

+ 1 - 1
Admin.NET/Admin.NET.Core/Service/OnlineUser/SysOnlineUserService.cs

@@ -79,7 +79,7 @@ public class SysOnlineUserService : IDynamicApiController, ITransient
     /// </summary>
     /// <returns></returns>
     [NonAction]
-    public async Task SignleLogin(long userId)
+    public async Task SingleLogin(long userId)
     {
         if (await _sysConfigService.GetConfigValue<bool>(CommonConst.SysSingleLogin))
         {

+ 2 - 2
Admin.NET/Admin.NET.Core/Service/Tenant/SysTenantService.cs

@@ -385,7 +385,7 @@ public class SysTenantService : IDynamicApiController, ITransient
             throw Oops.Oh(ErrorCodeEnum.Z1002);
 
         // 默认数据库配置
-        var defautConfig = App.GetOptions<DbConnectionOptions>().ConnectionConfigs.FirstOrDefault();
+        var defaultConfig = App.GetOptions<DbConnectionOptions>().ConnectionConfigs.FirstOrDefault();
 
         var config = new DbConnectionConfig
         {
@@ -396,7 +396,7 @@ public class SysTenantService : IDynamicApiController, ITransient
             {
                 EnableInitDb = true,
                 EnableDiffLog = false,
-                EnableUnderLine = defautConfig.DbSettings.EnableUnderLine,
+                EnableUnderLine = defaultConfig.DbSettings.EnableUnderLine,
             }
         };
         SqlSugarSetup.InitTenantDatabase(App.GetRequiredService<ISqlSugarClient>().AsTenant(), config);

+ 2 - 2
Admin.NET/Admin.NET.Web.Core/Handlers/JwtHandler.cs

@@ -51,7 +51,7 @@ namespace Admin.NET.Web.Core
         public override async Task<bool> PipelineAsync(AuthorizationHandlerContext context, DefaultHttpContext httpContext)
         {
             // 已自动验证 Jwt Token 有效性
-            return await CheckAuthorzieAsync(httpContext);
+            return await CheckAuthorizeAsync(httpContext);
         }
 
         /// <summary>
@@ -59,7 +59,7 @@ namespace Admin.NET.Web.Core
         /// </summary>
         /// <param name="httpContext"></param>
         /// <returns></returns>
-        private static async Task<bool> CheckAuthorzieAsync(DefaultHttpContext httpContext)
+        private static async Task<bool> CheckAuthorizeAsync(DefaultHttpContext httpContext)
         {
             // 登录模式判断PC、APP
             if (App.User.FindFirst(ClaimConst.LoginMode)?.Value == ((int)LoginModeEnum.APP).ToString())