commit 6e2ebf67afc09659efb0f2f29a3be72aa80bc43a Author: Nick Blakely Date: Fri Aug 7 23:53:35 2020 -0700 Skeleton/basic implementation for web API. diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..1ff0c42 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,63 @@ +############################################################################### +# Set default behavior to automatically normalize line endings. +############################################################################### +* text=auto + +############################################################################### +# Set default behavior for command prompt diff. +# +# This is need for earlier builds of msysgit that does not have it on by +# default for csharp files. +# Note: This is only used by command line +############################################################################### +#*.cs diff=csharp + +############################################################################### +# Set the merge driver for project and solution files +# +# Merging from the command prompt will add diff markers to the files if there +# are conflicts (Merging from VS is not affected by the settings below, in VS +# the diff markers are never inserted). Diff markers may cause the following +# file extensions to fail to load in VS. An alternative would be to treat +# these files as binary and thus will always conflict and require user +# intervention with every merge. To do so, just uncomment the entries below +############################################################################### +#*.sln merge=binary +#*.csproj merge=binary +#*.vbproj merge=binary +#*.vcxproj merge=binary +#*.vcproj merge=binary +#*.dbproj merge=binary +#*.fsproj merge=binary +#*.lsproj merge=binary +#*.wixproj merge=binary +#*.modelproj merge=binary +#*.sqlproj merge=binary +#*.wwaproj merge=binary + +############################################################################### +# behavior for image files +# +# image files are treated as binary by default. +############################################################################### +#*.jpg binary +#*.png binary +#*.gif binary + +############################################################################### +# diff behavior for common document formats +# +# Convert binary document formats to text before diffing them. This feature +# is only available from the command line. Turn it on by uncommenting the +# entries below. +############################################################################### +#*.doc diff=astextplain +#*.DOC diff=astextplain +#*.docx diff=astextplain +#*.DOCX diff=astextplain +#*.dot diff=astextplain +#*.DOT diff=astextplain +#*.pdf diff=astextplain +#*.PDF diff=astextplain +#*.rtf diff=astextplain +#*.RTF diff=astextplain diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4ce6fdd --- /dev/null +++ b/.gitignore @@ -0,0 +1,340 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUNIT +*.VisualState.xml +TestResult.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# JustCode is a .NET coding add-in +.JustCode + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- Backup*.rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# JetBrains Rider +.idea/ +*.sln.iml + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# BeatPulse healthcheck temp database +healthchecksdb \ No newline at end of file diff --git a/Giants.DataContract/Contracts/PlayerInfo.cs b/Giants.DataContract/Contracts/PlayerInfo.cs new file mode 100644 index 0000000..b5f44a5 --- /dev/null +++ b/Giants.DataContract/Contracts/PlayerInfo.cs @@ -0,0 +1,19 @@ +namespace Giants.DataContract +{ + using System; + using System.Collections.Generic; + using System.Text; + + public class PlayerInfo + { + public int Index { get; set; } + + public string Name { get; set; } + + public int Frags { get; set; } + + public int Deaths { get; set; } + + public string TeamName { get; set; } + } +} diff --git a/Giants.DataContract/Contracts/ServerInfo.cs b/Giants.DataContract/Contracts/ServerInfo.cs new file mode 100644 index 0000000..fcadcfb --- /dev/null +++ b/Giants.DataContract/Contracts/ServerInfo.cs @@ -0,0 +1,56 @@ +namespace Giants.DataContract +{ + using System; + using System.Collections.Generic; + using System.ComponentModel.DataAnnotations; + using System.Diagnostics.CodeAnalysis; + using System.Text; + + public class ServerInfo + { + [Required] + [StringLength(100)] + public string GameName { get; set; } + + [Required] + [StringLength(100)] + public string Version { get; set; } + + [Required] + [StringLength(100)] + public string SessionName { get; set; } // was "HostName" + + [Required] + public int Port { get; set; } + + [Required] + [StringLength(300)] + public string MapName { get; set; } + + [Required] + [StringLength(100)] + public string GameType { get; set; } + + [Required] + public int NumPlayers { get; set; } + + [Required] + [StringLength(100)] + public string GameState { get; set; } + + [Required] + public int TimeLimit { get; set; } + + [Required] + public int FragLimit { get; set; } + + [Required] + public int TeamFragLimit { get; set; } + + [Required] + public bool FirstBaseComplete { get; set; } + + [Required] + public IList PlayerInfo { get; set; } + } +} diff --git a/Giants.DataContract/Contracts/ServerInfoWithHostAddress.cs b/Giants.DataContract/Contracts/ServerInfoWithHostAddress.cs new file mode 100644 index 0000000..30c9484 --- /dev/null +++ b/Giants.DataContract/Contracts/ServerInfoWithHostAddress.cs @@ -0,0 +1,13 @@ +namespace Giants.DataContract +{ + using System; + using System.Collections.Generic; + using System.Text; + + public class ServerInfoWithHostAddress + { + public ServerInfo ServerInfo { get; set; } + + public string HostIpAddress { get; set; } + } +} diff --git a/Giants.DataContract/Giants.DataContract.csproj b/Giants.DataContract/Giants.DataContract.csproj new file mode 100644 index 0000000..cb63190 --- /dev/null +++ b/Giants.DataContract/Giants.DataContract.csproj @@ -0,0 +1,7 @@ + + + + netcoreapp3.1 + + + diff --git a/Giants.Services/Core/Entities/ServerInfo.cs b/Giants.Services/Core/Entities/ServerInfo.cs new file mode 100644 index 0000000..0e63ce7 --- /dev/null +++ b/Giants.Services/Core/Entities/ServerInfo.cs @@ -0,0 +1,11 @@ +namespace Giants.Services +{ + using System; + + public class ServerInfo : DataContract.ServerInfo + { + public string HostIpAddress { get; set; } + + public DateTime LastHeartbeat { get; set; } + } +} diff --git a/Giants.Services/Core/ServicesModule.cs b/Giants.Services/Core/ServicesModule.cs new file mode 100644 index 0000000..0f9ced8 --- /dev/null +++ b/Giants.Services/Core/ServicesModule.cs @@ -0,0 +1,13 @@ +namespace Giants.Services +{ + using Microsoft.Extensions.DependencyInjection; + + public static class ServicesModule + { + public static void RegisterServices(IServiceCollection services) + { + services.AddSingleton(); + services.AddSingleton(); + } + } +} diff --git a/Giants.Services/Giants.Services.csproj b/Giants.Services/Giants.Services.csproj new file mode 100644 index 0000000..921189f --- /dev/null +++ b/Giants.Services/Giants.Services.csproj @@ -0,0 +1,16 @@ + + + + netcoreapp3.1 + + + + + + + + + + + + diff --git a/Giants.Services/Mapper/Mapper.cs b/Giants.Services/Mapper/Mapper.cs new file mode 100644 index 0000000..c2c24ae --- /dev/null +++ b/Giants.Services/Mapper/Mapper.cs @@ -0,0 +1,35 @@ +namespace Giants.Services +{ + using System; + using System.Collections.Generic; + using System.Text; + using AutoMapper; + + public static class Mapper + { + public static IMapper Instance { get; private set; } + + private static readonly object LockObject = new object(); + + public static IMapper GetMapper() + { + if (Instance == null) + { + lock(LockObject) + { + if (Instance == null) + { + var config = new MapperConfiguration(cfg => { + cfg.CreateMap(); + cfg.CreateMap(); + }); + + Instance = new AutoMapper.Mapper(config); + } + } + } + + return Instance; + } + } +} diff --git a/Giants.Services/Services/FileUpdaterStore.cs b/Giants.Services/Services/FileUpdaterStore.cs new file mode 100644 index 0000000..4557c10 --- /dev/null +++ b/Giants.Services/Services/FileUpdaterStore.cs @@ -0,0 +1,10 @@ +namespace Giants.Services +{ + using System; + using System.Collections.Generic; + using System.Text; + + public class FileUpdaterStore : IUpdaterStore + { + } +} diff --git a/Giants.Services/Services/IServerRegistryService.cs b/Giants.Services/Services/IServerRegistryService.cs new file mode 100644 index 0000000..d81a8f9 --- /dev/null +++ b/Giants.Services/Services/IServerRegistryService.cs @@ -0,0 +1,15 @@ +namespace Giants.Services +{ + using System; + using System.Collections.Generic; + using System.Net; + using System.Text; + using System.Threading.Tasks; + + public interface IServerRegistryService + { + Task> GetAllServers(); + + Task AddServer(IPAddress ipAddress, ServerInfo server); + } +} diff --git a/Giants.Services/Services/IServerRegistryStore.cs b/Giants.Services/Services/IServerRegistryStore.cs new file mode 100644 index 0000000..ba3fd53 --- /dev/null +++ b/Giants.Services/Services/IServerRegistryStore.cs @@ -0,0 +1,17 @@ +namespace Giants.Services +{ + using System; + using System.Collections.Generic; + using System.Net; + using System.Text; + using System.Threading.Tasks; + + public interface IServerRegistryStore + { + public Task> GetAllServerInfos(); + + public Task GetServerInfo(IPAddress ipAddress); + + public Task UpsertServerInfo(IPAddress ipAddress, ServerInfo serverInfo); + } +} diff --git a/Giants.Services/Services/IUpdaterService.cs b/Giants.Services/Services/IUpdaterService.cs new file mode 100644 index 0000000..0903b45 --- /dev/null +++ b/Giants.Services/Services/IUpdaterService.cs @@ -0,0 +1,10 @@ +namespace Giants.Services +{ + using System; + using System.Collections.Generic; + using System.Text; + + public interface IUpdaterService + { + } +} diff --git a/Giants.Services/Services/IUpdaterStore.cs b/Giants.Services/Services/IUpdaterStore.cs new file mode 100644 index 0000000..df0058e --- /dev/null +++ b/Giants.Services/Services/IUpdaterStore.cs @@ -0,0 +1,11 @@ +namespace Giants.Services +{ + using System; + using System.Collections.Generic; + using System.Text; + + + public interface IUpdaterStore + { + } +} diff --git a/Giants.Services/Services/InMemoryServerRegistryStore.cs b/Giants.Services/Services/InMemoryServerRegistryStore.cs new file mode 100644 index 0000000..8e207f2 --- /dev/null +++ b/Giants.Services/Services/InMemoryServerRegistryStore.cs @@ -0,0 +1,36 @@ +namespace Giants.Services +{ + using System.Collections.Concurrent; + using System.Collections.Generic; + using System.Linq; + using System.Net; + using System.Threading.Tasks; + + public class InMemoryServerRegistryStore : IServerRegistryStore + { + private ConcurrentDictionary servers = new ConcurrentDictionary(); + + public Task> GetAllServerInfos() + { + return Task.FromResult( + this.servers.Values.AsEnumerable()); + } + + public Task GetServerInfo(IPAddress ipAddress) + { + if (servers.ContainsKey(ipAddress)) + { + return Task.FromResult(servers[ipAddress]); + } + + return Task.FromResult((ServerInfo)null); + } + + public Task UpsertServerInfo(IPAddress ipAddress, ServerInfo serverInfo) + { + servers.TryAdd(ipAddress, serverInfo); + + return Task.CompletedTask; + } + } +} diff --git a/Giants.Services/Services/ServerRegistryService.cs b/Giants.Services/Services/ServerRegistryService.cs new file mode 100644 index 0000000..a2e370e --- /dev/null +++ b/Giants.Services/Services/ServerRegistryService.cs @@ -0,0 +1,35 @@ +namespace Giants.Services +{ + using System; + using System.Collections.Generic; + using System.Net; + using System.Threading.Tasks; + + public class ServerRegistryService : IServerRegistryService + { + private readonly IServerRegistryStore registryStore; + + public ServerRegistryService(IServerRegistryStore registryStore) + { + this.registryStore = registryStore; + } + + public async Task AddServer( + IPAddress ipAddress, + ServerInfo server) + { + ServerInfo existingServer = await this.registryStore.GetServerInfo(ipAddress ?? throw new ArgumentNullException(nameof(ipAddress))); + if (existingServer != null) + { + + } + + await this.registryStore.UpsertServerInfo(ipAddress, server ?? throw new ArgumentNullException(nameof(server))); + } + + public async Task> GetAllServers() + { + return await this.registryStore.GetAllServerInfos(); + } + } +} diff --git a/Giants.Services/Services/UpdaterService.cs b/Giants.Services/Services/UpdaterService.cs new file mode 100644 index 0000000..cee3a19 --- /dev/null +++ b/Giants.Services/Services/UpdaterService.cs @@ -0,0 +1,16 @@ +namespace Giants.Services +{ + using System; + using System.Collections.Generic; + using System.Text; + + public class UpdaterService + { + private readonly IUpdaterStore updaterStore; + + public UpdaterService(IUpdaterStore updaterStore) + { + this.updaterStore = updaterStore; + } + } +} diff --git a/Giants.WebApi/Controllers/ServersController.cs b/Giants.WebApi/Controllers/ServersController.cs new file mode 100644 index 0000000..c5da69d --- /dev/null +++ b/Giants.WebApi/Controllers/ServersController.cs @@ -0,0 +1,65 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net; +using System.Threading.Tasks; +using AutoMapper; +using Giants.DataContract; +using Giants.Services; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Logging; + +namespace Giants.Web.Controllers +{ + [ApiController] + [Route("[controller]")] + public class ServersController : ControllerBase + { + private readonly IMapper mapper; + private readonly IHttpContextAccessor httpContextAccessor; + private readonly ILogger logger; + private readonly IServerRegistryService serverRegistryService; + + public ServersController( + IMapper mapper, + IHttpContextAccessor httpContextAccessor, + ILogger logger, + IServerRegistryService serverRegistryService) + { + this.mapper = mapper; + this.httpContextAccessor = httpContextAccessor; + this.logger = logger; + this.serverRegistryService = serverRegistryService; + } + + [HttpGet] + public async Task> GetServers() + { + IEnumerable serverInfo = await this.serverRegistryService.GetAllServers(); + + IMapper mapper = Services.Mapper.GetMapper(); + return serverInfo + .Select(x => + { + var serverInfo = mapper.Map(x); + serverInfo.HostIpAddress = x.HostIpAddress; + return serverInfo; + }) + .ToList(); + } + + [HttpPost] + public async Task AddServer([FromBody]DataContract.ServerInfo serverInfo) + { + IPAddress requestIpAddress = this.httpContextAccessor.HttpContext.Connection.RemoteIpAddress.MapToIPv4(); + this.logger.LogInformation($"Request to add server from {requestIpAddress}"); + + var serverInfoEntity = mapper.Map(serverInfo); + serverInfoEntity.HostIpAddress = requestIpAddress.ToString(); + serverInfoEntity.LastHeartbeat = DateTime.UtcNow; + + await this.serverRegistryService.AddServer(requestIpAddress, serverInfoEntity); + } + } +} diff --git a/Giants.WebApi/Giants.WebApi.csproj b/Giants.WebApi/Giants.WebApi.csproj new file mode 100644 index 0000000..335e16d --- /dev/null +++ b/Giants.WebApi/Giants.WebApi.csproj @@ -0,0 +1,17 @@ + + + + netcoreapp3.1 + Library + + + + + + + + + + + + diff --git a/Giants.WebApi/Program.cs b/Giants.WebApi/Program.cs new file mode 100644 index 0000000..47c2e2b --- /dev/null +++ b/Giants.WebApi/Program.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Hosting; +using Microsoft.Extensions.Logging; + +namespace Giants.Web +{ + public class Program + { + public static void Main(string[] args) + { + CreateHostBuilder(args).Build().Run(); + } + + public static IHostBuilder CreateHostBuilder(string[] args) => + Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }); + } +} diff --git a/Giants.WebApi/Properties/launchSettings.json b/Giants.WebApi/Properties/launchSettings.json new file mode 100644 index 0000000..29bcacc --- /dev/null +++ b/Giants.WebApi/Properties/launchSettings.json @@ -0,0 +1,30 @@ +{ + "$schema": "http://json.schemastore.org/launchsettings.json", + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:65478", + "sslPort": 44304 + } + }, + "profiles": { + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, + "launchUrl": "weatherforecast", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "GiantsTools": { + "commandName": "Project", + "launchBrowser": true, + "launchUrl": "weatherforecast", + "applicationUrl": "https://localhost:5001;http://localhost:5000", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + } + } +} diff --git a/Giants.WebApi/Startup.cs b/Giants.WebApi/Startup.cs new file mode 100644 index 0000000..317052d --- /dev/null +++ b/Giants.WebApi/Startup.cs @@ -0,0 +1,56 @@ +using AutoMapper; +using Giants.Services; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Mvc.Infrastructure; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection.Extensions; +using Microsoft.Extensions.Hosting; + +namespace Giants.Web +{ + public class Startup + { + public Startup(IConfiguration configuration) + { + Configuration = configuration; + } + + public IConfiguration Configuration { get; } + + // This method gets called by the runtime. Use this method to add services to the container. + public void ConfigureServices(IServiceCollection services) + { + services.AddControllers(); + + services.AddHttpContextAccessor(); + services.TryAddSingleton(); + + ServicesModule.RegisterServices(services); + + IMapper mapper = Services.Mapper.GetMapper(); + services.AddSingleton(mapper); + } + + // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. + public void Configure(IApplicationBuilder app, IWebHostEnvironment env) + { + if (env.IsDevelopment()) + { + app.UseDeveloperExceptionPage(); + } + + app.UseHttpsRedirection(); + + app.UseRouting(); + + app.UseAuthorization(); + + app.UseEndpoints(endpoints => + { + endpoints.MapControllers(); + }); + } + } +} diff --git a/Giants.WebApi/appsettings.Development.json b/Giants.WebApi/appsettings.Development.json new file mode 100644 index 0000000..8983e0f --- /dev/null +++ b/Giants.WebApi/appsettings.Development.json @@ -0,0 +1,9 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft": "Warning", + "Microsoft.Hosting.Lifetime": "Information" + } + } +} diff --git a/Giants.WebApi/appsettings.json b/Giants.WebApi/appsettings.json new file mode 100644 index 0000000..d9d9a9b --- /dev/null +++ b/Giants.WebApi/appsettings.json @@ -0,0 +1,10 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft": "Warning", + "Microsoft.Hosting.Lifetime": "Information" + } + }, + "AllowedHosts": "*" +} diff --git a/GiantsTools.sln b/GiantsTools.sln new file mode 100644 index 0000000..b817512 --- /dev/null +++ b/GiantsTools.sln @@ -0,0 +1,37 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30320.27 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Giants.Services", "Giants.Services\Giants.Services.csproj", "{0CD61424-4E74-4A48-A726-729FEA32C50C}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Giants.DataContract", "Giants.DataContract\Giants.DataContract.csproj", "{D426FE47-231B-41F0-AC78-293D12EF66A0}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Giants.WebApi", "Giants.WebApi\Giants.WebApi.csproj", "{9A284C34-8F4B-4E20-B74B-1A0AF04EDBD1}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0CD61424-4E74-4A48-A726-729FEA32C50C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0CD61424-4E74-4A48-A726-729FEA32C50C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0CD61424-4E74-4A48-A726-729FEA32C50C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0CD61424-4E74-4A48-A726-729FEA32C50C}.Release|Any CPU.Build.0 = Release|Any CPU + {D426FE47-231B-41F0-AC78-293D12EF66A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D426FE47-231B-41F0-AC78-293D12EF66A0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D426FE47-231B-41F0-AC78-293D12EF66A0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D426FE47-231B-41F0-AC78-293D12EF66A0}.Release|Any CPU.Build.0 = Release|Any CPU + {9A284C34-8F4B-4E20-B74B-1A0AF04EDBD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9A284C34-8F4B-4E20-B74B-1A0AF04EDBD1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9A284C34-8F4B-4E20-B74B-1A0AF04EDBD1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9A284C34-8F4B-4E20-B74B-1A0AF04EDBD1}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {5B1F49CA-E8B9-4763-8476-FC8FB7A944E6} + EndGlobalSection +EndGlobal