😎代码整理优化

zuohuaijun · zuohuaijun · commit bc0b950832cd · 2024-04-15T22:20:09.000+08:00
diff --git a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
@@ -38,7 +38,7 @@
     <PackageReference Include="Novell.Directory.Ldap.NETStandard" Version="3.6.0" />
     <PackageReference Include="OnceMi.AspNetCore.OSS" Version="1.1.9" />
     <PackageReference Include="RabbitMQ.Client" Version="6.8.1" />
-    <PackageReference Include="SixLabors.ImageSharp.Web" Version="3.1.1" />
+    <PackageReference Include="SixLabors.ImageSharp.Web" Version="3.1.2" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="3.0.0" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="3.2.0" />
     <PackageReference Include="SqlSugarCore" Version="5.1.4.152" />
diff --git a/Admin.NET/Admin.NET.Core/Entity/SysUserLdap.cs b/Admin.NET/Admin.NET.Core/Entity/SysUserLdap.cs
@@ -29,17 +29,18 @@ public class SysUserLdap : EntityTenant
     /// Ldap对应uid
     /// </summary>
     [SugarColumn(ColumnDescription = "域账号", Length = 32)]
+    [Required]
     public string Account { get; set; }
 
     /// <summary>
     /// 对应EmployeeId(用于数据导入对照)
     /// </summary>
     [SugarColumn(ColumnDescription = "对应EmployeeId", Length = 32)]
-    public string EmployeeId { get; set; }
+    public string? EmployeeId { get; set; }
 
     /// <summary>
     /// 组织代码
     /// </summary>
-    [SugarColumn(ColumnDescription = "DeptCode", Length = 64)]
-    public string DeptCode { get; set; }
+    [SugarColumn(ColumnDescription = "组织代码", Length = 64)]
+    public string? DeptCode { get; set; }
 }
diff --git a/Admin.NET/Admin.NET.Core/Service/Auth/SysLdapService.cs b/Admin.NET/Admin.NET.Core/Service/Auth/SysLdapService.cs
@@ -186,13 +186,14 @@ public async Task SyncUser(SyncSysLdapInput input)
                 }
 
                 var attrs = ldapEntry.GetAttributeSet();
-                string deptCode = GetDepartmentCode(attrs, sysLdap.BindAttrCode);
+                var deptCode = GetDepartmentCode(attrs, sysLdap.BindAttrCode);
                 if (attrs.Count == 0 || attrs.ContainsKey("OU"))
+                {
                     SearchDnLdapUser(ldapConn, sysLdap, userLdapList, ldapEntry.Dn, deptCode);
+                }
                 else
                 {
                     var sysUserLdap = CreateSysUserLdap(attrs, sysLdap.BindAttrAccount, sysLdap.BindAttrEmployeeId, deptCode);
-
                     if (string.IsNullOrEmpty(sysUserLdap.EmployeeId)) continue;
                     userLdapList.Add(sysUserLdap);
                 }
@@ -302,7 +303,7 @@ public async Task SyncDept(SyncSysLdapInput input)
             ldapConn.Connect(sysLdap.Host, sysLdap.Port);
             ldapConn.Bind(sysLdap.Version, sysLdap.BindDn, sysLdap.BindPass);
             var ldapSearchResults = ldapConn.Search(sysLdap.BaseDn, LdapConnection.ScopeOne, "(objectClass=*)", null, false);
-            var listOrgs = new List<SysOrg>();
+            var orgList = new List<SysOrg>();
             while (ldapSearchResults.HasMore())
             {
                 LdapEntry ldapEntry;
@@ -319,17 +320,17 @@ public async Task SyncDept(SyncSysLdapInput input)
                 var attrs = ldapEntry.GetAttributeSet();
                 if (attrs.Count == 0 || attrs.ContainsKey("OU"))
                 {
-                    var sysOrg = CreateSysOrg(attrs, sysLdap, listOrgs, new SysOrg { Id = 0, Level = 0 });
-                    listOrgs.Add(sysOrg);
+                    var sysOrg = CreateSysOrg(attrs, sysLdap, orgList, new SysOrg { Id = 0, Level = 0 });
+                    orgList.Add(sysOrg);
 
-                    SearchDnLdapDept(ldapConn, sysLdap, listOrgs, ldapEntry.Dn, sysOrg);
+                    SearchDnLdapDept(ldapConn, sysLdap, orgList, ldapEntry.Dn, sysOrg);
                 }
             }
 
