1、调整账号全局唯一模式（也可根据域名区分租户） 2、其他优化

Admin.NET/Admin.NET.Core/Admin.NET.Core.xml

@@ -2495,7 +2495,12 @@
         </member>
         <member name="F:Admin.NET.Core.ErrorCodeEnum.D1300">
             <summary>
-            已存在同名或同管理员或同主机租户
+            已存在同名的租户
+            </summary>
+        </member>
+        <member name="F:Admin.NET.Core.ErrorCodeEnum.D1301">
+            <summary>
+            已存在同名的租户管理员
             </summary>
         </member>
         <member name="F:Admin.NET.Core.ErrorCodeEnum.D1400">
@@ -3850,11 +3855,6 @@
             验证码
             </summary>
         </member>
-        <member name="P:Admin.NET.Core.Service.LoginInput.TenantId">
-            <summary>
-            租户Id
-            </summary>
-        </member>
         <member name="T:Admin.NET.Core.Service.LoginOutput">
             <summary>
             用户登录结果

Admin.NET/Admin.NET.Core/Enum/ErrorCodeEnum.cs

@@ -397,11 +397,17 @@ public enum ErrorCodeEnum
     D1200,
 
     /// <summary>
-    /// 已存在同名或同管理员或同主机租户
+    /// 已存在同名的租户
     /// </summary>
-    [ErrorCodeItemMetadata("已存在同名或同主机租户")]
+    [ErrorCodeItemMetadata("已存在同名的租户")]
     D1300,
 
+    /// <summary>
+    /// 已存在同名的租户管理员
+    /// </summary>
+    [ErrorCodeItemMetadata("已存在同名的租户管理员")]
+    D1301,
+
     /// <summary>
     /// 该表代码模板已经生成过
     /// </summary>

Admin.NET/Admin.NET.Core/Service/Auth/Dto/LoginInput.cs

@@ -29,8 +29,8 @@ public class LoginInput
     /// </summary>
     public string Code { get; set; }
 
-    /// <summary>
-    /// 租户Id
-    /// </summary>
-    public long TenantId { get; set; }
+    ///// <summary>
+    ///// 租户Id
+    ///// </summary>
+    //public long TenantId { get; set; }
 }

Admin.NET/Admin.NET.Core/Service/Auth/SysAuthService.cs

