wanggang
/
iot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update

Browse Source 
Former-commit-id: bd4af6992b973ca5a78de85ac0696225a2bbde9d
TangShanKaiPing
wanggang 5 years ago
parent 278d945652
commit 530cf25332
6 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File

5
projects/Infrastructure/Infrastructure.csproj
Unescape View File

@ -26,15 +26,16 @@
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="3.1.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.4" />
<PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.1.0" />
<PackageReference Include="Microsoft.Extensions.Localization" Version="3.1.4" />
<PackageReference Include="Minio" Version="3.1.13" />
<PackageReference Include="nacos-sdk-csharp-unofficial" Version="0.2.6" />
<PackageReference Include="nacos-sdk-csharp-unofficial.AspNetCore" Version="0.2.6" />
<PackageReference Include="nacos-sdk-csharp-unofficial.Extensions.Configuration" Version="0.2.6" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.1.3" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.1.4" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.1.1" />
<PackageReference Include="DotNetCore.NPOI" Version="1.2.2" />
<PackageReference Include="HtmlAgilityPack.NetCore" Version="1.5.0.1" />
<PackageReference Include="MailKit" Version="2.6.0" />
<PackageReference Include="MailKit" Version="2.7.0" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
<PackageReference Include="Serilog.Settings.Configuration" Version="3.1.0" />

3
projects/Infrastructure/Web/BaseStartup.cs
Unescape View File

@ -113,12 +113,13 @@ namespace Infrastructure.Web
.SetCompatibilityVersion(CompatibilityVersion.Latest)
.AddNewtonsoftJson()
.AddControllersAsServices()
.AddMvcLocalization()
.AddViewLocalization(LanguageViewLocationExpanderFormat.Suffix)
.AddDataAnnotationsLocalization(options =>
{
options.DataAnnotationLocalizerProvider = (type, factory) =>
{
var localizer = factory.Create("Resources.Resource", Assembly.GetEntryAssembly().FullName);
var localizer = factory.Create("Resources.Resource", Assembly.GetEntryAssembly().GetName().Name);
return localizer;
};
});

9
projects/IoTCenter/Api/NodeController.cs
Unescape View File

@ -3,15 +3,16 @@ using Application.Models;
using Infrastructure.Application.Services.Settings;
using Infrastructure.Data;
using Infrastructure.Extensions;
using IoTCenter.Application.Domain;
using IoTCenter.Services;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.SignalR;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
using System;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Threading;
using Microsoft.Extensions.Logging;
namespace IoTCenter.Api.Controllers
{
@ -22,6 +23,7 @@ namespace IoTCenter.Api.Controllers
{
private readonly ILogger<NodeController> _logger;
private readonly ISettingService _settingService;
private readonly IRepository<NodeCategoryNode> _nodeCategoryNodeRepo;
private readonly IRepository<Node> _nodeRepo;
private readonly IRepository<Device> _deviceRepo;
private readonly IHubContext<IoTCenterHub> _hub;
@ -29,12 +31,14 @@ namespace IoTCenter.Api.Controllers
public NodeController(
ILogger<NodeController> logger,
ISettingService settingService,
IRepository<NodeCategoryNode> nodeCategoryNodeRepo,
IRepository<Node> nodeRepo,
IRepository<Device> deviceRepo,
IHubContext<IoTCenterHub> hub)
{
this._logger = logger;
this._settingService = settingService;
this._nodeCategoryNodeRepo = nodeCategoryNodeRepo;
this._nodeRepo = nodeRepo;
this._deviceRepo = deviceRepo;
this._hub = hub;
@ -57,7 +61,8 @@ namespace IoTCenter.Api.Controllers
o.IsOnline,
o.Image,
o.DisplayOrder,
Count = _deviceRepo.ReadOnlyTable().Count(d => d.NodeId == o.Id)
Count = _deviceRepo.ReadOnlyTable().Count(d => d.NodeId == o.Id),
Template = _nodeCategoryNodeRepo.ReadOnlyTable().FirstOrDefault(o => o.NodeId == o.Id)?.Category.Template
});
return Ok(model);
}

9
projects/IoTCenter/IoTCenter.csproj
Unescape View File

@ -5,17 +5,16 @@
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<Deterministic>false</Deterministic>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\Version.cs" Link="Version.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.9" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Infrastructure\Infrastructure.csproj" />
<ProjectReference Include="..\IoT.Shared\IoT.Shared.csproj" />
</ItemGroup>
<ProjectExtensions>
<VisualStudio>
<UserProperties appsettings_1json__JsonSchema="" />
</VisualStudio>
</ProjectExtensions>
</Project>