-            if (listOrgs.Count == 0)
+            if (orgList.Count == 0)
                 return;
 
-            await App.GetRequiredService<SysOrgService>().BatchAddOrgs(listOrgs);
+            await App.GetRequiredService<SysOrgService>().BatchAddOrgs(orgList);
         }
         catch (LdapException e)
         {
diff --git a/Admin.NET/Admin.NET.Core/Service/Org/SysOrgService.cs b/Admin.NET/Admin.NET.Core/Service/Org/SysOrgService.cs
@@ -132,14 +132,14 @@ public async Task<long> AddOrg(AddOrgInput input)
     /// <summary>
     /// 批量增加机构
     /// </summary>
-    /// <param name="list"></param>
+    /// <param name="orgs"></param>
     /// <returns></returns>
     [NonAction]
-    public async Task BatchAddOrgs(List<SysOrg> list)
+    public async Task BatchAddOrgs(List<SysOrg> orgs)
     {
         DeleteAllUserOrgCache(0, 0);
         await _sysOrgRep.AsDeleteable().ExecuteCommandAsync();
-        await _sysOrgRep.AsInsertable(list).ExecuteCommandAsync();
+        await _sysOrgRep.AsInsertable(orgs).ExecuteCommandAsync();
     }
 
     /// <summary>
diff --git a/Web/src/api-services/apis/sys-ldap-api.ts b/Web/src/api-services/apis/sys-ldap-api.ts
@@ -273,13 +273,13 @@ export const SysLdapApiAxiosParamCreator = function (configuration?: Configurati
         },
         /**
          * 
-         * @summary 同步域用户 🔖
+         * @summary 同步域组织 🔖
          * @param {SyncSysLdapInput} [body] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        apiSysLdapSyncUserPost: async (body?: SyncSysLdapInput, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            const localVarPath = `/api/sysLdap/syncUser`;
+        apiSysLdapSyncDeptPost: async (body?: SyncSysLdapInput, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/sysLdap/syncDept`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, 'https://example.com');
             let baseOptions;
@@ -321,13 +321,13 @@ export const SysLdapApiAxiosParamCreator = function (configuration?: Configurati
         },
         /**
          * 
-         * @summary 同步域组织 🔖
+         * @summary 同步域用户 🔖
          * @param {SyncSysLdapInput} [body] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        apiSysLdapSyncOrgPost: async (body?: SyncSysLdapInput, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            const localVarPath = `/api/sysLdap/syncOrg`;
+        apiSysLdapSyncUserPost: async (body?: SyncSysLdapInput, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/sysLdap/syncUser`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, 'https://example.com');
             let baseOptions;
@@ -495,27 +495,27 @@ export const SysLdapApiFp = function(configuration?: Configuration) {
         },
         /**
          * 
-         * @summary 同步域用户 🔖
+         * @summary 同步域组织 🔖
          * @param {SyncSysLdapInput} [body] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async apiSysLdapSyncUserPost(body?: SyncSysLdapInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<void>>> {
-            const localVarAxiosArgs = await SysLdapApiAxiosParamCreator(configuration).apiSysLdapSyncUserPost(body, options);
+        async apiSysLdapSyncDeptPost(body?: SyncSysLdapInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<void>>> {
+            const localVarAxiosArgs = await SysLdapApiAxiosParamCreator(configuration).apiSysLdapSyncDeptPost(body, options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 return axios.request(axiosRequestArgs);
             };
         },
         /**
          * 
-         * @summary 同步域组织 🔖
+         * @summary 同步域用户 🔖
          * @param {SyncSysLdapInput} [body] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async apiSysLdapSyncOrgPost(body?: SyncSysLdapInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<void>>> {
-            const localVarAxiosArgs = await SysLdapApiAxiosParamCreator(configuration).apiSysLdapSyncOrgPost(body, options);
+        async apiSysLdapSyncUserPost(body?: SyncSysLdapInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<void>>> {
+            const localVarAxiosArgs = await SysLdapApiAxiosParamCreator(configuration).apiSysLdapSyncUserPost(body, options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 return axios.request(axiosRequestArgs);
@@ -595,23 +595,23 @@ export const SysLdapApiFactory = function (configuration?: Configuration, basePa
         },
         /**
          * 
-         * @summary 同步域用户 🔖
+         * @summary 同步域组织 🔖
          * @param {SyncSysLdapInput} [body] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async apiSysLdapSyncUserPost(body?: SyncSysLdapInput, options?: AxiosRequestConfig): Promise<AxiosResponse<void>> {
-            return SysLdapApiFp(configuration).apiSysLdapSyncUserPost(body, options).then((request) => request(axios, basePath));
+        async apiSysLdapSyncDeptPost(body?: SyncSysLdapInput, options?: AxiosRequestConfig): Promise<AxiosResponse<void>> {
+            return SysLdapApiFp(configuration).apiSysLdapSyncDeptPost(body, options).then((request) => request(axios, basePath));
         },
         /**
          * 
-         * @summary 同步域组织 🔖
+         * @summary 同步域用户 🔖
          * @param {SyncSysLdapInput} [body] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async apiSysLdapSyncOrgPost(body?: SyncSysLdapInput, options?: AxiosRequestConfig): Promise<AxiosResponse<void>> {
-            return SysLdapApiFp(configuration).apiSysLdapSyncOrgPost(body, options).then((request) => request(axios, basePath));
+        async apiSysLdapSyncUserPost(body?: SyncSysLdapInput, options?: AxiosRequestConfig): Promise<AxiosResponse<void>> {
+            return SysLdapApiFp(configuration).apiSysLdapSyncUserPost(body, options).then((request) => request(axios, basePath));
         },
         /**
          * 
@@ -689,25 +689,25 @@ export class SysLdapApi extends BaseAPI {
     }
     /**
      * 
-     * @summary 同步域用户 🔖
+     * @summary 同步域组织 🔖
      * @param {SyncSysLdapInput} [body] 
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof SysLdapApi
      */
-    public async apiSysLdapSyncUserPost(body?: SyncSysLdapInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<void>> {
-        return SysLdapApiFp(this.configuration).apiSysLdapSyncUserPost(body, options).then((request) => request(this.axios, this.basePath));
+    public async apiSysLdapSyncDeptPost(body?: SyncSysLdapInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<void>> {
+        return SysLdapApiFp(this.configuration).apiSysLdapSyncDeptPost(body, options).then((request) => request(this.axios, this.basePath));
     }
     /**
      * 
-     * @summary 同步域组织 🔖
+     * @summary 同步域用户 🔖
      * @param {SyncSysLdapInput} [body] 
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof SysLdapApi
      */
-    public async apiSysLdapSyncOrgPost(body?: SyncSysLdapInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<void>> {
-        return SysLdapApiFp(this.configuration).apiSysLdapSyncOrgPost(body, options).then((request) => request(this.axios, this.basePath));
+    public async apiSysLdapSyncUserPost(body?: SyncSysLdapInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<void>> {
+        return SysLdapApiFp(this.configuration).apiSysLdapSyncUserPost(body, options).then((request) => request(this.axios, this.basePath));
     }
     /**
      * 
diff --git a/Web/src/api-services/models/sys-ldap.ts b/Web/src/api-services/models/sys-ldap.ts
@@ -169,7 +169,7 @@ export interface SysLdap {
      * 绑定Code属性值
      *
      * @type {string}
-     * @memberof AddSysLdapInput
+     * @memberof SysLdap
      */
     bindAttrCode: string;
 
diff --git a/Web/src/api-services/models/update-sys-ldap-input.ts b/Web/src/api-services/models/update-sys-ldap-input.ts
@@ -169,7 +169,7 @@ export interface UpdateSysLdapInput {
      * 绑定Code属性值
      *
      * @type {string}
-     * @memberof AddSysLdapInput
+     * @memberof UpdateSysLdapInput
      */
     bindAttrCode: string;
 
diff --git a/Web/src/layout/lockScreen/index.vue b/Web/src/layout/lockScreen/index.vue
@@ -194,7 +194,6 @@ const onLockScreenSubmit = async () => {
 	if (state.lockScreenPassword) {
 		try {
 			// SM2加密密码
-			// const keys = SM2.generateKeyPair();
 			const publicKey = window.__env__.VITE_SM_PUBLIC_KEY;
 			const password = sm2.doEncrypt(state.lockScreenPassword, publicKey, 1);
 			const [err, res] = await feature(getAPI(SysAuthApi).apiSysAuthUnLockScreenPost(password));
diff --git a/Web/src/views/system/ldap/component/editLdap.vue b/Web/src/views/system/ldap/component/editLdap.vue
@@ -20,12 +20,12 @@
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="用户搜索基准" prop="baseDn">
+						<el-form-item label="搜索基准" prop="baseDn">
 							<el-input v-model="state.ruleForm.baseDn" placeholder="请输入用户搜索基准" maxlength="128" show-word-limit clearable />
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="用户过滤规则" prop="authFilter">
+						<el-form-item label="过滤规则" prop="authFilter">
 							<el-input v-model="state.ruleForm.authFilter" placeholder="请输入用户过滤规则" maxlength="128" show-word-limit clearable />
 						</el-form-item>
 					</el-col>
@@ -40,12 +40,12 @@
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="绑定账号属性" prop="bindAttrAccount">
+						<el-form-item label="字段属性" prop="bindAttrAccount">
 							<el-input v-model="state.ruleForm.bindAttrAccount" placeholder="请输入域账号字段属性值" maxlength="24" show-word-limit clearable />
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="绑定账号属性" prop="bindAttrEmployeeId">
+						<el-form-item label="用户属性" prop="bindAttrEmployeeId">
 							<el-input v-model="state.ruleForm.bindAttrEmployeeId" placeholder="请输入绑定用户EmployeeId属性！" maxlength="24" show-word-limit clearable />
 						</el-form-item>
 					</el-col>
diff --git a/Web/src/views/system/ldap/index.vue b/Web/src/views/system/ldap/index.vue
@@ -41,7 +41,7 @@
 						<ModifyRecord :data="scope.row" />
 					</template>
 				</el-table-column>
-				<el-table-column label="操作" width="240" align="center" fixed="right" show-overflow-tooltip="" v-if="auth('sysLdap:update') || auth('sysLdap:delete') || auth('sysLdap:syncUser') || auth('sysLdap:syncOrg')">
+				<el-table-column label="操作" width="300" align="center" fixed="right" show-overflow-tooltip="" v-if="auth('sysLdap:update') || auth('sysLdap:delete') || auth('sysLdap:syncUser') || auth('sysLdap:syncOrg')">
 					<template #default="scope">
 						<el-button icon="ele-Edit" size="small" text="" type="primary" @click="openEditSysLdap(scope.row)" v-auth="'sysLdap:update'"> 编辑 </el-button>
 						<el-button icon="ele-Delete" size="small" text type="danger" @click="delSysLdap(scope.row)" v-auth="'sysLdap:delete'"> 删除 </el-button>

Original file line number	Diff line number	Diff line change
`@@ -186,13 +186,14 @@ public async Task SyncUser(SyncSysLdapInput input)`
`186`	`186`	`}`
`187`	`187`
`188`	`188`	`var attrs = ldapEntry.GetAttributeSet();`
`189`		`- string deptCode = GetDepartmentCode(attrs, sysLdap.BindAttrCode);`
	`189`	`+ var deptCode = GetDepartmentCode(attrs, sysLdap.BindAttrCode);`
`190`	`190`	`if (attrs.Count == 0 \|\| attrs.ContainsKey("OU"))`
	`191`	`+ {`
`191`	`192`	`SearchDnLdapUser(ldapConn, sysLdap, userLdapList, ldapEntry.Dn, deptCode);`
	`193`	`+ }`
`192`	`194`	`else`
`193`	`195`	`{`
`194`	`196`	`var sysUserLdap = CreateSysUserLdap(attrs, sysLdap.BindAttrAccount, sysLdap.BindAttrEmployeeId, deptCode);`
`195`		`-`
`196`	`197`	`if (string.IsNullOrEmpty(sysUserLdap.EmployeeId)) continue;`
`197`	`198`	`userLdapList.Add(sysUserLdap);`
`198`	`199`	`}`
`@@ -302,7 +303,7 @@ public async Task SyncDept(SyncSysLdapInput input)`
`302`	`303`	`ldapConn.Connect(sysLdap.Host, sysLdap.Port);`
`303`	`304`	`ldapConn.Bind(sysLdap.Version, sysLdap.BindDn, sysLdap.BindPass);`
`304`	`305`	`var ldapSearchResults = ldapConn.Search(sysLdap.BaseDn, LdapConnection.ScopeOne, "(objectClass=*)", null, false);`
`305`		`- var listOrgs = new List<SysOrg>();`
	`306`	`+ var orgList = new List<SysOrg>();`
`306`	`307`	`while (ldapSearchResults.HasMore())`
`307`	`308`	`{`
`308`	`309`	`LdapEntry ldapEntry;`
`@@ -319,17 +320,17 @@ public async Task SyncDept(SyncSysLdapInput input)`
`319`	`320`	`var attrs = ldapEntry.GetAttributeSet();`
`320`	`321`	`if (attrs.Count == 0 \|\| attrs.ContainsKey("OU"))`
`321`	`322`	`{`
`322`		`- var sysOrg = CreateSysOrg(attrs, sysLdap, listOrgs, new SysOrg { Id = 0, Level = 0 });`
`323`		`- listOrgs.Add(sysOrg);`
	`323`	`+ var sysOrg = CreateSysOrg(attrs, sysLdap, orgList, new SysOrg { Id = 0, Level = 0 });`
	`324`	`+ orgList.Add(sysOrg);`
`324`	`325`
`325`		`- SearchDnLdapDept(ldapConn, sysLdap, listOrgs, ldapEntry.Dn, sysOrg);`
	`326`	`+ SearchDnLdapDept(ldapConn, sysLdap, orgList, ldapEntry.Dn, sysOrg);`
`326`	`327`	`}`
`327`	`328`	`}`
`328`	`329`
`329`		`- if (listOrgs.Count == 0)`
	`330`	`+ if (orgList.Count == 0)`
`330`	`331`	`return;`
`331`	`332`
`332`		`- await App.GetRequiredService<SysOrgService>().BatchAddOrgs(listOrgs);`
	`333`	`+ await App.GetRequiredService<SysOrgService>().BatchAddOrgs(orgList);`
`333`	`334`	`}`
`334`	`335`	`catch (LdapException e)`
`335`	`336`	`{`
Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ export interface SysLdap {`
`169`	`169`	`* 绑定Code属性值`
`170`	`170`	`*`
`171`	`171`	`* @type {string}`
`172`		`- * @memberof AddSysLdapInput`
	`172`	`+ * @memberof SysLdap`
`173`	`173`	`*/`
`174`	`174`	`bindAttrCode: string;`
`175`	`175`
Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ export interface UpdateSysLdapInput {`
`169`	`169`	`* 绑定Code属性值`
`170`	`170`	`*`
`171`	`171`	`* @type {string}`
`172`		`- * @memberof AddSysLdapInput`
	`172`	`+ * @memberof UpdateSysLdapInput`
`173`	`173`	`*/`
`174`	`174`	`bindAttrCode: string;`
`175`	`175`