diff --git a/.gitignore b/.gitignore index 92d9cd1..20596e9 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ bld/ /BinServer /BinAgent /Samples/HisData/Config +/AntJob.Web/.config diff --git a/AntJob.Agent/AntJob.Agent.csproj b/AntJob.Agent/AntJob.Agent.csproj index c28f093..b7e1b08 100644 --- a/AntJob.Agent/AntJob.Agent.csproj +++ b/AntJob.Agent/AntJob.Agent.csproj @@ -42,7 +42,7 @@ - + diff --git a/AntJob.Data/AntJob.Data.csproj b/AntJob.Data/AntJob.Data.csproj index db39184..6f49905 100644 --- a/AntJob.Data/AntJob.Data.csproj +++ b/AntJob.Data/AntJob.Data.csproj @@ -42,8 +42,8 @@ - - + + diff --git a/AntJob.Data/Entity/作业.Biz.cs b/AntJob.Data/Entity/作业.Biz.cs index ba21ca7..ef4feeb 100644 --- a/AntJob.Data/Entity/作业.Biz.cs +++ b/AntJob.Data/Entity/作业.Biz.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.Linq; using System.Xml.Serialization; +using NewLife; using NewLife.Data; using NewLife.Serialization; using XCode; diff --git a/AntJob.Data/Entity/作业任务.Biz.cs b/AntJob.Data/Entity/作业任务.Biz.cs index f520838..ba647a8 100644 --- a/AntJob.Data/Entity/作业任务.Biz.cs +++ b/AntJob.Data/Entity/作业任务.Biz.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.Linq; using System.Xml.Serialization; +using NewLife; using NewLife.Data; using XCode; diff --git a/AntJob.Data/Entity/作业错误.Biz.cs b/AntJob.Data/Entity/作业错误.Biz.cs index 64fc032..c92cbfe 100644 --- a/AntJob.Data/Entity/作业错误.Biz.cs +++ b/AntJob.Data/Entity/作业错误.Biz.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.Xml.Serialization; +using NewLife; using NewLife.Data; using XCode; using XCode.Membership; diff --git a/AntJob.Data/Entity/应用历史.Biz.cs b/AntJob.Data/Entity/应用历史.Biz.cs index 7220fa5..694a1c3 100644 --- a/AntJob.Data/Entity/应用历史.Biz.cs +++ b/AntJob.Data/Entity/应用历史.Biz.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.Runtime.Serialization; using System.Xml.Serialization; +using NewLife; using NewLife.Data; using XCode; using XCode.Cache; diff --git a/AntJob.Data/Entity/应用在线.Biz.cs b/AntJob.Data/Entity/应用在线.Biz.cs index e068644..46f9237 100644 --- a/AntJob.Data/Entity/应用在线.Biz.cs +++ b/AntJob.Data/Entity/应用在线.Biz.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.Xml.Serialization; +using NewLife; using NewLife.Data; using XCode; using XCode.Membership; diff --git a/AntJob.Data/Entity/应用消息.Biz.cs b/AntJob.Data/Entity/应用消息.Biz.cs index 574c2a0..106c628 100644 --- a/AntJob.Data/Entity/应用消息.Biz.cs +++ b/AntJob.Data/Entity/应用消息.Biz.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.Linq; using System.Xml.Serialization; +using NewLife; using NewLife.Data; using XCode; using XCode.Membership; diff --git a/AntJob.Data/Entity/应用系统.Biz.cs b/AntJob.Data/Entity/应用系统.Biz.cs index 093949a..9f83962 100644 --- a/AntJob.Data/Entity/应用系统.Biz.cs +++ b/AntJob.Data/Entity/应用系统.Biz.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Xml.Serialization; +using NewLife; using NewLife.Data; using XCode; using XCode.Cache; diff --git a/AntJob.Data/Entity/应用配置.Biz.cs b/AntJob.Data/Entity/应用配置.Biz.cs index 6d76d9e..9a3fb10 100644 --- a/AntJob.Data/Entity/应用配置.Biz.cs +++ b/AntJob.Data/Entity/应用配置.Biz.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.Runtime.Serialization; using System.Xml.Serialization; +using NewLife; using NewLife.Data; using XCode; using XCode.Cache; diff --git a/AntJob.Extensions/AntJob.Extensions.csproj b/AntJob.Extensions/AntJob.Extensions.csproj index fba8fc3..5b8336c 100644 --- a/AntJob.Extensions/AntJob.Extensions.csproj +++ b/AntJob.Extensions/AntJob.Extensions.csproj @@ -42,8 +42,8 @@ true - - + + diff --git a/AntJob.Extensions/DataHandler.cs b/AntJob.Extensions/DataHandler.cs index 9e0613a..8fe5af1 100644 --- a/AntJob.Extensions/DataHandler.cs +++ b/AntJob.Extensions/DataHandler.cs @@ -1,6 +1,7 @@ using System; using System.Collections; using AntJob.Data; +using NewLife; using XCode; using XCode.Configuration; diff --git a/AntJob.Extensions/SqlMessage.cs b/AntJob.Extensions/SqlMessage.cs index 8492651..62225d0 100644 --- a/AntJob.Extensions/SqlMessage.cs +++ b/AntJob.Extensions/SqlMessage.cs @@ -5,6 +5,7 @@ using AntJob.Data; using AntJob.Extensions; using AntJob.Handlers; using AntJob.Providers; +using NewLife; using NewLife.Data; namespace AntJob diff --git a/AntJob.Extensions/SqlSection.cs b/AntJob.Extensions/SqlSection.cs index 82d795b..c92982f 100644 --- a/AntJob.Extensions/SqlSection.cs +++ b/AntJob.Extensions/SqlSection.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using NewLife; using NewLife.Data; using NewLife.Model; using NewLife.Reflection; @@ -151,14 +152,14 @@ namespace AntJob.Extensions } // 选取目标表和数据集共有的字段 - tableName = dal.Db.FormatTableName(tableName); + //tableName = dal.Db.FormatTableName(tableName); var columns = new List(); foreach (var dc in table.Columns) { if (dc.ColumnName.EqualIgnoreCase(dt.Columns)) columns.Add(dc); } - return dal.Session.Insert(tableName, columns.ToArray(), dt.Cast()); + return dal.Session.Insert(table, columns.ToArray(), dt.Cast()); } #endregion } diff --git a/AntJob.Server/AntJob.Server.csproj b/AntJob.Server/AntJob.Server.csproj index 80bce52..f1f37b8 100644 --- a/AntJob.Server/AntJob.Server.csproj +++ b/AntJob.Server/AntJob.Server.csproj @@ -40,9 +40,9 @@ - - - + + + diff --git a/AntJob.Server/Properties/PublishProfiles/FolderProfile.pubxml b/AntJob.Server/Properties/PublishProfiles/FolderProfile.pubxml new file mode 100644 index 0000000..fa07136 --- /dev/null +++ b/AntJob.Server/Properties/PublishProfiles/FolderProfile.pubxml @@ -0,0 +1,16 @@ + + + + + Release + Any CPU + ..\Bin\Server\publish\ + FileSystem + netcoreapp3.1 + linux-x64 + false + False + + \ No newline at end of file diff --git a/AntJob.Web/AntJob.Web.csproj b/AntJob.Web/AntJob.Web.csproj index 8c710f9..35caaa9 100644 --- a/AntJob.Web/AntJob.Web.csproj +++ b/AntJob.Web/AntJob.Web.csproj @@ -16,6 +16,7 @@ true TRACE latest + 98927802-be3c-45aa-98b7-98c431ed6ec3 $(DefineConstants);DEBUG @@ -23,9 +24,9 @@ true - - - + + + diff --git a/AntJob.Web/Areas/Ant/AntAreaRegistration.cs b/AntJob.Web/Areas/Ant/AntAreaRegistration.cs index 8941814..a38acc5 100644 --- a/AntJob.Web/Areas/Ant/AntAreaRegistration.cs +++ b/AntJob.Web/Areas/Ant/AntAreaRegistration.cs @@ -1,5 +1,6 @@ using System; using System.ComponentModel; +using NewLife; using NewLife.Cube; namespace AntJob.Web.Areas.Ant diff --git a/AntJob.Web/Areas/Ant/Controllers/AppController.cs b/AntJob.Web/Areas/Ant/Controllers/AppController.cs index e9a37d8..2c07cb4 100644 --- a/AntJob.Web/Areas/Ant/Controllers/AppController.cs +++ b/AntJob.Web/Areas/Ant/Controllers/AppController.cs @@ -4,6 +4,7 @@ using System.ComponentModel; using System.Linq; using AntJob.Data.Entity; using Microsoft.AspNetCore.Mvc; +using NewLife; using NewLife.Cube; using NewLife.Web; using XCode.Membership; diff --git a/AntJob.Web/Areas/Ant/Controllers/JobController.cs b/AntJob.Web/Areas/Ant/Controllers/JobController.cs index f28e93d..5d9c728 100644 --- a/AntJob.Web/Areas/Ant/Controllers/JobController.cs +++ b/AntJob.Web/Areas/Ant/Controllers/JobController.cs @@ -4,6 +4,7 @@ using System.ComponentModel; using System.Threading.Tasks; using AntJob.Data.Entity; using Microsoft.AspNetCore.Mvc; +using NewLife; using NewLife.Cube; using NewLife.Security; using NewLife.Web; diff --git a/AntJob.Web/Areas/Ant/Controllers/JobTaskController.cs b/AntJob.Web/Areas/Ant/Controllers/JobTaskController.cs index 88c3b2b..e911b01 100644 --- a/AntJob.Web/Areas/Ant/Controllers/JobTaskController.cs +++ b/AntJob.Web/Areas/Ant/Controllers/JobTaskController.cs @@ -4,6 +4,7 @@ using System.ComponentModel; using AntJob.Data; using AntJob.Data.Entity; using Microsoft.AspNetCore.Mvc; +using NewLife; using NewLife.Cube; using NewLife.Web; using XCode.Membership; diff --git a/AntJob.Web/Properties/PublishProfiles/FolderProfile.pubxml b/AntJob.Web/Properties/PublishProfiles/FolderProfile.pubxml new file mode 100644 index 0000000..8ad7c44 --- /dev/null +++ b/AntJob.Web/Properties/PublishProfiles/FolderProfile.pubxml @@ -0,0 +1,21 @@ + + + + + False + False + True + Release + Any CPU + FileSystem + ..\Bin\Web\publish\ + FileSystem + + netcoreapp3.1 + linux-x64 + a9e0597c-e818-4b33-8ac3-be134d68b78e + false + + \ No newline at end of file diff --git a/AntJob/AntJob.csproj b/AntJob/AntJob.csproj index 755e016..997b54c 100644 --- a/AntJob/AntJob.csproj +++ b/AntJob/AntJob.csproj @@ -46,6 +46,6 @@ - + \ No newline at end of file diff --git a/AntJob/AntSetting.cs b/AntJob/AntSetting.cs index 58dce5d..a3ce56e 100644 --- a/AntJob/AntSetting.cs +++ b/AntJob/AntSetting.cs @@ -1,6 +1,7 @@ using System; using System.ComponentModel; using System.Reflection; +using NewLife; using NewLife.Configuration; namespace AntJob diff --git a/AntJob/Data/TemplateHelper.cs b/AntJob/Data/TemplateHelper.cs index aeeded3..c6c45be 100644 --- a/AntJob/Data/TemplateHelper.cs +++ b/AntJob/Data/TemplateHelper.cs @@ -1,4 +1,5 @@ using System; +using NewLife; using NewLife.Collections; namespace AntJob.Data diff --git a/AntJob/Handler.cs b/AntJob/Handler.cs index 66c4430..0732de5 100644 --- a/AntJob/Handler.cs +++ b/AntJob/Handler.cs @@ -4,6 +4,7 @@ using System.Diagnostics; using System.Threading; using AntJob.Data; using AntJob.Providers; +using NewLife; using NewLife.Collections; using NewLife.Log; diff --git a/AntJob/Handlers/CSharpHandler.cs b/AntJob/Handlers/CSharpHandler.cs index a1386a1..9b7bd34 100644 --- a/AntJob/Handlers/CSharpHandler.cs +++ b/AntJob/Handlers/CSharpHandler.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using AntJob.Data; +using NewLife; namespace AntJob.Handlers { diff --git a/AntJob/Handlers/MessageHandler.cs b/AntJob/Handlers/MessageHandler.cs index 13293d9..a0caa51 100644 --- a/AntJob/Handlers/MessageHandler.cs +++ b/AntJob/Handlers/MessageHandler.cs @@ -3,6 +3,7 @@ using System.Collections; using System.Collections.Generic; using System.Linq; using AntJob.Data; +using NewLife; using NewLife.Serialization; namespace AntJob.Handlers diff --git a/AntJob/Providers/AntClient.cs b/AntJob/Providers/AntClient.cs index 99d2c71..429e167 100644 --- a/AntJob/Providers/AntClient.cs +++ b/AntJob/Providers/AntClient.cs @@ -6,6 +6,7 @@ using System.Linq; using System.Reflection; using System.Threading.Tasks; using AntJob.Data; +using NewLife; using NewLife.Log; using NewLife.Net; using NewLife.Reflection; diff --git a/AntTest/AntTest.csproj b/AntTest/AntTest.csproj index d9e25a1..332ff3b 100644 --- a/AntTest/AntTest.csproj +++ b/AntTest/AntTest.csproj @@ -11,7 +11,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Samples/HisData/HisData.csproj b/Samples/HisData/HisData.csproj index 13411fc..86d51e7 100644 --- a/Samples/HisData/HisData.csproj +++ b/Samples/HisData/HisData.csproj @@ -16,7 +16,7 @@ - + diff --git a/Samples/HisWeb/Areas/His/HisAreaRegistration.cs b/Samples/HisWeb/Areas/His/HisAreaRegistration.cs index e27842e..18234fa 100644 --- a/Samples/HisWeb/Areas/His/HisAreaRegistration.cs +++ b/Samples/HisWeb/Areas/His/HisAreaRegistration.cs @@ -1,5 +1,6 @@ using System; using System.ComponentModel; +using NewLife; using NewLife.Cube; namespace HisWeb.Areas.His diff --git a/Samples/HisWeb/HisWeb.csproj b/Samples/HisWeb/HisWeb.csproj index 98cdc06..57a3d79 100644 --- a/Samples/HisWeb/HisWeb.csproj +++ b/Samples/HisWeb/HisWeb.csproj @@ -9,7 +9,7 @@ - +