租户列表，未设置标题时，Label仅显示名称(修复未设置标题时,多个减号 -xxx)

Admin.NET/Admin.NET.Core/Const/ConfigConst.cs

@@ -14,135 +14,135 @@ public class ConfigConst
     /// <summary>
     /// 演示环境
     /// </summary>
-    public const string SysDemoEnv = "sys_demo";
+    public const string SysDemoEnv = "SYS_DEMO";
 
     /// <summary>
     /// 默认密码
     /// </summary>
-    public const string SysPassword = "sys_password";
+    public const string SysPassword = "SYS_PASSWORD";
 
     /// <summary>
     /// 密码最大错误次数
     /// </summary>
-    public const string SysPasswordMaxErrorTimes = "sys_password_max_error_times";
+    public const string SysPasswordMaxErrorTimes = "SYS_PASSWORD_MAX_ERROR_TIMES";
 
     /// <summary>
     /// 日志保留天数
     /// </summary>
-    public const string SysLogRetentionDays = "sys_log_retention_days";
+    public const string SysLogRetentionDays = "SYS_LOG_RETENTION_DAYS";
 
     /// <summary>
     /// 记录操作日志
     /// </summary>
-    public const string SysOpLog = "sys_oplog";
+    public const string SysOpLog = "SYS_OPLOG";
 
     /// <summary>
     /// 单设备登录
     /// </summary>
-    public const string SysSingleLogin = "sys_single_login";
+    public const string SysSingleLogin = "SYS_SINGLE_LOGIN";
 
     /// <summary>
     /// 登入登出提醒
     /// </summary>
-    public const string SysLoginOutReminder = "sys_login_out_reminder";
+    public const string SysLoginOutReminder = "SYS_LOGIN_OUT_REMINDER";
 
     /// <summary>
     /// 登陆时隐藏租户
     /// </summary>
-    public const string SysHideTenantLogin = "sys_hide_tenant_login";
+    public const string SysHideTenantLogin = "SYS_HIDE_TENANT_LOGIN";
 
     /// <summary>
     /// 登录二次验证
     /// </summary>
-    public const string SysSecondVer = "sys_second_ver";
+    public const string SysSecondVer = "SYS_SECOND_VER";
 
     /// <summary>
     /// 图形验证码
     /// </summary>
-    public const string SysCaptcha = "sys_captcha";
+    public const string SysCaptcha = "SYS_CAPTCHA";
 
     /// <summary>
     /// Token过期时间
     /// </summary>
-    public const string SysTokenExpire = "sys_token_expire";
+    public const string SysTokenExpire = "SYS_TOKEN_EXPIRE";
 
     /// <summary>
     /// RefreshToken过期时间
     /// </summary>
-    public const string SysRefreshTokenExpire = "sys_refresh_token_expire";
+    public const string SysRefreshTokenExpire = "SYS_REFRESH_TOKEN_EXPIRE";
 
     /// <summary>
     /// 发送异常日志邮件
     /// </summary>
-    public const string SysErrorMail = "sys_error_mail";
+    public const string SysErrorMail = "SYS_ERROR_MAIL";
 
     /// <summary>
     /// 域登录验证
     /// </summary>
-    public const string SysDomainLogin = "sys_domain_login";
+    public const string SysDomainLogin = "SYS_DOMAIN_LOGIN";
 
     // /// <summary>
     // /// 租户域名隔离登录验证
     // /// </summary>
-    // public const string SysTenantHostLogin = "sys_tenant_host_login";
+    // public const string SysTenantHostLogin = "SYS_TENANT_HOST_LOGIN";
 
     /// <summary>
     /// 数据校验日志
     /// </summary>
-    public const string SysValidationLog = "sys_validation_log";
+    public const string SysValidationLog = "SYS_VALIDATION_LOG";
 
     /// <summary>
     /// 行政区域同步层级 1-省级,2-市级,3-区县级,4-街道级,5-村级
     /// </summary>
-    public const string SysRegionSyncLevel = "sys_region_sync_level";
+    public const string SysRegionSyncLevel = "SYS_REGION_SYNC_LEVEL";
 
     /// <summary>
     /// Default 分组
     /// </summary>
-    public const string SysDefaultGroup = "Default";
+    public const string SysDefaultGroup = "DEFAULT";
 
     /// <summary>
     /// 支付宝授权页面地址
     /// </summary>
