Former-commit-id: 37cc3593f39cf5f310230373561d367206fea1f0
Former-commit-id: b1d575021526cb93901f61a0de4a0f6d54a088ed
1.0
wanggang 4 years ago
parent e505540062
commit 33da10b0d7

@ -410,6 +410,7 @@ namespace Platform.Data
//初始化建筑
var image = "/images/empty.svg";
var platformId = db.Set<Organ>().FirstOrDefault(o => o.Number == "jiaoyuju").Id;
var organId = db.Set<Organ>().FirstOrDefault(o => o.Number == "xuexiao").Id;
var buildingRoot = new Building
{
@ -428,6 +429,14 @@ namespace Platform.Data
Name="默认建筑",
Number="1",
Children = new List<Building> {
new Building{
Image = image,
Order = order++,
OrganId = platformId,
Type= "建筑",
Name="默认建筑",
Number="1"
},
new Building {
Image= image,
Order=order++,
@ -590,6 +599,22 @@ namespace Platform.Data
}
}
});
db.Set<User>().Add(new User
{
UserName = "user",
SecurityStamp = securityStam,
PasswordHash = _encryptionService.CreatePasswordHash("123456", securityStam),
PasswordConfirmed = true,
Email = "user@test.com",
EmailConfirmed = true,
NickName = "普通用户",
OrganUsers = new List<OrganUser> {
new OrganUser {
Type= "其他",
OrganId=platformOrganId
}
}
});
db.SaveChanges();
//
var set = db.Set<Setting>();

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<app>
<version>1.0.0.20091601</version>
<checksum>7d5ff4ac251a6e682b85e49a130933d5d0c1dcaf820b7007c9924d55e975a37378ab67fccbc00950c23f2eb730b8bf52b1f454380ee8255d225d72747c84b787</checksum>
</app>

@ -1,41 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>items</key>
<array>
<dict>
<key>assets</key>
<array>
<dict>
<key>kind</key>
<string>software-package</string>
<key>url</key>
<string>https://iot.edusoa.com/apps/XamarinApp.ipa</string>
</dict>
<dict>
<key>kind</key>
<string>display-image</string>
<key>needs-shine</key>
<true/>
<key>url</key>
<string>https://iot.edusoa.com/apps/XamarinApp.png</string>
</dict>
</array>
<key>metadata</key>
<dict>
<key>bundle-identifier</key>
<string>com.edusoa.iot</string>
<key>bundle-version</key>
<string>1.0</string>
<key>kind</key>
<string>software</string>
<key>subtitle</key>
<string>XamarinApp</string>
<key>title</key>
<string>XamarinApp</string>
</dict>
</dict>
</array>
</dict>
</plist>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 35 KiB

@ -0,0 +1,7 @@
[common]
bind_port = 7000
vhost_http_port = 7001
dashboard_port = 8003
dashboard_user = admin
dashboard_pwd = admin
subdomain_host = iot.edusoa.com

@ -0,0 +1,22 @@
server {
listen 443 ssl;
server_name iot.edusoa.com;
ssl_certificate edusoa.pem;
ssl_certificate_key edusoa.key;
ssl_session_timeout 5m;
ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
ssl_ciphers HIGH:!RC4:!MD5:!aNULL:!eNULL:!NULL:!DH:!EDH:!EXP:+MEDIUM;
ssl_prefer_server_ciphers on;
location / {
proxy_pass http://127.0.0.1;
}
location ^~ /platform/hub {
proxy_pass http://127.0.0.1;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
}
}

@ -0,0 +1,7 @@
#docker-compose up -d
version: "3.8"
services:
website:
volumes:
- ./conf/website/edusoa.pem:/etc/nginx/edusoa.pem
- ./conf/website/edusoa.key:/etc/nginx/edusoa.key

