Skip to content

S
smallproject
Commit cba26e56 by mahaisong
Options

feat:国海定时时长计算任务，配置修改

parent 0f3dc7d9
Showing with 73 additions and 18 deletions
11.图片转储API/ImgSave/ImgSave/Areas/HelpPage/HelpPageAreaRegistration.cs
using System.Web.Http; using System.Web.Http;
using System.Web.Http; using System.Web.Http;
using System.Web.Mvc; using System.Web.Mvc;
namespace ImgSave.Areas.HelpPage namespace PdfToJson.Areas.HelpPage
{ {
public class HelpPageAreaRegistration : AreaRegistration public class HelpPageAreaRegistration : AreaRegistration
{ {
......
23.GHABTest/BuLu/obj/Debug/BuLu.csproj.CoreCompileInputs.cache
e9de5fa2b0cd0f836496983b5be6a0cd93e34de3 eef75015fb311bd7c9563350300bbd099d2976bd
23.GHABTest/DurationWinService/App.config
...@@ -4,8 +4,11 @@ ...@@ -4,8 +4,11 @@
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 --> <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" /> <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
</configSections> </configSections>
<appSettings>
<add key="SplitTime" value="5"/>
<add key="FromVersionA" value="guohai"/>
<add key="FromVersionB" value="gimind"/>
</appSettings>
<startup> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
</startup> </startup>
......
23.GHABTest/DurationWinService/Program.cs
...@@ -4,6 +4,17 @@ using System.Linq; ...@@ -4,6 +4,17 @@ using System.Linq;
using System.ServiceProcess; using System.ServiceProcess;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using GIClientModel;
using GILogger;
using Quartz;
using DurationWinService.QuartzJobs;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Configuration;
namespace DurationWinService namespace DurationWinService
{ {
...@@ -13,7 +24,7 @@ namespace DurationWinService ...@@ -13,7 +24,7 @@ namespace DurationWinService
/// 应用程序的主入口点。 /// 应用程序的主入口点。
/// </summary> /// </summary>
static void Main() static void Main()
{ {
ServiceBase[] ServicesToRun; ServiceBase[] ServicesToRun;
ServicesToRun = new ServiceBase[] ServicesToRun = new ServiceBase[]
{ {
...@@ -21,5 +32,6 @@ namespace DurationWinService ...@@ -21,5 +32,6 @@ namespace DurationWinService
}; };
ServiceBase.Run(ServicesToRun); ServiceBase.Run(ServicesToRun);
} }
} }
} }
23.GHABTest/DurationWinService/Service1.cs
...@@ -10,6 +10,23 @@ using System.Linq; ...@@ -10,6 +10,23 @@ using System.Linq;
using System.ServiceProcess; using System.ServiceProcess;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System;
using System.Collections.Generic;
using System.Linq;
using System.ServiceProcess;
using System.Text;
using System.Threading.Tasks;
using GIClientModel;
using GILogger;
using Quartz;
using DurationWinService.QuartzJobs;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Configuration;
namespace DurationWinService namespace DurationWinService
{ {
...@@ -25,7 +42,13 @@ namespace DurationWinService ...@@ -25,7 +42,13 @@ namespace DurationWinService
{ {
try try
{ {
//加载配置
string stime = ConfigurationManager.AppSettings["SplitTime"] != null ? ConfigurationManager.AppSettings["SplitTime"].ToString() : "5";
InitConfig.SplitTime = int.Parse(stime);
InitConfig.FromVersionA = ConfigurationManager.AppSettings["FromVersionA"] != null ? ConfigurationManager.AppSettings["FromVersionA"].ToString() : "guohai";
InitConfig.FromVersionB = ConfigurationManager.AppSettings["FromVersionB"] != null ? ConfigurationManager.AppSettings["FromVersionB"].ToString() : "gimind";
//开启quartz //开启quartz
wstr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff") + "： 1.程序启动中……"; wstr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff") + "： 1.程序启动中……";
......
23.GHABTest/DurationWinService/bin/Debug/DurationWinService.exe.config
...@@ -4,6 +4,11 @@ ...@@ -4,6 +4,11 @@
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 --> <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" /> <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
</configSections> </configSections>
<appSettings>
<add key="SplitTime" value="5" />
<add key="FromVersionA" value="guohai" />
<add key="FromVersionB" value="gimind" />
</appSettings>
<startup> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
</startup> </startup>
......
23.GHABTest/DurationWinService/bin/Debug/appsettings.json
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
"DataHistoryModel": "server=castle.gimind.com;port=3306;user=palas;password=lapas;database=debit_quote;Character Set=utf8", "DataHistoryModel": "server=castle.gimind.com;port=3306;user=palas;password=lapas;database=debit_quote;Character Set=utf8",
"GIClientModel": "server=earth.gimind.com;port=3306;user=palas;password=lapas;database=gi_client_db", "GIClientModel": "server=earth.gimind.com;port=3306;user=palas;password=lapas;database=gi_client_db",
"iTraderModels": "server=mech.gimind.com;port=3306;user=palas;password=lapas;database=iTrader;Character Set=utf8", "iTraderModels": "server=mech.gimind.com;port=3306;user=palas;password=lapas;database=iTrader;Character Set=utf8",
"PalasEntityModel": "server=earth.gimind.com;port=3306;user=palas;password=lapas;database=Palas_V5;Character Set=utf8", "PalasEntityModel": "server=earth.gimind.com;port=3306;user=palas;password=lapas;database=Palas_V5;Character Set=utf8;Convert Zero Datetime=True;",
"PalasToolModels": "server=earth.gimind.com;port=3306;user=palas;password=lapas;database=Palas_tools;Character Set=utf8", "PalasToolModels": "server=earth.gimind.com;port=3306;user=palas;password=lapas;database=Palas_tools;Character Set=utf8",
"PalasV5Model": "server=earth.gimind.com;port=3306;user=palas;password=lapas;database=Palas_V5;Character Set=utf8;Convert Zero Datetime=True", "PalasV5Model": "server=earth.gimind.com;port=3306;user=palas;password=lapas;database=Palas_V5;Character Set=utf8;Convert Zero Datetime=True",
"QuantModels": "server=mech.gimind.com;port=3306;user=palas;password=lapas;database=quant;Character Set=utf8", "QuantModels": "server=mech.gimind.com;port=3306;user=palas;password=lapas;database=quant;Character Set=utf8",
......
23.GHABTest/DurationWinService/obj/Debug/DurationWinService.csproj.CoreCompileInputs.cache
8cb0a00cd3e5f9e7becf4f49beae722baac87ae9 abea7dbc127b1ed790fe9bdcc70b7c08180dbd23
23.GHABTest/DurationWinService/obj/Debug/DurationWinService.exe.config
...@@ -4,6 +4,11 @@ ...@@ -4,6 +4,11 @@
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 --> <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" /> <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
</configSections> </configSections>
<appSettings>
<add key="SplitTime" value="5" />
<add key="FromVersionA" value="guohai" />
<add key="FromVersionB" value="gimind" />
</appSettings>
<startup> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
</startup> </startup>
......
23.GHABTest/GHABTest/QuartzJobs/InitConfig.cs
...@@ -3,6 +3,7 @@ using System.Collections.Generic; ...@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace GHABTest.QuartzJobs namespace GHABTest.QuartzJobs
{ {
public class InitConfig public class InitConfig
......
23.GHABTest/GHABTest/obj/Debug/netcoreapp2.0/GHABTest.csproj.CoreCompileInputs.cache
228b65580572c0d649fc4b4d3bc3665781b83ea9 e68291ec8200b6bb30b286d3968a89ee87a058fd
23.GHABTest/GHABTest/obj/GHABTest.csproj.nuget.cache
{ {
"version": 1, "version": 1,
"dgSpecHash": "JEN8n2C/sGW0ujLnveg3susG4IYqCA6xK6oFuxm+YE5ChYtFgYHCkMcIR/9eie8UY3ytiiUJAQyLhA0ot1OMhA==", "dgSpecHash": "fAsT7RjgUcxbmKveeXcW0N+3ybkvdzAnLuwBIF/dfEWVT90Jnmdj6/xRSo9dhtPeJ+x0O5tq6+WcRNEdj1rXZQ==",
"success": true "success": true
} }
\ No newline at end of file
23.GHABTest/GHABTest/obj/GHABTest.csproj.nuget.g.props
...@@ -5,15 +5,18 @@ ...@@ -5,15 +5,18 @@
<RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool> <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
<ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">D:\smallproject\23.GHABTest\GHABTest\obj\project.assets.json</ProjectAssetsFile> <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">D:\smallproject\23.GHABTest\GHABTest\obj\project.assets.json</ProjectAssetsFile>
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot> <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\admin\.nuget\packages\;C:\Program Files\dotnet\sdk\NuGetFallbackFolder</NuGetPackageFolders> <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Administrator\.nuget\packages\;C:\Program Files\dotnet\sdk\NuGetFallbackFolder</NuGetPackageFolders>
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle> <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">4.8.0</NuGetToolVersion> <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">4.9.2</NuGetToolVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects> <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
</PropertyGroup> </PropertyGroup>
<ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' "> <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<Import Project="C:\Program Files\dotnet\sdk\NuGetFallbackFolder\microsoft.netcore.app\2.0.0\build\netcoreapp2.0\Microsoft.NETCore.App.props" Condition="Exists('C:\Program Files\dotnet\sdk\NuGetFallbackFolder\microsoft.netcore.app\2.0.0\build\netcoreapp2.0\Microsoft.NETCore.App.props')" /> <Import Project="$(NuGetPackageRoot)microsoft.netcore.app\2.0.0\build\netcoreapp2.0\Microsoft.NETCore.App.props" Condition="Exists('$(NuGetPackageRoot)microsoft.netcore.app\2.0.0\build\netcoreapp2.0\Microsoft.NETCore.App.props')" />
<Import Project="$(NuGetPackageRoot)microsoft.entityframeworkcore.design\2.1.1\build\netcoreapp2.0\Microsoft.EntityFrameworkCore.Design.props" Condition="Exists('$(NuGetPackageRoot)microsoft.entityframeworkcore.design\2.1.1\build\netcoreapp2.0\Microsoft.EntityFrameworkCore.Design.props')" /> <Import Project="$(NuGetPackageRoot)microsoft.entityframeworkcore.design\2.1.1\build\netcoreapp2.0\Microsoft.EntityFrameworkCore.Design.props" Condition="Exists('$(NuGetPackageRoot)microsoft.entityframeworkcore.design\2.1.1\build\netcoreapp2.0\Microsoft.EntityFrameworkCore.Design.props')" />
</ImportGroup> </ImportGroup>
<PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<PkgMicrosoft_EntityFrameworkCore_Tools Condition=" '$(PkgMicrosoft_EntityFrameworkCore_Tools)' == '' ">C:\Users\Administrator\.nuget\packages\microsoft.entityframeworkcore.tools\2.1.1</PkgMicrosoft_EntityFrameworkCore_Tools>
</PropertyGroup>
</Project> </Project>
\ No newline at end of file
23.GHABTest/GHABTest/obj/GHABTest.csproj.nuget.g.targets
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
</PropertyGroup> </PropertyGroup>
<ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' "> <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<Import Project="$(NuGetPackageRoot)netstandard.library\2.0.0\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('$(NuGetPackageRoot)netstandard.library\2.0.0\build\netstandard2.0\NETStandard.Library.targets')" /> <Import Project="$(NuGetPackageRoot)netstandard.library\2.0.0\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('$(NuGetPackageRoot)netstandard.library\2.0.0\build\netstandard2.0\NETStandard.Library.targets')" />
<Import Project="C:\Program Files\dotnet\sdk\NuGetFallbackFolder\microsoft.netcore.app\2.0.0\build\netcoreapp2.0\Microsoft.NETCore.App.targets" Condition="Exists('C:\Program Files\dotnet\sdk\NuGetFallbackFolder\microsoft.netcore.app\2.0.0\build\netcoreapp2.0\Microsoft.NETCore.App.targets')" /> <Import Project="$(NuGetPackageRoot)microsoft.netcore.app\2.0.0\build\netcoreapp2.0\Microsoft.NETCore.App.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.netcore.app\2.0.0\build\netcoreapp2.0\Microsoft.NETCore.App.targets')" />
<Import Project="C:\Program Files\dotnet\sdk\NuGetFallbackFolder\microsoft.extensions.configuration.usersecrets\2.0.2\build\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.targets" Condition="Exists('C:\Program Files\dotnet\sdk\NuGetFallbackFolder\microsoft.extensions.configuration.usersecrets\2.0.2\build\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.targets')" /> <Import Project="$(NuGetPackageRoot)microsoft.extensions.configuration.usersecrets\2.0.2\build\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.extensions.configuration.usersecrets\2.0.2\build\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.targets')" />
<Import Project="C:\Program Files\dotnet\sdk\NuGetFallbackFolder\microsoft.aspnetcore.mvc.razor.viewcompilation\2.0.4\build\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.targets" Condition="Exists('C:\Program Files\dotnet\sdk\NuGetFallbackFolder\microsoft.aspnetcore.mvc.razor.viewcompilation\2.0.4\build\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.targets')" /> <Import Project="$(NuGetPackageRoot)microsoft.aspnetcore.mvc.razor.viewcompilation\2.0.4\build\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.aspnetcore.mvc.razor.viewcompilation\2.0.4\build\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.targets')" />
<Import Project="C:\Program Files\dotnet\sdk\NuGetFallbackFolder\microsoft.aspnetcore.all\2.0.9\build\netcoreapp2.0\Microsoft.AspNetCore.All.targets" Condition="Exists('C:\Program Files\dotnet\sdk\NuGetFallbackFolder\microsoft.aspnetcore.all\2.0.9\build\netcoreapp2.0\Microsoft.AspNetCore.All.targets')" /> <Import Project="$(NuGetPackageRoot)microsoft.aspnetcore.all\2.0.9\build\netcoreapp2.0\Microsoft.AspNetCore.All.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.aspnetcore.all\2.0.9\build\netcoreapp2.0\Microsoft.AspNetCore.All.targets')" />
</ImportGroup> </ImportGroup>
</Project> </Project>
\ No newline at end of file
23.GHABTest/GHABTest/obj/project.assets.json
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment