From 4b7fa28f082c16bc2c0cb113670edddcee5e6b2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=9F=B3=E5=A4=B4?= <nnhy@vip.qq.com>
Date: Sun, 14 Jul 2024 19:37:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    | 32 ++-----------------
 NewLife.Cube/Entity/Cube.xml                  |  8 ++---
 NewLife.Cube/Entity/OAuth日志.cs            | 16 +++++++++-
 NewLife.Cube/Entity/OAuth配置.cs            |  3 ++
 NewLife.Cube/Entity/make.bat                  |  5 +++
 NewLife.Cube/Entity/委托代理.cs           |  3 ++
 NewLife.Cube/Entity/定时作业.cs           |  3 ++
 NewLife.Cube/Entity/应用插件.cs           |  3 ++
 NewLife.Cube/Entity/应用日志.cs           | 16 +++++++++-
 NewLife.Cube/Entity/应用系统.cs           |  3 ++
 NewLife.Cube/Entity/指令管理.cs           |  3 ++
 NewLife.Cube/Entity/模型列.cs              |  3 ++
 NewLife.Cube/Entity/模型表.cs              | 15 +++++++++
 NewLife.Cube/Entity/用户令牌.cs           |  3 ++
 NewLife.Cube/Entity/用户在线.cs           |  3 ++
 NewLife.Cube/Entity/用户统计.cs           |  3 ++
 NewLife.Cube/Entity/用户链接.cs           | 28 ++++++++++++++++
 NewLife.Cube/Entity/访问规则.cs           |  3 ++
 NewLife.Cube/Entity/附件.cs                 | 16 +++++++++-
 NewLife.CubeNC/Modules/ModuleManager.cs       | 10 ++----
 NewLife.CubeNC/Properties/launchSettings.json | 12 +++++++
 21 files changed, 147 insertions(+), 44 deletions(-)
 create mode 100644 NewLife.Cube/Entity/make.bat
 create mode 100644 NewLife.CubeNC/Properties/launchSettings.json

diff --git a/.gitignore b/.gitignore
index 66f05ac6..f09c13b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,42 +7,14 @@
 [Dd]ebugPublic/
 [Rr]elease/
 [Rr]eleases/
+[Cc]onfig/
+[Ll]og/
 x64/
 x86/
 build/
 bld/
 [Bb]in/
 [Oo]bj/
-/packages
-/Data
-/Log
-/Backup
-/Avatars
-/BinTest
 *.user
-/NewLife.Cube/Config
-/NewLife.Cube/Plugins
-/NewLife.CubeNC/Properties/launchSettings.json
-/CubeDemo/Entity
-/NewLife.Cube/Entity
-/CubeDemoNC/wwwroot/Content
-/NewLife.CubeBlazor
-/NewLife.CubeBlazor1
-/NewLife.Cube.VueUI/node_modules
-/NewLife.Cube.VueUI
 *.pubxml
 /.vscode
-/CubeDemo/Config
-/XTemp
-/CubeDemoNC/Areas/School/Models/Config
-/CubeDemoNC/Areas/School/Models/Log
-/CubeDemoNC/publish
-/NewLife.CubeUI/node_modules
-/WebApplication1
-/WebApplication2
-/WebApplication3
-/WebApplication4
-/WebApplication5
-/BinSSO
-/workspace.code-workspace
-/Bin3
diff --git a/NewLife.Cube/Entity/Cube.xml b/NewLife.Cube/Entity/Cube.xml
index 014d1677..787dd342 100644
--- a/NewLife.Cube/Entity/Cube.xml
+++ b/NewLife.Cube/Entity/Cube.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<EntityModel xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:schemaLocation="https://newlifex.com https://newlifex.com/Model202309.xsd" Document="https://newlifex.com/xcode/model" xmlns="https://newlifex.com/Model202309.xsd">
+<EntityModel xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:schemaLocation="https://newlifex.com https://newlifex.com/Model202407.xsd" Document="https://newlifex.com/xcode/model" xmlns="https://newlifex.com/Model202407.xsd">
   <Option>
     <!--类名模板。其中{name}替换为Table.Name，如{name}Model/I{name}Dto等-->
     <ClassNameTemplate />
@@ -72,7 +72,7 @@
     </Table>
     <Table Name="OAuthLog" Description="OAuth日志。用于记录OAuth客户端请求，同时Id作为state，避免向OAuthServer泄漏本机Url">
       <Columns>