@@ -58,6 +58,9 @@ public class SysAuthService : IDynamicApiController, ITransient
     [SuppressMonitor]
     public async Task<LoginOutput> Login([Required] LoginInput input)
     {
+        //// 可以根据域名获取具体租户
+        //var host = _httpContextAccessor.HttpContext.Request.Host;
+
         // 判断验证码
         var captchaEnabled = await GetCaptchaFlag();
         if (captchaEnabled && !_captcha.Validate(input.CodeId.ToString(), input.Code))
@@ -67,7 +70,7 @@ public class SysAuthService : IDynamicApiController, ITransient
 
         // 判断用户名密码 
         var user = await _sysUserRep.AsQueryable().Filter(null, true)
-            .WhereIF(input.TenantId > 0, u => u.TenantId == input.TenantId)
+            // .WhereIF(input.TenantId > 0, u => u.TenantId == input.TenantId)
             .FirstAsync(u => u.Account.Equals(input.Account) && u.Password.Equals(encryptPasswod));
         _ = user ?? throw Oops.Oh(ErrorCodeEnum.D1000);
 

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

@@ -78,10 +78,12 @@ public class SysTenantService : IDynamicApiController, ITransient
     [HttpPost("/sysTenant/add")]
     public async Task AddTenant(AddTenantInput input)
     {
-        var isExist = await _tenantRep.IsAnyAsync(u => u.Name == input.Name ||
-            (u.AdminName == input.AdminName && input.TenantType == TenantTypeEnum.Id));
+        var isExist = await _tenantRep.IsAnyAsync(u => u.Name == input.Name);
         if (isExist) throw Oops.Oh(ErrorCodeEnum.D1300);
 
+        isExist = await _userRep.AsQueryable().Filter(null, true).AnyAsync(u => u.Account == input.AdminName);
+        if (isExist) throw Oops.Oh(ErrorCodeEnum.D1301);
+
         var tenant = input.Adapt<SysTenant>();
         await _tenantRep.InsertAsync(tenant);
         await UpdateTenantCache();

Admin.NET/Admin.NET.Core/Service/User/SysUserService.cs

@@ -58,7 +58,7 @@ public class SysUserService : IDynamicApiController, ITransient
     [UnitOfWork]
     public async Task AddUser(AddUserInput input)
     {
-        var isExist = await _sysUserRep.IsAnyAsync(u => u.Account == input.Account);
+        var isExist = await _sysUserRep.AsQueryable().Filter(null, true).AnyAsync(u => u.Account == input.Account);
         if (isExist) throw Oops.Oh(ErrorCodeEnum.D1003);
 
         var password = await _sysConfigService.GetConfigValue<string>(CommonConst.SysPassword);
@@ -91,7 +91,7 @@ public class SysUserService : IDynamicApiController, ITransient
     [UnitOfWork]
     public async Task UpdateUser(UpdateUserInput input)
     {
-        var isExist = await _sysUserRep.IsAnyAsync(u => u.Account == input.Account && u.Id != input.Id);
+        var isExist = await _sysUserRep.AsQueryable().Filter(null, true).AnyAsync(u => u.Account == input.Account && u.Id != input.Id);
         if (isExist) throw Oops.Oh(ErrorCodeEnum.D1003);
 
         await _sysUserRep.AsUpdateable(input.Adapt<SysUser>()).IgnoreColumns(true)

Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarSetup.cs

@@ -218,7 +218,6 @@ public static class SqlSugarSetup
             seedDataTable.TableName = db2.EntityMaintenance.GetEntityInfo(entityType).DbTableName;
             if (seedDataTable.Columns.Contains(SqlSugarConst.PrimaryKey))
             {
-                //解决pgsql中，业务添加框架的种子数据时候，类映射了多个类型的问题bug（本bug是sqlsugar作者提供的解决方案）
                 var storage = db2.CopyNew().Storageable(seedDataTable).WhereColumns(SqlSugarConst.PrimaryKey).ToStorage();
                 storage.AsInsertable.ExecuteCommand();
                 storage.AsUpdateable.ExecuteCommand();

Web/src/api-services/apis/sys-tenant-api.ts

@@ -17,11 +17,13 @@ import { Configuration } from '../configuration';
 // @ts-ignore
 import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError } from '../base';
 import { AddTenantInput } from '../models';
+import { AdminResultInt32 } from '../models';
 import { AdminResultListInt64 } from '../models';
 import { AdminResultListSysMenu } from '../models';
 import { AdminResultSqlSugarPagedListSysTenant } from '../models';
 import { DeleteTenantInput } from '../models';
 import { RoleMenuInput } from '../models';
+import { StatusEnum } from '../models';
 import { TenantInput } from '../models';
 import { UpdateTenantInput } from '../models';
 /**
@@ -73,7 +75,7 @@ export const SysTenantApiAxiosParamCreator = function (configuration?: Configura
         },
         /**
          * 
-         * @summary 创建租户数据库（根据默认库结构）
+         * @summary 创建租户数据库
          * @param {TenantInput} [body] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
@@ -198,10 +200,11 @@ export const SysTenantApiAxiosParamCreator = function (configuration?: Configura
          * 
          * @summary 获取租户管理员角色拥有菜单树
          * @param {number} id 主键Id
+         * @param {StatusEnum} [status] 状态
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        sysTenantOwnMenuListGet: async (id: number, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        sysTenantOwnMenuListGet: async (id: number, status?: StatusEnum, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'id' is not null or undefined
             if (id === null || id === undefined) {
                 throw new RequiredError('id','Required parameter id was null or undefined when calling sysTenantOwnMenuListGet.');
@@ -219,6 +222,10 @@ export const SysTenantApiAxiosParamCreator = function (configuration?: Configura
 
             // authentication Bearer required
 
+            if (status !== undefined) {
+                localVarQueryParameter['Status'] = status;
+            }
+
             if (id !== undefined) {
                 localVarQueryParameter['Id'] = id;
             }
@@ -243,10 +250,11 @@ export const SysTenantApiAxiosParamCreator = function (configuration?: Configura
          * 
          * @summary 获取租户管理员角色拥有菜单树
          * @param {number} id 主键Id
+         * @param {StatusEnum} [status] 状态
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        sysTenantOwnMenuTreeGet: async (id: number, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        sysTenantOwnMenuTreeGet: async (id: number, status?: StatusEnum, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'id' is not null or undefined
             if (id === null || id === undefined) {
                 throw new RequiredError('id','Required parameter id was null or undefined when calling sysTenantOwnMenuTreeGet.');
@@ -264,6 +272,10 @@ export const SysTenantApiAxiosParamCreator = function (configuration?: Configura
 
             // authentication Bearer required
 
+            if (status !== undefined) {
+                localVarQueryParameter['Status'] = status;
+            }
+
             if (id !== undefined) {
                 localVarQueryParameter['Id'] = id;
             }
@@ -396,6 +408,47 @@ export const SysTenantApiAxiosParamCreator = function (configuration?: Configura
                 options: localVarRequestOptions,
             };
         },
+        /**
+         * 
+         * @summary 设置租户状态
+         * @param {TenantInput} [body] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        sysTenantSetStatusPost: async (body?: TenantInput, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/sysTenant/setStatus`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, 'https://example.com');
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions :AxiosRequestConfig = { method: 'POST', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+            // authentication Bearer required
+
+            localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
+
+            const query = new URLSearchParams(localVarUrlObj.search);
+            for (const key in localVarQueryParameter) {
+                query.set(key, localVarQueryParameter[key]);
+            }
+            for (const key in options.params) {
+                query.set(key, options.params[key]);
+            }
+            localVarUrlObj.search = (new URLSearchParams(query)).toString();
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            const needsSerialization = (typeof body !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json';
+            localVarRequestOptions.data =  needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || "");
+
+            return {
+                url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
+                options: localVarRequestOptions,
+            };
+        },
         /**
          * 
          * @summary 更新租户
@@ -462,7 +515,7 @@ export const SysTenantApiFp = function(configuration?: Configuration) {
         },
         /**
          * 
-         * @summary 创建租户数据库（根据默认库结构）
+         * @summary 创建租户数据库
          * @param {TenantInput} [body] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
@@ -506,11 +559,12 @@ export const SysTenantApiFp = function(configuration?: Configuration) {
          * 
          * @summary 获取租户管理员角色拥有菜单树
          * @param {number} id 主键Id
+         * @param {StatusEnum} [status] 状态
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async sysTenantOwnMenuListGet(id: number, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultListInt64>>> {
-            const localVarAxiosArgs = await SysTenantApiAxiosParamCreator(configuration).sysTenantOwnMenuListGet(id, options);
+        async sysTenantOwnMenuListGet(id: number, status?: StatusEnum, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultListInt64>>> {
+            const localVarAxiosArgs = await SysTenantApiAxiosParamCreator(configuration).sysTenantOwnMenuListGet(id, status, options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 return axios.request(axiosRequestArgs);
@@ -520,11 +574,12 @@ export const SysTenantApiFp = function(configuration?: Configuration) {
          * 
          * @summary 获取租户管理员角色拥有菜单树
          * @param {number} id 主键Id
+         * @param {StatusEnum} [status] 状态
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async sysTenantOwnMenuTreeGet(id: number, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultListSysMenu>>> {
-            const localVarAxiosArgs = await SysTenantApiAxiosParamCreator(configuration).sysTenantOwnMenuTreeGet(id, options);
+        async sysTenantOwnMenuTreeGet(id: number, status?: StatusEnum, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultListSysMenu>>> {
+            const localVarAxiosArgs = await SysTenantApiAxiosParamCreator(configuration).sysTenantOwnMenuTreeGet(id, status, options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 return axios.request(axiosRequestArgs);
@@ -564,6 +619,20 @@ export const SysTenantApiFp = function(configuration?: Configuration) {
                 return axios.request(axiosRequestArgs);
             };
         },
+        /**
+         * 
+         * @summary 设置租户状态
+         * @param {TenantInput} [body] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async sysTenantSetStatusPost(body?: TenantInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultInt32>>> {
+            const localVarAxiosArgs = await SysTenantApiAxiosParamCreator(configuration).sysTenantSetStatusPost(body, options);
+            return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
+                const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
+                return axios.request(axiosRequestArgs);
+            };
+        },
         /**
          * 
          * @summary 更新租户
@@ -599,7 +668,7 @@ export const SysTenantApiFactory = function (configuration?: Configuration, base
         },
         /**
          * 
-         * @summary 创建租户数据库（根据默认库结构）
+         * @summary 创建租户数据库
          * @param {TenantInput} [body] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
@@ -631,21 +700,23 @@ export const SysTenantApiFactory = function (configuration?: Configuration, base
          * 
          * @summary 获取租户管理员角色拥有菜单树
          * @param {number} id 主键Id
+         * @param {StatusEnum} [status] 状态
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async sysTenantOwnMenuListGet(id: number, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultListInt64>> {
-            return SysTenantApiFp(configuration).sysTenantOwnMenuListGet(id, options).then((request) => request(axios, basePath));
+        async sysTenantOwnMenuListGet(id: number, status?: StatusEnum, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultListInt64>> {
+            return SysTenantApiFp(configuration).sysTenantOwnMenuListGet(id, status, options).then((request) => request(axios, basePath));
         },
         /**
          * 
          * @summary 获取租户管理员角色拥有菜单树
          * @param {number} id 主键Id
+         * @param {StatusEnum} [status] 状态
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async sysTenantOwnMenuTreeGet(id: number, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultListSysMenu>> {
-            return SysTenantApiFp(configuration).sysTenantOwnMenuTreeGet(id, options).then((request) => request(axios, basePath));
+        async sysTenantOwnMenuTreeGet(id: number, status?: StatusEnum, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultListSysMenu>> {
+            return SysTenantApiFp(configuration).sysTenantOwnMenuTreeGet(id, status, options).then((request) => request(axios, basePath));
         },
         /**
          * 
@@ -673,6 +744,16 @@ export const SysTenantApiFactory = function (configuration?: Configuration, base
         async sysTenantResetPwdPost(body?: TenantInput, options?: AxiosRequestConfig): Promise<AxiosResponse<void>> {
             return SysTenantApiFp(configuration).sysTenantResetPwdPost(body, options).then((request) => request(axios, basePath));
         },
+        /**
+         * 
+         * @summary 设置租户状态
+         * @param {TenantInput} [body] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async sysTenantSetStatusPost(body?: TenantInput, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultInt32>> {
+            return SysTenantApiFp(configuration).sysTenantSetStatusPost(body, options).then((request) => request(axios, basePath));
+        },
         /**
          * 
          * @summary 更新租户
@@ -706,7 +787,7 @@ export class SysTenantApi extends BaseAPI {
     }
     /**
      * 
-     * @summary 创建租户数据库（根据默认库结构）
+     * @summary 创建租户数据库
      * @param {TenantInput} [body] 
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
@@ -741,23 +822,25 @@ export class SysTenantApi extends BaseAPI {
      * 
      * @summary 获取租户管理员角色拥有菜单树
      * @param {number} id 主键Id
+     * @param {StatusEnum} [status] 状态
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof SysTenantApi
      */
-    public async sysTenantOwnMenuListGet(id: number, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultListInt64>> {
-        return SysTenantApiFp(this.configuration).sysTenantOwnMenuListGet(id, options).then((request) => request(this.axios, this.basePath));
+    public async sysTenantOwnMenuListGet(id: number, status?: StatusEnum, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultListInt64>> {
+        return SysTenantApiFp(this.configuration).sysTenantOwnMenuListGet(id, status, options).then((request) => request(this.axios, this.basePath));
     }
     /**
      * 
      * @summary 获取租户管理员角色拥有菜单树
      * @param {number} id 主键Id
+     * @param {StatusEnum} [status] 状态
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof SysTenantApi
      */
-    public async sysTenantOwnMenuTreeGet(id: number, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultListSysMenu>> {
-        return SysTenantApiFp(this.configuration).sysTenantOwnMenuTreeGet(id, options).then((request) => request(this.axios, this.basePath));
+    public async sysTenantOwnMenuTreeGet(id: number, status?: StatusEnum, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultListSysMenu>> {
+        return SysTenantApiFp(this.configuration).sysTenantOwnMenuTreeGet(id, status, options).then((request) => request(this.axios, this.basePath));
     }
     /**
      * 
@@ -787,6 +870,17 @@ export class SysTenantApi extends BaseAPI {
     public async sysTenantResetPwdPost(body?: TenantInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<void>> {
         return SysTenantApiFp(this.configuration).sysTenantResetPwdPost(body, options).then((request) => request(this.axios, this.basePath));
     }
+    /**
+     * 
+     * @summary 设置租户状态
+     * @param {TenantInput} [body] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof SysTenantApi
+     */
+    public async sysTenantSetStatusPost(body?: TenantInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultInt32>> {
+        return SysTenantApiFp(this.configuration).sysTenantSetStatusPost(body, options).then((request) => request(this.axios, this.basePath));
+    }
     /**
      * 
      * @summary 更新租户

Web/src/api-services/models/add-tenant-input.ts

@@ -12,6 +12,7 @@
  * Do not edit the class manually.
  */
 import { DbType } from './db-type';
+import { StatusEnum } from './status-enum';
 import { TenantTypeEnum } from './tenant-type-enum';
 /**
  * 
@@ -109,6 +110,12 @@ export interface AddTenantInput {
      * @memberof AddTenantInput
      */
     remark?: string | null;
+    /**
+     * 
+     * @type {StatusEnum}
+     * @memberof AddTenantInput
+     */
+    status?: StatusEnum;
     /**
      * 租户名称
      * @type {string}

Web/src/api-services/models/login-input.ts

@@ -41,10 +41,4 @@ export interface LoginInput {
      * @memberof LoginInput
      */
     code?: string | null;
-    /**
-     * 租户Id
-     * @type {number}
-     * @memberof LoginInput
-     */
-    tenantId?: number;
 }

Web/src/api-services/models/sys-tenant.ts

@@ -12,6 +12,7 @@
  * Do not edit the class manually.
  */
 import { DbType } from './db-type';
+import { StatusEnum } from './status-enum';
 import { TenantTypeEnum } from './tenant-type-enum';
 /**
  * 系统租户表
@@ -121,4 +122,10 @@ export interface SysTenant {
      * @memberof SysTenant
      */
     remark?: string | null;
+    /**
+     * 
+     * @type {StatusEnum}
+     * @memberof SysTenant
+     */
+    status?: StatusEnum;
 }

Web/src/api-services/models/tenant-input.ts

@@ -11,6 +11,7 @@
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
+import { StatusEnum } from './status-enum';
 /**
  * 
  * @export
@@ -23,4 +24,10 @@ export interface TenantInput {
      * @memberof TenantInput
      */
     id: number;
+    /**
+     * 
+     * @type {StatusEnum}
+     * @memberof TenantInput
+     */
+    status?: StatusEnum;
 }

Web/src/api-services/models/update-tenant-input.ts

@@ -12,6 +12,7 @@
  * Do not edit the class manually.
  */
 import { DbType } from './db-type';
+import { StatusEnum } from './status-enum';
 import { TenantTypeEnum } from './tenant-type-enum';
 /**
  * 
@@ -109,6 +110,12 @@ export interface UpdateTenantInput {
      * @memberof UpdateTenantInput
      */
     remark?: string | null;
+    /**
+     * 
+     * @type {StatusEnum}
+     * @memberof UpdateTenantInput
+     */
+    status?: StatusEnum;
     /**
      * 租户名称
      * @type {string}

Web/src/stores/themeConfig.ts

@@ -19,7 +19,7 @@ export const useThemeConfig = defineStore('themeConfig', {
 			 * 全局主题
 			 */
 			// 默认 primary 主题颜色
-			primary: '#0033CC', // '#FF5C00',
+			primary: '#0052D9', // '#FF6A00',
 			// 是否开启深色模式
 			isIsDark: false,
 

Web/src/views/login/component/account.vue

@@ -1,6 +1,6 @@
 <template>
 	<el-form ref="ruleFormRef" :model="ruleForm" size="large" :rules="rules" class="login-content-form">
-		<el-form-item class="login-animation0" v-show="tenantList.length > 0">
+		<!-- <el-form-item class="login-animation0" v-show="tenantList.length > 0">
 			<el-select v-model="ruleForm.tenantId" value-key="id" placeholder="租户名称" class="w100">
 				<template #prefix>
 					<el-icon>
@@ -9,7 +9,7 @@
 				</template>
 				<el-option v-for="item in tenantList" :key="item.id" :label="item.name" :value="item.id" />
 			</el-select>
-		</el-form-item>
+		</el-form-item> -->
 		<el-form-item class="login-animation1" prop="account">
 			<el-input type="text" placeholder="请输入账号" v-model="ruleForm.account" clearable autocomplete="off">
 				<template #prefix>
@@ -84,7 +84,7 @@ import { NextLoading } from '/@/utils/loading';
 
 import { clearTokens, feature, getAPI } from '/@/utils/axios-utils';
 import { SysAuthApi } from '/@/api-services/api';
-import { SysTenant } from '/@/api-services/models';
+//import { SysTenant } from '/@/api-services/models';
 
 // 旋转图片滑块组件
 import DragVerifyImgRotate from '/@/components/dragVerify/dragVerifyImgRotate.vue';
@@ -107,7 +107,7 @@ export default defineComponent({
 				password: '123456',
 				code: '',
 				codeId: 0,
-				tenantId: 0,
+				//tenantId: 0,
 			},
 			rules: {
 				account: [{ required: true, message: '请输入用户名', trigger: 'blur' }],
@@ -122,13 +122,13 @@ export default defineComponent({
 			verifyImg: verifyImg,
 			captchaImage: '',
 			captchaEnabled: true,
-			tenantList: [] as Array<SysTenant>,
+			//tenantList: [] as Array<SysTenant>,
 		});
 		onMounted(async () => {
-			// 是否开启多库租户
-			var res = await getAPI(SysAuthApi).tenantDbListGet();
-			state.tenantList = res.data.result ?? [];
-			if (state.tenantList.length > 0) state.ruleForm.tenantId = state.tenantList[0].id ?? 0;
+			// // 是否开启多库租户
+			// var res = await getAPI(SysAuthApi).tenantDbListGet();
+			// state.tenantList = res.data.result ?? [];
+			// if (state.tenantList.length > 0) state.ruleForm.tenantId = state.tenantList[0].id ?? 0;
 
 			// 是否开启验证码验证
 			var res1 = await getAPI(SysAuthApi).captchaFlagGet();
@@ -149,7 +149,7 @@ export default defineComponent({
 		});
 		// 登录
 		const onSignIn = async () => {
-			// 先清空缓存
+			// 先清空Token缓存
 			clearTokens();
 
 			const [err, res] = await feature(getAPI(SysAuthApi).loginPost(state.ruleForm));
@@ -158,6 +158,7 @@ export default defineComponent({
 				return;
 			}
 			if (res?.data.result?.accessToken == undefined) {
+				getCaptcha(); // 重新获取验证码
 				ElMessage.error('登录失败，请检查账号！');
 				return;
 			}

Web/src/views/login/index.vue

@@ -131,7 +131,7 @@ export default defineComponent({
 
 	.login-content {
 		width: 500px;
-		height: 550px;
+		height: 500px;
 		padding: 20px;
 		position: absolute;
 		right: 10%;