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

update

Browse Source 
Former-commit-id: 067f3ccc031b59e045d930e6c4b2b59e2500a574
TangShanKaiPing
wanggang 5 years ago
parent a9e7fc1256
commit e7657d8aab
5 changed files with 49 additions and 17 deletions
Show Stats Download Patch File Download Diff File

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>

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

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

@ -29,7 +29,7 @@ services:
volumes: volumes:
- ./influxdb:/var/lib/influxdb - ./influxdb:/var/lib/influxdb
srs: srs:
image: ossrs/srs:v3.0-b4 image: ossrs/srs:v4.0.23
environment: environment:
TZ: "Asia/Shanghai" TZ: "Asia/Shanghai"
restart: always restart: always
@ -38,15 +38,16 @@ services:
- 1985:1985 - 1985:1985
volumes: volumes:
- ./srs/conf/srs.conf:/usr/local/srs/conf/srs.conf - ./srs/conf/srs.conf:/usr/local/srs/conf/srs.conf
- ./log/srs:/usr/local/srs/objs/log
- ./srs/objs/nginx/html/video:/usr/local/srs/objs/nginx/html/video - ./srs/objs/nginx/html/video:/usr/local/srs/objs/nginx/html/video
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: environment:
TZ: "Asia/Shanghai" 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:
@ -54,10 +55,9 @@ services:
restart: always restart: always
environment: environment:
TZ: "Asia/Shanghai" 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: jobserver:
@ -65,25 +65,40 @@ services:
restart: always restart: always
environment: environment:
TZ: "Asia/Shanghai" TZ: "Asia/Shanghai"
command: bash -c "sleep 3 && chmod +x /JobServer/JobServer && cd /JobServer && ./JobServer"
depends_on: depends_on:
- mysql - mysql
command: bash -c "sleep 3 && chmod +x /JobServer/JobServer && cd /JobServer && ./JobServer"
volumes: volumes:
- ./JobServer:/JobServer - ./JobServer:/JobServer
nginx: 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 image: nginx:1.18
restart: always restart: always
hostname: nginx
environment: environment:
TZ: "Asia/Shanghai" TZ: "Asia/Shanghai"
ports: ports:
- 80:80 - 80:80
- 443:443 - 443:443
depends_on: depends_on:
- srs - webmvc
- webspa
- usercenter - usercenter
- iotcenter - iotcenter
- jobserver
volumes: volumes:
- ./nginx/nginx.conf:/etc/nginx/nginx.conf - ./nginx/nginx.conf:/etc/nginx/nginx.conf
- ./nginx/edusoa.key:/etc/nginx/edusoa.key - ./nginx/edusoa.key:/etc/nginx/edusoa.key

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

@ -46,10 +46,10 @@ http {
location / { location / {
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/ {

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

@ -1,8 +1,8 @@
listen 1935; listen 1935;
daemon off;
max_connections 1000; max_connections 1000;
srs_log_tank file; srs_log_tank file;
srs_log_file ./objs/srs.log; srs_log_file ./objs/log/srs.log;
daemon off;
http_api { http_api {
enabled on; enabled on;
listen 1985; listen 1985;
@ -24,7 +24,7 @@ stats {
} }
vhost __defaultVhost__ { vhost __defaultVhost__ {
transcode live { transcode live {
enabled on; enabled off;
ffmpeg ./objs/ffmpeg/bin/ffmpeg; ffmpeg ./objs/ffmpeg/bin/ffmpeg;
engine snapshot { engine snapshot {
enabled on; enabled on;

Write Preview
Loading…
Cancel
Save