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

Merge branch '1.0' of http://49.4.92.112:3000/root/ZHXY into 1.0

Browse Source 
Former-commit-id: 70f05d5d47b4204bbde7b2197d69ef6faf714e0d
TangShanKaiPing
zhengpengju 5 years ago
parent 71fe0e35ff 21955aa2e0
commit 553999a2c9
15 changed files with 119 additions and 27 deletions
Show Stats Download Patch File Download Diff File

4
projects/Infrastructure/Application/PagedList.cs
Unescape View File

@ -77,6 +77,10 @@ namespace Infrastructure.Application
public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
{
if (PageIndex < 1)
{
yield return new ValidationResult("当前页索引必须大于等于1");
}
if (PageSize > 1000)
{
yield return new ValidationResult("分页数量超出系统限制");

1
projects/Infrastructure/Views/Shared/DisplayTemplates/EmailAddress.cshtml
Unescape View File

@ -0,0 +1 @@
@Model

28
projects/Infrastructure/Views/Shared/_Paged.cshtml
Unescape View File

@ -3,18 +3,14 @@
var links = Model.GetPageIndexs();
var url = Url.Content("~") + this.Context.Request.Path + this.Context.Request.QueryString;
var pageIndexParam = "PageIndex";
var firstUrl = url.RemoveParam("PageIndex");
var prevUrl = Model.PageIndex - 1 == 1 ? firstUrl : url.SetParam(pageIndexParam, Model.PageIndex - 1);
var empty = "javascript:;";
var firstUrl = url.RemoveParam(pageIndexParam);
var prevUrl = Model.PageIndex - 1 >= 1 ? url.SetParam(pageIndexParam, Model.PageIndex - 1) : empty;
var lastUrl = Model.TotalCount > 0 ? url.SetParam(pageIndexParam, Model.PageCount()) : empty;
var nextUrl = Model.PageIndex + 1 <= Model.PageCount() ? url.SetParam(pageIndexParam, Model.PageIndex + 1) : empty;
<ul class="pagination pagination-sm m-0 float-right">
<li class="page-item"><a class="page-link" href="@firstUrl">首页</a></li>
@if (Model.HasPrev())
{
<li class="page-item"><a class="page-link" href="@url.SetParam(pageIndexParam,Model.PageIndex-1)">上一页</a></li>
}
else
{
<li class="page-item"><a class="page-link" href="javascript:;">上一页</a></li>
}
<li class="page-item"><a class="page-link" href="@prevUrl">上一页</a></li>
@foreach (var item in links)
{
if (item == Model.PageIndex)
@ -26,19 +22,11 @@
<li class="page-item"><a class="page-link" href="@url.SetParam(pageIndexParam,item)">@item</a></li>
}
}
@if (Model.HasNext())
{
<li class="page-item"><a class="page-link" href="@url.SetParam(pageIndexParam,Model.PageIndex+1)">下一页</a></li>
}
else
{
<li class="page-item"><a class="page-link" href="javascript:;">下一页</a></li>
}
<li class="page-item"><a class="page-link" href="@url.SetParam(pageIndexParam,Model.PageCount())">末页</a></li>
<li class="page-item"><a class="page-link" href="@nextUrl">下一页</a></li>
<li class="page-item"><a class="page-link" href="@lastUrl">末页</a></li>
<li class="page-item"><a class="page-link" href="javascript:;">@Model.PageIndex / @Model.PageCount()</a></li>
<li class="page-item">
@Html.DropDownListFor(o => Model.PageSize, Model.GetPageSizes().Select(o => new SelectListItem { Text = o.ToString(), Value = o.ToString() }), new { @class = "page-link" })
</li>
</ul>
}

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