-    public const string AlipayAuthPageUrl = "alipay_auth_page_url_";
+    public const string AlipayAuthPageUrl = "ALIPAY_AUTH_PAGE_URL_";
 
     // /// <summary>
     // /// 系统图标
     // /// </summary>
-    // public const string SysWebLogo = "sys_web_logo";
+    // public const string SysWebLogo = "SYS_WEB_LOGO";
     //
     // /// <summary>
     // /// 系统主标题
     // /// </summary>
-    // public const string SysWebTitle = "sys_web_title";
+    // public const string SysWebTitle = "SYS_WEB_TITLE";
     //
     // /// <summary>
     // /// 系统副标题
     // /// </summary>
-    // public const string SysWebViceTitle = "sys_web_viceTitle";
+    // public const string SysWebViceTitle = "SYS_WEB_VICETITLE";
     //
     // /// <summary>
     // /// 系统描述
     // /// </summary>
-    // public const string SysWebViceDesc = "sys_web_viceDesc";
+    // public const string SysWebViceDesc = "SYS_WEB_VICEDESC";
     //
     // /// <summary>
     // /// 水印内容
     // /// </summary>
-    // public const string SysWebWatermark = "sys_web_watermark";
+    // public const string SysWebWatermark = "SYS_WEB_WATERMARK";
     //
     // /// <summary>
     // /// 版权说明
     // /// </summary>
-    // public const string SysWebCopyright = "sys_web_copyright";
+    // public const string SysWebCopyright = "SYS_WEB_COPYRIGHT";
     //
     // /// <summary>
     // /// ICP备案号
     // /// </summary>
-    // public const string SysWebIcp = "sys_web_icp";
+    // public const string SysWebIcp = "SYS_WEB_ICP";
     //
     // /// <summary>
     // /// ICP地址
     // /// </summary>
-    // public const string SysWebIcpUrl = "sys_web_icpUrl";
+    // public const string SysWebIcpUrl = "SYS_WEB_ICPURL";
 }

Admin.NET/Admin.NET.Core/SeedData/SysOrgSeedData.cs

