Home
This commit is contained in:
parent
52eaaaac79
commit
cffb8a180b
Binary file not shown.
@ -4,7 +4,7 @@
|
|||||||
<Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
|
<Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
|
||||||
<Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath>
|
<Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath>
|
||||||
<ActiveDebugProfile>ApiServer</ActiveDebugProfile>
|
<ActiveDebugProfile>ApiServer</ActiveDebugProfile>
|
||||||
<NameOfLastUsedPublishProfile>D:\GIT\ASCKU_PC\ApiServer\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
|
<NameOfLastUsedPublishProfile>F:\GIT\ASCKU_PC\ApiServer\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||||
<DebuggerFlavor>ProjectDebugger</DebuggerFlavor>
|
<DebuggerFlavor>ProjectDebugger</DebuggerFlavor>
|
||||||
|
@ -6,27 +6,26 @@ using DataClient.Struct;
|
|||||||
|
|
||||||
namespace ApiServer.ApiStruct
|
namespace ApiServer.ApiStruct
|
||||||
{
|
{
|
||||||
public class PasportCheckRep
|
public class PasportCheckApi
|
||||||
{
|
{
|
||||||
public bool HasData { get; set; }
|
public bool Status { get; set; }
|
||||||
public DateTime DateAndTime { get; set; }
|
public DateTime DateAndTime { get; set; }
|
||||||
public string Name { get; set; }
|
public string Name { get; set; }
|
||||||
}
|
}
|
||||||
public class PasportCheckReq
|
public class PasportCheckClient
|
||||||
{
|
{
|
||||||
public bool Status { get; set; } = true;
|
public bool Status { get; set; }
|
||||||
public bool Exist { get; set; }
|
public bool Exist { get; set; }
|
||||||
|
public ulong PaspSum { get; set; }
|
||||||
|
}
|
||||||
|
public class PasportCreateApi
|
||||||
|
{
|
||||||
|
public bool Status { get; set; }
|
||||||
public Pasport Pasp { get; set; }
|
public Pasport Pasp { get; set; }
|
||||||
}
|
}
|
||||||
public class PasportCreateRep
|
public class PasportCreateClient
|
||||||
{
|
{
|
||||||
public bool HasData { get; set; }
|
public bool Status { get; set; }
|
||||||
public DateTime DateAndTime { get; set; }
|
|
||||||
public string Name { get; set; }
|
|
||||||
public Pasport Pasp { get; set; }
|
|
||||||
}
|
|
||||||
public class PasportCreateReq
|
|
||||||
{
|
|
||||||
public bool Status { get; set; } = true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -18,62 +18,89 @@ namespace ApiServer.Controllers
|
|||||||
public class PasportController : ControllerBase
|
public class PasportController : ControllerBase
|
||||||
{
|
{
|
||||||
private Logger log = LogManager.GetCurrentClassLogger();
|
private Logger log = LogManager.GetCurrentClassLogger();
|
||||||
|
|
||||||
[HttpPost, Route("check")]
|
[HttpPost, Route("check")]
|
||||||
public PasportCheckReq Check([FromBody] object value)
|
public PasportCheckClient Check([FromBody] object value)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var reply = JsonConvert.DeserializeObject<PasportCheckRep>(value.ToString());
|
var getResult = JsonConvert.DeserializeObject<PasportCheckApi>(value.ToString());
|
||||||
if (!reply.HasData || string.IsNullOrEmpty(reply.Name)) throw new Exception();
|
if (!getResult.Status || string.IsNullOrEmpty(getResult.Name))
|
||||||
|
{
|
||||||
|
log.Warn("Wrong answer.");
|
||||||
|
return new PasportCheckClient();
|
||||||
|
}
|
||||||
|
|
||||||
var paspName =
|
var paspName =
|
||||||
reply.DateAndTime.Hour.ToString("D2") +
|
getResult.DateAndTime.Hour.ToString("D2") +
|
||||||
reply.DateAndTime.Minute.ToString("D2") +
|
getResult.DateAndTime.Minute.ToString("D2") +
|
||||||
reply.DateAndTime.Second.ToString("D2") +
|
getResult.DateAndTime.Second.ToString("D2") +
|
||||||
"-" + reply.Name;
|
"-" + getResult.Name;
|
||||||
var paspDir = Path.Combine(
|
var paspDir = Path.Combine(
|
||||||
Directory.GetCurrentDirectory(),
|
Directory.GetCurrentDirectory(),
|
||||||
"data", "pasport",
|
"data", "pasport",
|
||||||
reply.DateAndTime.Year.ToString("D4"),
|
getResult.DateAndTime.Year.ToString("D4"),
|
||||||
reply.DateAndTime.Month.ToString("D2"),
|
getResult.DateAndTime.Month.ToString("D2"),
|
||||||
reply.DateAndTime.Day.ToString("D2"),
|
getResult.DateAndTime.Day.ToString("D2"),
|
||||||
paspName);
|
paspName);
|
||||||
|
log.Info("Search pasport: " + paspDir);
|
||||||
if (!System.IO.File.Exists(paspDir))
|
if (!System.IO.File.Exists(paspDir))
|
||||||
return new PasportCheckReq { Status = true, Exist = false };
|
{
|
||||||
return new PasportCheckReq { Status = true, Exist = true, Pasp = new Pasport(System.IO.File.ReadAllBytes(paspDir)) };
|
log.Info("Psport not exist: " + paspDir);
|
||||||
|
return new PasportCheckClient { Status = true, Exist = false, PaspSum = 0 };
|
||||||
|
}
|
||||||
|
var pasport = System.IO.File.ReadAllBytes(paspDir);
|
||||||
|
ulong paspResult = 0;
|
||||||
|
foreach (var b in pasport)
|
||||||
|
paspResult += b;
|
||||||
|
log.Info("Send pasport size: " + paspResult + " | " + paspDir);
|
||||||
|
return new PasportCheckClient { Status = true, Exist = true, PaspSum = paspResult };
|
||||||
|
}
|
||||||
|
catch(Exception e)
|
||||||
|
{
|
||||||
|
log.Warn(e);
|
||||||
|
return new PasportCheckClient();
|
||||||
}
|
}
|
||||||
catch { return new PasportCheckReq { Status = false }; }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
[HttpPost, Route("create")]
|
[HttpPost, Route("create")]
|
||||||
public PasportCreateReq Create([FromBody] object value)
|
public PasportCreateClient Create([FromBody] object value)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var reply = JsonConvert.DeserializeObject<PasportCreateRep>(value.ToString());
|
var getResult = JsonConvert.DeserializeObject<PasportCreateApi>(value.ToString());
|
||||||
if (!reply.HasData || string.IsNullOrEmpty(reply.Name)) throw new Exception();
|
if (!getResult.Status ||
|
||||||
|
getResult.Pasp == null ||
|
||||||
|
!getResult.Pasp.HasData)
|
||||||
|
{
|
||||||
|
log.Warn("Wrong answer.");
|
||||||
|
return new PasportCreateClient();
|
||||||
|
}
|
||||||
var paspName =
|
var paspName =
|
||||||
reply.DateAndTime.Hour.ToString("D2") +
|
getResult.Pasp.dEnd.Value.Hour.ToString("D2") +
|
||||||
reply.DateAndTime.Minute.ToString("D2") +
|
getResult.Pasp.dEnd.Value.Minute.ToString("D2") +
|
||||||
reply.DateAndTime.Second.ToString("D2") +
|
getResult.Pasp.dEnd.Value.Second.ToString("D2") +
|
||||||
"-" + reply.Name;
|
"-" + (string.IsNullOrEmpty(getResult.Pasp.nplav) ?
|
||||||
|
getResult.Pasp.numVDP.Value.ToString("D2") :
|
||||||
|
getResult.Pasp.nplav);
|
||||||
var dir = Path.Combine(
|
var dir = Path.Combine(
|
||||||
Directory.GetCurrentDirectory(),
|
Directory.GetCurrentDirectory(),
|
||||||
"data", "pasport",
|
"data", "pasport",
|
||||||
reply.DateAndTime.Year.ToString("D4"),
|
getResult.Pasp.dEnd.Value.Year.ToString("D4"),
|
||||||
reply.DateAndTime.Month.ToString("D2"),
|
getResult.Pasp.dEnd.Value.Month.ToString("D2"),
|
||||||
reply.DateAndTime.Day.ToString("D2"));
|
getResult.Pasp.dEnd.Value.Day.ToString("D2"));
|
||||||
var paspDir = Path.Combine(dir, paspName);
|
var paspDir = Path.Combine(dir, paspName);
|
||||||
|
|
||||||
if (!Directory.Exists(dir))
|
if (!Directory.Exists(dir))
|
||||||
Directory.CreateDirectory(dir);
|
Directory.CreateDirectory(dir);
|
||||||
System.IO.File.WriteAllBytes(paspDir, reply.Pasp.PaspByte);
|
System.IO.File.WriteAllBytes(paspDir, getResult.Pasp.PaspByte);
|
||||||
|
log.Info("Save pasport: " + paspDir);
|
||||||
return new PasportCreateReq { Status = true };
|
return new PasportCreateClient { Status = true };
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
log.Warn(e);
|
||||||
|
return new PasportCreateClient();
|
||||||
}
|
}
|
||||||
catch { return new PasportCreateReq { Status = false }; }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -4,7 +4,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
|
|||||||
-->
|
-->
|
||||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<History>True|2021-07-31T12:43:14.2797709Z;False|2021-07-31T17:41:49.3152422+05:00;True|2021-07-31T14:07:45.4057263+05:00;False|2021-07-31T13:53:38.4952669+05:00;</History>
|
<History>True|2021-08-01T14:33:24.0605718Z;True|2021-08-01T19:29:09.0622642+05:00;True|2021-08-01T16:14:00.2837619+05:00;True|2021-07-31T17:43:14.2797709+05:00;False|2021-07-31T17:41:49.3152422+05:00;True|2021-07-31T14:07:45.4057263+05:00;False|2021-07-31T13:53:38.4952669+05:00;</History>
|
||||||
<_PublishTargetUrl>D:\GIT\ASCKU_PC\ApiServer\bin\Release\</_PublishTargetUrl>
|
<_PublishTargetUrl>F:\GIT\ASCKU_PC\ApiServer\bin\Release\</_PublishTargetUrl>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
</Project>
|
</Project>
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,11 +1,10 @@
|
|||||||
{
|
{
|
||||||
"runtimeOptions": {
|
"runtimeOptions": {
|
||||||
"additionalProbingPaths": [
|
"additionalProbingPaths": [
|
||||||
"C:\\Users\\google\\.dotnet\\store\\|arch|\\|tfm|",
|
"C:\\Users\\Admin\\.dotnet\\store\\|arch|\\|tfm|",
|
||||||
"C:\\Users\\google\\.nuget\\packages",
|
"C:\\Users\\Admin\\.nuget\\packages",
|
||||||
"C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
|
"C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
|
||||||
"C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet",
|
"C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet"
|
||||||
"C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
|
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,25 +1,24 @@
|
|||||||
{
|
{
|
||||||
"format": 1,
|
"format": 1,
|
||||||
"restore": {
|
"restore": {
|
||||||
"D:\\GIT\\ASCKU_PC\\ApiServer\\ApiServer.csproj": {}
|
"F:\\GIT\\ASCKU_PC\\ApiServer\\ApiServer.csproj": {}
|
||||||
},
|
},
|
||||||
"projects": {
|
"projects": {
|
||||||
"D:\\GIT\\ASCKU_PC\\ApiServer\\ApiServer.csproj": {
|
"F:\\GIT\\ASCKU_PC\\ApiServer\\ApiServer.csproj": {
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"restore": {
|
"restore": {
|
||||||
"projectUniqueName": "D:\\GIT\\ASCKU_PC\\ApiServer\\ApiServer.csproj",
|
"projectUniqueName": "F:\\GIT\\ASCKU_PC\\ApiServer\\ApiServer.csproj",
|
||||||
"projectName": "ApiServer",
|
"projectName": "ApiServer",
|
||||||
"projectPath": "D:\\GIT\\ASCKU_PC\\ApiServer\\ApiServer.csproj",
|
"projectPath": "F:\\GIT\\ASCKU_PC\\ApiServer\\ApiServer.csproj",
|
||||||
"packagesPath": "C:\\Users\\google\\.nuget\\packages\\",
|
"packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\",
|
||||||
"outputPath": "D:\\GIT\\ASCKU_PC\\ApiServer\\obj\\",
|
"outputPath": "F:\\GIT\\ASCKU_PC\\ApiServer\\obj\\",
|
||||||
"projectStyle": "PackageReference",
|
"projectStyle": "PackageReference",
|
||||||
"fallbackFolders": [
|
"fallbackFolders": [
|
||||||
"C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
|
"C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
|
||||||
"C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\",
|
"C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
|
||||||
"C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
|
|
||||||
],
|
],
|
||||||
"configFilePaths": [
|
"configFilePaths": [
|
||||||
"C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config",
|
"C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config",
|
||||||
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
|
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
|
||||||
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
|
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
|
||||||
"C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
|
"C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
|
||||||
@ -35,8 +34,8 @@
|
|||||||
"net5.0": {
|
"net5.0": {
|
||||||
"targetAlias": "net5.0",
|
"targetAlias": "net5.0",
|
||||||
"projectReferences": {
|
"projectReferences": {
|
||||||
"D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj": {
|
"F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj": {
|
||||||
"projectPath": "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj"
|
"projectPath": "F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -78,26 +77,25 @@
|
|||||||
"privateAssets": "all"
|
"privateAssets": "all"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
|
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj": {
|
"F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj": {
|
||||||
"version": "0.0.3",
|
"version": "0.0.3",
|
||||||
"restore": {
|
"restore": {
|
||||||
"projectUniqueName": "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj",
|
"projectUniqueName": "F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj",
|
||||||
"projectName": "DataClient",
|
"projectName": "DataClient",
|
||||||
"projectPath": "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj",
|
"projectPath": "F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj",
|
||||||
"packagesPath": "C:\\Users\\google\\.nuget\\packages\\",
|
"packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\",
|
||||||
"outputPath": "D:\\GIT\\ASCKU_PC\\DataClient\\obj\\",
|
"outputPath": "F:\\GIT\\ASCKU_PC\\DataClient\\obj\\",
|
||||||
"projectStyle": "PackageReference",
|
"projectStyle": "PackageReference",
|
||||||
"fallbackFolders": [
|
"fallbackFolders": [
|
||||||
"C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
|
"C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
|
||||||
"C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\",
|
"C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
|
||||||
"C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
|
|
||||||
],
|
],
|
||||||
"configFilePaths": [
|
"configFilePaths": [
|
||||||
"C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config",
|
"C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config",
|
||||||
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
|
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
|
||||||
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
|
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
|
||||||
"C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
|
"C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
|
||||||
@ -153,7 +151,7 @@
|
|||||||
"privateAssets": "all"
|
"privateAssets": "all"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
|
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -5,15 +5,14 @@
|
|||||||
<RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
|
<RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
|
||||||
<ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
|
<ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
|
||||||
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
|
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
|
||||||
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\google\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\;C:\Program Files\dotnet\sdk\NuGetFallbackFolder</NuGetPackageFolders>
|
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Admin\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\</NuGetPackageFolders>
|
||||||
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
|
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
|
||||||
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.10.0</NuGetToolVersion>
|
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.10.0</NuGetToolVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
|
<ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
|
||||||
<SourceRoot Include="C:\Users\google\.nuget\packages\" />
|
<SourceRoot Include="C:\Users\Admin\.nuget\packages\" />
|
||||||
<SourceRoot Include="C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
|
<SourceRoot Include="C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
|
||||||
<SourceRoot Include="C:\Program Files (x86)\Microsoft\Xamarin\NuGet\" />
|
<SourceRoot Include="C:\Program Files (x86)\Microsoft\Xamarin\NuGet\" />
|
||||||
<SourceRoot Include="C:\Program Files\dotnet\sdk\NuGetFallbackFolder\" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
|
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
|
||||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1 +1 @@
|
|||||||
3105bb879a54082cdc433603df634090df709038
|
d29ca1fc6ac51c211fa6b3f4cdcf6f83a5b03d11
|
||||||
|
@ -29,3 +29,34 @@ D:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\ApiServer.dll
|
|||||||
D:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\ref\ApiServer.dll
|
D:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\ref\ApiServer.dll
|
||||||
D:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\ApiServer.pdb
|
D:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\ApiServer.pdb
|
||||||
D:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\ApiServer.genruntimeconfig.cache
|
D:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\ApiServer.genruntimeconfig.cache
|
||||||
|
F:\GIT\ASCKU_PC\ApiServer\bin\Release\net5.0\appsettings.Development.json
|
||||||
|
F:\GIT\ASCKU_PC\ApiServer\bin\Release\net5.0\appsettings.json
|
||||||
|
F:\GIT\ASCKU_PC\ApiServer\bin\Release\net5.0\ApiServer.exe
|
||||||
|
F:\GIT\ASCKU_PC\ApiServer\bin\Release\net5.0\Config\analog\default.json
|
||||||
|
F:\GIT\ASCKU_PC\ApiServer\bin\Release\net5.0\Config\config.json
|
||||||
|
F:\GIT\ASCKU_PC\ApiServer\bin\Release\net5.0\ApiServer.deps.json
|
||||||
|
F:\GIT\ASCKU_PC\ApiServer\bin\Release\net5.0\ApiServer.runtimeconfig.json
|
||||||
|
F:\GIT\ASCKU_PC\ApiServer\bin\Release\net5.0\ApiServer.runtimeconfig.dev.json
|
||||||
|
F:\GIT\ASCKU_PC\ApiServer\bin\Release\net5.0\ApiServer.dll
|
||||||
|
F:\GIT\ASCKU_PC\ApiServer\bin\Release\net5.0\ref\ApiServer.dll
|
||||||
|
F:\GIT\ASCKU_PC\ApiServer\bin\Release\net5.0\ApiServer.pdb
|
||||||
|
F:\GIT\ASCKU_PC\ApiServer\bin\Release\net5.0\Newtonsoft.Json.dll
|
||||||
|
F:\GIT\ASCKU_PC\ApiServer\bin\Release\net5.0\NLog.dll
|
||||||
|
F:\GIT\ASCKU_PC\ApiServer\bin\Release\net5.0\NLog.Extensions.Logging.dll
|
||||||
|
F:\GIT\ASCKU_PC\ApiServer\bin\Release\net5.0\DataClient.dll
|
||||||
|
F:\GIT\ASCKU_PC\ApiServer\bin\Release\net5.0\DataClient.pdb
|
||||||
|
F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\ApiServer.csproj.AssemblyReference.cache
|
||||||
|
F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\ApiServer.GeneratedMSBuildEditorConfig.editorconfig
|
||||||
|
F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\ApiServer.AssemblyInfoInputs.cache
|
||||||
|
F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\ApiServer.AssemblyInfo.cs
|
||||||
|
F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\ApiServer.csproj.CoreCompileInputs.cache
|
||||||
|
F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\ApiServer.MvcApplicationPartsAssemblyInfo.cache
|
||||||
|
F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\staticwebassets\ApiServer.StaticWebAssets.Manifest.cache
|
||||||
|
F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\staticwebassets\ApiServer.StaticWebAssets.xml
|
||||||
|
F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\scopedcss\bundle\ApiServer.styles.css
|
||||||
|
F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\ApiServer.RazorTargetAssemblyInfo.cache
|
||||||
|
F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\ApiServer.csproj.CopyComplete
|
||||||
|
F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\ApiServer.dll
|
||||||
|
F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\ref\ApiServer.dll
|
||||||
|
F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\ApiServer.pdb
|
||||||
|
F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\ApiServer.genruntimeconfig.cache
|
||||||
|
Binary file not shown.
@ -1 +1 @@
|
|||||||
0a8c2f7fcebea58b73a53bb1c0a2aa1056202aba
|
b0f840db997650a7593b11f7a1ba44023edfe205
|
||||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
14
ApiServer/obj/Release/net5.0/PublishOutputs.d3aa5e4bdb.txt
Normal file
14
ApiServer/obj/Release/net5.0/PublishOutputs.d3aa5e4bdb.txt
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\PubTmp\Out\Config\analog\default.json
|
||||||
|
F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\PubTmp\Out\Config\config.json
|
||||||
|
F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\PubTmp\Out\ApiServer.exe
|
||||||
|
F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\PubTmp\Out\appsettings.Development.json
|
||||||
|
F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\PubTmp\Out\appsettings.json
|
||||||
|
F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\PubTmp\Out\ApiServer.dll
|
||||||
|
F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\PubTmp\Out\ApiServer.deps.json
|
||||||
|
F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\PubTmp\Out\ApiServer.runtimeconfig.json
|
||||||
|
F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\PubTmp\Out\ApiServer.pdb
|
||||||
|
F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\PubTmp\Out\Newtonsoft.Json.dll
|
||||||
|
F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\PubTmp\Out\NLog.dll
|
||||||
|
F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\PubTmp\Out\NLog.Extensions.Logging.dll
|
||||||
|
F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\PubTmp\Out\DataClient.dll
|
||||||
|
F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\PubTmp\Out\DataClient.pdb
|
Binary file not shown.
Binary file not shown.
@ -381,27 +381,25 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"packageFolders": {
|
"packageFolders": {
|
||||||
"C:\\Users\\google\\.nuget\\packages\\": {},
|
"C:\\Users\\Admin\\.nuget\\packages\\": {},
|
||||||
"C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {},
|
"C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {},
|
||||||
"C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {},
|
"C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}
|
||||||
"C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {}
|
|
||||||
},
|
},
|
||||||
"project": {
|
"project": {
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"restore": {
|
"restore": {
|
||||||
"projectUniqueName": "D:\\GIT\\ASCKU_PC\\ApiServer\\ApiServer.csproj",
|
"projectUniqueName": "F:\\GIT\\ASCKU_PC\\ApiServer\\ApiServer.csproj",
|
||||||
"projectName": "ApiServer",
|
"projectName": "ApiServer",
|
||||||
"projectPath": "D:\\GIT\\ASCKU_PC\\ApiServer\\ApiServer.csproj",
|
"projectPath": "F:\\GIT\\ASCKU_PC\\ApiServer\\ApiServer.csproj",
|
||||||
"packagesPath": "C:\\Users\\google\\.nuget\\packages\\",
|
"packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\",
|
||||||
"outputPath": "D:\\GIT\\ASCKU_PC\\ApiServer\\obj\\",
|
"outputPath": "F:\\GIT\\ASCKU_PC\\ApiServer\\obj\\",
|
||||||
"projectStyle": "PackageReference",
|
"projectStyle": "PackageReference",
|
||||||
"fallbackFolders": [
|
"fallbackFolders": [
|
||||||
"C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
|
"C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
|
||||||
"C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\",
|
"C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
|
||||||
"C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
|
|
||||||
],
|
],
|
||||||
"configFilePaths": [
|
"configFilePaths": [
|
||||||
"C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config",
|
"C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config",
|
||||||
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
|
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
|
||||||
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
|
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
|
||||||
"C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
|
"C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
|
||||||
@ -417,8 +415,8 @@
|
|||||||
"net5.0": {
|
"net5.0": {
|
||||||
"targetAlias": "net5.0",
|
"targetAlias": "net5.0",
|
||||||
"projectReferences": {
|
"projectReferences": {
|
||||||
"D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj": {
|
"F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj": {
|
||||||
"projectPath": "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj"
|
"projectPath": "F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -460,7 +458,7 @@
|
|||||||
"privateAssets": "all"
|
"privateAssets": "all"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
|
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,19 +1,19 @@
|
|||||||
{
|
{
|
||||||
"version": 2,
|
"version": 2,
|
||||||
"dgSpecHash": "hTY5ZT/WYp2p43FfX3KnXAnDiB/J5VtZtww7gAIXsFl9arYKmuE7Kv3LxQJ/AR8R5Z4ajxBuJMpvWXDq7mxwrA==",
|
"dgSpecHash": "c7G+nOZ81H331zux09OXgbP7HT0d7L0fH0RWR7PzDQiuRE4M8wC0X3SJ0DcA3WX51Fx127vns1AXmLvzg6K8jQ==",
|
||||||
"success": true,
|
"success": true,
|
||||||
"projectFilePath": "D:\\GIT\\ASCKU_PC\\ApiServer\\ApiServer.csproj",
|
"projectFilePath": "F:\\GIT\\ASCKU_PC\\ApiServer\\ApiServer.csproj",
|
||||||
"expectedPackageFiles": [
|
"expectedPackageFiles": [
|
||||||
"C:\\Users\\google\\.nuget\\packages\\microsoft.extensions.configuration.abstractions\\5.0.0\\microsoft.extensions.configuration.abstractions.5.0.0.nupkg.sha512",
|
"C:\\Users\\Admin\\.nuget\\packages\\microsoft.extensions.configuration.abstractions\\5.0.0\\microsoft.extensions.configuration.abstractions.5.0.0.nupkg.sha512",
|
||||||
"C:\\Users\\google\\.nuget\\packages\\microsoft.extensions.dependencyinjection\\5.0.0\\microsoft.extensions.dependencyinjection.5.0.0.nupkg.sha512",
|
"C:\\Users\\Admin\\.nuget\\packages\\microsoft.extensions.dependencyinjection\\5.0.0\\microsoft.extensions.dependencyinjection.5.0.0.nupkg.sha512",
|
||||||
"C:\\Users\\google\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\5.0.0\\microsoft.extensions.dependencyinjection.abstractions.5.0.0.nupkg.sha512",
|
"C:\\Users\\Admin\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\5.0.0\\microsoft.extensions.dependencyinjection.abstractions.5.0.0.nupkg.sha512",
|
||||||
"C:\\Users\\google\\.nuget\\packages\\microsoft.extensions.logging\\5.0.0\\microsoft.extensions.logging.5.0.0.nupkg.sha512",
|
"C:\\Users\\Admin\\.nuget\\packages\\microsoft.extensions.logging\\5.0.0\\microsoft.extensions.logging.5.0.0.nupkg.sha512",
|
||||||
"C:\\Users\\google\\.nuget\\packages\\microsoft.extensions.logging.abstractions\\5.0.0\\microsoft.extensions.logging.abstractions.5.0.0.nupkg.sha512",
|
"C:\\Users\\Admin\\.nuget\\packages\\microsoft.extensions.logging.abstractions\\5.0.0\\microsoft.extensions.logging.abstractions.5.0.0.nupkg.sha512",
|
||||||
"C:\\Users\\google\\.nuget\\packages\\microsoft.extensions.options\\5.0.0\\microsoft.extensions.options.5.0.0.nupkg.sha512",
|
"C:\\Users\\Admin\\.nuget\\packages\\microsoft.extensions.options\\5.0.0\\microsoft.extensions.options.5.0.0.nupkg.sha512",
|
||||||
"C:\\Users\\google\\.nuget\\packages\\microsoft.extensions.primitives\\5.0.0\\microsoft.extensions.primitives.5.0.0.nupkg.sha512",
|
"C:\\Users\\Admin\\.nuget\\packages\\microsoft.extensions.primitives\\5.0.0\\microsoft.extensions.primitives.5.0.0.nupkg.sha512",
|
||||||
"C:\\Users\\google\\.nuget\\packages\\newtonsoft.json\\13.0.1\\newtonsoft.json.13.0.1.nupkg.sha512",
|
"C:\\Users\\Admin\\.nuget\\packages\\newtonsoft.json\\13.0.1\\newtonsoft.json.13.0.1.nupkg.sha512",
|
||||||
"C:\\Users\\google\\.nuget\\packages\\nlog\\4.7.10\\nlog.4.7.10.nupkg.sha512",
|
"C:\\Users\\Admin\\.nuget\\packages\\nlog\\4.7.10\\nlog.4.7.10.nupkg.sha512",
|
||||||
"C:\\Users\\google\\.nuget\\packages\\nlog.extensions.logging\\1.7.2\\nlog.extensions.logging.1.7.2.nupkg.sha512"
|
"C:\\Users\\Admin\\.nuget\\packages\\nlog.extensions.logging\\1.7.2\\nlog.extensions.logging.1.7.2.nupkg.sha512"
|
||||||
],
|
],
|
||||||
"logs": []
|
"logs": []
|
||||||
}
|
}
|
@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<_LastSelectedProfileId>D:\GIT\ASCKU_PC\ClientCollector\Properties\PublishProfiles\FolderProfile.pubxml</_LastSelectedProfileId>
|
<_LastSelectedProfileId>F:\GIT\ASCKU_PC\ClientCollector\Properties\PublishProfiles\FolderProfile.pubxml</_LastSelectedProfileId>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
</Project>
|
</Project>
|
@ -6,27 +6,26 @@ using DataClient.Struct;
|
|||||||
|
|
||||||
namespace ApiServer.ApiStruct
|
namespace ApiServer.ApiStruct
|
||||||
{
|
{
|
||||||
public class PasportCheckRep
|
public class PasportCheckApi
|
||||||
{
|
{
|
||||||
public bool HasData { get; set; }
|
public bool Status { get; set; }
|
||||||
public DateTime DateAndTime { get; set; }
|
public DateTime DateAndTime { get; set; }
|
||||||
public string Name { get; set; }
|
public string Name { get; set; }
|
||||||
}
|
}
|
||||||
public class PasportCheckReq
|
public class PasportCheckClient
|
||||||
{
|
{
|
||||||
public bool Status { get; set; } = true;
|
public bool Status { get; set; }
|
||||||
public bool Exist { get; set; }
|
public bool Exist { get; set; }
|
||||||
|
public ulong PaspSum { get; set; }
|
||||||
|
}
|
||||||
|
public class PasportCreateApi
|
||||||
|
{
|
||||||
|
public bool Status { get; set; }
|
||||||
public Pasport Pasp { get; set; }
|
public Pasport Pasp { get; set; }
|
||||||
}
|
}
|
||||||
public class PasportCreateRep
|
public class PasportCreateClient
|
||||||
{
|
{
|
||||||
public bool HasData { get; set; }
|
public bool Status { get; set; }
|
||||||
public DateTime DateAndTime { get; set; }
|
|
||||||
public string Name { get; set; }
|
|
||||||
public Pasport Pasp { get; set; }
|
|
||||||
}
|
|
||||||
public class PasportCreateReq
|
|
||||||
{
|
|
||||||
public bool Status { get; set; } = true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -13,6 +13,7 @@ using ApiServer.ApiStruct;
|
|||||||
using Newtonsoft.Json;
|
using Newtonsoft.Json;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
|
||||||
namespace ClientCollector
|
namespace ClientCollector
|
||||||
{
|
{
|
||||||
@ -24,148 +25,136 @@ namespace ClientCollector
|
|||||||
{
|
{
|
||||||
LogConf();
|
LogConf();
|
||||||
log.Info("Start Client Collector.");
|
log.Info("Start Client Collector.");
|
||||||
while (true)
|
Task taskPasp = null;
|
||||||
|
while (true)
|
||||||
|
{
|
||||||
|
if (taskPasp == null || taskPasp.IsCompleted)
|
||||||
|
{
|
||||||
|
log.Info("Start Pasport Task.");
|
||||||
|
taskPasp = Task.Run(WorkPasport);
|
||||||
|
}
|
||||||
|
log.Info("Wait tasks.");
|
||||||
|
Task.WaitAny(new Task[] { taskPasp });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static async void WorkPasport()
|
||||||
|
{
|
||||||
|
var nameCurrDate = "pasport";
|
||||||
|
var currDate = GetCurrData(nameCurrDate);
|
||||||
|
if (!currDate.HasValue)
|
||||||
|
currDate = new DateTime(2001, 01, 01);
|
||||||
|
NETClient netClient = new NETClient("10.10.45.152", 1070);
|
||||||
|
while (currDate.Value < DateTime.Now.AddDays(-1))
|
||||||
{
|
{
|
||||||
NETClient nc = new NETClient("10.10.45.152", 1070);
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
log.Info("Get Years.");
|
var currDir =
|
||||||
var dir_1lvl = nc.Full_Dir_Browse();
|
currDate.Value.Year.ToString("D4") + '/' +
|
||||||
foreach (var dir_1lvl_val in dir_1lvl)
|
currDate.Value.Month.ToString("D2") + '/' +
|
||||||
{
|
currDate.Value.Day.ToString("D2");
|
||||||
if (dir_1lvl_val == "current") continue;
|
log.Info("Get pasports from: " + currDir);
|
||||||
log.Info("Get Month of " + dir_1lvl_val + ".");
|
while (!netClient.Connected())
|
||||||
var dir_2lvl = nc.Full_Dir_Browse(dir_1lvl_val);
|
if (!netClient.Connect())
|
||||||
foreach (var dir_2lvl_val in dir_2lvl)
|
|
||||||
{
|
{
|
||||||
log.Info("Get Days of " + dir_2lvl_val + ".");
|
netClient.Close();
|
||||||
var dir_3lvl = nc.Full_Dir_Browse(dir_2lvl_val);
|
log.Warn("Can't connect to STP.");
|
||||||
foreach (var dir_3lvl_val in dir_3lvl)
|
await Task.Delay(10000);
|
||||||
{
|
|
||||||
log.Info("Get Pasps of " + dir_3lvl_val + ".");
|
|
||||||
var pasp_list = nc.Full_Dir_Browse(dir_3lvl_val);
|
|
||||||
foreach (var pasp_dir in pasp_list)
|
|
||||||
{
|
|
||||||
int count = 0;
|
|
||||||
do
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
log.Info("Get Pasp " + pasp_dir + ". Try " + (count + 1));
|
|
||||||
var pasp = nc.Full_Pasp_Download(pasp_dir);
|
|
||||||
if (pasp.HasData && SendPasport(pasp))
|
|
||||||
{
|
|
||||||
log.Info("Send OK.");
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
log.Warn("Can't send " + pasp_dir + ".");
|
|
||||||
Task.Delay(1000 * 60 * 5);
|
|
||||||
count = 0;
|
|
||||||
}
|
|
||||||
catch (Exception e) { log.Warn(e.Message); }
|
|
||||||
if (nc.Connect())
|
|
||||||
{
|
|
||||||
nc.Close();
|
|
||||||
count++;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
log.Warn("Can't connect to STP.");
|
|
||||||
Task.Delay(1000 * 60 * 5);
|
|
||||||
count = 0;
|
|
||||||
}
|
|
||||||
} while (count < 5);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
var currPasports = netClient.Full_Dir_Browse(currDir);
|
||||||
|
netClient.Close();
|
||||||
while (true)
|
if (currPasports == null)
|
||||||
|
currPasports = Array.Empty<string>();
|
||||||
|
foreach (var paspDir in currPasports)
|
||||||
{
|
{
|
||||||
log.Info("Wait next day.");
|
var count = 0;
|
||||||
var currDate = DateTime.Now;
|
do
|
||||||
while (currDate.ToString("yyyy.MM.dd") == DateTime.Now.ToString("yyyy.MM.dd"))
|
|
||||||
Task.Delay(1000 * 60 * 60);
|
|
||||||
try
|
|
||||||
{
|
{
|
||||||
var dir_3lvl_val =
|
try
|
||||||
currDate.Year.ToString("D4") + "/" +
|
|
||||||
currDate.Month.ToString("D2") + "/" +
|
|
||||||
currDate.Day.ToString("D2");
|
|
||||||
log.Info("Get Pasps of " + dir_3lvl_val + ".");
|
|
||||||
var pasp_list = nc.Full_Dir_Browse(dir_3lvl_val);
|
|
||||||
foreach (var pasp_dir in pasp_list)
|
|
||||||
{
|
{
|
||||||
int count = 0;
|
log.Info("Get pasport: " + paspDir + " try " + (count + 1));
|
||||||
do
|
while (!netClient.Connected())
|
||||||
{
|
if (!netClient.Connect())
|
||||||
try
|
|
||||||
{
|
|
||||||
log.Info("Get Pasp " + pasp_dir + ". Try " + (count + 1));
|
|
||||||
var pasp = nc.Full_Pasp_Download(pasp_dir);
|
|
||||||
if (pasp.HasData && SendPasport(pasp))
|
|
||||||
{
|
|
||||||
log.Info("Send OK.");
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
log.Warn("Can't send " + pasp_dir + ".");
|
|
||||||
Task.Delay(1000 * 60 * 5);
|
|
||||||
count = 0;
|
|
||||||
}
|
|
||||||
catch (Exception e) { log.Warn(e.Message); }
|
|
||||||
if (nc.Connect())
|
|
||||||
{
|
|
||||||
nc.Close();
|
|
||||||
count++;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
{
|
||||||
log.Warn("Can't connect to STP.");
|
log.Warn("Can't connect to STP.");
|
||||||
Task.Delay(1000 * 60 * 5);
|
netClient.Close();
|
||||||
count = 0;
|
await Task.Delay(10000);
|
||||||
}
|
}
|
||||||
} while (count < 5);
|
var pasp = netClient.Full_Pasp_Download(paspDir);
|
||||||
|
netClient.Close();
|
||||||
|
if (pasp == null || !pasp.HasData)
|
||||||
|
{
|
||||||
|
log.Warn("Can't get pasport.");
|
||||||
|
if (netClient.Connect())
|
||||||
|
count++;
|
||||||
|
netClient.Close();
|
||||||
|
await Task.Delay(10000);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
while (SendPasport(pasp))
|
||||||
|
{
|
||||||
|
log.Warn("Can't send pasp to API.");
|
||||||
|
await Task.Delay(10000);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
log.Warn(e);
|
||||||
|
await Task.Delay(5000);
|
||||||
}
|
}
|
||||||
currDate = DateTime.Now;
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
log.Warn(e);
|
|
||||||
Task.Delay(1000 * 60 * 10);
|
|
||||||
}
|
}
|
||||||
|
while (count < 5);
|
||||||
}
|
}
|
||||||
|
SaveCurrData(nameCurrDate, currDate.Value);
|
||||||
|
currDate = currDate.Value.AddDays(1);
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
log.Warn(e);
|
log.Warn(e);
|
||||||
Task.Delay(1000 * 60 * 10);
|
await Task.Delay(1000 * 60 * 5);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
do
|
||||||
|
{
|
||||||
|
log.Info("Wait next day.");
|
||||||
|
await Task.Delay(1000 * 60 * 60);
|
||||||
|
} while (!(currDate.Value < DateTime.Now.AddDays(-1)));
|
||||||
|
currDate.Value.AddMonths(-1);
|
||||||
|
SaveCurrData(nameCurrDate, currDate.Value);
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool SendPasport(Pasport pasp)
|
static bool SendPasport(Pasport pasp)
|
||||||
{
|
{
|
||||||
|
HttpWebRequest GetRequest(string path, bool useProxy = true)
|
||||||
|
{
|
||||||
|
HttpWebRequest clientReq = (HttpWebRequest)WebRequest.Create(path);
|
||||||
|
clientReq.Method = "POST";
|
||||||
|
clientReq.ContentType = "application/json; charset=utf-8";
|
||||||
|
if (useProxy)
|
||||||
|
{
|
||||||
|
clientReq.Proxy = new WebProxy("194.226.128.245", 3128)
|
||||||
|
{
|
||||||
|
BypassProxyOnLocal = false,
|
||||||
|
Credentials = new NetworkCredential("user4", "user4")
|
||||||
|
};
|
||||||
|
}
|
||||||
|
return clientReq;
|
||||||
|
}
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
{
|
{
|
||||||
log.Info("Check pasport on remote API server.");
|
log.Info("Check pasport on remote API server.");
|
||||||
var req = JsonConvert.SerializeObject(
|
var req = JsonConvert.SerializeObject(
|
||||||
new PasportCheckRep()
|
new PasportCheckApi()
|
||||||
{
|
{
|
||||||
HasData = true,
|
Status = true,
|
||||||
DateAndTime = pasp.dEnd.Value,
|
DateAndTime = pasp.dEnd.Value,
|
||||||
Name = string.IsNullOrEmpty(pasp.nplav) ? pasp.numVDP.Value.ToString() : pasp.nplav
|
Name = string.IsNullOrEmpty(pasp.nplav) ? pasp.numVDP.Value.ToString("D2") : pasp.nplav
|
||||||
});
|
});
|
||||||
var reqArr = Encoding.UTF8.GetBytes(req);
|
var reqArr = Encoding.UTF8.GetBytes(req);
|
||||||
HttpWebRequest clientReq = (HttpWebRequest)WebRequest.Create("https://vsmpo.mbucb.ru/api/pasport/check");
|
HttpWebRequest clientReq = GetRequest("https://vsmpo.mbucb.ru/api/pasport/check");
|
||||||
clientReq.Method = "POST";
|
|
||||||
clientReq.ContentType = "application/json; charset=utf-8";
|
|
||||||
clientReq.Proxy = new WebProxy("194.226.128.245", 3128)
|
|
||||||
{
|
|
||||||
BypassProxyOnLocal = false,
|
|
||||||
Credentials = new NetworkCredential("user4", "user4")
|
|
||||||
};
|
|
||||||
clientReq.ContentLength = reqArr.Length;
|
clientReq.ContentLength = reqArr.Length;
|
||||||
using (var stream = clientReq.GetRequestStream())
|
using (var stream = clientReq.GetRequestStream())
|
||||||
{
|
{
|
||||||
@ -174,7 +163,6 @@ namespace ClientCollector
|
|||||||
string response = "";
|
string response = "";
|
||||||
using (var clientRes = (HttpWebResponse)clientReq.GetResponse())
|
using (var clientRes = (HttpWebResponse)clientReq.GetResponse())
|
||||||
{
|
{
|
||||||
Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
|
|
||||||
using (var readStream = new StreamReader(clientRes.GetResponseStream(), Encoding.UTF8))
|
using (var readStream = new StreamReader(clientRes.GetResponseStream(), Encoding.UTF8))
|
||||||
{
|
{
|
||||||
response = readStream.ReadToEnd();
|
response = readStream.ReadToEnd();
|
||||||
@ -182,31 +170,29 @@ namespace ClientCollector
|
|||||||
clientRes.Close();
|
clientRes.Close();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
var rep = JsonConvert.DeserializeObject<PasportCheckReq>(response);
|
var rep = JsonConvert.DeserializeObject<PasportCheckClient>(response);
|
||||||
if (!rep.Status) return false;
|
if (!rep.Status) return false;
|
||||||
if (rep.Exist && rep.Pasp.PaspByte.SequenceEqual(pasp.PaspByte)) return true;
|
ulong paspSum = 0;
|
||||||
|
var paspArr = pasp.PaspByte;
|
||||||
|
foreach (var b in paspArr)
|
||||||
|
paspSum += b;
|
||||||
|
if (rep.Exist && rep.PaspSum == paspSum) return true;
|
||||||
|
if (!rep.Exist)
|
||||||
|
log.Info("API: Pasport not exist.");
|
||||||
|
if (rep.Exist && rep.PaspSum != paspSum)
|
||||||
|
log.Info("API: Wrong size pasport.");
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
log.Info("Send pasport to remote API server.");
|
log.Info("Send pasport to remote API server.");
|
||||||
var req = JsonConvert.SerializeObject(
|
var req = JsonConvert.SerializeObject(
|
||||||
new PasportCreateRep()
|
new PasportCreateApi()
|
||||||
{
|
{
|
||||||
HasData = true,
|
Status = true,
|
||||||
DateAndTime = pasp.dEnd.Value,
|
|
||||||
Name = string.IsNullOrEmpty(pasp.nplav) ? pasp.numVDP.Value.ToString() : pasp.nplav,
|
|
||||||
Pasp = pasp
|
Pasp = pasp
|
||||||
});
|
});
|
||||||
var reqArr = Encoding.UTF8.GetBytes(req);
|
var reqArr = Encoding.UTF8.GetBytes(req);
|
||||||
|
|
||||||
HttpWebRequest clientReq = (HttpWebRequest)WebRequest.Create("https://vsmpo.mbucb.ru/api/pasport/create");
|
HttpWebRequest clientReq = GetRequest("https://vsmpo.mbucb.ru/api/pasport/create");
|
||||||
clientReq.Method = "POST";
|
|
||||||
clientReq.ContentType = "application/json; charset=utf-8";
|
|
||||||
clientReq.Proxy = new WebProxy("194.226.128.245", 3128)
|
|
||||||
{
|
|
||||||
BypassProxyOnLocal = false,
|
|
||||||
Credentials = new NetworkCredential("user4", "user4")
|
|
||||||
};
|
|
||||||
clientReq.ContentLength = reqArr.Length;
|
clientReq.ContentLength = reqArr.Length;
|
||||||
using (var stream = clientReq.GetRequestStream())
|
using (var stream = clientReq.GetRequestStream())
|
||||||
{
|
{
|
||||||
@ -215,7 +201,6 @@ namespace ClientCollector
|
|||||||
string response = "";
|
string response = "";
|
||||||
using (var clientRes = (HttpWebResponse)clientReq.GetResponse())
|
using (var clientRes = (HttpWebResponse)clientReq.GetResponse())
|
||||||
{
|
{
|
||||||
Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
|
|
||||||
using (var readStream = new StreamReader(clientRes.GetResponseStream(), Encoding.UTF8))
|
using (var readStream = new StreamReader(clientRes.GetResponseStream(), Encoding.UTF8))
|
||||||
{
|
{
|
||||||
response = readStream.ReadToEnd();
|
response = readStream.ReadToEnd();
|
||||||
@ -223,7 +208,7 @@ namespace ClientCollector
|
|||||||
clientRes.Close();
|
clientRes.Close();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
var rep = JsonConvert.DeserializeObject<PasportCreateReq>(response);
|
var rep = JsonConvert.DeserializeObject<PasportCreateClient>(response);
|
||||||
if (!rep.Status) return false;
|
if (!rep.Status) return false;
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
@ -247,6 +232,77 @@ namespace ClientCollector
|
|||||||
conf.AddRule(LogLevel.Trace, LogLevel.Fatal, logcon);
|
conf.AddRule(LogLevel.Trace, LogLevel.Fatal, logcon);
|
||||||
LogManager.Configuration = conf;
|
LogManager.Configuration = conf;
|
||||||
}
|
}
|
||||||
|
static bool SaveCurrData(string name, DateTime currDate)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var fileForSave = Path.Combine(Directory.GetCurrentDirectory(), "currentState");
|
||||||
|
var currStrings = Array.Empty<string>();
|
||||||
|
if (File.Exists(fileForSave))
|
||||||
|
currStrings = File.ReadAllLines(fileForSave, Encoding.UTF8);
|
||||||
|
var newString =
|
||||||
|
name + ':' +
|
||||||
|
currDate.Year.ToString("D4") +
|
||||||
|
currDate.Month.ToString("D2") +
|
||||||
|
currDate.Day.ToString("D2");
|
||||||
|
for (var i = 0; i < currStrings.Length; i++)
|
||||||
|
{
|
||||||
|
var splitString = currStrings[i].Split(':');
|
||||||
|
if (splitString.Length != 2) continue;
|
||||||
|
if (splitString[0] != name) continue;
|
||||||
|
currStrings[i] = newString;
|
||||||
|
newString = null;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
if (!string.IsNullOrEmpty(newString))
|
||||||
|
{
|
||||||
|
Array.Resize(ref currStrings, currStrings.Length + 1);
|
||||||
|
currStrings[currStrings.Length - 1] = newString;
|
||||||
|
}
|
||||||
|
File.WriteAllLines(fileForSave, currStrings, Encoding.UTF8);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
log.Warn(e);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
static DateTime? GetCurrData(string name)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var file = Path.Combine(Directory.GetCurrentDirectory(), "currentState");
|
||||||
|
if (!File.Exists(file))
|
||||||
|
{
|
||||||
|
log.Info("State file not exist.");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
var listStrings = File.ReadAllLines(file, Encoding.UTF8);
|
||||||
|
for(var i = 0; i < listStrings.Length; i++)
|
||||||
|
{
|
||||||
|
var splitString = listStrings[i].Split(':');
|
||||||
|
if (splitString.Length != 2) continue;
|
||||||
|
if (splitString[0] != name) continue;
|
||||||
|
if (
|
||||||
|
!int.TryParse(splitString[1].Substring(0, 4), out int year) ||
|
||||||
|
!int.TryParse(splitString[1].Substring(4, 2), out int month) ||
|
||||||
|
!int.TryParse(splitString[1].Substring(6, 2), out int day))
|
||||||
|
{
|
||||||
|
log.Warn("Wron format state string.");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return new DateTime(year, month, day);
|
||||||
|
}
|
||||||
|
log.Info("State not exist.");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
log.Warn(e);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -4,6 +4,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
|
|||||||
-->
|
-->
|
||||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<History>True|2021-07-31T15:35:08.9408458Z;True|2021-07-31T20:20:29.0886405+05:00;</History>
|
<History>True|2021-08-01T14:27:43.9900600Z;True|2021-08-01T19:18:48.8000969+05:00;True|2021-08-01T19:15:19.9257002+05:00;True|2021-08-01T19:08:17.1315589+05:00;True|2021-07-31T20:35:08.9408458+05:00;True|2021-07-31T20:20:29.0886405+05:00;</History>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
</Project>
|
</Project>
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,11 +1,10 @@
|
|||||||
{
|
{
|
||||||
"runtimeOptions": {
|
"runtimeOptions": {
|
||||||
"additionalProbingPaths": [
|
"additionalProbingPaths": [
|
||||||
"C:\\Users\\google\\.dotnet\\store\\|arch|\\|tfm|",
|
"C:\\Users\\Admin\\.dotnet\\store\\|arch|\\|tfm|",
|
||||||
"C:\\Users\\google\\.nuget\\packages",
|
"C:\\Users\\Admin\\.nuget\\packages",
|
||||||
"C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
|
"C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
|
||||||
"C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet",
|
"C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet"
|
||||||
"C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
|
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,11 +1,10 @@
|
|||||||
{
|
{
|
||||||
"runtimeOptions": {
|
"runtimeOptions": {
|
||||||
"additionalProbingPaths": [
|
"additionalProbingPaths": [
|
||||||
"C:\\Users\\google\\.dotnet\\store\\|arch|\\|tfm|",
|
"C:\\Users\\Admin\\.dotnet\\store\\|arch|\\|tfm|",
|
||||||
"C:\\Users\\google\\.nuget\\packages",
|
"C:\\Users\\Admin\\.nuget\\packages",
|
||||||
"C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
|
"C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
|
||||||
"C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet",
|
"C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet"
|
||||||
"C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
|
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,25 +1,24 @@
|
|||||||
{
|
{
|
||||||
"format": 1,
|
"format": 1,
|
||||||
"restore": {
|
"restore": {
|
||||||
"D:\\GIT\\ASCKU_PC\\ClientCollector\\ClientCollector.csproj": {}
|
"F:\\GIT\\ASCKU_PC\\ClientCollector\\ClientCollector.csproj": {}
|
||||||
},
|
},
|
||||||
"projects": {
|
"projects": {
|
||||||
"D:\\GIT\\ASCKU_PC\\ClientCollector\\ClientCollector.csproj": {
|
"F:\\GIT\\ASCKU_PC\\ClientCollector\\ClientCollector.csproj": {
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"restore": {
|
"restore": {
|
||||||
"projectUniqueName": "D:\\GIT\\ASCKU_PC\\ClientCollector\\ClientCollector.csproj",
|
"projectUniqueName": "F:\\GIT\\ASCKU_PC\\ClientCollector\\ClientCollector.csproj",
|
||||||
"projectName": "ClientCollector",
|
"projectName": "ClientCollector",
|
||||||
"projectPath": "D:\\GIT\\ASCKU_PC\\ClientCollector\\ClientCollector.csproj",
|
"projectPath": "F:\\GIT\\ASCKU_PC\\ClientCollector\\ClientCollector.csproj",
|
||||||
"packagesPath": "C:\\Users\\google\\.nuget\\packages\\",
|
"packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\",
|
||||||
"outputPath": "D:\\GIT\\ASCKU_PC\\ClientCollector\\obj\\",
|
"outputPath": "F:\\GIT\\ASCKU_PC\\ClientCollector\\obj\\",
|
||||||
"projectStyle": "PackageReference",
|
"projectStyle": "PackageReference",
|
||||||
"fallbackFolders": [
|
"fallbackFolders": [
|
||||||
"C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
|
"C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
|
||||||
"C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\",
|
"C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
|
||||||
"C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
|
|
||||||
],
|
],
|
||||||
"configFilePaths": [
|
"configFilePaths": [
|
||||||
"C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config",
|
"C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config",
|
||||||
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
|
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
|
||||||
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
|
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
|
||||||
"C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
|
"C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
|
||||||
@ -35,8 +34,8 @@
|
|||||||
"net5.0": {
|
"net5.0": {
|
||||||
"targetAlias": "net5.0",
|
"targetAlias": "net5.0",
|
||||||
"projectReferences": {
|
"projectReferences": {
|
||||||
"D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj": {
|
"F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj": {
|
||||||
"projectPath": "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj"
|
"projectPath": "F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -75,26 +74,25 @@
|
|||||||
"privateAssets": "all"
|
"privateAssets": "all"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
|
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj": {
|
"F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj": {
|
||||||
"version": "0.0.3",
|
"version": "0.0.3",
|
||||||
"restore": {
|
"restore": {
|
||||||
"projectUniqueName": "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj",
|
"projectUniqueName": "F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj",
|
||||||
"projectName": "DataClient",
|
"projectName": "DataClient",
|
||||||
"projectPath": "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj",
|
"projectPath": "F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj",
|
||||||
"packagesPath": "C:\\Users\\google\\.nuget\\packages\\",
|
"packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\",
|
||||||
"outputPath": "D:\\GIT\\ASCKU_PC\\DataClient\\obj\\",
|
"outputPath": "F:\\GIT\\ASCKU_PC\\DataClient\\obj\\",
|
||||||
"projectStyle": "PackageReference",
|
"projectStyle": "PackageReference",
|
||||||
"fallbackFolders": [
|
"fallbackFolders": [
|
||||||
"C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
|
"C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
|
||||||
"C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\",
|
"C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
|
||||||
"C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
|
|
||||||
],
|
],
|
||||||
"configFilePaths": [
|
"configFilePaths": [
|
||||||
"C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config",
|
"C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config",
|
||||||
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
|
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
|
||||||
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
|
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
|
||||||
"C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
|
"C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
|
||||||
@ -150,7 +148,7 @@
|
|||||||
"privateAssets": "all"
|
"privateAssets": "all"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
|
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -5,15 +5,14 @@
|
|||||||
<RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
|
<RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
|
||||||
<ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
|
<ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
|
||||||
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
|
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
|
||||||
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\google\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\;C:\Program Files\dotnet\sdk\NuGetFallbackFolder</NuGetPackageFolders>
|
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Admin\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\</NuGetPackageFolders>
|
||||||
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
|
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
|
||||||
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.10.0</NuGetToolVersion>
|
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.10.0</NuGetToolVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
|
<ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
|
||||||
<SourceRoot Include="C:\Users\google\.nuget\packages\" />
|
<SourceRoot Include="C:\Users\Admin\.nuget\packages\" />
|
||||||
<SourceRoot Include="C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
|
<SourceRoot Include="C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
|
||||||
<SourceRoot Include="C:\Program Files (x86)\Microsoft\Xamarin\NuGet\" />
|
<SourceRoot Include="C:\Program Files (x86)\Microsoft\Xamarin\NuGet\" />
|
||||||
<SourceRoot Include="C:\Program Files\dotnet\sdk\NuGetFallbackFolder\" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
|
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
|
||||||
|
Binary file not shown.
Binary file not shown.
@ -1 +1 @@
|
|||||||
ca600f6453a6328134e1cf4f5631c7614d873558
|
3cb6fb029cd592b5bb8875b7b57cbd9077b47c81
|
||||||
|
@ -30,3 +30,35 @@ D:\GIT\ASCKU_PC\ClientCollector\obj\Debug\net5.0\ClientCollector.dll
|
|||||||
D:\GIT\ASCKU_PC\ClientCollector\obj\Debug\net5.0\ref\ClientCollector.dll
|
D:\GIT\ASCKU_PC\ClientCollector\obj\Debug\net5.0\ref\ClientCollector.dll
|
||||||
D:\GIT\ASCKU_PC\ClientCollector\obj\Debug\net5.0\ClientCollector.pdb
|
D:\GIT\ASCKU_PC\ClientCollector\obj\Debug\net5.0\ClientCollector.pdb
|
||||||
D:\GIT\ASCKU_PC\ClientCollector\obj\Debug\net5.0\ClientCollector.genruntimeconfig.cache
|
D:\GIT\ASCKU_PC\ClientCollector\obj\Debug\net5.0\ClientCollector.genruntimeconfig.cache
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Debug\net5.0\ClientCollector.exe
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Debug\net5.0\Config\analog\default.json
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Debug\net5.0\Config\config.json
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Debug\net5.0\ClientCollector.deps.json
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Debug\net5.0\ClientCollector.runtimeconfig.json
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Debug\net5.0\ClientCollector.runtimeconfig.dev.json
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Debug\net5.0\ClientCollector.dll
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Debug\net5.0\ref\ClientCollector.dll
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Debug\net5.0\ClientCollector.pdb
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Debug\net5.0\Microsoft.Extensions.Configuration.Abstractions.dll
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Debug\net5.0\Microsoft.Extensions.DependencyInjection.dll
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Debug\net5.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Debug\net5.0\Microsoft.Extensions.Logging.dll
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Debug\net5.0\Microsoft.Extensions.Logging.Abstractions.dll
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Debug\net5.0\Microsoft.Extensions.Options.dll
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Debug\net5.0\Microsoft.Extensions.Primitives.dll
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Debug\net5.0\Newtonsoft.Json.dll
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Debug\net5.0\NLog.dll
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Debug\net5.0\NLog.Extensions.Logging.dll
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Debug\net5.0\DataClient.dll
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Debug\net5.0\DataClient.pdb
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Debug\net5.0\DataClient.xml
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\obj\Debug\net5.0\ClientCollector.csproj.AssemblyReference.cache
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\obj\Debug\net5.0\ClientCollector.GeneratedMSBuildEditorConfig.editorconfig
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\obj\Debug\net5.0\ClientCollector.AssemblyInfoInputs.cache
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\obj\Debug\net5.0\ClientCollector.AssemblyInfo.cs
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\obj\Debug\net5.0\ClientCollector.csproj.CoreCompileInputs.cache
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\obj\Debug\net5.0\ClientCollector.csproj.CopyComplete
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\obj\Debug\net5.0\ClientCollector.dll
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\obj\Debug\net5.0\ref\ClientCollector.dll
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\obj\Debug\net5.0\ClientCollector.pdb
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\obj\Debug\net5.0\ClientCollector.genruntimeconfig.cache
|
||||||
|
Binary file not shown.
@ -1 +1 @@
|
|||||||
3059e59609f09ef6cd06323054f8ca266f28c046
|
846560ec7c1e16455a5ab89cc5fed101f9ef4aea
|
||||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1 +1 @@
|
|||||||
381935b869564bcce9839e36dd6b31f277b4f257
|
5e9419778287ec5b4cc0bdffcb19831a1be63478
|
||||||
|
@ -29,3 +29,34 @@ D:\GIT\ASCKU_PC\ClientCollector\obj\Release\net5.0\ClientCollector.dll
|
|||||||
D:\GIT\ASCKU_PC\ClientCollector\obj\Release\net5.0\ref\ClientCollector.dll
|
D:\GIT\ASCKU_PC\ClientCollector\obj\Release\net5.0\ref\ClientCollector.dll
|
||||||
D:\GIT\ASCKU_PC\ClientCollector\obj\Release\net5.0\ClientCollector.pdb
|
D:\GIT\ASCKU_PC\ClientCollector\obj\Release\net5.0\ClientCollector.pdb
|
||||||
D:\GIT\ASCKU_PC\ClientCollector\obj\Release\net5.0\ClientCollector.genruntimeconfig.cache
|
D:\GIT\ASCKU_PC\ClientCollector\obj\Release\net5.0\ClientCollector.genruntimeconfig.cache
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Release\net5.0\ClientCollector.exe
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Release\net5.0\Config\analog\default.json
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Release\net5.0\Config\config.json
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Release\net5.0\ClientCollector.deps.json
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Release\net5.0\ClientCollector.runtimeconfig.json
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Release\net5.0\ClientCollector.runtimeconfig.dev.json
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Release\net5.0\ClientCollector.dll
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Release\net5.0\ref\ClientCollector.dll
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Release\net5.0\ClientCollector.pdb
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Release\net5.0\Microsoft.Extensions.Configuration.Abstractions.dll
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Release\net5.0\Microsoft.Extensions.DependencyInjection.dll
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Release\net5.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Release\net5.0\Microsoft.Extensions.Logging.dll
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Release\net5.0\Microsoft.Extensions.Logging.Abstractions.dll
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Release\net5.0\Microsoft.Extensions.Options.dll
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Release\net5.0\Microsoft.Extensions.Primitives.dll
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Release\net5.0\Newtonsoft.Json.dll
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Release\net5.0\NLog.dll
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Release\net5.0\NLog.Extensions.Logging.dll
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Release\net5.0\DataClient.dll
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Release\net5.0\DataClient.pdb
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\obj\Release\net5.0\ClientCollector.csproj.AssemblyReference.cache
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\obj\Release\net5.0\ClientCollector.GeneratedMSBuildEditorConfig.editorconfig
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\obj\Release\net5.0\ClientCollector.AssemblyInfoInputs.cache
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\obj\Release\net5.0\ClientCollector.AssemblyInfo.cs
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\obj\Release\net5.0\ClientCollector.csproj.CoreCompileInputs.cache
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\obj\Release\net5.0\ClientCollector.csproj.CopyComplete
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\obj\Release\net5.0\ClientCollector.dll
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\obj\Release\net5.0\ref\ClientCollector.dll
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\obj\Release\net5.0\ClientCollector.pdb
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\obj\Release\net5.0\ClientCollector.genruntimeconfig.cache
|
||||||
|
Binary file not shown.
@ -1 +1 @@
|
|||||||
3059e59609f09ef6cd06323054f8ca266f28c046
|
846560ec7c1e16455a5ab89cc5fed101f9ef4aea
|
||||||
|
Binary file not shown.
@ -0,0 +1,19 @@
|
|||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Release\Config\analog\default.json
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Release\Config\config.json
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Release\ClientCollector.exe
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Release\ClientCollector.dll
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Release\ClientCollector.deps.json
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Release\ClientCollector.runtimeconfig.json
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Release\ClientCollector.pdb
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Release\Microsoft.Extensions.Configuration.Abstractions.dll
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Release\Microsoft.Extensions.DependencyInjection.dll
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Release\Microsoft.Extensions.DependencyInjection.Abstractions.dll
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Release\Microsoft.Extensions.Logging.dll
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Release\Microsoft.Extensions.Logging.Abstractions.dll
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Release\Microsoft.Extensions.Options.dll
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Release\Microsoft.Extensions.Primitives.dll
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Release\Newtonsoft.Json.dll
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Release\NLog.dll
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Release\NLog.Extensions.Logging.dll
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Release\DataClient.dll
|
||||||
|
F:\GIT\ASCKU_PC\ClientCollector\bin\Release\DataClient.pdb
|
Binary file not shown.
Binary file not shown.
@ -381,27 +381,25 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"packageFolders": {
|
"packageFolders": {
|
||||||
"C:\\Users\\google\\.nuget\\packages\\": {},
|
"C:\\Users\\Admin\\.nuget\\packages\\": {},
|
||||||
"C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {},
|
"C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {},
|
||||||
"C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {},
|
"C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}
|
||||||
"C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {}
|
|
||||||
},
|
},
|
||||||
"project": {
|
"project": {
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"restore": {
|
"restore": {
|
||||||
"projectUniqueName": "D:\\GIT\\ASCKU_PC\\ClientCollector\\ClientCollector.csproj",
|
"projectUniqueName": "F:\\GIT\\ASCKU_PC\\ClientCollector\\ClientCollector.csproj",
|
||||||
"projectName": "ClientCollector",
|
"projectName": "ClientCollector",
|
||||||
"projectPath": "D:\\GIT\\ASCKU_PC\\ClientCollector\\ClientCollector.csproj",
|
"projectPath": "F:\\GIT\\ASCKU_PC\\ClientCollector\\ClientCollector.csproj",
|
||||||
"packagesPath": "C:\\Users\\google\\.nuget\\packages\\",
|
"packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\",
|
||||||
"outputPath": "D:\\GIT\\ASCKU_PC\\ClientCollector\\obj\\",
|
"outputPath": "F:\\GIT\\ASCKU_PC\\ClientCollector\\obj\\",
|
||||||
"projectStyle": "PackageReference",
|
"projectStyle": "PackageReference",
|
||||||
"fallbackFolders": [
|
"fallbackFolders": [
|
||||||
"C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
|
"C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
|
||||||
"C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\",
|
"C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
|
||||||
"C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
|
|
||||||
],
|
],
|
||||||
"configFilePaths": [
|
"configFilePaths": [
|
||||||
"C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config",
|
"C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config",
|
||||||
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
|
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
|
||||||
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
|
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
|
||||||
"C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
|
"C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
|
||||||
@ -417,8 +415,8 @@
|
|||||||
"net5.0": {
|
"net5.0": {
|
||||||
"targetAlias": "net5.0",
|
"targetAlias": "net5.0",
|
||||||
"projectReferences": {
|
"projectReferences": {
|
||||||
"D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj": {
|
"F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj": {
|
||||||
"projectPath": "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj"
|
"projectPath": "F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -457,7 +455,7 @@
|
|||||||
"privateAssets": "all"
|
"privateAssets": "all"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
|
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,19 +1,19 @@
|
|||||||
{
|
{
|
||||||
"version": 2,
|
"version": 2,
|
||||||
"dgSpecHash": "4epxhxxqM5SAn5/9F6/bGIHXw5/ScXkV3Fnpxx1s5LXd8HLEicu36cn+HzGRnZuZrclSVkG7GSGYyc/b7S5lXA==",
|
"dgSpecHash": "zF3L4tiiP+J2PsAQ6ScS+0E49qIZFCv/pk/XinbS4FwOvm9eJ1+n3dvcrV6Ft+awfch4iiwEQEzKcRUdwv7vKA==",
|
||||||
"success": true,
|
"success": true,
|
||||||
"projectFilePath": "D:\\GIT\\ASCKU_PC\\ClientCollector\\ClientCollector.csproj",
|
"projectFilePath": "F:\\GIT\\ASCKU_PC\\ClientCollector\\ClientCollector.csproj",
|
||||||
"expectedPackageFiles": [
|
"expectedPackageFiles": [
|
||||||
"C:\\Users\\google\\.nuget\\packages\\microsoft.extensions.configuration.abstractions\\5.0.0\\microsoft.extensions.configuration.abstractions.5.0.0.nupkg.sha512",
|
"C:\\Users\\Admin\\.nuget\\packages\\microsoft.extensions.configuration.abstractions\\5.0.0\\microsoft.extensions.configuration.abstractions.5.0.0.nupkg.sha512",
|
||||||
"C:\\Users\\google\\.nuget\\packages\\microsoft.extensions.dependencyinjection\\5.0.0\\microsoft.extensions.dependencyinjection.5.0.0.nupkg.sha512",
|
"C:\\Users\\Admin\\.nuget\\packages\\microsoft.extensions.dependencyinjection\\5.0.0\\microsoft.extensions.dependencyinjection.5.0.0.nupkg.sha512",
|
||||||
"C:\\Users\\google\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\5.0.0\\microsoft.extensions.dependencyinjection.abstractions.5.0.0.nupkg.sha512",
|
"C:\\Users\\Admin\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\5.0.0\\microsoft.extensions.dependencyinjection.abstractions.5.0.0.nupkg.sha512",
|
||||||
"C:\\Users\\google\\.nuget\\packages\\microsoft.extensions.logging\\5.0.0\\microsoft.extensions.logging.5.0.0.nupkg.sha512",
|
"C:\\Users\\Admin\\.nuget\\packages\\microsoft.extensions.logging\\5.0.0\\microsoft.extensions.logging.5.0.0.nupkg.sha512",
|
||||||
"C:\\Users\\google\\.nuget\\packages\\microsoft.extensions.logging.abstractions\\5.0.0\\microsoft.extensions.logging.abstractions.5.0.0.nupkg.sha512",
|
"C:\\Users\\Admin\\.nuget\\packages\\microsoft.extensions.logging.abstractions\\5.0.0\\microsoft.extensions.logging.abstractions.5.0.0.nupkg.sha512",
|
||||||
"C:\\Users\\google\\.nuget\\packages\\microsoft.extensions.options\\5.0.0\\microsoft.extensions.options.5.0.0.nupkg.sha512",
|
"C:\\Users\\Admin\\.nuget\\packages\\microsoft.extensions.options\\5.0.0\\microsoft.extensions.options.5.0.0.nupkg.sha512",
|
||||||
"C:\\Users\\google\\.nuget\\packages\\microsoft.extensions.primitives\\5.0.0\\microsoft.extensions.primitives.5.0.0.nupkg.sha512",
|
"C:\\Users\\Admin\\.nuget\\packages\\microsoft.extensions.primitives\\5.0.0\\microsoft.extensions.primitives.5.0.0.nupkg.sha512",
|
||||||
"C:\\Users\\google\\.nuget\\packages\\newtonsoft.json\\13.0.1\\newtonsoft.json.13.0.1.nupkg.sha512",
|
"C:\\Users\\Admin\\.nuget\\packages\\newtonsoft.json\\13.0.1\\newtonsoft.json.13.0.1.nupkg.sha512",
|
||||||
"C:\\Users\\google\\.nuget\\packages\\nlog\\4.7.10\\nlog.4.7.10.nupkg.sha512",
|
"C:\\Users\\Admin\\.nuget\\packages\\nlog\\4.7.10\\nlog.4.7.10.nupkg.sha512",
|
||||||
"C:\\Users\\google\\.nuget\\packages\\nlog.extensions.logging\\1.7.2\\nlog.extensions.logging.1.7.2.nupkg.sha512"
|
"C:\\Users\\Admin\\.nuget\\packages\\nlog.extensions.logging\\1.7.2\\nlog.extensions.logging.1.7.2.nupkg.sha512"
|
||||||
],
|
],
|
||||||
"logs": []
|
"logs": []
|
||||||
}
|
}
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,25 +1,24 @@
|
|||||||
{
|
{
|
||||||
"format": 1,
|
"format": 1,
|
||||||
"restore": {
|
"restore": {
|
||||||
"D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj": {}
|
"F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj": {}
|
||||||
},
|
},
|
||||||
"projects": {
|
"projects": {
|
||||||
"D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj": {
|
"F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj": {
|
||||||
"version": "0.0.3",
|
"version": "0.0.3",
|
||||||
"restore": {
|
"restore": {
|
||||||
"projectUniqueName": "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj",
|
"projectUniqueName": "F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj",
|
||||||
"projectName": "DataClient",
|
"projectName": "DataClient",
|
||||||
"projectPath": "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj",
|
"projectPath": "F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj",
|
||||||
"packagesPath": "C:\\Users\\google\\.nuget\\packages\\",
|
"packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\",
|
||||||
"outputPath": "D:\\GIT\\ASCKU_PC\\DataClient\\obj\\",
|
"outputPath": "F:\\GIT\\ASCKU_PC\\DataClient\\obj\\",
|
||||||
"projectStyle": "PackageReference",
|
"projectStyle": "PackageReference",
|
||||||
"fallbackFolders": [
|
"fallbackFolders": [
|
||||||
"C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
|
"C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
|
||||||
"C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\",
|
"C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
|
||||||
"C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
|
|
||||||
],
|
],
|
||||||
"configFilePaths": [
|
"configFilePaths": [
|
||||||
"C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config",
|
"C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config",
|
||||||
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
|
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
|
||||||
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
|
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
|
||||||
"C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
|
"C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
|
||||||
@ -75,7 +74,7 @@
|
|||||||
"privateAssets": "all"
|
"privateAssets": "all"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
|
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -5,15 +5,14 @@
|
|||||||
<RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
|
<RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
|
||||||
<ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
|
<ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
|
||||||
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
|
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
|
||||||
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\google\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\;C:\Program Files\dotnet\sdk\NuGetFallbackFolder</NuGetPackageFolders>
|
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Admin\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\</NuGetPackageFolders>
|
||||||
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
|
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
|
||||||
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.10.0</NuGetToolVersion>
|
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.10.0</NuGetToolVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
|
<ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
|
||||||
<SourceRoot Include="C:\Users\google\.nuget\packages\" />
|
<SourceRoot Include="C:\Users\Admin\.nuget\packages\" />
|
||||||
<SourceRoot Include="C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
|
<SourceRoot Include="C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
|
||||||
<SourceRoot Include="C:\Program Files (x86)\Microsoft\Xamarin\NuGet\" />
|
<SourceRoot Include="C:\Program Files (x86)\Microsoft\Xamarin\NuGet\" />
|
||||||
<SourceRoot Include="C:\Program Files\dotnet\sdk\NuGetFallbackFolder\" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
|
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
|
||||||
|
Binary file not shown.
Binary file not shown.
@ -1 +1 @@
|
|||||||
dd97bd7f2ddb5e6bfbcd5e8344f0cae7dc566df2
|
0f2e1ea3576304fbcc337f0bbd4183051ce17da1
|
||||||
|
@ -13,3 +13,18 @@ D:\GIT\ASCKU_PC\DataClient\obj\Debug\net5.0\DataClient.csproj.CoreCompileInputs.
|
|||||||
D:\GIT\ASCKU_PC\DataClient\obj\Debug\net5.0\DataClient.dll
|
D:\GIT\ASCKU_PC\DataClient\obj\Debug\net5.0\DataClient.dll
|
||||||
D:\GIT\ASCKU_PC\DataClient\obj\Debug\net5.0\ref\DataClient.dll
|
D:\GIT\ASCKU_PC\DataClient\obj\Debug\net5.0\ref\DataClient.dll
|
||||||
D:\GIT\ASCKU_PC\DataClient\obj\Debug\net5.0\DataClient.pdb
|
D:\GIT\ASCKU_PC\DataClient\obj\Debug\net5.0\DataClient.pdb
|
||||||
|
F:\GIT\ASCKU_PC\DataClient\bin\Debug\net5.0\Config\analog\default.json
|
||||||
|
F:\GIT\ASCKU_PC\DataClient\bin\Debug\net5.0\Config\config.json
|
||||||
|
F:\GIT\ASCKU_PC\DataClient\bin\Debug\net5.0\DataClient.deps.json
|
||||||
|
F:\GIT\ASCKU_PC\DataClient\bin\Debug\net5.0\DataClient.dll
|
||||||
|
F:\GIT\ASCKU_PC\DataClient\bin\Debug\net5.0\ref\DataClient.dll
|
||||||
|
F:\GIT\ASCKU_PC\DataClient\bin\Debug\net5.0\DataClient.pdb
|
||||||
|
F:\GIT\ASCKU_PC\DataClient\bin\Debug\net5.0\DataClient.xml
|
||||||
|
F:\GIT\ASCKU_PC\DataClient\obj\Debug\net5.0\DataClient.csproj.AssemblyReference.cache
|
||||||
|
F:\GIT\ASCKU_PC\DataClient\obj\Debug\net5.0\DataClient.GeneratedMSBuildEditorConfig.editorconfig
|
||||||
|
F:\GIT\ASCKU_PC\DataClient\obj\Debug\net5.0\DataClient.AssemblyInfoInputs.cache
|
||||||
|
F:\GIT\ASCKU_PC\DataClient\obj\Debug\net5.0\DataClient.AssemblyInfo.cs
|
||||||
|
F:\GIT\ASCKU_PC\DataClient\obj\Debug\net5.0\DataClient.csproj.CoreCompileInputs.cache
|
||||||
|
F:\GIT\ASCKU_PC\DataClient\obj\Debug\net5.0\DataClient.dll
|
||||||
|
F:\GIT\ASCKU_PC\DataClient\obj\Debug\net5.0\ref\DataClient.dll
|
||||||
|
F:\GIT\ASCKU_PC\DataClient\obj\Debug\net5.0\DataClient.pdb
|
||||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1 +1 @@
|
|||||||
85eae5e91d48b2b6604876303fc37a94b53d66ee
|
db412880e1fb8cee75e62101cd5b42d093035d00
|
||||||
|
@ -12,3 +12,17 @@ D:\GIT\ASCKU_PC\DataClient\bin\Release\net5.0\DataClient.pdb
|
|||||||
D:\GIT\ASCKU_PC\DataClient\obj\Release\net5.0\DataClient.dll
|
D:\GIT\ASCKU_PC\DataClient\obj\Release\net5.0\DataClient.dll
|
||||||
D:\GIT\ASCKU_PC\DataClient\obj\Release\net5.0\ref\DataClient.dll
|
D:\GIT\ASCKU_PC\DataClient\obj\Release\net5.0\ref\DataClient.dll
|
||||||
D:\GIT\ASCKU_PC\DataClient\obj\Release\net5.0\DataClient.pdb
|
D:\GIT\ASCKU_PC\DataClient\obj\Release\net5.0\DataClient.pdb
|
||||||
|
F:\GIT\ASCKU_PC\DataClient\bin\Release\net5.0\Config\analog\default.json
|
||||||
|
F:\GIT\ASCKU_PC\DataClient\bin\Release\net5.0\Config\config.json
|
||||||
|
F:\GIT\ASCKU_PC\DataClient\bin\Release\net5.0\DataClient.deps.json
|
||||||
|
F:\GIT\ASCKU_PC\DataClient\bin\Release\net5.0\DataClient.dll
|
||||||
|
F:\GIT\ASCKU_PC\DataClient\bin\Release\net5.0\ref\DataClient.dll
|
||||||
|
F:\GIT\ASCKU_PC\DataClient\bin\Release\net5.0\DataClient.pdb
|
||||||
|
F:\GIT\ASCKU_PC\DataClient\obj\Release\net5.0\DataClient.csproj.AssemblyReference.cache
|
||||||
|
F:\GIT\ASCKU_PC\DataClient\obj\Release\net5.0\DataClient.GeneratedMSBuildEditorConfig.editorconfig
|
||||||
|
F:\GIT\ASCKU_PC\DataClient\obj\Release\net5.0\DataClient.AssemblyInfoInputs.cache
|
||||||
|
F:\GIT\ASCKU_PC\DataClient\obj\Release\net5.0\DataClient.AssemblyInfo.cs
|
||||||
|
F:\GIT\ASCKU_PC\DataClient\obj\Release\net5.0\DataClient.csproj.CoreCompileInputs.cache
|
||||||
|
F:\GIT\ASCKU_PC\DataClient\obj\Release\net5.0\DataClient.dll
|
||||||
|
F:\GIT\ASCKU_PC\DataClient\obj\Release\net5.0\ref\DataClient.dll
|
||||||
|
F:\GIT\ASCKU_PC\DataClient\obj\Release\net5.0\DataClient.pdb
|
||||||
|
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user