-        <Column Name="Id" DataType="Int64" PrimaryKey="True" Description="编号" />
+        <Column Name="Id" DataType="Int64" PrimaryKey="True" DataScale="time" Description="编号" />
         <Column Name="Provider" DataType="String" Description="提供商" />
         <Column Name="ConnectId" DataType="Int32" Description="链接" />
         <Column Name="UserId" DataType="Int32" Description="用户" />
@@ -248,7 +248,7 @@
     </Table>
     <Table Name="AppLog" Description="应用日志。用于OAuthServer的子系统">
       <Columns>
-        <Column Name="Id" DataType="Int64" PrimaryKey="True" Description="编号" />
+        <Column Name="Id" DataType="Int64" PrimaryKey="True" DataScale="time" Description="编号" />
         <Column Name="AppId" DataType="Int32" Description="应用" />
         <Column Name="Action" DataType="String" Description="操作" />
         <Column Name="Success" DataType="Boolean" Description="成功" />
@@ -273,7 +273,7 @@
     </Table>
     <Table Name="Attachment" Description="附件。用于记录各系统模块使用的文件，可以是Local/NAS/OSS等">
       <Columns>
-        <Column Name="Id" DataType="Int64" PrimaryKey="True" Description="编号" />
+        <Column Name="Id" DataType="Int64" PrimaryKey="True" DataScale="time" Description="编号" />
         <Column Name="Category" DataType="String" Description="业务分类" />
         <Column Name="Key" DataType="String" Description="业务主键" />
         <Column Name="Title" DataType="String" Length="200" Description="标题。业务内容作为附件标题，便于查看管理" />
diff --git a/NewLife.Cube/Entity/OAuth日志.cs b/NewLife.Cube/Entity/OAuth日志.cs
index 07ab304e..36a646f8 100644
--- a/NewLife.Cube/Entity/OAuth日志.cs
+++ b/NewLife.Cube/Entity/OAuth日志.cs
@@ -29,7 +29,7 @@ public partial class OAuthLog
     [DisplayName("编号")]
     [Description("编号")]
     [DataObjectField(true, false, false, 0)]
-    [BindColumn("Id", "编号", "")]
+    [BindColumn("Id", "编号", "", DataScale = "time")]
     public Int64 Id { get => _Id; set { if (OnPropertyChanging("Id", value)) { _Id = value; OnPropertyChanged("Id"); } } }
 
     private String _Provider;
@@ -232,6 +232,20 @@ public partial class OAuthLog
     #region 关联映射
     #endregion
 
+    #region 扩展查询
+    #endregion
+
+    #region 数据清理
+    /// <summary>清理指定时间段内的数据</summary>
+    /// <param name="start">开始时间。未指定时清理小于指定时间的所有数据</param>
+    /// <param name="end">结束时间</param>
+    /// <returns>清理行数</returns>
+    public static Int32 DeleteWith(DateTime start, DateTime end)
+    {
+        return Delete(_.Id.Between(start, end, Meta.Factory.Snow));
+    }
+    #endregion
+
     #region 字段名
     /// <summary>取得OAuth日志字段信息的快捷方式</summary>
     public partial class _
diff --git a/NewLife.Cube/Entity/OAuth配置.cs b/NewLife.Cube/Entity/OAuth配置.cs
index 3dfef88c..56a85cbe 100644
--- a/NewLife.Cube/Entity/OAuth配置.cs
+++ b/NewLife.Cube/Entity/OAuth配置.cs
@@ -353,6 +353,9 @@ public partial class OAuthConfig
     #region 关联映射
     #endregion
 
+    #region 扩展查询
+    #endregion
+
     #region 字段名
     /// <summary>取得OAuth配置字段信息的快捷方式</summary>
     public partial class _
diff --git a/NewLife.Cube/Entity/make.bat b/NewLife.Cube/Entity/make.bat
new file mode 100644
index 00000000..704a9a37
--- /dev/null
+++ b/NewLife.Cube/Entity/make.bat
@@ -0,0 +1,5 @@
+xcode
+IF ERRORLEVEL 1 (
+    echo xcode ����ִ��ʧ�ܣ����ڰ�װ .NET ����...
+    dotnet tool install xcodetool -g --prerelease
+)
\ No newline at end of file
diff --git a/NewLife.Cube/Entity/委托代理.cs b/NewLife.Cube/Entity/委托代理.cs
index 7dfd5659..2ee1ebc7 100644
--- a/NewLife.Cube/Entity/委托代理.cs
+++ b/NewLife.Cube/Entity/委托代理.cs
@@ -184,6 +184,9 @@ public partial class PrincipalAgent
     #region 关联映射
     #endregion
 
