diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Global.asax.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Global.asax.cs index 635751398..14c7be28c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Global.asax.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Global.asax.cs @@ -27,7 +27,7 @@ namespace Learun.Application.Web AreaRegistration.RegisterAllAreas(); FilterConfig.RegisterGlobalFilters(GlobalFilters.Filters); RouteConfig.RegisterRoutes(RouteTable.Routes); - Hangfire.GlobalConfiguration.Configuration.UseSqlServerStorage(ConfigurationManager.ConnectionStrings["hangfireString"].ConnectionString); + //Hangfire.GlobalConfiguration.Configuration.UseSqlServerStorage(ConfigurationManager.ConnectionStrings["hangfireString"].ConnectionString); // 启动的时候清除全部缓存 //ICache cache = CacheFactory.CaChe(); //cache.RemoveAll(0); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj index b28bdbdec..20a6b7fb9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj @@ -138,11 +138,9 @@ ..\packages\NPOI.2.3.0\lib\net40\NPOI.OpenXmlFormats.dll - False ..\packages\Oracle.ManagedDataAccess.12.1.24160719\lib\net40\Oracle.ManagedDataAccess.dll - False ..\packages\Oracle.ManagedDataAccess.EntityFramework.12.1.2400\lib\net45\Oracle.ManagedDataAccess.EntityFramework.dll diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Web.config b/Learun.Framework.Ultimate V7/Learun.Application.Web/Web.config index 2757f0670..11390c7f0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Web.config +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Web.config @@ -5,18 +5,19 @@ --> -
-
-
-
+
+
+
+
-
+
- - - - - + + + - + - + - + - - - - - - + + + + + + - + @@ -52,142 +53,162 @@ - - + + - - - - - - + + + + + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - - + + + - - - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/packages.config b/Learun.Framework.Ultimate V7/Learun.Application.Web/packages.config index 1cefcec51..507fde64e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/packages.config +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/packages.config @@ -26,8 +26,8 @@ - - + + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Db/Learun.DataBase.EF.Oracle/App.config b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Db/Learun.DataBase.EF.Oracle/App.config index 5cb7e34fb..93fd44556 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Db/Learun.DataBase.EF.Oracle/App.config +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Db/Learun.DataBase.EF.Oracle/App.config @@ -1,49 +1,56 @@  -
-
+
+
- - - - - - - - - + + - - + + + - - - - - - - - + - - + + - - - - + + + + + + + + + + + + + + + + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Db/Learun.DataBase.EF.Oracle/Learun.DataBase.Oracle.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Db/Learun.DataBase.EF.Oracle/Learun.DataBase.Oracle.csproj index 4b318f8e9..e9d90ce69 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Db/Learun.DataBase.EF.Oracle/Learun.DataBase.Oracle.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Db/Learun.DataBase.EF.Oracle/Learun.DataBase.Oracle.csproj @@ -52,10 +52,10 @@ False ..\..\..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll - + ..\..\..\packages\Oracle.ManagedDataAccess.12.1.24160719\lib\net40\Oracle.ManagedDataAccess.dll - + ..\..\..\packages\Oracle.ManagedDataAccess.EntityFramework.12.1.2400\lib\net45\Oracle.ManagedDataAccess.EntityFramework.dll diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Db/Learun.DataBase.EF.Oracle/packages.config b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Db/Learun.DataBase.EF.Oracle/packages.config index d9caea369..c98cbaf90 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Db/Learun.DataBase.EF.Oracle/packages.config +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Db/Learun.DataBase.EF.Oracle/packages.config @@ -3,6 +3,6 @@ - - + + \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/西昌单校区版V3.0.sln b/Learun.Framework.Ultimate V7/西昌单校区版V3.0.sln index 9aab000c1..a8de35eb9 100644 --- a/Learun.Framework.Ultimate V7/西昌单校区版V3.0.sln +++ b/Learun.Framework.Ultimate V7/西昌单校区版V3.0.sln @@ -118,8 +118,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Learun.Application.Extentio EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Learun.Application.Language", "Learun.Framework.Module\Learun.Application.Module\Learun.Application.Language\Learun.Application.Language.csproj", "{36083FBB-CE7F-4EE0-8459-C4B60A2DD070}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Learun.Application.Website", "Learun.Application.Website\Learun.Application.Website.csproj", "{DBB22F9E-ED75-40EB-A091-717D42C65A9B}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Quanjiang.DigitalSchool.IMServerService", "IMServerService\Quanjiang.DigitalSchool.IMServerService.csproj", "{E05A2B9A-A939-450F-9A44-A8B3201D055A}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Quanjiang.DigitalSchool.Aspose", "Quanjiang.DigitalSchool.Aspose\Quanjiang.DigitalSchool.Aspose.csproj", "{767D20C4-B983-4940-BF97-74D5479CA558}" @@ -1480,42 +1478,6 @@ Global {36083FBB-CE7F-4EE0-8459-C4B60A2DD070}.Release|Windows-x64.Build.0 = Release|Any CPU {36083FBB-CE7F-4EE0-8459-C4B60A2DD070}.Release|Windows-x86.ActiveCfg = Release|Any CPU {36083FBB-CE7F-4EE0-8459-C4B60A2DD070}.Release|Windows-x86.Build.0 = Release|Any CPU - {DBB22F9E-ED75-40EB-A091-717D42C65A9B}.Debug|Android.ActiveCfg = Debug|Any CPU - {DBB22F9E-ED75-40EB-A091-717D42C65A9B}.Debug|Android.Build.0 = Debug|Any CPU - {DBB22F9E-ED75-40EB-A091-717D42C65A9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DBB22F9E-ED75-40EB-A091-717D42C65A9B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DBB22F9E-ED75-40EB-A091-717D42C65A9B}.Debug|iOS.ActiveCfg = Debug|Any CPU - {DBB22F9E-ED75-40EB-A091-717D42C65A9B}.Debug|iOS.Build.0 = Debug|Any CPU - {DBB22F9E-ED75-40EB-A091-717D42C65A9B}.Debug|Windows-ARM.ActiveCfg = Debug|Any CPU - {DBB22F9E-ED75-40EB-A091-717D42C65A9B}.Debug|Windows-ARM.Build.0 = Debug|Any CPU - {DBB22F9E-ED75-40EB-A091-717D42C65A9B}.Debug|Windows-x64.ActiveCfg = Debug|Any CPU - {DBB22F9E-ED75-40EB-A091-717D42C65A9B}.Debug|Windows-x64.Build.0 = Debug|Any CPU - {DBB22F9E-ED75-40EB-A091-717D42C65A9B}.Debug|Windows-x86.ActiveCfg = Debug|Any CPU - {DBB22F9E-ED75-40EB-A091-717D42C65A9B}.Debug|Windows-x86.Build.0 = Debug|Any CPU - {DBB22F9E-ED75-40EB-A091-717D42C65A9B}.Development|Android.ActiveCfg = Debug|Any CPU - {DBB22F9E-ED75-40EB-A091-717D42C65A9B}.Development|Android.Build.0 = Debug|Any CPU - {DBB22F9E-ED75-40EB-A091-717D42C65A9B}.Development|Any CPU.ActiveCfg = Debug|Any CPU - {DBB22F9E-ED75-40EB-A091-717D42C65A9B}.Development|Any CPU.Build.0 = Debug|Any CPU - {DBB22F9E-ED75-40EB-A091-717D42C65A9B}.Development|iOS.ActiveCfg = Debug|Any CPU - {DBB22F9E-ED75-40EB-A091-717D42C65A9B}.Development|iOS.Build.0 = Debug|Any CPU - {DBB22F9E-ED75-40EB-A091-717D42C65A9B}.Development|Windows-ARM.ActiveCfg = Debug|Any CPU - {DBB22F9E-ED75-40EB-A091-717D42C65A9B}.Development|Windows-ARM.Build.0 = Debug|Any CPU - {DBB22F9E-ED75-40EB-A091-717D42C65A9B}.Development|Windows-x64.ActiveCfg = Debug|Any CPU - {DBB22F9E-ED75-40EB-A091-717D42C65A9B}.Development|Windows-x64.Build.0 = Debug|Any CPU - {DBB22F9E-ED75-40EB-A091-717D42C65A9B}.Development|Windows-x86.ActiveCfg = Debug|Any CPU - {DBB22F9E-ED75-40EB-A091-717D42C65A9B}.Development|Windows-x86.Build.0 = Debug|Any CPU - {DBB22F9E-ED75-40EB-A091-717D42C65A9B}.Release|Android.ActiveCfg = Release|Any CPU - {DBB22F9E-ED75-40EB-A091-717D42C65A9B}.Release|Android.Build.0 = Release|Any CPU - {DBB22F9E-ED75-40EB-A091-717D42C65A9B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DBB22F9E-ED75-40EB-A091-717D42C65A9B}.Release|Any CPU.Build.0 = Release|Any CPU - {DBB22F9E-ED75-40EB-A091-717D42C65A9B}.Release|iOS.ActiveCfg = Release|Any CPU - {DBB22F9E-ED75-40EB-A091-717D42C65A9B}.Release|iOS.Build.0 = Release|Any CPU - {DBB22F9E-ED75-40EB-A091-717D42C65A9B}.Release|Windows-ARM.ActiveCfg = Release|Any CPU - {DBB22F9E-ED75-40EB-A091-717D42C65A9B}.Release|Windows-ARM.Build.0 = Release|Any CPU - {DBB22F9E-ED75-40EB-A091-717D42C65A9B}.Release|Windows-x64.ActiveCfg = Release|Any CPU - {DBB22F9E-ED75-40EB-A091-717D42C65A9B}.Release|Windows-x64.Build.0 = Release|Any CPU - {DBB22F9E-ED75-40EB-A091-717D42C65A9B}.Release|Windows-x86.ActiveCfg = Release|Any CPU - {DBB22F9E-ED75-40EB-A091-717D42C65A9B}.Release|Windows-x86.Build.0 = Release|Any CPU {E05A2B9A-A939-450F-9A44-A8B3201D055A}.Debug|Android.ActiveCfg = Debug|Any CPU {E05A2B9A-A939-450F-9A44-A8B3201D055A}.Debug|Android.Build.0 = Debug|Any CPU {E05A2B9A-A939-450F-9A44-A8B3201D055A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU @@ -1671,11 +1633,10 @@ Global {211FA31A-B9D8-4F48-80CC-573B9410828E} = {16DDB25D-3101-47A2-BDC8-161954FD77FA} {4D033392-BBB8-4B5F-9144-A42E7695847E} = {16DDB25D-3101-47A2-BDC8-161954FD77FA} {36083FBB-CE7F-4EE0-8459-C4B60A2DD070} = {16DDB25D-3101-47A2-BDC8-161954FD77FA} - {DBB22F9E-ED75-40EB-A091-717D42C65A9B} = {29DFF52B-8455-4EA1-8798-3AEE210D9372} {E05A2B9A-A939-450F-9A44-A8B3201D055A} = {ED258CD0-0A0C-490B-9D8F-B4CEC4467251} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {968C278F-4142-4DFF-96B0-B3D70A649451} EnterpriseLibraryConfigurationToolBinariesPath = packages\Unity.2.1.505.0\lib\NET35 + SolutionGuid = {968C278F-4142-4DFF-96B0-B3D70A649451} EndGlobalSection EndGlobal