This commit is contained in:
2024-03-26 15:56:31 +08:00
parent 634e8b71ab
commit 0855ae42cd
547 changed files with 94818 additions and 60463 deletions

View File

@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
</startup>
<appSettings>
<add key="DbConntionString" value="Data Source=192.168.25.215\IRONINTEL;Initial Catalog=FORESIGHT_FLV_IICON004;Integrated Security=false;User ID=fi;Password=database" />
<add key="DbConntionString" value="Data Source=192.168.25.215\IRONINTEL;Initial Catalog=IRONINTEL_IRONDEV;Integrated Security=false;User ID=fi;Password=database" />
<add key="AppVersion" value="2.17.1.19" />
<add key="LastUpdateTime" value="10/17/2016 10:36:26.229" />
<add key="FleetAssetServiceAddress" value="http://192.168.25.210:5081/fleet/2/fleetsvc" />
<add key="FleetAssetServiceAddress" value="http://192.168.25.210:5081/fleet/1/fleetsvc;http://192.168.25.210:5081/fleet/2/fleetsvc" />
<add key="StartFICAlertService" value="false" />
<add key="StartFICChartSubscribeService" value="false" />
<add key="ClientSettingsProvider.ServiceUri" value="" />
@ -34,6 +34,10 @@
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ServiceProcess.ServiceController" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-7.0.0.1" newVersion="7.0.0.1" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<system.web>
@ -48,4 +52,4 @@
</providers>
</roleManager>
</system.web>
</configuration>
</configuration>

View File