@@ -18,7 +18,7 @@ public class SysOrgSeedData : ISqlSugarEntitySeedData<SysOrg>
     /// <returns></returns>
     public IEnumerable<SysOrg> HasData()
     {
-        var admin = new SysUserSeedData().HasData().First(u => u.Account == "admin");
+        var admin = new SysUserSeedData().HasData().First(u => u.Account == "Admin.NET");
         return new[]
         {
             new SysOrg{ Id=SqlSugarConst.DefaultTenantId, Pid=0, Name="系统默认", Code="1001", Type="101", Level=1, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="系统默认", TenantId=SqlSugarConst.DefaultTenantId },

Admin.NET/Admin.NET.Core/SeedData/SysTenantSeedData.cs

@@ -19,7 +19,7 @@ public class SysTenantSeedData : ISqlSugarEntitySeedData<SysTenant>
     {
         var defaultDbConfig = App.GetOptions<DbConnectionOptions>().ConnectionConfigs[0];
         var userList = new SysUserSeedData().HasData().ToList();
-        var admin = userList.First(u => u.Account == "admin");
+        var admin = userList.First(u => u.Account == "Admin.NET");
         return new[]
         {
             new SysTenant{ Id=SqlSugarConst.DefaultTenantId, OrgId=SqlSugarConst.DefaultTenantId, UserId=admin.Id, Host="gitee.com", TenantType=TenantTypeEnum.Id, DbType=defaultDbConfig.DbType, Connection=defaultDbConfig.ConnectionString, ConfigId=SqlSugarConst.MainConfigId, Logo="/upload/logo.png", Title="Admin.NET", ViceTitle="Admin.NET", ViceDesc="站在巨人肩膀上的 .NET 通用权限开发框架", Watermark="Admin.NET", Copyright="Copyright \u00a9 2021-present Admin.NET All rights reserved.", Icp="省ICP备12345678号", IcpUrl="https://beian.miit.gov.cn", Remark="系统默认", CreateTime=DateTime.Parse("2022-02-10 00:00:00") },

Admin.NET/Admin.NET.Core/SeedData/SysUserExtOrgSeedData.cs

@@ -20,8 +20,8 @@ public class SysUserExtOrgSeedData : ISqlSugarEntitySeedData<SysUserExtOrg>
         var userList = new SysUserSeedData().HasData().ToList();
         var orgList = new SysOrgSeedData().HasData().ToList();
         var posList = new SysPosSeedData().HasData().ToList();
-        var admin = userList.First(u => u.Account == "admin");
-        var user3 = userList.First(u => u.Account == "user3");
+        var admin = userList.First(u => u.Account == "Admin.NET");
+        var user3 = userList.First(u => u.Account == "TestUser3");
         var org1 = orgList.First(u => u.Name == "系统默认");
         var org2 = orgList.First(u => u.Name == "开发部");
         var pos1 = posList.First(u => u.Name == "部门经理");

Admin.NET/Admin.NET.Core/SeedData/SysUserRoleSeedData.cs

@@ -21,10 +21,10 @@ public class SysUserRoleSeedData : ISqlSugarEntitySeedData<SysUserRole>
         var roleList = new SysRoleSeedData().HasData().ToList();
         return new[]
         {
-            new SysUserRole{ Id=1300000000101, UserId=userList.First(u => u.Account == "user1").Id, RoleId=roleList.First(u => u.Code == "sys_deptChild").Id },
-            new SysUserRole{ Id=1300000000102, UserId=userList.First(u => u.Account == "user2").Id, RoleId=roleList.First(u => u.Code == "sys_dept").Id },
-            new SysUserRole{ Id=1300000000103, UserId=userList.First(u => u.Account == "user3").Id, RoleId=roleList.First(u => u.Code == "sys_self").Id },
-            new SysUserRole{ Id=1300000000104, UserId=userList.First(u => u.Account == "user4").Id, RoleId=roleList.First(u => u.Code == "sys_define").Id },
+            new SysUserRole{ Id=1300000000101, UserId=userList.First(u => u.Account == "TestUser1").Id, RoleId=roleList.First(u => u.Code == "sys_deptChild").Id },
+            new SysUserRole{ Id=1300000000102, UserId=userList.First(u => u.Account == "TestUser2").Id, RoleId=roleList.First(u => u.Code == "sys_dept").Id },
+            new SysUserRole{ Id=1300000000103, UserId=userList.First(u => u.Account == "TestUser3").Id, RoleId=roleList.First(u => u.Code == "sys_self").Id },
+            new SysUserRole{ Id=1300000000104, UserId=userList.First(u => u.Account == "TestUser4").Id, RoleId=roleList.First(u => u.Code == "sys_define").Id },
         };
     }
 }

Admin.NET/Admin.NET.Core/SeedData/SysUserSeedData.cs

@@ -22,12 +22,12 @@ public class SysUserSeedData : ISqlSugarEntitySeedData<SysUser>
         var posList = new SysPosSeedData().HasData().ToList();
         return new[]
         {
-            new SysUser{ Id=1300000000101, Account="superadmin", Password=encryptPassword, NickName="超级管理员", RealName="超级管理员", Phone="18012345678", Birthday=DateTime.Parse("2000-01-01"), Sex=GenderEnum.Male, AccountType=AccountTypeEnum.SuperAdmin, Remark="超级管理员", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), TenantId=SqlSugarConst.DefaultTenantId },
-            new SysUser{ Id=1300000000111, Account="admin", Password=encryptPassword, NickName="系统管理员", RealName="系统管理员", Phone="18012345677", Birthday=DateTime.Parse("2000-01-01"), Sex=GenderEnum.Male, AccountType=AccountTypeEnum.SysAdmin, Remark="系统管理员", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrgId=SqlSugarConst.DefaultTenantId, PosId=posList[0].Id, TenantId=SqlSugarConst.DefaultTenantId },
-            new SysUser{ Id=1300000000112, Account="user1", Password=encryptPassword, NickName="部门主管", RealName="部门主管", Phone="18012345676", Birthday=DateTime.Parse("2000-01-01"), Sex=GenderEnum.Female, AccountType=AccountTypeEnum.NormalUser, Remark="部门主管", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrgId=SqlSugarConst.DefaultTenantId + 1, PosId=posList[1].Id, TenantId=SqlSugarConst.DefaultTenantId },
-            new SysUser{ Id=1300000000113, Account="user2", Password=encryptPassword, NickName="部门职员", RealName="部门职员", Phone="18012345675", Birthday=DateTime.Parse("2000-01-01"), Sex=GenderEnum.Female, AccountType=AccountTypeEnum.NormalUser, Remark="部门职员", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrgId=SqlSugarConst.DefaultTenantId + 2, PosId=posList[2].Id, TenantId=SqlSugarConst.DefaultTenantId },
-            new SysUser{ Id=1300000000114, Account="user3", Password=encryptPassword, NickName="普通用户", RealName="普通用户", Phone="18012345674", Birthday=DateTime.Parse("2000-01-01"), Sex=GenderEnum.Female, AccountType=AccountTypeEnum.NormalUser, Remark="普通用户", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrgId=SqlSugarConst.DefaultTenantId + 3, PosId=posList[3].Id, TenantId=SqlSugarConst.DefaultTenantId },
-            new SysUser{ Id=1300000000115, Account="user4", Password=encryptPassword, NickName="其他", RealName="其他", Phone="18012345673", Birthday=DateTime.Parse("2000-01-01"), Sex=GenderEnum.Female, AccountType=AccountTypeEnum.Member, Remark="会员", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrgId=SqlSugarConst.DefaultTenantId + 4, PosId=posList[4].Id, TenantId=SqlSugarConst.DefaultTenantId },
+            new SysUser{ Id=1300000000101, Account="SuperAdmin", Password=encryptPassword, NickName="超级管理员", RealName="超级管理员", Phone="18012345678", Birthday=DateTime.Parse("2000-01-01"), Sex=GenderEnum.Male, AccountType=AccountTypeEnum.SuperAdmin, Remark="超级管理员", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), TenantId=SqlSugarConst.DefaultTenantId },
+            new SysUser{ Id=1300000000111, Account="Admin.NET", Password=encryptPassword, NickName="系统管理员", RealName="系统管理员", Phone="18012345677", Birthday=DateTime.Parse("2000-01-01"), Sex=GenderEnum.Male, AccountType=AccountTypeEnum.SysAdmin, Remark="系统管理员", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrgId=SqlSugarConst.DefaultTenantId, PosId=posList[0].Id, TenantId=SqlSugarConst.DefaultTenantId },
+            new SysUser{ Id=1300000000112, Account="TestUser1", Password=encryptPassword, NickName="部门主管", RealName="部门主管", Phone="18012345676", Birthday=DateTime.Parse("2000-01-01"), Sex=GenderEnum.Female, AccountType=AccountTypeEnum.NormalUser, Remark="部门主管", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrgId=SqlSugarConst.DefaultTenantId + 1, PosId=posList[1].Id, TenantId=SqlSugarConst.DefaultTenantId },
+            new SysUser{ Id=1300000000113, Account="TestUser2", Password=encryptPassword, NickName="部门职员", RealName="部门职员", Phone="18012345675", Birthday=DateTime.Parse("2000-01-01"), Sex=GenderEnum.Female, AccountType=AccountTypeEnum.NormalUser, Remark="部门职员", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrgId=SqlSugarConst.DefaultTenantId + 2, PosId=posList[2].Id, TenantId=SqlSugarConst.DefaultTenantId },
+            new SysUser{ Id=1300000000114, Account="TestUser3", Password=encryptPassword, NickName="普通用户", RealName="普通用户", Phone="18012345674", Birthday=DateTime.Parse("2000-01-01"), Sex=GenderEnum.Female, AccountType=AccountTypeEnum.NormalUser, Remark="普通用户", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrgId=SqlSugarConst.DefaultTenantId + 3, PosId=posList[3].Id, TenantId=SqlSugarConst.DefaultTenantId },
+            new SysUser{ Id=1300000000115, Account="TestUser4", Password=encryptPassword, NickName="其他", RealName="其他", Phone="18012345673", Birthday=DateTime.Parse("2000-01-01"), Sex=GenderEnum.Female, AccountType=AccountTypeEnum.Member, Remark="会员", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrgId=SqlSugarConst.DefaultTenantId + 4, PosId=posList[4].Id, TenantId=SqlSugarConst.DefaultTenantId },
         };
     }
 }

Admin.NET/Admin.NET.Core/Service/Tenant/SysTenantService.cs

@@ -109,7 +109,7 @@ public class SysTenantService : IDynamicApiController, ITransient
            .Where(u => u.Status == StatusEnum.Enable)
            .Select((u, a) => new
            {
-               Label = $"{u.Title}-{a.Name}",
+               Label = SqlFunc.HasValue(u.Title) ? $"{u.Title}-{a.Name}" : a.Name,
                Host = u.Host.ToLower(),
                Value = u.Id,
            }).ToListAsync();