+    #region 扩展查询
+    #endregion
+
     #region 字段名
     /// <summary>取得委托代理字段信息的快捷方式</summary>
     public partial class _
diff --git a/NewLife.Cube/Entity/定时作业.cs b/NewLife.Cube/Entity/定时作业.cs
index a3c8c10c..c79cd069 100644
--- a/NewLife.Cube/Entity/定时作业.cs
+++ b/NewLife.Cube/Entity/定时作业.cs
@@ -233,6 +233,9 @@ public partial class CronJob
     #region 关联映射
     #endregion
 
+    #region 扩展查询
+    #endregion
+
     #region 字段名
     /// <summary>取得定时作业字段信息的快捷方式</summary>
     public partial class _
diff --git a/NewLife.Cube/Entity/应用插件.cs b/NewLife.Cube/Entity/应用插件.cs
index 18aea2e8..af767263 100644
--- a/NewLife.Cube/Entity/应用插件.cs
+++ b/NewLife.Cube/Entity/应用插件.cs
@@ -214,6 +214,9 @@ public partial class AppModule
     #region 关联映射
     #endregion
 
+    #region 扩展查询
+    #endregion
+
     #region 字段名
     /// <summary>取得应用插件字段信息的快捷方式</summary>
     public partial class _
diff --git a/NewLife.Cube/Entity/应用日志.cs b/NewLife.Cube/Entity/应用日志.cs
index 4d70f6f1..3a2bfec6 100644
--- a/NewLife.Cube/Entity/应用日志.cs
+++ b/NewLife.Cube/Entity/应用日志.cs
@@ -27,7 +27,7 @@ public partial class AppLog
     [DisplayName("编号")]
     [Description("编号")]
     [DataObjectField(true, false, false, 0)]
-    [BindColumn("Id", "编号", "")]
+    [BindColumn("Id", "编号", "", DataScale = "time")]
     public Int64 Id { get => _Id; set { if (OnPropertyChanging("Id", value)) { _Id = value; OnPropertyChanged("Id"); } } }
 
     private Int32 _AppId;
@@ -232,6 +232,20 @@ public partial class AppLog
     #region 关联映射
     #endregion
 
+    #region 扩展查询
+    #endregion
+
+    #region 数据清理
+    /// <summary>清理指定时间段内的数据</summary>
+    /// <param name="start">开始时间。未指定时清理小于指定时间的所有数据</param>
+    /// <param name="end">结束时间</param>
+    /// <returns>清理行数</returns>
+    public static Int32 DeleteWith(DateTime start, DateTime end)
+    {
+        return Delete(_.Id.Between(start, end, Meta.Factory.Snow));
+    }
+    #endregion
+
     #region 字段名
     /// <summary>取得应用日志字段信息的快捷方式</summary>
     public partial class _
diff --git a/NewLife.Cube/Entity/应用系统.cs b/NewLife.Cube/Entity/应用系统.cs
index 4f1adbf2..6814a3cc 100644
--- a/NewLife.Cube/Entity/应用系统.cs
+++ b/NewLife.Cube/Entity/应用系统.cs
@@ -305,6 +305,9 @@ public partial class App
     #region 关联映射
     #endregion
 
+    #region 扩展查询
+    #endregion
+
     #region 字段名
     /// <summary>取得应用系统字段信息的快捷方式</summary>
     public partial class _
diff --git a/NewLife.Cube/Entity/指令管理.cs b/NewLife.Cube/Entity/指令管理.cs
index b7101703..2d2b83a8 100644
--- a/NewLife.Cube/Entity/指令管理.cs
+++ b/NewLife.Cube/Entity/指令管理.cs
@@ -233,6 +233,9 @@ public partial class OrderManager
     #region 关联映射
     #endregion
 
+    #region 扩展查询
+    #endregion
+
     #region 字段名
     /// <summary>取得指令管理字段信息的快捷方式</summary>
     public partial class _
