😒代码整理及升级所有依赖

Admin.NET/Admin.NET.Application/Configuration/CodeGen.json

@@ -13,7 +13,7 @@
       "EntityBaseId": [ "Id" ]
       //"BaseId": [ "Id" ]
     },
-    "FrontRootPath": "Web", // 前端文件根目录
-    "BackendApplicationNamespaces": [ "Admin.NET.Application", "Admin.NET.Application2" ] // 后端生成到的项目（如果有多个）
+    "FrontRootPath": "Web", // 前端项目根目录
+    "BackendApplicationNamespaces": [ "Admin.NET.Application", "Admin.NET.Application2" ] // 后端生成到的项目
   }
 }

Admin.NET/Admin.NET.Application/GlobalUsings.cs

@@ -7,19 +7,17 @@
 // 软件按“原样”提供，不提供任何形式的明示或暗示的保证，包括但不限于对适销性、适用性和非侵权的保证。
 // 在任何情况下，作者或版权持有人均不对任何索赔、损害或其他责任负责，无论是因合同、侵权或其他方式引起的，与软件或其使用或其他交易有关。
 
+global using Admin.NET.Core;
 global using Furion;
+global using Furion.DependencyInjection;
 global using Furion.DynamicApiController;
+global using Furion.FriendlyException;
 global using Mapster;
 global using Microsoft.AspNetCore.Mvc;
 global using Microsoft.Extensions.DependencyInjection;
 global using SqlSugar;
 global using System;
+global using System.Collections.Generic;
 global using System.ComponentModel;
 global using System.ComponentModel.DataAnnotations;
-global using System.Threading.Tasks;
-global using System.Collections.Generic;
-
-global using Admin.NET.Core;
-global using Furion.DependencyInjection;
-global using Furion.FriendlyException;
-global using SKIT.FlurlHttpClient.Wechat.Api.Events;
+global using System.Threading.Tasks;

Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj

@@ -22,9 +22,9 @@
     <PackageReference Include="AspNet.Security.OAuth.Weixin" Version="6.0.15" />
     <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
     <PackageReference Include="FluentEmail.Smtp" Version="3.0.2" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.8.8.44" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.8.8.44" />
-    <PackageReference Include="Furion.Pure" Version="4.8.8.44" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.8.8.45" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.8.8.45" />
+    <PackageReference Include="Furion.Pure" Version="4.8.8.45" />
     <PackageReference Include="IPTools.China" Version="1.6.0" />
     <PackageReference Include="Lazy.Captcha.Core" Version="2.0.6" />
     <PackageReference Include="Magicodes.IE.Excel" Version="2.7.4.5" />
@@ -36,7 +36,7 @@
     <PackageReference Include="OnceMi.AspNetCore.OSS" Version="1.1.9" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="2.33.0" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="2.20.0" />
-    <PackageReference Include="SqlSugarCore" Version="5.1.4.108-preview21" />
+    <PackageReference Include="SqlSugarCore" Version="5.1.4.108" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.5" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />

Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs

@@ -297,6 +297,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient
     {
         return _codeGenOptions.BackendApplicationNamespaces;
     }
+
     /// <summary>
     /// 代码生成到本地
     /// </summary>

Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/Input.cs.vm

@@ -1,5 +1,5 @@
-using System.ComponentModel.DataAnnotations;
 using Admin.NET.Core;
+using System.ComponentModel.DataAnnotations;
 
 namespace @Model.NameSpace;
 

Web/src/api-services/models/culture-level-enum.ts

@@ -12,7 +12,7 @@
  * Do not edit the class manually.
  */
 /**
- * 文化程度枚举<br />&nbsp;小学 Level1 = 0<br />&nbsp;初中 Level2 = 1<br />&nbsp;高中 Level3 = 2<br />&nbsp;中专 Level4 = 3<br />&nbsp;大专 Level5 = 4<br />&nbsp;本科 Level6 = 5<br />&nbsp;硕士研究生 Level7 = 6<br />&nbsp;博士研究生 Level8 = 7<br />
+ * 文化程度枚举<br />&nbsp;其他 Level0 = 0<br />&nbsp;小学 Level1 = 1<br />&nbsp;初中 Level2 = 2<br />&nbsp;普通高中 Level3 = 3<br />&nbsp;技工学校 Level4 = 4<br />&nbsp;职业教育 Level5 = 5<br />&nbsp;职业高中 Level6 = 6<br />&nbsp;中等专科 Level7 = 7<br />&nbsp;大学专科 Level8 = 8<br />&nbsp;大学本科 Level9 = 9<br />&nbsp;硕士研究生 Level10 = 10<br />&nbsp;博士研究生 Level11 = 11<br />
  * @export
  * @enum {string}
  */
@@ -24,6 +24,10 @@ export enum CultureLevelEnum {
     NUMBER_4 = 4,
     NUMBER_5 = 5,
     NUMBER_6 = 6,
-    NUMBER_7 = 7
+    NUMBER_7 = 7,
+    NUMBER_8 = 8,
+    NUMBER_9 = 9,
+    NUMBER_10 = 10,
+    NUMBER_11 = 11
 }
 

Web/src/utils/commonFunction.ts

@@ -64,7 +64,7 @@ export default function () {
 	const removeHtml = (value: string) => {
 		return value.replace(/<[^>]+>/g, '');
 	};
-	//获取枚举描述
+	// 获取枚举描述
 	const getEnumDesc = (key: any, lstEnum: any) => {
 		return lstEnum.find((x: any) => x.value == key)?.describe;
 	};
@@ -78,6 +78,6 @@ export default function () {
 		copyText,
 		removeHtmlSub,
 		removeHtml,
-		getEnumDesc
+		getEnumDesc,
 	};
 }