Parcourir la source

😎1、调整默认账号密码 2、修复外链打开错误 3、升级依赖

zuohuaijun il y a 4 mois
Parent
commit
5efb75ca94

+ 8 - 10
Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj

@@ -15,13 +15,13 @@
   <ItemGroup>
     <PackageReference Include="AlibabaCloud.SDK.Dysmsapi20170525" Version="4.0.1" />
     <PackageReference Include="AlipaySDKNet.Standard" Version="4.9.874" />
-    <PackageReference Include="AngleSharp" Version="1.3.1" />
+    <PackageReference Include="AngleSharp" Version="1.4.0" />
     <PackageReference Include="AspectCore.Extensions.Reflection" Version="2.4.0" />
     <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
     <PackageReference Include="Elastic.Clients.Elasticsearch" Version="9.2.1" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.200" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.200" />
-    <PackageReference Include="Furion.Pure" Version="4.9.7.200" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.208" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.208" />
+    <PackageReference Include="Furion.Pure" Version="4.9.7.208" />
     <PackageReference Include="Hardware.Info" Version="101.1.0.1" />
     <PackageReference Include="Hashids.net" Version="1.7.0" />
     <PackageReference Include="IPTools.China" Version="1.6.0" />
@@ -34,7 +34,7 @@
     <PackageReference Include="MailKit" Version="4.14.1" />
     <PackageReference Include="MiniExcel" Version="1.41.4" />
     <PackageReference Include="MiniWord" Version="0.9.2" />
-    <PackageReference Include="NewLife.Redis" Version="6.3.2025.1001" />
+    <PackageReference Include="NewLife.Redis" Version="6.4.2025.1113" />
     <PackageReference Include="Novell.Directory.Ldap.NETStandard" Version="4.0.0" />
     <PackageReference Include="OnceMi.AspNetCore.OSS" Version="1.2.0" />
     <PackageReference Include="QRCoder" Version="1.7.0" />
@@ -45,10 +45,8 @@
     <PackageReference Include="SqlSugar.MongoDbCore" Version="5.1.4.271" />
     <PackageReference Include="SqlSugarCore" Version="5.1.4.207" />
     <PackageReference Include="SSH.NET" Version="2025.1.0" />
-    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.10" />
-    <PackageReference Include="System.Net.Http" Version="4.3.4" />
-    <PackageReference Include="System.Private.Uri" Version="4.3.2" />
-    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1339" />
+    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.7.0" />
+    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1346" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
     <PackageReference Include="BouncyCastle.Cryptography" Version="2.6.2" Aliases="BouncyCastleV2" />
@@ -70,7 +68,7 @@
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="10.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="10.0.0" />
     <PackageReference Include="Microsoft.PowerShell.SDK" Version="7.5.4" />
-    <PackageReference Include="XiHan.Framework.Utils" Version="1.4.3" />
+    <PackageReference Include="XiHan.Framework.Utils" Version="1.4.5" />
   </ItemGroup>	
 
 </Project>

+ 1 - 1
Admin.NET/Admin.NET.Core/SeedData/SysConfigSeedData.cs

