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

1.0.0.0810d2

Browse Source 
Former-commit-id: 9f5df6de653abd67521b279809fc01f6c1d24619
Former-commit-id: c8262111dd4101ddc2f919562dcd2a75f7fb794b
TSXN
wanggang 5 years ago
parent a1365e5c5d
commit 71660b12ab
7 changed files with 12 additions and 126 deletions
Show Stats Download Patch File Download Diff File

2
projects/Version.cs
Unescape View File

@ -1,4 +1,4 @@
using System.Reflection;
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyInformationalVersion("1.0.0.0810d1")]
[assembly: AssemblyInformationalVersion("1.0.0.0810d2")]

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

@ -4,7 +4,4 @@ services:
website:
volumes:
- ../../../../projects/WebMVC/wwwroot:/usr/share/nginx/html/desktop
- ../../../../projects/WebSPA/wwwroot:/usr/share/nginx/html/mobile
gateway:
volumes:
- ./docker/conf/gateway/nginx.development.conf:/etc/nginx/nginx.conf
- ../../../../projects/WebSPA/wwwroot:/usr/share/nginx/html/mobile

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

@ -28,7 +28,6 @@ services:
command: bash -c "chmod +x /IoTCenter/IoTCenter && cd /IoTCenter && ./IoTCenter"
depends_on:
- mysql
- redis
ports:
- 8011:80
volumes:

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

@ -32,9 +32,6 @@ services:
- ./docker/log/website:/var/log/nginx
- ./apps/WebMVC/wwwroot:/usr/share/nginx/html/desktop
- ./apps/WebSPA/wwwroot:/usr/share/nginx/html/mobile
depends_on:
- minio
- mysql
networks:
default:
ipv4_address: 172.172.0.10
@ -47,11 +44,8 @@ services:
ports:
- 8000:80
volumes:
- ./docker/conf/gateway/nginx.conf:/etc/nginx/nginx.conf
- ./docker/conf/gateway/nginx.development.conf:/etc/nginx/nginx.conf
- ./docker/log/gateway:/var/log/nginx
depends_on:
- minio
- mysql
networks:
default:
ipv4_address: 172.172.0.12
@ -99,8 +93,6 @@ services:
- PMA_PORT=3306
ports:
- 9003:80
depends_on:
- mysql
networks:
default:
ipv4_address: 172.172.0.102
@ -130,8 +122,6 @@ services:
INFLUXDB_ADMIN_PASSWORD: admin
ports:
- 8083:8083
depends_on:
- influxdb
networks:
default:
ipv4_address: 172.172.0.104
@ -155,8 +145,6 @@ services:
- ADMIN_PASS=123456
ports:
- 9004:80
depends_on:
- redis
networks:
default:
ipv4_address: 172.172.0.103

16
publish/src/linux-x64/publish/docker/conf/gateway/nginx.conf
Unescape View File

@ -29,38 +29,38 @@ http {
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_pass http://172.172.0.20:9000/;
proxy_pass http://host.docker.internal:9000/;
}
location ^~ /live/ {
proxy_pass http://172.172.0.60:8080/live/;
proxy_pass http://host.docker.internal:8080/live/;
}
location ^~ /video/ {
proxy_pass http://172.172.0.60:8080/video/;
proxy_pass http://host.docker.internal:8080/video/;
}
location ^~ /influxdb/ {
proxy_pass http://172.172.0.50:8086/;
proxy_pass http://host.docker.internal:8086/;
}
location ^~ /UserCenter/ {
proxy_pass http://172.172.0.70:8010/UserCenter/;
proxy_pass http://host.docker.internal:8010/UserCenter/;
}
location ^~ /IoTCenter/ {
proxy_pass http://172.172.0.80:8011/IoTCenter/;
proxy_pass http://host.docker.internal:8011/IoTCenter/;
}
location ^~ /IoTCenter/hub {
proxy_pass http://172.172.0.80:8011/IoTCenter/hub;
proxy_pass http://host.docker.internal:8011/IoTCenter/hub;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
}
location ^~ /JobServer/ {
proxy_pass http://172.172.0.90:8013/JobServer/;
proxy_pass http://host.docker.internal:8013/JobServer/;
}
error_page 500 502 503 504 /50x.html;

71
publish/src/linux-x64/publish/docker/conf/gateway/nginx.development.conf
Unescape View File

@ -1,71 +0,0 @@
#user nobody;
worker_processes 1;
#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;
server {
listen 0.0.0.0:80;
server_name localhost;
location / {
root /usr/share/nginx/html;
index index.html;
}
location ^~ /dfs/ {
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_pass http://host.docker.internal:9000/;
}
location ^~ /live/ {
proxy_pass http://host.docker.internal:8080/live/;
}
location ^~ /video/ {
proxy_pass http://host.docker.internal:8080/video/;
}
location ^~ /influxdb/ {
proxy_pass http://host.docker.internal:8086/;
}
location ^~ /UserCenter/ {
proxy_pass http://host.docker.internal:8010/UserCenter/;
}
location ^~ /IoTCenter/ {
proxy_pass http://host.docker.internal:8011/IoTCenter/;
}
location ^~ /IoTCenter/hub {
proxy_pass http://host.docker.internal:8011/IoTCenter/hub;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
}
location ^~ /JobServer/ {
proxy_pass http://host.docker.internal:8013/JobServer/;
}
error_page 500 502 503 504 /50x.html;
location = /50x.html {
root html;
}
}
}

29
publish/src/linux-x64/publish/docker/conf/website/nginx.conf
Unescape View File

@ -32,33 +32,10 @@ http {
index index.html;
}
location ^~ /dfs/ {
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
location ~* ^/(dfs|live|video|influxdb|UserCenter|IoTCenter|JobServer)/ {
proxy_pass http://gateway;
}
location ^~ /live/ {
proxy_pass http://gateway;
}
location ^~ /video/ {
proxy_pass http://gateway;
}
location ^~ /influxdb/ {
proxy_pass http://172.172.0.12;
}
location ^~ /UserCenter/ {
proxy_pass http://172.172.0.12;
}
location ^~ /IoTCenter/ {
proxy_pass http://172.172.0.12;
}
location ^~ /IoTCenter/hub {
proxy_pass http://gateway;
proxy_http_version 1.1;
@ -66,10 +43,6 @@ http {
proxy_set_header Connection "upgrade";
}
location ^~ /JobServer/ {
proxy_pass http://gateway;
}
error_page 500 502 503 504 /50x.html;
location = /50x.html {
root html;

Write Preview
Loading…
Cancel
Save