version estable: router, menu, interceptors, refresh url

develop
Al Garcia 2 years ago
parent 701577dead
commit d4c5c82720
  1. BIN
      .vs/AOLBackend/DesignTimeBuild/.dtbcache.v2
  2. BIN
      .vs/AOLBackend/v17/.futdcache.v1
  3. BIN
      .vs/AOLBackend/v17/.suo
  4. BIN
      .vs/ProjectEvaluation/aolbackend.metadata.v2
  5. BIN
      .vs/ProjectEvaluation/aolbackend.projects.v2
  6. 1
      AOLBackend.csproj.user
  7. 2
      Controllers/Catalogos/CatClientesController.cs
  8. 2
      Controllers/Catalogos/CatProveedoresController.cs
  9. 2
      Controllers/Catalogos/CatRutasController.cs
  10. 3
      Controllers/Catalogos/CatServiciosController.cs
  11. 2
      Controllers/Catalogos/CatTipoUnidadController.cs
  12. 3
      Controllers/Catalogos/CatUbicacionesController.cs
  13. 2
      Controllers/Operaciones/OpViajesController.cs
  14. 2
      Controllers/Usuarios/AuthController.cs
  15. 1
      DTO/Operaciones/DTOOpViajes.cs
  16. 9
      Program.cs
  17. 6
      appsettings.Development.json
  18. 6
      appsettings.json
  19. BIN
      bin/Debug/net6.0/AOLBackend.dll
  20. BIN
      bin/Debug/net6.0/AOLBackend.pdb
  21. 6
      bin/Debug/net6.0/appsettings.Development.json
  22. 6
      bin/Debug/net6.0/appsettings.json
  23. 4
      obj/Debug/net6.0/AOLBackend.GeneratedMSBuildEditorConfig.editorconfig
  24. BIN
      obj/Debug/net6.0/AOLBackend.assets.cache
  25. BIN
      obj/Debug/net6.0/AOLBackend.dll
  26. BIN
      obj/Debug/net6.0/AOLBackend.pdb
  27. BIN
      obj/Debug/net6.0/ref/AOLBackend.dll
  28. BIN
      obj/Debug/net6.0/refint/AOLBackend.dll
  29. 98
      obj/staticwebassets.pack.sentinel

Binary file not shown.

Binary file not shown.

@ -3,5 +3,6 @@
<PropertyGroup> <PropertyGroup>
<Controller_SelectedScaffolderID>ApiControllerWithActionsScaffolder</Controller_SelectedScaffolderID> <Controller_SelectedScaffolderID>ApiControllerWithActionsScaffolder</Controller_SelectedScaffolderID>
<Controller_SelectedScaffolderCategoryPath>root/Common/Api</Controller_SelectedScaffolderCategoryPath> <Controller_SelectedScaffolderCategoryPath>root/Common/Api</Controller_SelectedScaffolderCategoryPath>
<NameOfLastUsedPublishProfile>C:\projects\staging\AOLBackend\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

