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

1.0.0.512

Browse Source 
Former-commit-id: 22a235baec9209b15b69fc145ff0b79d393ecfc9
TangShanKaiPing
wanggang 5 years ago
parent 74cd73520e
commit 1b9b9d6499
15 changed files with 35 additions and 36 deletions
Show Stats Download Patch File Download Diff File

BIN
docs/物联网中心.EAP
View File

Binary file not shown.

BIN
docs/研发/技术选型.xmind
View File

Binary file not shown.

17
projects/Infrastructure/Views/Account/_Layout.cshtml
Unescape View File

@ -1,9 +1,14 @@
@inject IConfiguration cfg
@inject Infrastructure.Application.Services.Settings.ISettingService settingSerice
@{
var name = settingSerice.GetSetting("name").Value;
var logo = settingSerice.GetSetting("logo").Value;
var copyright = settingSerice.GetSetting("copyright").Value;
}
<!DOCTYPE html>
<html>
<head>
@(await Html.PartialAsync("_Header"))
<title>@HtmlTitle | @cfg["name"]</title>
<title>@name @HtmlTitle</title>
@RenderSection("styles", required: false)
</head>
<body class="hold-transition sidebar-mini layout-boxed" data-senna data-senna-surface>
@ -42,8 +47,8 @@
</nav>
<aside class="main-sidebar sidebar-dark-primary elevation-4">
<a class="brand-link" href="@Url.Action("Index","Home",new { area=""})">
<img class="brand-image img-circle elevation-3" style="opacity: .8" src="@Url.Content("~"+cfg["logo"])" />
<span class="brand-text font-weight-light">@cfg["name"]</span>
<img class="brand-image img-circle elevation-3" style="opacity: .8" src="@Url.Content("~"+logo)" />
<span class="brand-text font-weight-light">@name</span>
</a>
<div class="sidebar">
<nav class="mt-2">
@ -87,10 +92,10 @@
</div>
<footer class="main-footer">
<strong>
@Html.Raw(cfg["copyright"].Replace("{now}", DateTime.Now.Year.ToString()))
@Html.Raw(string.Format(copyright, DateTime.Now.Year.ToString()))
</strong>
<div class="float-right d-none d-sm-inline-block">
<b>v @Helper.Instance.GetVersion()</b>
<b>v @Helper.Instance.GetVersion() build @Helper.Instance.GetAssemblyVersion()</b>
@if (User.Identity.IsAuthenticated)
{
<a href="@Url.Action("Index","Home",new { area="Admin" })">管理</a>

2
projects/Infrastructure/Views/Shared/_Layout.cshtml
Unescape View File

@ -92,7 +92,7 @@
@Html.Raw(string.Format(copyright, DateTime.Now.Year.ToString()))
</strong>
<div class="float-right d-none d-sm-inline-block">
<b>v @Helper.Instance.GetVersion()</b>
<b>v @Helper.Instance.GetVersion() build @Helper.Instance.GetAssemblyVersion()</b>
@if (User.Identity.IsAuthenticated)
{
<a href="@Url.Action("Index","Home",new { area="Admin" })">管理</a>

10
projects/IoT.Shared/Application/Domain/Entities/Node.cs
Unescape View File

@ -20,14 +20,8 @@ namespace Application.Domain.Entities
[Display(Name = "图片")]
public string Image { get; set; }
[Display(Name = "经度")]
public decimal Longitude { get; set; }
[Display(Name = "维度")]
public decimal Latitude { get; set; }
[Display(Name = "海拔")]
public decimal Altitude { get; set; }
[Display(Name = "版本")]
public string Version { get; set; }
[Display(Name = "序号")]
public int DisplayOrder { get; set; }

10
projects/IoT.Shared/Application/Models/EditNodeModel.cs
Unescape View File

@ -24,14 +24,8 @@ namespace Application.Models
[DataType(DataType.ImageUrl)]
public string Image { get; set; }
[Display(Name = "经度")]
public decimal Longitude { get; set; }
[Display(Name = "维度")]
public decimal Latitude { get; set; }
[Display(Name = "海拔")]
public decimal Altitude { get; set; }
[Display(Name = "版本")]
public string Version { get; set; }
[Display(Name = "序号")]
public int DisplayOrder { get; set; }

2
projects/IoT.Shared/Application/Models/EditSceneTiggerModel.cs
Unescape View File

@ -30,7 +30,7 @@ namespace Application.Models
public Guid? DataId { get; set; }
[Display(Name = "触发规则")]
[Description("示例：value==\"开\"")]
[Description("javascript逻辑运算表达式：如value>250或value==\"开\"")]
[Remote("ConditionValid", "Ajax", "Admin", AdditionalFields = "DataId")]
[Required(ErrorMessage = nameof(RequiredAttribute))]
public string Condition { get; set; }

2
projects/IoTCenter/Application/Domain/OrganNode.cs
Unescape View File

@ -1,9 +1,11 @@
using Application.Domain.Entities;
using Infrastructure.Domain;
using System;
using System.ComponentModel.DataAnnotations;
namespace IoTCenter.Application.Domain
{
[Display(Name = "机构节点")]
public class OrganNode : BaseEntity
{
public Guid OrganId { get; set; }

2
projects/IoTCenter/Application/Models/EditGlobalSceneTiggerModel.cs
Unescape View File

@ -1,6 +1,7 @@
using Infrastructure.Application;
using Microsoft.AspNetCore.Mvc;
using System;
using System.ComponentModel;
using System.ComponentModel.DataAnnotations;
namespace IoTCenter.Application.Models
@ -32,6 +33,7 @@ namespace IoTCenter.Application.Models
public Guid? DataId { get; set; }
[Display(Name = "触发规则")]
[Description("javascript逻辑运算表达式：如value>250或value==\"开\"")]
[Remote("ConditionValid", "Ajax", "Admin", AdditionalFields = "DataId")]
[Required(ErrorMessage = nameof(RequiredAttribute))]
public string Condition { get; set; }

2
projects/IoTCenter/wwwroot/js/message.js
Unescape View File

@ -1,4 +1,4 @@
var connection = new signalR.HubConnectionBuilder().withUrl(hubUrl).build();
var connection = new signalR.HubConnectionBuilder().withUrl(hubUrl).withAutomaticReconnect().build();
var connectionId;
function connect() {
if (connection.state === signalR.HubConnectionState.Disconnected) {

1
projects/IoTNode/DbConfig.cs
Unescape View File

@ -97,6 +97,7 @@ namespace IoTNode
Name = "节点",
Number = sn,
IsOnline = true,
Version = Helper.Instance.GetVersion(),
Image = "/images/classroom.png"
});
db.SaveChanges();

1
projects/UserCenter/Application/Domain/Entities/User.cs
Unescape View File

@ -2,6 +2,7 @@ using Infrastructure.Domain;
using Infrastructure.Web.Mvc;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.ComponentModel.DataAnnotations;
namespace Application.Domain.Entities

11
projects/UserCenter/Application/Models/EditUserModel.cs
Unescape View File

@ -20,27 +20,18 @@ namespace Application.Models
[Display(Name = "登录密码")]
public string Password { get; set; }
[Display(Name = "密码认证")]
public bool PasswordConfirmed { get; set; }
[DataType(DataType.EmailAddress)]
[RegularExpression(@"^\w+@\w+\.\w+$", ErrorMessage = "邮箱格式错误")]
[Display(Name = "邮箱")]
[Required(ErrorMessage = nameof(RequiredAttribute))]
public string Email { get; set; }
[Display(Name = "邮箱认证")]
public bool EmailConfirmed { get; set; }
[RegularExpression(@"^\d{11}$", ErrorMessage = "手机号格式错误")]
[DataType(DataType.PhoneNumber)]
[Display(Name = "手机号")]
public string PhoneNumber { get; set; }
[Display(Name = "手机号认证")]
public bool PhoneNumberConfirmed { get; set; }
[Display(Name = "昵称")]
[Required(ErrorMessage = nameof(RequiredAttribute))]
public string NickName { get; set; }
[Display(Name = "头像")]

9
projects/UserCenter/Areas/Admin/Controllers/UserController.cs
Unescape View File

@ -52,6 +52,15 @@ namespace UserCenter.Areas.Admin.Controllers
if (!string.IsNullOrEmpty(model.Password))
{
entity.PasswordHash = this._encrypitonService.CreatePasswordHash(model.Password, entity.SecurityStamp);
entity.PasswordConfirmed = true;
}
if (string.IsNullOrEmpty(model.Email))
{
entity.EmailConfirmed = true;
}
if (string.IsNullOrEmpty(model.PhoneNumber))
{
entity.PhoneNumberConfirmed = true;
}
foreach (var id in entity.UserRoles.Select(o => o.RoleId).ToList())
{

2
projects/Version.cs
Unescape View File

@ -1,4 +1,4 @@
using System.Reflection;
[assembly: AssemblyVersion("1.0.0.*")]
[assembly: AssemblyInformationalVersion("1.0.0.510")]
[assembly: AssemblyInformationalVersion("1.0.0.512")]
Write Preview
Loading…
Cancel
Save