diff --git a/projects/CheckSum/CheckSum.csproj b/projects/CheckSum/CheckSum.csproj index c73e0d16..4e63e4ff 100644 --- a/projects/CheckSum/CheckSum.csproj +++ b/projects/CheckSum/CheckSum.csproj @@ -1,8 +1,9 @@ - - Exe - netcoreapp3.1 - - - + + Exe + netcoreapp3.1 + win10-x64 + true + + \ No newline at end of file diff --git a/projects/CheckSum/CheckSum.sln b/projects/CheckSum/CheckSum.sln new file mode 100644 index 00000000..677c9d89 --- /dev/null +++ b/projects/CheckSum/CheckSum.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30503.244 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CheckSum", "CheckSum.csproj", "{6FC96518-2C31-438A-A146-0DFF567B7CE1}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {6FC96518-2C31-438A-A146-0DFF567B7CE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6FC96518-2C31-438A-A146-0DFF567B7CE1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6FC96518-2C31-438A-A146-0DFF567B7CE1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6FC96518-2C31-438A-A146-0DFF567B7CE1}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {60DF06D2-62DD-4A39-B3C0-CFA99A48F570} + EndGlobalSection +EndGlobal diff --git a/projects/CheckSum/Properties/PublishProfiles/FolderProfile.pubxml b/projects/CheckSum/Properties/PublishProfiles/FolderProfile.pubxml new file mode 100644 index 00000000..ed3755a7 --- /dev/null +++ b/projects/CheckSum/Properties/PublishProfiles/FolderProfile.pubxml @@ -0,0 +1,12 @@ + + + + + Release + Any CPU + bin\Release\netcoreapp3.1\publish\ + FileSystem + + \ No newline at end of file diff --git a/publish/dslx/linux-x64/docker-compose.yml b/publish/dslx/linux-x64/docker-compose.yml deleted file mode 100644 index 5183be38..00000000 --- a/publish/dslx/linux-x64/docker-compose.yml +++ /dev/null @@ -1,174 +0,0 @@ -version: "3.8" -networks: - default: - driver: bridge - ipam: - config: - - subnet: 172.172.0.0/24 -services: -#container management - portainer: - image: portainer/portainer:1.24.1 - restart: always - ports: - - 9002:9000 - volumes: - - /var/run/docker.sock:/var/run/docker.sock - - ./docker/data/portainer:/data - networks: - default: - ipv4_address: 172.172.0.101 -#web site - website: - image: nginx:1.18.0 - restart: always - environment: - TZ: "Asia/Shanghai" - ports: - - 80:80 - - 443:443 - volumes: - - ./docker/conf/website/nginx.conf:/etc/nginx/nginx.conf - - ./docker/conf/website/edusoa.pem:/etc/nginx/edusoa.pem - - ./docker/conf/website/edusoa.key:/etc/nginx/edusoa.key - - ./docker/log/website:/var/log/nginx - - ./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 - restart: always - environment: - TZ: "Asia/Shanghai" - ports: - - 8000:80 - volumes: - - ./docker/conf/gateway/nginx.conf:/etc/nginx/nginx.conf - - ./docker/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 - restart: always - environment: - MINIO_ACCESS_KEY: "admin" - MINIO_SECRET_KEY: "12345678" - command: server /data - ports: - - 9000:9000 - volumes: - - ./docker/data/minio:/data - networks: - default: - ipv4_address: 172.172.0.20 -#database server - mysql: - image: mysql:8.0.21 - restart: always - environment: - - MYSQL_ROOT_PASSWORD=root - - MYSQL_DATABASE=jobserver - command: --default-authentication-plugin=mysql_native_password - ports: - - 3306:3306 - volumes: - - ./docker/conf/mysql/my.cnf:/etc/my.cnf - - ./docker/data/mysql:/var/lib/mysql - healthcheck: - test: mysqladmin ping -h localhost -u $$MYSQL_USER --password=$$MYSQL_PASSWORD - timeout: 10s - retries: 30 - networks: - default: - ipv4_address: 172.172.0.30 - #mysql web manager - phpmyadmin: - image: phpmyadmin/phpmyadmin:latest - restart: always - environment: - - PMA_HOST=mysql - - PMA_PORT=3306 - ports: - - 9003:80 - networks: - default: - ipv4_address: 172.172.0.102 - influxdb: - image: influxdb:1.8.1 - restart: always - environment: - TZ: "Asia/Shanghai" - INFLUXDB_ADMIN_ENABLED: "true" - INFLUXDB_ADMIN_USER: admin - INFLUXDB_ADMIN_PASSWORD: admin - ports: - - 8086:8086 - - 8088:8088 - volumes: - - ./docker/data/influxdb:/var/lib/influxdb - - ./backup:/backup - networks: - default: - ipv4_address: 172.172.0.50 - #use old version influxdb web manager - influxdb-web: - image: influxdb:1.2.4 - restart: always - environment: - TZ: "Asia/Shanghai" - INFLUXDB_ADMIN_ENABLED: "true" - INFLUXDB_ADMIN_USER: admin - INFLUXDB_ADMIN_PASSWORD: admin - ports: - - 8083:8083 - networks: - default: - ipv4_address: 172.172.0.104 -#cache server - redis: - image: redis:6.0.6 - restart: always - ports: - - 6379:6379 - volumes: - - ./docker/data/redis:/data - - ./docker/conf/redis/redis.conf:/usr/local/etc/redis/redis.conf - networks: - default: - ipv4_address: 172.172.0.40 - #redis web manager - phpredisadmin: - image: erikdubbelboer/phpredisadmin - restart: always - environment: - - REDIS_1_HOST=redis - - REDIS_1_PORT=6379 - - ADMIN_USER=admin - - ADMIN_PASS=123456 - ports: - - 9004:80 - networks: - default: - ipv4_address: 172.172.0.103 -#streaming server - srs: - image: ubuntu - environment: - TZ: "Asia/Shanghai" - restart: always - ports: - - 1935:1935 - - 8080:8080 - - 1985:1985 - working_dir: /usr/local/srs - command: bash -c "chmod +x ./objs/srs && ./objs/srs -c ./conf/srs.conf" - volumes: - - ./apps/srs:/usr/local/srs - networks: - default: - ipv4_address: 172.172.0.60 \ No newline at end of file diff --git a/publish/projects/dslx/linux-x64/publish/apps/IoTCenter/wwwroot/CheckSum.exe b/publish/projects/dslx/linux-x64/publish/apps/IoTCenter/wwwroot/CheckSum.exe new file mode 100644 index 00000000..055a58c5 Binary files /dev/null and b/publish/projects/dslx/linux-x64/publish/apps/IoTCenter/wwwroot/CheckSum.exe differ diff --git a/publish/projects/dslx/linux-x64/publish/apps/IoTCenter/wwwroot/IoTNode.zip b/publish/projects/dslx/linux-x64/publish/apps/IoTCenter/wwwroot/IoTNode.zip new file mode 100644 index 00000000..59ac39a2 Binary files /dev/null and b/publish/projects/dslx/linux-x64/publish/apps/IoTCenter/wwwroot/IoTNode.zip differ diff --git a/publish/projects/dslx/linux-x64/publish/apps/IoTCenter/wwwroot/iotnode.xml b/publish/projects/dslx/linux-x64/publish/apps/IoTCenter/wwwroot/iotnode.xml new file mode 100644 index 00000000..4030693c --- /dev/null +++ b/publish/projects/dslx/linux-x64/publish/apps/IoTCenter/wwwroot/iotnode.xml @@ -0,0 +1,5 @@ + + + 1.0.0.20091601 + 7d5ff4ac251a6e682b85e49a130933d5d0c1dcaf820b7007c9924d55e975a37378ab67fccbc00950c23f2eb730b8bf52b1f454380ee8255d225d72747c84b787 + \ No newline at end of file diff --git a/publish/dslx/linux-x64/publish/apps/WebMVC/wwwroot/apps/XamarinApp.ipa b/publish/projects/dslx/linux-x64/publish/apps/WebMVC/wwwroot/apps/XamarinApp.ipa similarity index 100% rename from publish/dslx/linux-x64/publish/apps/WebMVC/wwwroot/apps/XamarinApp.ipa rename to publish/projects/dslx/linux-x64/publish/apps/WebMVC/wwwroot/apps/XamarinApp.ipa diff --git a/publish/dslx/linux-x64/publish/apps/WebMVC/wwwroot/apps/XamarinApp.plist b/publish/projects/dslx/linux-x64/publish/apps/WebMVC/wwwroot/apps/XamarinApp.plist similarity index 100% rename from publish/dslx/linux-x64/publish/apps/WebMVC/wwwroot/apps/XamarinApp.plist rename to publish/projects/dslx/linux-x64/publish/apps/WebMVC/wwwroot/apps/XamarinApp.plist diff --git a/publish/dslx/linux-x64/publish/apps/WebMVC/wwwroot/apps/XamarinApp.png b/publish/projects/dslx/linux-x64/publish/apps/WebMVC/wwwroot/apps/XamarinApp.png similarity index 100% rename from publish/dslx/linux-x64/publish/apps/WebMVC/wwwroot/apps/XamarinApp.png rename to publish/projects/dslx/linux-x64/publish/apps/WebMVC/wwwroot/apps/XamarinApp.png diff --git a/publish/dslx/linux-x64/publish/docker/conf/website/edusoa.key b/publish/projects/dslx/linux-x64/publish/docker/conf/website/edusoa.key similarity index 100% rename from publish/dslx/linux-x64/publish/docker/conf/website/edusoa.key rename to publish/projects/dslx/linux-x64/publish/docker/conf/website/edusoa.key diff --git a/publish/dslx/linux-x64/publish/docker/conf/website/edusoa.pem b/publish/projects/dslx/linux-x64/publish/docker/conf/website/edusoa.pem similarity index 100% rename from publish/dslx/linux-x64/publish/docker/conf/website/edusoa.pem rename to publish/projects/dslx/linux-x64/publish/docker/conf/website/edusoa.pem diff --git a/publish/dslx/linux-x64/publish/docker/conf/website/nginx.conf b/publish/projects/dslx/linux-x64/publish/docker/conf/website/nginx.conf similarity index 93% rename from publish/dslx/linux-x64/publish/docker/conf/website/nginx.conf rename to publish/projects/dslx/linux-x64/publish/docker/conf/website/nginx.conf index 06c184ae..e9ab388b 100644 --- a/publish/dslx/linux-x64/publish/docker/conf/website/nginx.conf +++ b/publish/projects/dslx/linux-x64/publish/docker/conf/website/nginx.conf @@ -43,6 +43,12 @@ http { 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)") { diff --git a/publish/src/linux-x64/publish/apps/srs/conf/srs.development.conf b/publish/src/linux-x64/publish/apps/srs/conf/srs.development.conf new file mode 100644 index 00000000..ff15485a --- /dev/null +++ b/publish/src/linux-x64/publish/apps/srs/conf/srs.development.conf @@ -0,0 +1,65 @@ +listen 1935; +max_connections 1000; +srs_log_tank file; +srs_log_file ./objs/log/srs.log; +daemon off; +http_api { + enabled on; + listen 1985; + raw_api { + enabled on; + allow_reload on; + allow_query on; + allow_update on; + } +} +http_server { + enabled on; + listen 8080; + dir ./objs/nginx/html; +} +stats { + network 0; + disk sda sdb xvda xvdb; +} +vhost __defaultVhost__ { + transcode live { + enabled off; + ffmpeg ./objs/ffmpeg/bin/ffmpeg; + engine snapshot { + enabled on; + iformat flv; + vfilter { + vf fps=1; + } + vcodec png; + vparams { + vframes 1; + } + acodec an; + oformat image2; + output ./objs/nginx/html/[app]/[stream].png; + } + } + http_remux { + enabled on; + mount [vhost]/[app]/[stream].flv; + } + hls { + enabled on; + hls_fragment 3; + hls_window 10; + hls_path ./objs/nginx/html; + hls_m3u8_file [app]/[stream].m3u8; + hls_ts_file [app]/[stream]-[seq].ts; + } + dvr { + enabled on; + dvr_apply none; + dvr_path ./objs/nginx/html/video/[app].[stream].[timestamp].mp4; + } + http_hooks { + enabled on; + on_dvr http://host.docker.internal/IoTCenter/api/v1/Srs/OnDvr; + } +} diff --git a/publish/src/linux-x64/publish/docker-compose.yml b/publish/src/linux-x64/publish/docker-compose.yml index a75dd007..87406c6f 100644 --- a/publish/src/linux-x64/publish/docker-compose.yml +++ b/publish/src/linux-x64/publish/docker-compose.yml @@ -6,7 +6,24 @@ networks: config: - subnet: 172.172.0.0/24 services: -#container management + #monitor + netdata: + image: netdata/netdata:latest-amd64 + hostname: localhost + ports: + - 9999:19999 + cap_add: + - SYS_PTRACE + security_opt: + - apparmor:unconfined + volumes: + - /proc:/host/proc:ro + - /sys:/host/sys:ro + - /var/run/docker.sock:/var/run/docker.sock:ro + networks: + default: + ipv4_address: 172.172.0.100 + #container management portainer: image: portainer/portainer:1.24.1 restart: always @@ -18,7 +35,7 @@ services: networks: default: ipv4_address: 172.172.0.101 -#web site + #web site website: image: nginx:1.18.0 restart: always @@ -29,13 +46,15 @@ services: - 443:443 volumes: - ./docker/conf/website/nginx.conf:/etc/nginx/nginx.conf + - ./docker/conf/website/edusoa.pem:/etc/nginx/edusoa.pem + - ./docker/conf/website/edusoa.key:/etc/nginx/edusoa.key - ./docker/log/website:/var/log/nginx - ./apps/WebMVC/wwwroot:/root/nginx/html/desktop - ./apps/WebSPA/wwwroot:/root/nginx/html/mobile networks: default: ipv4_address: 172.172.0.10 -#gateway + #gateway gateway: image: nginx:1.18.0 restart: always @@ -49,7 +68,7 @@ services: networks: default: ipv4_address: 172.172.0.12 -#file server + #file server minio: image: minio/minio:RELEASE.2020-08-08T04-50-06Z restart: always @@ -64,7 +83,7 @@ services: networks: default: ipv4_address: 172.172.0.20 -#database server + #database server mysql: image: mysql:8.0.21 restart: always @@ -126,13 +145,13 @@ services: networks: default: ipv4_address: 172.172.0.104 -#cache server + #cache server redis: image: redis:6.0.6 restart: always ports: - 6379:6379 - volumes: + volumes: - ./docker/data/redis:/data - ./docker/conf/redis/redis.conf:/usr/local/etc/redis/redis.conf networks: @@ -152,7 +171,7 @@ services: networks: default: ipv4_address: 172.172.0.103 -#streaming server + #streaming server srs: image: ubuntu environment: @@ -168,4 +187,4 @@ services: - ./apps/srs:/usr/local/srs networks: default: - ipv4_address: 172.172.0.60 \ No newline at end of file + ipv4_address: 172.172.0.60