@@ -20,7 +20,7 @@ public class SysConfigSeedData : ISqlSugarEntitySeedData<SysConfig>
         return new[]
         {
             new SysConfig{ Id=1300000000101, Name="演示环境", Code=ConfigConst.SysDemoEnv, Value="False", SysFlag=YesNoEnum.Y, Remark="演示环境", OrderNo=10, GroupCode=ConfigConst.SysDefaultGroup, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-            new SysConfig{ Id=1300000000111, Name="默认密码", Code=ConfigConst.SysPassword, Value="123456", SysFlag=YesNoEnum.Y, Remark="默认密码", OrderNo=20, GroupCode=ConfigConst.SysDefaultGroup, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysConfig{ Id=1300000000111, Name="默认密码", Code=ConfigConst.SysPassword, Value="Admin.NET++010101", SysFlag=YesNoEnum.Y, Remark="默认密码", OrderNo=20, GroupCode=ConfigConst.SysDefaultGroup, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
             new SysConfig{ Id=1300000000121, Name="密码最大错误次数", Code=ConfigConst.SysPasswordMaxErrorTimes, Value="5", SysFlag=YesNoEnum.Y, Remark="允许密码最大输入错误次数", OrderNo=30, GroupCode=ConfigConst.SysDefaultGroup, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
             new SysConfig{ Id=1300000000131, Name="日志保留天数", Code=ConfigConst.SysLogRetentionDays, Value="180", SysFlag=YesNoEnum.Y, Remark="日志保留天数(天)", OrderNo=40, GroupCode=ConfigConst.SysDefaultGroup, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
             new SysConfig{ Id=1300000000141, Name="记录操作日志", Code=ConfigConst.SysOpLog, Value="True", SysFlag=YesNoEnum.Y, Remark="是否记录操作日志", OrderNo=50, GroupCode=ConfigConst.SysDefaultGroup, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },

+ 6 - 6
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.NET", 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 },
         };
     }
 }

+ 1 - 1
Admin.NET/Admin.NET.Test/Admin.NET.Test.csproj

@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Furion.Xunit" Version="4.9.7.200" />
+    <PackageReference Include="Furion.Xunit" Version="4.9.7.208" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
     <PackageReference Include="Selenium.Support" Version="4.38.0" />
     <PackageReference Include="Selenium.WebDriver" Version="4.38.0" />

+ 1 - 1
README.md

@@ -26,7 +26,7 @@ Admin.NET 是基于 .NET6 (Furion/SqlSugar) 实现的通用权限开发框架,
 1.  支持各种数据库,后台配置文件自行修改(自动生成数据库及种子数据)
 2.  前端运行步骤:1、安装依赖pnpm install 2、运行pnpm run dev 3、打包pnpm run build
 3.  QQ交流群1:[87333204](https://jq.qq.com/?_wv=1027&k=1t8iqf0G)  QQ交流群2:[252381476](https://jq.qq.com/?_wv=1027&k=IkzihDcL)  
-4.  演示环境1:https://demo.adminnet.top  账号:superadmin  密码:Admin.NET++010101
+4.  演示环境1:https://demo.adminnet.top  账号:superAdmin.NET  密码:Admin.NET++010101
 5. [GitHub 镜像地址](https://github.com/zuohuaijun/Admin.NET.git)  [Gitee 镜像地址](https://gitee.com/zuohuaijun/Admin.NET.git)  [GitCode 镜像地址](https://gitcode.com/zuohuaijun/Admin.NET.git)
 6.  在线文档 [https://adminnet.top/](https://adminnet.top/)
 

+ 2 - 2
Web/.env.development

@@ -5,7 +5,7 @@ ENV = development
 VITE_API_URL = http://localhost:5005
 
 # 登陆界面默认用户
-VITE_DEFAULT_USER = superadmin
+VITE_DEFAULT_USER = superAdmin.NET
 
 # 登陆界面默认密码
-VITE_DEFAULT_USER_PASSWORD = 123456
+VITE_DEFAULT_USER_PASSWORD = Admin.NET++010101

+ 4 - 4
Web/package.json

@@ -2,7 +2,7 @@
 	"name": "admin.net",
 	"type": "module",
 	"version": "2.4.33",
-	"lastBuildTime": "2025.11.12",
+	"lastBuildTime": "2025.11.16",
 	"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
 	"author": "zuohuaijun",
 	"license": "MIT",
@@ -28,7 +28,7 @@
 		"@logicflow/core": "^2.1.3",
 		"@logicflow/extension": "^2.1.5",
 		"@logicflow/vue-node-registry": "^1.1.4",
-		"@microsoft/signalr": "^9.0.6",
+		"@microsoft/signalr": "^10.0.0",
 		"@vue-office/docx": "^1.6.3",
 		"@vue-office/excel": "^1.7.14",
 		"@vue-office/pdf": "^2.0.10",
@@ -43,7 +43,7 @@
 		"echarts": "^6.0.0",
 		"echarts-gl": "^2.0.9",
 		"echarts-wordcloud": "^2.1.0",
-		"element-plus": "^2.11.7",
+		"element-plus": "^2.11.8",
 		"ezuikit-js": "^8.1.16",
 		"js-cookie": "^3.0.5",
 		"js-table2excel": "^1.1.2",
@@ -86,7 +86,7 @@
 		"@plugin-web-update-notification/vite": "^2.0.2",
 		"@rollup/pluginutils": "^5.3.0",
 		"@types/lodash-es": "^4.17.12",
-		"@types/node": "^22.19.0",
+		"@types/node": "^22.19.1",
 		"@types/nprogress": "^0.2.3",
 		"@types/sortablejs": "^1.15.9",
 		"@typescript-eslint/eslint-plugin": "^8.46.4",

+ 6 - 9
Web/src/utils/toolsValidate.ts

@@ -329,15 +329,11 @@ export function verifyPostalCode(val: string) {
  * @returns 返回 true: url 正确
  */
 export function verifyUrl(val: string) {
-	// false: url不正确
-	if (
-		!/^(?:(?:(?:https?|ftp):)?\/\/)(?:\S+(?::\S*)?@)?(?:(?!(?:10|127)(?:\.\d{1,3}){3})(?!(?:169\.254|192\.168)(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)(?:\.(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)*(?:\.(?:[a-z\u00a1-\uffff]{2,})).?)(?::\d{2,5})?(?:[/?#]\S*)?$/i.test(
-			val
-		)
-	)
-		return false;
-	// true: url正确
-	else return true;
+	if (typeof val !== 'string' || !val.trim()) return false;
+	// 严格URL正则表达式,允许私有IP地址
+	const strictUrlRegex =
+		/^(?:(?:(?:https?|ftp):)?\/\/)(?:\S+(?::\S*)?@)?(?:(?:(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4])))|(?:(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)(?:\.(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)*(?:\.(?:[a-z\u00a1-\uffff]{2,})))(?::\d{2,5})?(?:[/?#]\S*)?$/i;
+	return strictUrlRegex.test(val);
 }
 
 /**
@@ -361,6 +357,7 @@ export function verifyCarNum(val: string) {
  * 解析身份证
  */
 export function judgementIdCard(idCard: string) {
+	if (!idCard?.trim()) return null;
 	let entity = {} as any;
 	let currentDate = new Date();
 	let yearNow = currentDate.getFullYear();