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: 60da561a66acadfd55b61b325fbf1509506a662b
TangShanKaiPing
zhengpengju 5 years ago
parent 66e2a061e7 e7657d8aab
commit 7a588919b0
12 changed files with 172 additions and 36 deletions
Show Stats Download Patch File Download Diff File

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

@ -95,7 +95,7 @@
@Html.Raw(string.Format(copyright, DateTime.Now.Year.ToString())) @Html.Raw(string.Format(copyright, DateTime.Now.Year.ToString()))
</strong> </strong>
<div class="float-right d-none d-sm-inline-block"> <div class="float-right d-none d-sm-inline-block">
<b>v @Helper.Instance.GetVersion() build @Helper.Instance.GetAssemblyVersion()</b> <b>v @Helper.Instance.GetVersion()</b>
</div> </div>
</footer> </footer>
</div> </div>

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

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

4
projects/IoT.Shared/Services/IoTCenter/IoTCenterHub.cs
Unescape View File

@ -105,7 +105,7 @@ namespace IoTCenter.Services
var organ = Context.Items["organ"] as string; var organ = Context.Items["organ"] as string;
if (!string.IsNullOrEmpty(organ)) if (!string.IsNullOrEmpty(organ))
{ {
this._publisher.Publish(new NodeClientConnectedEvent { NodeNumber=node.Number,OrganNumber=organ }); this._publisher.Publish(new NodeClientConnectedEvent { NodeNumber = node.Number, OrganNumber = organ });
} }
} }
catch (Exception ex) catch (Exception ex)
@ -308,7 +308,7 @@ namespace IoTCenter.Services
{ {
var device = this._deviceRepo.ReadOnlyTable().Include(o => o.Node).FirstOrDefault(o => o.Id == model.DeviceId); var device = this._deviceRepo.ReadOnlyTable().Include(o => o.Node).FirstOrDefault(o => o.Id == model.DeviceId);
var number = device.Node.Number; var number = device.Node.Number;
var url = this._cfg.GetValue<string>("srs", "http://localhost:1985"); var url = this._cfg.GetConnectionString("srs");
var method = Methods.UpdateCamera; var method = Methods.UpdateCamera;
if (model.Value == "是") if (model.Value == "是")
{ {

2
projects/IoTCenter/Program.cs
Unescape View File

@ -57,7 +57,7 @@ namespace IoTCenter
Log.Logger = new LoggerConfiguration().WriteTo.Console().CreateLogger(); Log.Logger = new LoggerConfiguration().WriteTo.Console().CreateLogger();
} }
o.AddSerilog(); o.AddSerilog();
Log.Logger.Information("start..."); Log.Logger.Information(string.IsNullOrEmpty(config["docker"]) ? "start..." : "docker...");
}) })
.UseStartup<Startup>() .UseStartup<Startup>()
.Build() .Build()

2
projects/Version.cs
Unescape View File

@ -1,4 +1,4 @@
using System.Reflection; using System.Reflection;
[assembly: AssemblyVersion("1.0.0.*")] [assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyInformationalVersion("1.0.0.515")] [assembly: AssemblyInformationalVersion("1.0.0.515")]

4
projects/WebSPA/wwwroot/index.html
Unescape View File

@ -10,7 +10,7 @@
<link rel="stylesheet" href="css/app.css?v0.1.0.2002250904"> <link rel="stylesheet" href="css/app.css?v0.1.0.2002250904">
<link rel="apple-touch-icon" sizes="76x76" href="icon-76.png"> <link rel="apple-touch-icon" sizes="76x76" href="icon-76.png">
<link rel="apple-touch-icon" sizes="152x152" href="icon-76@2x.png"> <link rel="apple-touch-icon" sizes="152x152" href="icon-76@2x.png">
<title>物联管控</title> <title>物联管控</title>
</head> </head>
<body> <body>
<div id="app"> <div id="app">
@ -24,7 +24,7 @@
</div> </div>
</div> </div>
<script> <script>
var version = '0.1.0.202005181416'; // 版本信息全局变量 var version = '0.1.0.202005181416'; // 版本信息全局变量
</script> </script>
<script src="js/config.js?v=0.1.0.202005181416"></script> <script src="js/config.js?v=0.1.0.202005181416"></script>
<script src="lib/linq/linq.min.js"></script> <script src="lib/linq/linq.min.js"></script>

