diff --git a/Masuit.Tools.Abstractions/Masuit.Tools.Abstractions.csproj b/Masuit.Tools.Abstractions/Masuit.Tools.Abstractions.csproj
index 3e12be1..011a33b 100644
--- a/Masuit.Tools.Abstractions/Masuit.Tools.Abstractions.csproj
+++ b/Masuit.Tools.Abstractions/Masuit.Tools.Abstractions.csproj
@@ -7,7 +7,7 @@
9.0
true
- 2.4.1.4
+ 2.4.1.5
懒得勤快
Masuit.Tools基础公共库
懒得勤快,长空X
@@ -20,9 +20,9 @@
Github
True
False
- 2.4.1.4
+ 2.4.1.5
masuit.com
- 2.4.1.4
+ 2.4.1.5
https://github.com/ldqk/Masuit.Tools/blob/master/LICENSE
true
true
diff --git a/Masuit.Tools.Core/Models/ITree.cs b/Masuit.Tools.Abstractions/Models/ITree.cs
similarity index 93%
rename from Masuit.Tools.Core/Models/ITree.cs
rename to Masuit.Tools.Abstractions/Models/ITree.cs
index 122d38c..0180f0c 100644
--- a/Masuit.Tools.Core/Models/ITree.cs
+++ b/Masuit.Tools.Abstractions/Models/ITree.cs
@@ -1,6 +1,6 @@
using System.Collections.Generic;
-namespace Masuit.Tools.Core.Models
+namespace Masuit.Tools.Models
{
///
/// 树形实体接口
diff --git a/Masuit.Tools.Core/Models/TreeExtensions.cs b/Masuit.Tools.Abstractions/Models/TreeExtensions.cs
similarity index 97%
rename from Masuit.Tools.Core/Models/TreeExtensions.cs
rename to Masuit.Tools.Abstractions/Models/TreeExtensions.cs
index 60307b2..eb53411 100644
--- a/Masuit.Tools.Core/Models/TreeExtensions.cs
+++ b/Masuit.Tools.Abstractions/Models/TreeExtensions.cs
@@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Linq;
-namespace Masuit.Tools.Core.Models
+namespace Masuit.Tools.Models
{
///
/// 树形数据扩展
@@ -80,9 +80,9 @@ namespace Masuit.Tools.Core.Models
public static bool IsLeaf(this ITree tree) where T : ITree => tree.Children.Count == 0;
///
- /// 深度
+ /// 深度层级
///
- public static int Level(this ITree tree) where T : ITree => IsRoot(tree) ? 0 : Level(tree.Parent) + 1;
+ public static int Level(this ITree tree) where T : ITree => IsRoot(tree) ? 1 : Level(tree.Parent) + 1;
///
/// 节点路径(UNIX路径格式,以“/”分隔)
diff --git a/Masuit.Tools.Core/Masuit.Tools.Core.csproj b/Masuit.Tools.Core/Masuit.Tools.Core.csproj
index 6a317ff..64aa323 100644
--- a/Masuit.Tools.Core/Masuit.Tools.Core.csproj
+++ b/Masuit.Tools.Core/Masuit.Tools.Core.csproj
@@ -20,10 +20,10 @@
830c282f-f7c1-42be-8651-4cd06ac8e73f
Github
True
- 2.4.1.4
- 2.4.1.4
+ 2.4.1.5
+ 2.4.1.5
masuit.com
- 2.4.1.4
+ 2.4.1.5
懒得勤快X
https://github.com/ldqk/Masuit.Tools
true
@@ -201,6 +201,7 @@
Models\IspInfo.cs
+
Models\Location.cs
@@ -216,6 +217,7 @@
Models\TaobaoIP.cs
+
Net\FtpClient.cs
diff --git a/Masuit.Tools/Masuit.Tools.csproj b/Masuit.Tools/Masuit.Tools.csproj
index 71aa14c..4616902 100644
--- a/Masuit.Tools/Masuit.Tools.csproj
+++ b/Masuit.Tools/Masuit.Tools.csproj
@@ -215,6 +215,9 @@
Models\IspInfo.cs
+
+ Models\ITree.cs
+
Models\Location.cs
@@ -230,6 +233,9 @@
Models\TaobaoIP.cs
+
+ Models\TreeExtensions.cs
+
Net\FtpClient.cs
diff --git a/Masuit.Tools/Properties/AssemblyInfo.cs b/Masuit.Tools/Properties/AssemblyInfo.cs
index e578cef..434db1d 100644
Binary files a/Masuit.Tools/Properties/AssemblyInfo.cs and b/Masuit.Tools/Properties/AssemblyInfo.cs differ
diff --git a/Masuit.Tools/package.nuspec b/Masuit.Tools/package.nuspec
index e0a2b13..b1c5435 100644
--- a/Masuit.Tools/package.nuspec
+++ b/Masuit.Tools/package.nuspec
@@ -4,7 +4,7 @@
Masuit.Tools.Net
- 2.4.1.4
+ 2.4.1.5
Masuit.Tools
masuit.com
diff --git a/NetCoreTest/Program.cs b/NetCoreTest/Program.cs
index f7d1d1a..b1bed26 100644
--- a/NetCoreTest/Program.cs
+++ b/NetCoreTest/Program.cs
@@ -1,5 +1,5 @@
using Masuit.Tools;
-using Masuit.Tools.Core.Models;
+using Masuit.Tools.Models;
using Masuit.Tools.Reflection;
using Masuit.Tools.Security;
using Microsoft.AspNetCore;