diff --git a/projects/Version.cs b/projects/Version.cs index b7bf0ea0..c028065b 100644 --- a/projects/Version.cs +++ b/projects/Version.cs @@ -1,4 +1,4 @@ using System.Reflection; [assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyInformationalVersion("1.0.0.0812d1")] \ No newline at end of file +[assembly: AssemblyInformationalVersion("1.0.0.0812d2")] \ No newline at end of file diff --git a/projects/WebMVC/wwwroot/js/iot.js b/projects/WebMVC/wwwroot/js/iot.js index e680ecb0..1f0eb72b 100644 --- a/projects/WebMVC/wwwroot/js/iot.js +++ b/projects/WebMVC/wwwroot/js/iot.js @@ -106,7 +106,6 @@ deviceInfo['红外转发器'] = 'iot-ir'; deviceInfo['调色灯'] = 'iot-color-light'; deviceInfo['门锁'] = 'iot-door'; deviceInfo['摄像头'] = 'iot-camera'; -deviceInfo['摄像头'] = 'gateway'; deviceInfo['串口控制器'] = 'iot-serial-port'; /// function updateSelect(action, id, value) { diff --git a/publish/build.ps1 b/publish/build.ps1 index 6b0acf1c..27f53459 100644 --- a/publish/build.ps1 +++ b/publish/build.ps1 @@ -5,8 +5,9 @@ Copy-Item ./src/* ./dist -recurse -Exclude @('.gitignore','debug-start.cmd','de Remove-Item ./dist/linux-x64/publish/docker/log/* -recurse -force Remove-Item ./dist/linux-x64/publish/docker/data/* -recurse -force -dotnet publish ../projects/WebMvc/WebMVC.csproj -c Release -r linux-x64 -o ../publish/dist/linux-x64/publish/apps/WebMVC -dotnet publish ../projects/WebSPA/WebSPA.csproj -c Release -r linux-x64 -o ../publish/dist/linux-x64/publish/apps/WebSPA +Copy-Item ../projects/WebMVC/wwwroot ./dist/linux-x64/publish/apps/WebMVC -recurse +Copy-Item ../projects/WebSPA/wwwroot ./dist/linux-x64/publish/apps/WebSPA -recurse + dotnet publish ../projects/UserCenter/UserCenter.csproj -c Release -r linux-x64 -o ../publish/dist/linux-x64/publish/apps/UserCenter dotnet publish ../projects/JobServer/JobServer.csproj -c Release -r linux-x64 -o ../publish/dist/linux-x64/publish/apps/JobServer dotnet publish ../projects/IoTCenter/IoTCenter.csproj -c Release -r linux-x64 -o ../publish/dist/linux-x64/publish/apps/IoTCenter diff --git a/publish/src/linux-x64/publish/docker-compose.yml b/publish/src/linux-x64/publish/docker-compose.yml index 33d446a8..7ade1f4a 100644 --- a/publish/src/linux-x64/publish/docker-compose.yml +++ b/publish/src/linux-x64/publish/docker-compose.yml @@ -8,7 +8,7 @@ networks: services: #container management portainer: - image: portainer/portainer:1.23.2 + image: portainer/portainer:1.24.1 restart: always ports: - 9002:9000 @@ -20,7 +20,7 @@ services: ipv4_address: 172.172.0.101 #web site website: - image: nginx:1.18 + image: nginx:1.18.0 restart: always environment: TZ: "Asia/Shanghai" @@ -37,7 +37,7 @@ services: ipv4_address: 172.172.0.10 #gateway gateway: - image: nginx:1.18 + image: nginx:1.18.0 restart: always environment: TZ: "Asia/Shanghai" @@ -51,7 +51,7 @@ services: ipv4_address: 172.172.0.12 #file server minio: - image: minio/minio:RELEASE.2020-05-29T14-08-49Z + image: minio/minio:RELEASE.2020-08-08T04-50-06Z restart: always environment: MINIO_ACCESS_KEY: "admin" @@ -66,7 +66,7 @@ services: ipv4_address: 172.172.0.20 #database server mysql: - image: mysql:8.0 + image: mysql:8.0.21 restart: always environment: - MYSQL_ROOT_PASSWORD=root @@ -86,7 +86,7 @@ services: ipv4_address: 172.172.0.30 #mysql web manager phpmyadmin: - image: phpmyadmin/phpmyadmin + image: phpmyadmin/phpmyadmin:latest restart: always environment: - PMA_HOST=mysql @@ -97,7 +97,7 @@ services: default: ipv4_address: 172.172.0.102 influxdb: - image: influxdb:1.8 + image: influxdb:1.8.1 restart: always environment: TZ: "Asia/Shanghai" @@ -127,7 +127,7 @@ services: ipv4_address: 172.172.0.104 #cache server redis: - image: redis:6.0 + image: redis:6.0.6 restart: always ports: - 6379:6379 @@ -153,7 +153,7 @@ services: ipv4_address: 172.172.0.103 #streaming server srs: - image: ossrs/srs:3 + image: ossrs/srs:v3.0-r0 environment: TZ: "Asia/Shanghai" restart: always