@ -35,7 +35,6 @@ using Microsoft.IdentityModel.Tokens;
using Microsoft.OpenApi.Models;
using Newtonsoft.Json;
using System;
using System.Buffers;
using System.Globalization;
using System.IO;
using System.Linq;
@ -264,7 +263,11 @@ namespace Infrastructure.Web
{
OnTokenValidated = context =>
{
if (DateTime.UtcNow > context.SecurityToken.ValidTo)
if (context.SecurityToken == null)
{
context.Fail("token error");
}
else if (DateTime.UtcNow > context.SecurityToken.ValidTo)
{
context.Fail("token time out");
}

2
projects/IoTCenter/Views/Home/Device.cshtml
Unescape View File

@ -1,5 +1,5 @@
@section bread{
<li class="breadcrumb-item"><a href="@Url.Action("Product","Home",new { number=Model})">产品</a></li>
<li class="breadcrumb-item"><a href="@Url.Action("Product","Home",new { number=Context.Request.Query["productNumber"]})">产品</a></li>
}
<div id="template">
<template v-if="device">

1
projects/IoTCenter/wwwroot/lib/jswebrtc/jswebrtc.min.js vendored
View File

File diff suppressed because one or more lines are too long

18
projects/IoTCenter/wwwroot/lib/jswebrtc/player-via-html.html
Unescape View File

@ -0,0 +1,18 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>WebRTCPlayer</title>
<style type="text/css">
html, body {
background-color: #111;
text-align: center;
}
</style>
</head>
<body>
<div class="jswebrtc" data-url="webrtc://localhost/live/b57e867ae29d11b483864cbd8fd0f747"></div>
<script type="text/javascript" src="jswebrtc.min.js"></script>
</body>
</html>

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

@ -28,7 +28,11 @@ namespace UserCenter.Areas.Admin.Controllers
public override IQueryable<User> Query(SearchUserModel model, IQueryable<User> query)
{
return query.WhereIf(!model.IsDeleted, o => o.IsDeleted == null);
if (model.IsDeleted)
{
return query.Where(o => o.IsDeleted != null);
}
return query.Where(o => o.IsDeleted == null);
}
public override IQueryable<User> Include(IQueryable<User> query)

1
projects/lib/local/jswebrtc/dist/jswebrtc.min.js vendored
View File

File diff suppressed because one or more lines are too long

18
projects/lib/local/jswebrtc/examples/player-via-html.html
Unescape View File

@ -0,0 +1,18 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>WebRTCPlayer</title>
<style type="text/css">
html, body {
background-color: #111;
text-align: center;
}
</style>
</head>
<body>
<div class="jswebrtc" data-url="webrtc://localhost/live/b57e867ae29d11b483864cbd8fd0f747"></div>
<script type="text/javascript" src="jswebrtc.min.js"></script>
</body>
</html>

17
projects/lib/local/jswebrtc/examples/player-via-js.html
Unescape View File

@ -0,0 +1,17 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>WebRTCPlayer</title>
</head>
<body>
<video id="video-webrtc" controls></video>
<script type="text/javascript" src="../dist/jswebrtc.min.js"></script>
<script type="text/javascript">
var video = document.getElementById('video-webrtc');
var url = 'webrtc://osiii.com/live/livestream';
var player = new JSWebrtc.Player(url, { video: video, autoplay: true, onPlay: (obj) => { console.log("start play") } });
</script>
</body>
</html>

6
publish/src/linux-x64/publish/docker-compose.override.yml
Unescape View File

@ -13,6 +13,9 @@ services:
webmvc:
image: nginx:1.18
restart: always
networks:
default:
ipv4_address: 10.0.1.80
environment:
TZ: "Asia/Shanghai"
volumes:
@ -21,6 +24,9 @@ services:
webspa:
image: nginx:1.18
restart: always
networks:
default:
ipv4_address: 10.0.1.90
environment:
TZ: "Asia/Shanghai"
volumes:

6
publish/src/linux-x64/publish/docker-compose.prod.yml
Unescape View File

@ -4,6 +4,9 @@ services:
usercenter:
image: mcr.microsoft.com/dotnet/core/runtime-deps:3.1-focal
restart: always
networks:
default:
ipv4_address: 10.0.1.110
environment:
- TZ=Asia/Shanghai
- ASPNETCORE_ENVIRONMENT=Docker
@ -15,6 +18,9 @@ services:
iotcenter:
image: mcr.microsoft.com/dotnet/core/runtime-deps:3.1-focal
restart: always
networks:
default:
ipv4_address: 10.0.1.120
environment:
- TZ=Asia/Shanghai
- ASPNETCORE_ENVIRONMENT=Docker

27
publish/src/linux-x64/publish/docker-compose.yml
Unescape View File

@ -1,8 +1,17 @@
version: "3.8"
networks:
default:
driver: overlay
ipam:
config:
- subnet: 10.0.1.0/24
services:
#https://portainer.readthedocs.io/en/latest/deployment.html
portainer:
image: portainer/portainer:1.23.2
restart: always
networks:
default:
ipv4_address: 10.0.1.20
ports:
- 9000:9000
volumes:
@ -11,18 +20,28 @@ services:
mysql:
image: mysql:8.0
restart: always
networks:
default:
ipv4_address: 10.0.1.30
environment:
- MYSQL_ROOT_PASSWORD=root
- MYSQL_DATABASE=jobserver
command: --default-authentication-plugin=mysql_native_password
volumes:
- ./mysql:/var/lib/mysql
redis:
image: redis:6.0
restart: always
networks:
default:
ipv4_address: 10.0.1.40
influxdb:
image: influxdb:1.8
restart: always
networks:
default:
ipv4_address: 10.0.1.50
hostname: influxdb
environment:
TZ: "Asia/Shanghai"
@ -33,6 +52,9 @@ services:
- ./influxdb:/var/lib/influxdb
srs:
image: ossrs/srs:v4.0.23
networks:
default:
ipv4_address: 10.0.1.60
environment:
TZ: "Asia/Shanghai"
restart: always
@ -46,6 +68,9 @@ services:
nginx:
image: nginx:1.18
restart: always
networks:
default:
ipv4_address: 10.0.1.70
environment:
TZ: "Asia/Shanghai"
ports:

4
publish/src/linux-x64/publish/nginx/nginx.development.conf
Unescape View File

@ -45,11 +45,11 @@ http {
}
location ^~ /live/ {
proxy_pass http://host.docker.internal:8080/live/;
proxy_pass http://srs:8080/live/;
}
location ^~ /video/ {
proxy_pass http://host.docker.internal:8080/video/;
proxy_pass http://srs:8080/video/;
}
location ^~ /UserCenter/ {

Write Preview
Loading…
Cancel
Save