6
publish/src/linux-x64/publish/.gitignore vendored
Unescape View File

@ -1,8 +1,10 @@
influxdb portainer/data
mysql mysql
influxdb
srs/objs
log log
UserCenter UserCenter
IoTCenter IoTCenter
JobServer JobServer
WebMVC WebMVC
WebSPA WebSPA

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

@ -1 +1,18 @@
version: "3.8" version: "3.8"
services:
webmvc:
image: nginx:1.18
restart: always
environment:
TZ: "Asia/Shanghai"
volumes:
- ../../../../projects/WebMVC/wwwroot:/usr/share/nginx/html
- ./log/webmvc:/var/log/nginx
webspa:
image: nginx:1.18
restart: always
environment:
TZ: "Asia/Shanghai"
volumes:
- ../../../../projects/WebSPA/wwwroot:/usr/share/nginx/html
- ./log/webspa:/var/log/nginx

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

@ -1,5 +1,13 @@
version: "3.8" version: "3.8"
services: services:
#https://portainer.readthedocs.io/en/latest/deployment.html
portainer:
image: portainer/portainer:1.23.2
ports:
- 9000:9000
volumes:
- /var/run/docker.sock:/var/run/docker.sock
- ./portainer/data:/data
mysql: mysql:
image: mysql:8.0 image: mysql:8.0
restart: always restart: always
@ -14,40 +22,85 @@ services:
restart: always restart: always
hostname: influxdb hostname: influxdb
environment: environment:
TZ: "Asia/Shanghai"
INFLUXDB_ADMIN_ENABLED: "true" INFLUXDB_ADMIN_ENABLED: "true"
INFLUXDB_ADMIN_USER: admin INFLUXDB_ADMIN_USER: admin
INFLUXDB_ADMIN_PASSWORD: admin INFLUXDB_ADMIN_PASSWORD: admin
volumes: volumes:
- ./influxdb:/var/lib/influxdb - ./influxdb:/var/lib/influxdb
nginx: srs:
image: nginx:1.18 image: ossrs/srs:v4.0.23
environment:
TZ: "Asia/Shanghai"
restart: always restart: always
hostname: nginx ports:
ports: - 1935:1935
- 80:80 - 1985:1985
- 443:443
links:
- usercenter
- iotcenter
volumes: volumes:
- ./nginx/nginx.conf:/etc/nginx/nginx.conf - ./srs/conf/srs.conf:/usr/local/srs/conf/srs.conf
- ./nginx/edusoa.key:/etc/nginx/edusoa.key - ./log/srs:/usr/local/srs/objs/log
- ./nginx/edusoa.pem:/etc/nginx/edusoa.pem - ./srs/objs/nginx/html/video:/usr/local/srs/objs/nginx/html/video
- ./log/nginx:/var/log/nginx
usercenter: usercenter:
image: mcr.microsoft.com/dotnet/core/runtime-deps:3.1-focal image: mcr.microsoft.com/dotnet/core/runtime-deps:3.1-focal
restart: always restart: always
environment:
TZ: "Asia/Shanghai"
command: bash -c "chmod +x /UserCenter/UserCenter && cd /UserCenter && ./UserCenter"
depends_on: depends_on:
- mysql - mysql
command: bash -c "chmod +x /UserCenter/UserCenter && cd /UserCenter && ./UserCenter"
volumes: volumes:
- ./UserCenter:/UserCenter - ./UserCenter:/UserCenter
iotcenter: iotcenter:
image: mcr.microsoft.com/dotnet/core/runtime-deps:3.1-focal image: mcr.microsoft.com/dotnet/core/runtime-deps:3.1-focal
restart: always restart: always
environment:
TZ: "Asia/Shanghai"
command: bash -c "chmod +x /IoTCenter/IoTCenter && cd /IoTCenter && ./IoTCenter"
depends_on: depends_on:
- mysql - mysql
- influxdb
command: bash -c "chmod +x /IoTCenter/IoTCenter && cd /IoTCenter && ./IoTCenter"
volumes: volumes:
- ./IotCenter:/IoTCenter - ./IotCenter:/IoTCenter
jobserver:
image: mcr.microsoft.com/dotnet/core/runtime-deps:3.1-focal
restart: always
environment:
TZ: "Asia/Shanghai"
command: bash -c "sleep 3 && chmod +x /JobServer/JobServer && cd /JobServer && ./JobServer"
depends_on:
- mysql
volumes:
- ./JobServer:/JobServer
webmvc:
image: nginx:1.18
restart: always
environment:
TZ: "Asia/Shanghai"
volumes:
- ./WebMVC/wwwroot:/usr/share/nginx/html
- ./log/webmvc:/var/log/nginx
webspa:
image: nginx:1.18
restart: always
environment:
TZ: "Asia/Shanghai"
volumes:
- ./WebSPA/wwwroot:/usr/share/nginx/html
- ./log/webspa:/var/log/nginx
nginx:
image: nginx:1.18
restart: always
environment:
TZ: "Asia/Shanghai"
ports:
- 80:80
- 443:443
depends_on:
- webmvc
- webspa
- usercenter
- iotcenter
volumes:
- ./nginx/nginx.conf:/etc/nginx/nginx.conf
- ./nginx/edusoa.key:/etc/nginx/edusoa.key
- ./nginx/edusoa.pem:/etc/nginx/edusoa.pem
- ./log/nginx:/var/log/nginx

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

