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

update

Browse Source 
Former-commit-id: 363b58d3158a59d02803f8bd5d87a68b5c2c68c9
Former-commit-id: 6f1be3f72083490eff9f4a47f1364798906c6d19
1.0
wanggang 4 years ago
parent 9574927d21
commit 39c3e04196
10 changed files with 644 additions and 1389 deletions
Show Stats Download Patch File Download Diff File

5
projects/Platform/appsettings.Development.json
Unescape View File

@ -7,8 +7,9 @@
}
},
"AppSettings": {
"Database": "SQLite",
"JobDatabase": "SQLite",
//"Database": "SQLite",
//"JobDatabase": "SQLite",
//"Cache": "Memory",
"Profiler": true
},
"ReverseProxy": {

1920
projects/Platform/db.sql
View File

File diff suppressed because it is too large Load Diff

4
publish/build.ps1
Unescape View File

@ -14,8 +14,8 @@ Remove-Item ./dist/linux-x64/publish/log/* -recurse -force
Remove-Item ./dist/linux-x64/publish/data/* -recurse -force
echo 'copy project files to dist folder'
Copy-Item ../projects/WebMVC/wwwroot ./dist/linux-x64/publish/apps/WebMVC/wwwroot -recurse
Copy-Item ../projects/WebSPA/wwwroot ./dist/linux-x64/publish/apps/WebSPA/wwwroot -recurse
Copy-Item -Path ../projects/WebMVC/wwwroot/* -Destination ./dist/linux-x64/publish/apps/WebMVC/wwwroot/ -Recurse
Copy-Item -Path ../projects/WebSPA/wwwroot/* -Destination ./dist/linux-x64/publish/apps/WebSPA/wwwroot/ -Recurse
dotnet publish ../projects/Platform/Platform.csproj -c Release -r linux-x64 -p:PublishSingleFile=true -o ../publish/dist/linux-x64/publish/apps/Platform
dotnet publish ../projects/IoTNode/IoTNode.csproj -c Release -r linux-arm64 -p:PublishSingleFile=true -o ../publish/dist/linux-arm64/publish/apps/IoTNode

1
publish/exclude.txt
Unescape View File

@ -4,4 +4,5 @@ docker-compose.override.yml
nginx.dev.conf
\src\linux-x64\publish\log
\src\linux-x64\publish\data
\src\linux-x64\publish\conf\platform

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

@ -29,51 +29,39 @@ 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://minio:9000/;
}
location ^~ /live/ {
proxy_pass http://172.172.0.60:8080/live/;
proxy_pass http://srs:8080/live/;
}
location ^~ /video/ {
proxy_pass http://172.172.0.60:8080/video/;
proxy_pass http://srs:8080/video/;
}
location ^~ /influxdb/ {
proxy_pass http://172.172.0.50:8086/;
proxy_pass http://influxdb:8086/;
}
location ^~ /portainer/ {
proxy_pass http://172.172.0.101:9000/;
proxy_pass http://portainer:9000/;
}
location ^~ /minio/ {
proxy_pass http://172.172.0.20:9000/minio/;
}
location ^~ /mysqlui/ {
proxy_pass http://172.172.0.102/;
}
location ^~ /influxui/ {
proxy_pass http://172.172.0.104:8083/;
}
location ^~ /phpredisadmin/ {
proxy_pass http://172.172.0.103/;
proxy_pass http://minio:9000/minio/;
}
location ^~ /srs/ {
proxy_pass http://172.172.0.60:8080/;
proxy_pass http://srs:8080/;
}
location ^~ /platform/ {
proxy_pass http://172.172.0.80/platform/;
proxy_pass http://platform/platform/;
}
location ^~ /platform/hub {
proxy_pass http://172.172.0.80/platform/hub;
proxy_pass http://platform/platform/hub;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";

9
publish/src/linux-x64/publish/conf/mysql/my.cnf
Unescape View File

@ -1,6 +1,13 @@
[client]
default-character-set=utf8mb4
[mysql]
default-character-set=utf8mb4
[mysqld]
character-set-server=utf8mb4
collation-server=utf8mb4_general_ci
server_id=1
binlog-ignore-db=master
log-bin=mysql-bin
binlog-format=ROW
binlog_expire_logs_seconds=604800

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

@ -20,8 +20,8 @@ http {
sendfile on;
keepalive_timeout 65;
upstream gateway {
server 172.172.0.12:81;
upstream proxy {
server gateway:81;
}
server {
@ -38,11 +38,11 @@ http {
}
location ~* ^/(platform|dfs|live|video|influxdb|portainer|minio|mysqlui|influxui|phpredisadmin|srs)/ {
proxy_pass http://gateway;
proxy_pass http://proxy;
}
location ^~ /platform/hub {
proxy_pass http://gateway;
proxy_pass http://proxy;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";

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

@ -6,15 +6,11 @@ services:
- ./conf/srs/dev:/usr/local/srs/conf
website:
volumes:
- ../../../../projects/WebSPA/wwwroot:/root/nginx/html/desktop
- ../../../../projects/WebSPA/wwwroot:/root/nginx/html/mobile
- ../../../../projects/Platform/wwwroot:/root/nginx/html/desktop
platform:
image: nginx:1.18.0
restart: always
environment:
TZ: "Asia/Shanghai"
volumes:
- ./conf/platform/nginx.dev.conf:/etc/nginx/nginx.conf
networks:
default:
ipv4_address: 172.172.0.80
- ./conf/platform/nginx.dev.conf:/etc/nginx/nginx.conf

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

@ -18,7 +18,4 @@ services:
- 8011:80
volumes:
- ./apps/Platform:/Platform
- ./docker/log/Platform:/Platform/logs
networks:
default:
ipv4_address: 172.172.0.80
- ./log/Platform:/Platform/logs

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

@ -2,9 +2,6 @@ version: "3.8"
networks:
default:
driver: bridge
ipam:
config:
- subnet: 172.172.0.0/24
services:
#netdata
netdata:
@ -17,17 +14,11 @@ services:
security_opt:
- apparmor:unconfined
volumes:
- ./data/netdata/etc/netdata:/etc/netdata
- ./data/netdata/var/lib/netdata:/var/lib/netdata
- ./data/netdata/var/cache/netdata:/var/cache/netdata
- /etc/passwd:/host/etc/passwd:ro
- /etc/group:/host/etc/group:ro
- /proc:/host/proc:ro
- /sys:/host/sys:ro
- /etc/os-release:/host/etc/os-release:ro
networks:
default:
ipv4_address: 172.172.0.100
#container management
portainer:
image: portainer/portainer:1.24.1
@ -37,9 +28,6 @@ services:
volumes:
- /var/run/docker.sock:/var/run/docker.sock
- ./data/portainer:/data
networks:
default:
ipv4_address: 172.172.0.101
#web site
website:
image: nginx:1.18.0
@ -54,11 +42,8 @@ services:
# - ./conf/website/edusoa.pem:/etc/nginx/edusoa.pem
# - ./conf/website/edusoa.key:/etc/nginx/edusoa.key
- ./log/website:/var/log/nginx
- ./apps/Platform/wwwroot:/root/nginx/html/desktop
- ./apps/WebMVC/wwwroot:/root/nginx/html/desktop
- ./apps/WebSPA/wwwroot:/root/nginx/html/mobile
networks:
default:
ipv4_address: 172.172.0.10
#gateway
gateway:
image: nginx:1.18.0
@ -70,9 +55,6 @@ services:
volumes:
- ./conf/gateway/nginx.conf:/etc/nginx/nginx.conf
- ./log/gateway:/var/log/nginx
networks:
default:
ipv4_address: 172.172.0.12
#file server
minio:
image: minio/minio:RELEASE.2020-08-08T04-50-06Z
@ -85,13 +67,14 @@ services:
- 9000:9000
volumes:
- ./data/minio:/data
networks:
default:
ipv4_address: 172.172.0.20
#database server
mysql:
image: mysql:8.0
restart: always
deploy:
resources:
limits:
memory: 2g
environment:
- MYSQL_ROOT_PASSWORD=aA123456!
command: --default-authentication-plugin=mysql_native_password
@ -101,9 +84,6 @@ services:
- ./conf/mysql/my.cnf:/etc/mysql/conf.d/my.cnf
- ./data/mysql:/var/lib/mysql
- ./conf/mysql/init.sql:/docker-entrypoint-initdb.d/init.sql
networks:
default:
ipv4_address: 172.172.0.30
influxdb:
image: influxdb:1.8.1
restart: always
@ -117,9 +97,6 @@ services:
- 8088:8088
volumes:
- ./data/influxdb:/var/lib/influxdb
networks:
default:
ipv4_address: 172.172.0.50
#cache server
redis:
image: redis:6.0.6
@ -130,9 +107,6 @@ services:
- ./data/redis:/data
- ./conf/redis/redis.conf:/usr/local/etc/redis/redis.conf
command: redis-server /usr/local/etc/redis/redis.conf
networks:
default:
ipv4_address: 172.172.0.40
#streaming server
srs:
image: ossrs/srs:v4.0.84
@ -147,9 +121,6 @@ services:
volumes:
- ./conf/srs/conf:/usr/local/srs/conf
- ./data/srs:/usr/local/srs/objs/nginx/html/video
networks:
default:
ipv4_address: 172.172.0.60
#log db
elasticsearch:
image: elasticsearch:7.12.0
@ -157,7 +128,7 @@ services:
deploy:
resources:
limits:
memory: 1500M
memory: 2g
environment:
- discovery.type=single-node
- ES_JAVA_OPTS=-Xms1g -Xmx1g
@ -173,4 +144,4 @@ services:
image: kibana:7.12.0
restart: always
ports:
- 5601:5601
- 5601:5601
Write Preview
Loading…
Cancel
Save