@ -1,76 +0,0 @@
user root;
worker_processes 4;
#error_log logs/error.log;
#error_log logs/error.log notice;
#error_log logs/error.log info;
#pid logs/nginx.pid;
events {
worker_connections 1024;
}
http {
include mime.types;
default_type application/octet-stream;
sendfile on;
keepalive_timeout 65;
types {
application/vnd.android.package-archive apk;
application/iphone pxl ipa;
text/plain plist;
}
upstream gateway {
server 172.172.0.12;
}
server {
listen 80;
server_name iot.edusoa.com;
return 301 https://$host$request_uri;
}
server {
#listen 80;
listen 443;
server_name iot.edusoa.com;
ssl on;
ssl_certificate edusoa.pem;
ssl_certificate_key edusoa.key;
ssl_session_timeout 5m;
ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
ssl_ciphers HIGH:!RC4:!MD5:!aNULL:!eNULL:!NULL:!DH:!EDH:!EXP:+MEDIUM;
ssl_prefer_server_ciphers on;
location /stub_status {
stub_status;
allow 127.0.0.1;
deny all;
}
location / {
root /root/nginx/html/desktop;
if ($http_user_agent ~* "(mobile|android|ipad|iphone|ipod|tablet)") {
root /root/nginx/html/mobile;
}
index index.html;
}
location ~* ^/(dfs|live|video|influxdb|UserCenter|IoTCenter|JobServer|portainer|minio|mysqlui|influxui|phpredisadmin|srs)/ {
proxy_pass http://gateway;
}
location ^~ /IoTCenter/hub {
proxy_pass http://gateway;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
}
error_page 500 502 503 504 /50x.html;
location = /50x.html {
root html;
}
}
}

@ -22,13 +22,22 @@ stats {
network 0;
disk sda sdb xvda xvdb;
}
rtc_server{
enabled on;
listen 8000;
candidate *;
}
vhost __defaultVhost__ {
tcp_nodelay on
min_latency on;
rtc {
enabled on;
bframe discard;
}
tcp_nodelay on
min_latency on;
play {
gop_cache off;
queue_length 10;
mw_latency 100;
gop_cache off;
queue_length 10;
mw_latency 100;
}
publish {
mr off;
@ -92,6 +101,6 @@ vhost __defaultVhost__ {
}
http_hooks {
enabled on;
on_dvr http://172.172.0.80/platform/api/v1/Srs/OnDvr;
on_dvr http://srs/platform/api/v1/Srs/OnDvr;
}
}

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

@ -1,10 +1,6 @@
user root;
worker_processes 4;
#error_log logs/error.log;
#error_log logs/error.log notice;
#error_log logs/error.log info;
#pid logs/nginx.pid;
events {
worker_connections 1024;
}
@ -53,4 +49,5 @@ http {
root html;
}
}
include conf.d/*.conf;
}

@ -2,8 +2,14 @@
version: "3.8"
services:
srs:
volumes:
- ./conf/srs/dev:/usr/local/srs/conf
command:
- /bin/bash
- -c
- |
cat /usr/local/srs/conf/srs.conf > /usr/local/srs/conf/srs.dev.conf
sed -i "s/on_dvr[^;]*;/on_dvr http:\/\/host.docker.internal\/platform\/api\/v1\/Srs\/OnDvr;/g" /usr/local/srs/conf/srs.dev.conf
cd /usr/local/srs
./objs/srs -c conf/srs.dev.conf
website:
volumes:
- ../../../../projects/Platform/wwwroot:/root/nginx/html/desktop
@ -13,4 +19,4 @@ services:
environment:
TZ: "Asia/Shanghai"
volumes:
- ./conf/platform/nginx.dev.conf:/etc/nginx/nginx.conf
- ./conf/platform/nginx.conf:/etc/nginx/nginx.conf

@ -1,5 +1,3 @@
#docker-compose -f docker-compose.yml -f docker-compose.prod.yml up -d
#docker-compose down --remove-orphans
version: "3.8"
services:
#monitor

@ -36,8 +36,7 @@ services:
- 443:443
volumes:
- ./conf/website/nginx.conf:/etc/nginx/nginx.conf
# - ./conf/website/edusoa.pem:/etc/nginx/edusoa.pem
# - ./conf/website/edusoa.key:/etc/nginx/edusoa.key
- ./conf/website/conf.d:/etc/nginx/conf.d
- ./log/website:/var/log/nginx
- ./apps/WebMVC/wwwroot:/root/nginx/html/desktop
- ./apps/WebSPA/wwwroot:/root/nginx/html/mobile
@ -104,8 +103,6 @@ services:
srs:
image: ossrs/srs:v4.0.84
restart: always
environment:
CANDIDATE: 192.168.100.144
ports:
- 1935:1935
- 8080:8080

@ -1 +1 @@
docker-compose --compatibility -f docker-compose.yml -f docker-compose.prod.yml up --remove-orphans --force-recreate -d
docker-compose --compatibility -f docker-compose.yml -f docker-compose.prod.yml -f docker-compose.project.yml up --remove-orphans -d

@ -1 +1 @@
docker-compose --compatibility -f docker-compose.yml -f docker-compose.prod.yml up --remove-orphans -d
docker-compose --compatibility -f docker-compose.yml -f docker-compose.prod.yml -f docker-compose.project.yml up --remove-orphans -d
Loading…
Cancel
Save