@ -45,27 +45,26 @@ http {
ssl_prefer_server_ciphers on; ssl_prefer_server_ciphers on;
location / { location / {
#proxy_set_header Host $host:$server_port;
if ($http_user_agent ~* "(mobile|android|ipad|iphone|ipod|tablet)") { if ($http_user_agent ~* "(mobile|android|ipad|iphone|ipod|tablet)") {
proxy_pass http://localhost:5002; proxy_pass http://webspa;
break; break;
} }
proxy_pass http://localhost:5001/; proxy_pass http://webmvc/;
} }
location ^~ /dfs/ { location ^~ /dfs/ {
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_pass http://go-fastdfs/; proxy_pass http://minio/;
} }
location ^~ /live/ { location ^~ /live/ {
proxy_pass http://localhost:8080/live/; proxy_pass http://srs:8080/live/;
} }
location ^~ /video/ { location ^~ /video/ {
proxy_pass http://localhost:8080/video/; proxy_pass http://srs:8080/video/;
} }
location ^~ /UserCenter/ { location ^~ /UserCenter/ {
@ -90,7 +89,7 @@ http {
} }
location ^~ /JobServer/ { location ^~ /JobServer/ {
proxy_pass http://localhost:8013/JobServer/; proxy_pass http://jobserver/JobServer/;
proxy_set_header Host $host:$server_port; proxy_set_header Host $host:$server_port;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Proto $scheme;

65
publish/src/linux-x64/publish/srs/conf/srs.conf
Unescape View File

@ -0,0 +1,65 @@
listen 1935;
max_connections 1000;
srs_log_tank file;
srs_log_file ./objs/log/srs.log;
daemon off;
http_api {
enabled on;
listen 1985;
raw_api {
enabled on;
allow_reload on;
allow_query on;
allow_update on;
}
}
http_server {
enabled on;
listen 8080;
dir ./objs/nginx/html;
}
stats {
network 0;
disk sda sdb xvda xvdb;
}
vhost __defaultVhost__ {
transcode live {
enabled off;
ffmpeg ./objs/ffmpeg/bin/ffmpeg;
engine snapshot {
enabled on;
iformat flv;
vfilter {
vf fps=1;
}
vcodec png;
vparams {
vframes 1;
}
acodec an;
oformat image2;
output ./objs/nginx/html/[app]/[stream].png;
}
}
http_remux {
enabled on;
mount [vhost]/[app]/[stream].flv;
}
hls {
enabled on;
hls_fragment 3;
hls_window 10;
hls_path ./objs/nginx/html;
hls_m3u8_file [app]/[stream].m3u8;
hls_ts_file [app]/[stream]-[seq].ts;
}
dvr {
enabled on;
dvr_apply none;
dvr_path ./objs/nginx/html/video/[app].[stream].[timestamp].mp4;
}
http_hooks {
enabled on;
on_dvr http://iotcenter/IoTCenter/api/v1/Srs/OnDvr;
}
}
Write Preview
Loading…
Cancel
Save