diff --git a/NewLife.Cube/Entity/模型列.cs b/NewLife.Cube/Entity/模型列.cs
index a5f52fb9..1204db82 100644
--- a/NewLife.Cube/Entity/模型列.cs
+++ b/NewLife.Cube/Entity/模型列.cs
@@ -392,6 +392,9 @@ public partial class ModelColumn
     #region 关联映射
     #endregion
 
+    #region 扩展查询
+    #endregion
+
     #region 字段名
     /// <summary>取得模型列字段信息的快捷方式</summary>
     public partial class _
diff --git a/NewLife.Cube/Entity/模型表.cs b/NewLife.Cube/Entity/模型表.cs
index 82f0e21c..b66e5e02 100644
--- a/NewLife.Cube/Entity/模型表.cs
+++ b/NewLife.Cube/Entity/模型表.cs
@@ -222,6 +222,21 @@ public partial class ModelTable
     #region 关联映射
     #endregion
 
+    #region 扩展查询
+    /// <summary>根据分类查找</summary>
+    /// <param name="category">分类</param>
+    /// <returns>实体列表</returns>
+    public static IList<ModelTable> FindAllByCategory(String category)
+    {
+        if (category.IsNullOrEmpty()) return [];
+
+        // 实体缓存
+        if (Meta.Session.Count < 1000) return Meta.Cache.FindAll(e => e.Category.EqualIgnoreCase(category));
+
+        return FindAll(_.Category == category);
+    }
+    #endregion
+
     #region 字段名
     /// <summary>取得模型表字段信息的快捷方式</summary>
     public partial class _
diff --git a/NewLife.Cube/Entity/用户令牌.cs b/NewLife.Cube/Entity/用户令牌.cs
index 5e6f46cf..69c7684e 100644
--- a/NewLife.Cube/Entity/用户令牌.cs
+++ b/NewLife.Cube/Entity/用户令牌.cs
@@ -234,6 +234,9 @@ public partial class UserToken
     #region 关联映射
     #endregion
 
+    #region 扩展查询
+    #endregion
+
     #region 字段名
     /// <summary>取得用户令牌字段信息的快捷方式</summary>
     public partial class _
diff --git a/NewLife.Cube/Entity/用户在线.cs b/NewLife.Cube/Entity/用户在线.cs
index bf18cd3e..422931e2 100644
--- a/NewLife.Cube/Entity/用户在线.cs
+++ b/NewLife.Cube/Entity/用户在线.cs
@@ -273,6 +273,9 @@ public partial class UserOnline
     #region 关联映射
     #endregion
 
+    #region 扩展查询
+    #endregion
+
     #region 字段名
     /// <summary>取得用户在线字段信息的快捷方式</summary>
     public partial class _
diff --git a/NewLife.Cube/Entity/用户统计.cs b/NewLife.Cube/Entity/用户统计.cs
index 64f2ed46..1f6ff93b 100644
--- a/NewLife.Cube/Entity/用户统计.cs
+++ b/NewLife.Cube/Entity/用户统计.cs
@@ -209,6 +209,9 @@ public partial class UserStat
     #region 关联映射
     #endregion
 
+    #region 扩展查询
+    #endregion
+
     #region 字段名
     /// <summary>取得用户统计字段信息的快捷方式</summary>
     public partial class _
diff --git a/NewLife.Cube/Entity/用户链接.cs b/NewLife.Cube/Entity/用户链接.cs
index af4fab49..f97aa745 100644
--- a/NewLife.Cube/Entity/用户链接.cs
+++ b/NewLife.Cube/Entity/用户链接.cs
@@ -257,6 +257,34 @@ public partial class UserConnect
     #region 关联映射
     #endregion
 
