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

update

Browse Source 
Former-commit-id: 33922823550b34bc77426b88b129aa71b36f064e
Former-commit-id: 9608ce1f31e9be915767fa7c1285a26d0624d0da
1.0
wanggang 4 years ago
parent f8f002b7ca
commit 2809c37030
6 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File

1
projects/Platform/Api/Api/SiteController.cs
Unescape View File

@ -75,6 +75,7 @@ namespace Platform.Api
Roles = User == null Roles = User == null
? new List<string>() ? new List<string>()
: this._organUserRepo.ReadOnlyTable() : this._organUserRepo.ReadOnlyTable()
.Include(o=>o.UserRoles).ThenInclude(o=>o.OrganRole)
.Where(o => o.User.UserName == userName) .Where(o => o.User.UserName == userName)
.Where(o => o.OrganId == organId) .Where(o => o.OrganId == organId)
.SelectMany(o => o.UserRoles) .SelectMany(o => o.UserRoles)

4
projects/Platform/Controllers/AccountController.cs
Unescape View File

@ -957,14 +957,14 @@ namespace Platform.Controllers
new Claim(this._parameters.NameClaimType, User.Identity.Name), new Claim(this._parameters.NameClaimType, User.Identity.Name),
new Claim("OrganId",userCurrentOrganNumber) new Claim("OrganId",userCurrentOrganNumber)
}; };
this.HttpContext.JwtSignOut();
this.HttpContext.JwtSignIn(claims, false);
if (Request.IsJsonRequest()) if (Request.IsJsonRequest())
{ {
return Json(this.CreateToken(claims)); return Json(this.CreateToken(claims));
} }
else else
{ {
this.HttpContext.JwtSignOut();
this.HttpContext.JwtSignIn(claims, false);
return Redirect(returnUrl); return Redirect(returnUrl);
} }
} }

17
projects/Platform/wwwroot/jswebrtc/index.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="jswebrtc.min.js"></script>
<script type="text/javascript">
var video = document.getElementById('video-webrtc');
var url = 'webrtc://192.168.100.144/live/a333b366205911b38149988b0a470d79';
var player = new JSWebrtc.Player(url, { video: video, autoplay: true, onPlay: (obj) => { console.log("start play") } });
</script>
</body>
</html>

1
projects/Platform/wwwroot/jswebrtc/jswebrtc.min.js vendored
View File

File diff suppressed because one or more lines are too long

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

@ -24,8 +24,8 @@ stats {
} }
rtc_server{ rtc_server{
enabled on; enabled on;
listen 8888; listen 8000;
candidate *; candidate $CANDIDATE;
} }
vhost __defaultVhost__ { vhost __defaultVhost__ {
rtc { rtc {

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

@ -117,15 +117,15 @@ services:
ipv4_address: 172.172.0.40 ipv4_address: 172.172.0.40
#streaming server #streaming server
srs: srs:
image: ossrs/srs:v4.0.76 image: ossrs/srs:v4.0.84
restart: always restart: always
# environment: environment:
# CANDIDATE: "172.172.0.253" CANDIDATE: 192.168.100.144
ports: ports:
- 1935:1935 - 1935:1935
- 8080:8080 - 8080:8080
- 1985:1985 - 1985:1985
- 8000:8000 - 8000:8000/udp
volumes: volumes:
- ./conf/srs/conf:/usr/local/srs/conf - ./conf/srs/conf:/usr/local/srs/conf
- ./data/srs:/usr/local/srs/objs/nginx/html/video - ./data/srs:/usr/local/srs/objs/nginx/html/video

Write Preview
Loading…
Cancel
Save