@ -1,9 +1,11 @@
using AOLBackend.Contracts.Catalogos; using AOLBackend.Contracts.Catalogos;
using AOLBackend.Models.Catalogos; using AOLBackend.Models.Catalogos;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Authorization;
namespace AOLBackend.Controllers.Catalogos namespace AOLBackend.Controllers.Catalogos
{ {
[Authorize]
[ApiController] [ApiController]
[Route("api/Catalogos/[controller]")] [Route("api/Catalogos/[controller]")]
public class CatClientesController : ControllerBase public class CatClientesController : ControllerBase

@ -1,9 +1,11 @@
using AOLBackend.Contracts.Catalogos; using AOLBackend.Contracts.Catalogos;
using AOLBackend.Models.Catalogos; using AOLBackend.Models.Catalogos;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Authorization;
namespace AOLBackend.Controllers.Catalogos namespace AOLBackend.Controllers.Catalogos
{ {
[Authorize]
[ApiController] [ApiController]
[Route("api/Catalogos/[controller]")] [Route("api/Catalogos/[controller]")]
public class CatProveedoresController : ControllerBase public class CatProveedoresController : ControllerBase

@ -2,9 +2,11 @@ using AOLBackend.Contracts.Catalogos;
using AOLBackend.Models.Catalogos; using AOLBackend.Models.Catalogos;
using AOLBackend.DTO.Catalogos; using AOLBackend.DTO.Catalogos;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Authorization;
namespace AOLBackend.Controllers.Catalogos namespace AOLBackend.Controllers.Catalogos
{ {
[Authorize]
[ApiController] [ApiController]
[Route("api/Catalogos/[controller]")] [Route("api/Catalogos/[controller]")]
public class CatRutasController : ControllerBase public class CatRutasController : ControllerBase

@ -1,10 +1,11 @@
using AOLBackend.Contracts.Catalogos; using AOLBackend.Contracts.Catalogos;
using AOLBackend.Models.Catalogos; using AOLBackend.Models.Catalogos;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Authorization;
namespace AOLBackend.Controllers.Catalogos namespace AOLBackend.Controllers.Catalogos
{ {
[Authorize]
[ApiController] [ApiController]
[Route("api/Catalogos/[controller]")] [Route("api/Catalogos/[controller]")]
public class CatServiciosController : ControllerBase public class CatServiciosController : ControllerBase

@ -1,9 +1,11 @@
using AOLBackend.Contracts.Catalogos; using AOLBackend.Contracts.Catalogos;
using AOLBackend.Models.Catalogos; using AOLBackend.Models.Catalogos;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Authorization;
namespace AOLBackend.Controllers.Catalogos namespace AOLBackend.Controllers.Catalogos
{ {
[Authorize]
[ApiController] [ApiController]
[Route("api/Catalogos/[controller]")] [Route("api/Catalogos/[controller]")]
public class CatTipoUnidadController : ControllerBase public class CatTipoUnidadController : ControllerBase

@ -1,10 +1,11 @@
using AOLBackend.Contracts.Catalogos; using AOLBackend.Contracts.Catalogos;
using AOLBackend.Models.Catalogos; using AOLBackend.Models.Catalogos;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Authorization;
namespace AOLBackend.Controllers.Catalogos namespace AOLBackend.Controllers.Catalogos
{ {
[Authorize]
[ApiController] [ApiController]
[Route("api/Catalogos/[controller]")] [Route("api/Catalogos/[controller]")]
public class CatUbicacionesController : ControllerBase public class CatUbicacionesController : ControllerBase

@ -1,9 +1,11 @@
using AOLBackend.Contracts.Operaciones; using AOLBackend.Contracts.Operaciones;
using AOLBackend.DTO.Operaciones; using AOLBackend.DTO.Operaciones;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Authorization;
namespace AOLBackend.Controllers.Operaciones namespace AOLBackend.Controllers.Operaciones
{ {
[Authorize]
[ApiController] [ApiController]
[Route("api/Operaciones/[controller]")] [Route("api/Operaciones/[controller]")]
public class OpViajesController : ControllerBase public class OpViajesController : ControllerBase

@ -61,7 +61,7 @@ namespace AOLBackend.Controllers.Usuarios
_config["Jwt:Audience"], _config["Jwt:Audience"],
claims, claims,
expires: DateTime.UtcNow.AddHours(Int32.Parse(_config["Jwt:ExpirationHours"])), expires: DateTime.UtcNow.AddHours(Int32.Parse(_config["Jwt:ExpirationHours"])),
//expires: DateTime.UtcNow.AddMinutes(5), //expires: DateTime.UtcNow.AddMinutes(2),
signingCredentials: signIn); signingCredentials: signIn);
var _token = new JwtSecurityTokenHandler().WriteToken(token); var _token = new JwtSecurityTokenHandler().WriteToken(token);

@ -18,6 +18,7 @@ namespace AOLBackend.DTO.Operaciones
public string? sDestino { get; set; } = null!; public string? sDestino { get; set; } = null!;
public byte Hazmat { get; set; } = 0; public byte Hazmat { get; set; } = 0;
public byte TipoOperacion { get; set; } = 1; public byte TipoOperacion { get; set; } = 1;
public string sTipoOperacion { get; set; } = null!;
public string Pedimento { get; set; } = null!; public string Pedimento { get; set; } = null!;
public int Status { get; set; } = 0; public int Status { get; set; } = 0;
public int Activo { get; set; } = 0; public int Activo { get; set; } = 0;

@ -48,12 +48,15 @@ builder.Services.AddCors(p => p.AddPolicy("corsapp", builder =>
//builder.WithOrigins("*").AllowAnyMethod().AllowAnyHeader(); //builder.WithOrigins("*").AllowAnyMethod().AllowAnyHeader();
builder.WithOrigins("http://localhost:3000", builder.WithOrigins("http://localhost:3000",
"http://localhost:7001",
"http://localhost:5000", "http://localhost:5000",
"https://localhost:5001", "https://localhost:5001",
"https://www.alphaomega.com.mx",
"https://74.208.165.122",
"https://www.alphaomega.com.mx:443",
"https://74.208.165.122:443",
"http://localhost", "http://localhost",
"http://192.168.100.242:3000", "http://74.208.165.122:5000").AllowAnyMethod().AllowAnyHeader();
"http://74.208.65.168",
"http://reportes.gemcousa.com").AllowAnyMethod().AllowAnyHeader();
})); }));
var app = builder.Build(); var app = builder.Build();

@ -1,7 +1,7 @@
{ {
/* "ConnectionStrings": { "ConnectionStrings": {
"SqlConnection": "server=127.0.0.1,14033; database=GEMCO; User Id=sa;Password=toor1234.;Encrypt=False;" "SqlConnection": "server=.; database=AOL; Integrated Security=true;TrustServerCertificate=True;"
}, */ },
"Logging": { "Logging": {
"LogLevel": { "LogLevel": {
"Default": "Information", "Default": "Information",

@ -1,7 +1,6 @@
{ {
"ConnectionStrings": { "ConnectionStrings": {
"SqlConnection": "server=.; database=AOL; Integrated Security=true;TrustServerCertificate=True;" "SqlConnection": "server=localhost\\SQLEXPRESS; database=AOL; User Id=AOLadmin;Password=40La6m1n.22;Encrypt=False;"
// "SqlConnection": "server=127.0.0.1,14033; database=GEMCO; User Id=sa; Password=toor1234.; TrustServerCertificate=True;"
}, },
"DefaultUser": { "DefaultUser": {
"Password": "Bienvenido123!" "Password": "Bienvenido123!"
@ -18,7 +17,8 @@
"Issuer": "JWTAuthenticationServer", "Issuer": "JWTAuthenticationServer",
"Audience": "JWTServicePostmanClient", "Audience": "JWTServicePostmanClient",
"Subject": "JWTServiceAccessToken", "Subject": "JWTServiceAccessToken",
"ExpirationHours": 4 "ExpirationHours": 4,
"ExpirationMinutes": 1
}, },
"EmailServer": "146.20.161.11", "EmailServer": "146.20.161.11",
"EmailPort": 587, "EmailPort": 587,

Binary file not shown.

Binary file not shown.

@ -1,7 +1,7 @@
{ {
/* "ConnectionStrings": { "ConnectionStrings": {
"SqlConnection": "server=127.0.0.1,14033; database=GEMCO; User Id=sa;Password=toor1234.;Encrypt=False;" "SqlConnection": "server=.; database=AOL; Integrated Security=true;TrustServerCertificate=True;"
}, */ },
"Logging": { "Logging": {
"LogLevel": { "LogLevel": {
"Default": "Information", "Default": "Information",

@ -1,7 +1,6 @@
{ {
"ConnectionStrings": { "ConnectionStrings": {
"SqlConnection": "server=.; database=AOL; Integrated Security=true;TrustServerCertificate=True;" "SqlConnection": "server=localhost\\SQLEXPRESS; database=AOL; User Id=AOLadmin;Password=40La6m1n.22;Encrypt=False;"
// "SqlConnection": "server=127.0.0.1,14033; database=GEMCO; User Id=sa; Password=toor1234.; TrustServerCertificate=True;"
}, },
"DefaultUser": { "DefaultUser": {
"Password": "Bienvenido123!" "Password": "Bienvenido123!"
@ -18,7 +17,8 @@
"Issuer": "JWTAuthenticationServer", "Issuer": "JWTAuthenticationServer",
"Audience": "JWTServicePostmanClient", "Audience": "JWTServicePostmanClient",
"Subject": "JWTServiceAccessToken", "Subject": "JWTServiceAccessToken",
"ExpirationHours": 4 "ExpirationHours": 4,
"ExpirationMinutes": 1
}, },
"EmailServer": "146.20.161.11", "EmailServer": "146.20.161.11",
"EmailPort": 587, "EmailPort": 587,

@ -8,9 +8,9 @@ build_property.PlatformNeutralAssembly =
build_property._SupportedPlatformList = Linux,macOS,Windows build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = AOLBackend build_property.RootNamespace = AOLBackend
build_property.RootNamespace = AOLBackend build_property.RootNamespace = AOLBackend
build_property.ProjectDir = C:\projects\staging\AOLBackend\ build_property.ProjectDir = c:\projects\staging\AOLBackend\
build_property.RazorLangVersion = 6.0 build_property.RazorLangVersion = 6.0
build_property.SupportLocalizedComponentNames = build_property.SupportLocalizedComponentNames =
build_property.GenerateRazorMetadataSourceChecksumAttributes = build_property.GenerateRazorMetadataSourceChecksumAttributes =
build_property.MSBuildProjectDirectory = C:\projects\staging\AOLBackend build_property.MSBuildProjectDirectory = c:\projects\staging\AOLBackend
build_property._RazorSourceGeneratorDebug = build_property._RazorSourceGeneratorDebug =

Binary file not shown.

Binary file not shown.

@ -142,3 +142,101 @@
2.0 2.0
2.0 2.0
2.0 2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0
2.0

Loading…
Cancel
Save