+    #region 扩展查询
+    /// <summary>根据提供商查找</summary>
+    /// <param name="provider">提供商</param>
+    /// <returns>实体列表</returns>
+    public static IList<UserConnect> FindAllByProvider(String provider)
+    {
+        if (provider.IsNullOrEmpty()) return [];
+
+        // 实体缓存
+        if (Meta.Session.Count < 1000) return Meta.Cache.FindAll(e => e.Provider.EqualIgnoreCase(provider));
+
+        return FindAll(_.Provider == provider);
+    }
+
+    /// <summary>根据全局标识查找</summary>
+    /// <param name="unionId">全局标识</param>
+    /// <returns>实体列表</returns>
+    public static IList<UserConnect> FindAllByUnionID(String unionId)
+    {
+        if (unionId.IsNullOrEmpty()) return [];
+
+        // 实体缓存
+        if (Meta.Session.Count < 1000) return Meta.Cache.FindAll(e => e.UnionID.EqualIgnoreCase(unionId));
+
+        return FindAll(_.UnionID == unionId);
+    }
+    #endregion
+
     #region 字段名
     /// <summary>取得用户链接字段信息的快捷方式</summary>
     public partial class _
diff --git a/NewLife.Cube/Entity/访问规则.cs b/NewLife.Cube/Entity/访问规则.cs
index c3d98930..a4f7d53a 100644
--- a/NewLife.Cube/Entity/访问规则.cs
+++ b/NewLife.Cube/Entity/访问规则.cs
@@ -263,6 +263,9 @@ public partial class AccessRule
     #region 关联映射
     #endregion
 
+    #region 扩展查询
+    #endregion
+
     #region 字段名
     /// <summary>取得访问规则字段信息的快捷方式</summary>
     public partial class _
diff --git a/NewLife.Cube/Entity/附件.cs b/NewLife.Cube/Entity/附件.cs
index c1e6392a..b81fe164 100644
--- a/NewLife.Cube/Entity/附件.cs
+++ b/NewLife.Cube/Entity/附件.cs
@@ -29,7 +29,7 @@ public partial class Attachment
     [DisplayName("编号")]
     [Description("编号")]
     [DataObjectField(true, false, false, 0)]
-    [BindColumn("Id", "编号", "")]
+    [BindColumn("Id", "编号", "", DataScale = "time")]
     public Int64 Id { get => _Id; set { if (OnPropertyChanging("Id", value)) { _Id = value; OnPropertyChanged("Id"); } } }
 
     private String _Category;
@@ -298,6 +298,20 @@ public partial class Attachment
     #region 关联映射
     #endregion
 
+    #region 扩展查询
+    #endregion
+
+    #region 数据清理
+    /// <summary>清理指定时间段内的数据</summary>
+    /// <param name="start">开始时间。未指定时清理小于指定时间的所有数据</param>
+    /// <param name="end">结束时间</param>
+    /// <returns>清理行数</returns>
+    public static Int32 DeleteWith(DateTime start, DateTime end)
+    {
+        return Delete(_.Id.Between(start, end, Meta.Factory.Snow));
+    }
+    #endregion
+
     #region 字段名
     /// <summary>取得附件字段信息的快捷方式</summary>
     public partial class _
diff --git a/NewLife.CubeNC/Modules/ModuleManager.cs b/NewLife.CubeNC/Modules/ModuleManager.cs
index a3082aa8..c376b3fe 100644
--- a/NewLife.CubeNC/Modules/ModuleManager.cs
+++ b/NewLife.CubeNC/Modules/ModuleManager.cs
@@ -1,8 +1,5 @@
 using System.Reflection;
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.ApplicationParts;
-using Microsoft.AspNetCore.Mvc.Razor;
-using Microsoft.Extensions.DependencyInjection;
 using NewLife.Cube.Entity;
 using NewLife.Log;
 using NewLife.Reflection;
@@ -45,12 +42,11 @@ public class ModuleManager
 
                         var assembly = Assembly.LoadFrom(filePath);
                         type = assembly.GetType(item.ClassName);
-                        if (services != null) {
-                            services.AddMvc()
-                                .ConfigureApplicationPartManager(_ => { 
+                        services?.AddMvc()
+                                .ConfigureApplicationPartManager(_ =>
+                                {
                                     _.ApplicationParts.Add(new CompiledRazorAssemblyPart(assembly));
                                 });
-                        }
                     }
 
                     if (type != null)
diff --git a/NewLife.CubeNC/Properties/launchSettings.json b/NewLife.CubeNC/Properties/launchSettings.json
new file mode 100644
index 00000000..66504856
--- /dev/null
+++ b/NewLife.CubeNC/Properties/launchSettings.json
@@ -0,0 +1,12 @@
+{
+  "profiles": {
+    "NewLife.CubeNC": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "https://localhost:58433;http://localhost:58434"
+    }
+  }
+}
\ No newline at end of file