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

rc2

Browse Source 
Former-commit-id: 511b9af256b0b4363dc93e62ac64d9ec34c8ddd3
TangShanKaiPing
wanggang 6 years ago
parent 984f035e41
commit 5fd6388237
8 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File

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

@ -82,7 +82,7 @@
@Html.Raw(cfg["copyright"].Replace("{now}", DateTime.Now.Year.ToString()))
</div>
<div class="pull-right hidden-xs">
<span>版本：@Html.Raw(cfg["version"]) 设备Id：@DeviceAttribute.DeviceId </span>
<span>版本：@Html.Raw(cfg["version"])</span><!--设备Id：@DeviceAttribute.DeviceId-->
@if (User.Identity.IsAuthenticated)
{
<a href="@Url.Action("Index","Home",new { area="Admin" })">管理</a>

2
projects/Infrastructure/Web/DeviceAttribute.cs
Unescape View File

@ -13,7 +13,7 @@ namespace Infrastructure.Web
static DeviceAttribute()
{
DeviceId = Helper.Instance.GetCPUNumber();
DeviceId = $"{Helper.Instance.GetCPUNumber()}{Helper.Instance.GetMacAddress()}".Md5();
}
public override void OnResultExecuting(ResultExecutingContext context)

1
projects/IoT/IdGen/Program.cs
Unescape View File

@ -8,6 +8,7 @@ namespace IdGen
private static void Main(string[] args)
{
Console.WriteLine("物联网设备程序授权码生成工具:");
Console.WriteLine($"当前设备编号:{(Helper.Instance.GetCPUNumber() + Helper.Instance.GetMacAddress()).Md5()}");
var message = "请输入以空格分隔的设备编号、有效天数，有效天数为0则不限制使用期限";
Console.WriteLine(message);
while (true)

2
projects/IoT/IoTNode/appsettings.json
Unescape View File

@ -1,5 +1,5 @@
{
"version": "1.0.0-rc.1",
"version": "1.0.0-rc.2",
"Logging": {
"LogLevel": {
"Default": "Warning",

2
projects/IoTCenter/appsettings.json
Unescape View File

@ -1,5 +1,5 @@
{
"version": "1.0.0-rc.1",
"version": "1.0.0-rc.2",
"Logging": {
"LogLevel": {
"Default": "Warning",

17
projects/UserCenter/Areas/Admin/Views/Shared/_Menu.cshtml
Unescape View File

@ -2,20 +2,9 @@
<ul class="sidebar-menu" data-widget="tree">
<li class="@GetClass("Home")"><a href="@Url.Action("Index","Home")"><i class="fa fa-circle-o"></i><span>首页</span></a></li>
<li class="@GetClass("Configuration")"><a href="@Url.Action("Index","Configuration")"><i class="fa fa-circle-o"></i><span>网站配置</span></a></li>
<li class="treeview @GetClass("User","Role","Permission")">
<a href="javascript:;" class="dropdown-toggle">
<i class="fa fa-list"></i>
<span>权限管理</span>
<span class="pull-right-container">
<i class="fa fa-angle-left pull-right"></i>
</span>
</a>
<ul class="treeview-menu">
<li class="@GetClass("User")"><a href="@Url.Action("Index","User")"><i class="fa fa-circle-o"></i><span>用户管理</span></a></li>
<li class="@GetClass("Role")"><a href="@Url.Action("Index","Role")"><i class="fa fa-circle-o"></i><span>角色管理</span></a></li>
<li class="@GetClass("Permission")"><a href="@Url.Action("Index","Permission")"><i class="fa fa-circle-o"></i><span>权限管理</span></a></li>
</ul>
</li>
<li class="@GetClass("User")"><a href="@Url.Action("Index","User")"><i class="fa fa-circle-o"></i><span>用户管理</span></a></li>
<li class="@GetClass("Role")"><a href="@Url.Action("Index","Role")"><i class="fa fa-circle-o"></i><span>角色管理</span></a></li>
<li class="@GetClass("Permission")"><a href="@Url.Action("Index","Permission")"><i class="fa fa-circle-o"></i><span>权限管理</span></a></li>
<li class="@GetClass("Site")"><a href="@Url.Action("Index","Site")"><i class="fa fa-circle-o"></i><span>应用管理</span></a></li>
</ul>
</section>

2
projects/UserCenter/appsettings.json
Unescape View File

@ -1,5 +1,5 @@
{
"version": "1.0.0-rc.1",
"version": "1.0.0-rc.2",
"Logging": {
"LogLevel": {
"Default": "Warning"

6
publish/build.cmd
Unescape View File

@ -5,10 +5,10 @@ rd /q/s "./dist/"
echo d|xcopy "./src" "./dist/" /s /e /y /f
dotnet publish ../projects/UserCenter/UserCenter.csproj -c Release -r linux-x64 -o ../publish/dist/linux-x64/publish/apps/UserCenter
dotnet publish ../projects/IoTCenter/IoTCenter.csproj -c Release -r linux-x64 -o ../publish/dist/linux-x64/publish/apps/IoTCenter
dotnet publish ../projects/UserCenter/UserCenter.csproj -c Release -r linux-x64 -o ../../publish/dist/linux-x64/publish/apps/UserCenter
dotnet publish ../projects/IoTCenter/IoTCenter.csproj -c Release -r linux-x64 -o ../../publish/dist/linux-x64/publish/apps/IoTCenter
dotnet publish ../projects/IoT/IoTNode/IoTNode.csproj -c Release -o ../publish/dist/linux-arm64/publish/apps/IoTNode
dotnet publish ../projects/IoT/IoTNode/IoTNode.csproj -c Release -o ../../../publish/dist/linux-arm64/publish/apps/IoTNode
::dotnet publish ../projects/IoT/IoTServices/WinService/WinService.csproj -c Release -r win-x86 -o "../../publish/dist/win-x86/Program Files (x86)/WinService"
::dotnet publish ../projects/IoT/IoTServices/APService/APService.csproj -c Release -o ../../publish/dist/linux-arm64/publish/apps/APService
::dotnet publish ../projects/IoT/IoTServices/FBeeService/FBeeService.csproj -c Release -r linux-arm64 -o ../publish/dist/linux-arm64/publish/apps/FBeeService

Write Preview
Loading…
Cancel
Save