17
projects/UserCenter/Controllers/AccountController.cs
Unescape View File

@ -4,7 +4,6 @@ using Infrastructure.Application.Services.Settings;
using Infrastructure.Data;
using Infrastructure.Email;
using Infrastructure.Extensions;
using Infrastructure.Resources;
using Infrastructure.Security;
using Infrastructure.Sms;
using Infrastructure.Web;
@ -15,7 +14,6 @@ using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Localization;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
@ -34,7 +32,6 @@ namespace UserCenter.Controllers
private readonly ISettingService _settingService;
private readonly IRepository<User> _userRepo;
private readonly IRepository<Site> _siteRepo;
private readonly IStringLocalizer<Resource> _localizer;
private readonly IEncryptionService _encryptionService;
private readonly IEmailSender _emailSender;
private readonly ISmsSender _smsSender;
@ -45,7 +42,6 @@ namespace UserCenter.Controllers
IRepository<User> userRepo,
IRepository<Site> siteRepo,
IEncryptionService encryptionService,
IStringLocalizer<Resource> localizer,
IEmailSender emaliSender,
ISmsSender smsSender
//FaceRecognitionService frs
@ -56,7 +52,6 @@ namespace UserCenter.Controllers
this._userRepo = userRepo;
this._siteRepo = siteRepo;
this._encryptionService = encryptionService;
this._localizer = localizer;
this._emailSender = emaliSender;
this._smsSender = smsSender;
//this._frs = frs;
@ -228,7 +223,7 @@ namespace UserCenter.Controllers
#region 注册
[AllowAnonymous]
public JsonResult UserNameNotUsed([Required]string userName)
public JsonResult UserNameNotUsed([Required] string userName)
{
if (ModelState.IsValid)
{
@ -292,7 +287,7 @@ namespace UserCenter.Controllers
}
[AllowAnonymous]
public JsonResult EmailNotUsed([Required]string email)
public JsonResult EmailNotUsed([Required] string email)
{
if (ModelState.IsValid)
{
@ -302,7 +297,7 @@ namespace UserCenter.Controllers
}
[AllowAnonymous]
public JsonResult SendCodeToEmail([Required]string email)
public JsonResult SendCodeToEmail([Required] string email)
{
if (ModelState.IsValid)
{
@ -383,7 +378,7 @@ namespace UserCenter.Controllers
}
[AllowAnonymous]
public JsonResult PhoneNumberNotUsed([Required]string phoneNumber)
public JsonResult PhoneNumberNotUsed([Required] string phoneNumber)
{
if (ModelState.IsValid)
{
@ -393,7 +388,7 @@ namespace UserCenter.Controllers
}
[AllowAnonymous]
public JsonResult SendCodeToPhoneNumber([Required]string phoneNumber)
public JsonResult SendCodeToPhoneNumber([Required] string phoneNumber)
{
if (ModelState.IsValid)
{
@ -450,7 +445,7 @@ namespace UserCenter.Controllers
}
[AllowAnonymous]
public JsonResult HasUser([Required]string userName)
public JsonResult HasUser([Required] string userName)
{
if (ModelState.IsValid)
{

5
projects/UserCenter/Controllers/HomeController.cs
Unescape View File

@ -2,7 +2,6 @@ using Application.Domain.Entities;
using Application.Models;
using Infrastructure.Data;
using Infrastructure.Extensions;
using Infrastructure.Resources;
using Infrastructure.Security;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Configuration;
@ -17,16 +16,14 @@ namespace UserCenter.Controllers
private readonly IRepository<User> _userRepo;
private readonly IRepository<Site> _siteRepo;
private readonly IConfiguration _configuration;
private readonly IStringLocalizer<Resource> _localizer;
private readonly IEncryptionService _encryptionService;
public HomeController(IRepository<User> userRepo, IRepository<Site> siteRepo, IEncryptionService encryptionService, IConfiguration configuration, IStringLocalizer<Resource> localizer)
public HomeController(IRepository<User> userRepo, IRepository<Site> siteRepo, IEncryptionService encryptionService, IConfiguration configuration)
{
this._userRepo = userRepo;
this._siteRepo = siteRepo;
this._encryptionService = encryptionService;
this._configuration = configuration;
this._localizer = localizer;
}
public IActionResult Index()

Write Preview
Loading…
Cancel
Save