@ -27,7 +27,7 @@ namespace IronIntel.Contractor
SystemParams.CreateDbObjects();
FI.FIC.FICHostEnvironment.RunInServices = true;
FI.FIC.FICHostEnvironment.RunInServices = true;
if (IsTrue(ConfigurationManager.AppSettings["StartFICAlertService"]))
{
_Alert = new AlertManagerEx();
@ -47,14 +47,7 @@ namespace IronIntel.Contractor
{
SvcMon = new ForesightMonitorServiceBase(monendpoints);
SvcMon.Category = "Fleet-FICAlert";
if (!string.IsNullOrWhiteSpace(SvcMon.ServiceInfo.Description))
{
SvcMon.ServiceInfo.Description = SvcMon.ServiceInfo.Description + "\r\n" + SystemParams.CompanyID;
}
else
{
SvcMon.ServiceInfo.Description = "Fleet FIC Alert Service - " + SystemParams.CompanyID;
}
SvcMon.Description = SystemParams.CompanyID;
SvcMon.Notes = "Fleet FIC Alert Service";
SvcMon.Start();
}

View File

@ -8,11 +8,12 @@
<OutputType>WinExe</OutputType>
<RootNamespace>IronIntel.Contractor</RootNamespace>
<AssemblyName>IronIntelSiteServiceHost</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Deterministic>true</Deterministic>
<IsWebBootstrapper>false</IsWebBootstrapper>
<TargetFrameworkProfile />
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
@ -28,6 +29,7 @@
<UseApplicationTrust>false</UseApplicationTrust>
<PublishWizardCompleted>true</PublishWizardCompleted>
<BootstrapperEnabled>true</BootstrapperEnabled>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
@ -51,7 +53,7 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>true</SignAssembly>
<SignAssembly>false</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>LHBIS.snk</AssemblyOriginatorKeyFile>
@ -71,9 +73,7 @@
<PropertyGroup>
<TargetZone>LocalIntranet</TargetZone>
</PropertyGroup>
<PropertyGroup>
<ApplicationManifest>Properties\app.manifest</ApplicationManifest>
</PropertyGroup>
<PropertyGroup />
<ItemGroup>
<Reference Include="FICBLC, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b006d6021b5c4397, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@ -97,20 +97,23 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Reflib\FIC\FICModels.dll</HintPath>
</Reference>
<Reference Include="ForesightServiceMonitorClient">
<HintPath>..\Reflib\ForesightServiceMonitorClient.dll</HintPath>
<Reference Include="FICore.std">
<HintPath>..\Reflib\FICore.std.dll</HintPath>
</Reference>
<Reference Include="Foresight.Service.Client">
<HintPath>..\Reflib\Foresight.Service.Client.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Win32.Registry, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Win32.Registry.5.0.0\lib\net461\Microsoft.Win32.Registry.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.CodeDom, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.CodeDom.6.0.0\lib\net461\System.CodeDom.dll</HintPath>
<Reference Include="System.CodeDom, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.CodeDom.7.0.0\lib\net462\System.CodeDom.dll</HintPath>
</Reference>
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="System.Diagnostics.EventLog, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Diagnostics.EventLog.6.0.0\lib\net461\System.Diagnostics.EventLog.dll</HintPath>
<Reference Include="System.Diagnostics.EventLog, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Diagnostics.EventLog.7.0.0\lib\net462\System.Diagnostics.EventLog.dll</HintPath>
</Reference>
<Reference Include="System.Management" />
<Reference Include="System.Security.AccessControl, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@ -119,8 +122,8 @@
<Reference Include="System.Security.Principal.Windows, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll</HintPath>
</Reference>
<Reference Include="System.ServiceProcess.ServiceController, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.ServiceProcess.ServiceController.6.0.0\lib\net461\System.ServiceProcess.ServiceController.dll</HintPath>
<Reference Include="System.ServiceProcess.ServiceController, Version=7.0.0.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.ServiceProcess.ServiceController.7.0.1\lib\net462\System.ServiceProcess.ServiceController.dll</HintPath>
</Reference>
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Xml.Linq" />
@ -141,7 +144,6 @@
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
<None Include="IronIntelSiteServiceHost_TemporaryKey.pfx" />
<None Include="LHBIS.snk" />
<None Include="packages.config" />
<None Include="Properties\app.manifest" />
@ -156,12 +158,6 @@
<Name>IronIntelContractorSiteLib</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="..\Site\fic\Languages\en-us\textres.xml">
<Link>Languages\en-us\textres.xml</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include=".NETFramework,Version=v4.7.2">
<Visible>False</Visible>
@ -174,15 +170,5 @@
<Install>false</Install>
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="..\Site\fic\Languages\fr-fr\textres.xml">
<Link>Languages\fr-fr\textres.xml</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</EmbeddedResource>
<EmbeddedResource Include="..\Site\fic\Languages\zh-chs\textres.xml">
<Link>Languages\zh-chs\textres.xml</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</EmbeddedResource>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

View File

@ -15,11 +15,7 @@ namespace IronIntel.Contractor
static void Main()
{
IronIntel.Contractor.IronIntelHost.Init();
ServiceBase[] ServicesToRun;
ServicesToRun = new ServiceBase[]
{
new IronIntelService()
};
ServiceBase[] ServicesToRun = new ServiceBase[] { new IronIntelService() };
ServiceBase.Run(ServicesToRun);
}
}

View File

@ -33,4 +33,4 @@ using System.Runtime.InteropServices;
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("3.0.0.0")]
[assembly: AssemblyFileVersion("22.11.21")]
[assembly: AssemblyFileVersion("24.1.19")]

View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Win32.Registry" version="5.0.0" targetFramework="net472" />
<package id="System.CodeDom" version="7.0.0" targetFramework="net48" />
<package id="System.Diagnostics.EventLog" version="7.0.0" targetFramework="net48" />
<package id="System.Management" version="7.0.2" targetFramework="net48" />
<package id="System.Security.AccessControl" version="6.0.0" targetFramework="net472" />
<package id="System.Security.Principal.Windows" version="5.0.0" targetFramework="net472" />
<package id="System.ServiceProcess.ServiceController" version="7.0.1" targetFramework="net48" />
</packages>