diff --git a/projects/IoTCenter/appsettings.Docker.json b/projects/IoTCenter/appsettings.Docker.json index 5091688a..5cd23c15 100644 --- a/projects/IoTCenter/appsettings.Docker.json +++ b/projects/IoTCenter/appsettings.Docker.json @@ -21,6 +21,8 @@ } }, "minio": { - "endpoint": " 172.172.0.20:9000" + "endpoint": "172.172.0.20:9000", + "accessKey": "admin", + "secretKey": "12345678" } } \ No newline at end of file diff --git a/projects/Version.cs b/projects/Version.cs index 899a650e..99554e5d 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.0811d2")] \ No newline at end of file +[assembly: AssemblyInformationalVersion("1.0.0.0811d3")] \ No newline at end of file diff --git a/projects/WebMVC/libman.json b/projects/WebMVC/libman.json index 8c6094d9..2936fb16 100644 --- a/projects/WebMVC/libman.json +++ b/projects/WebMVC/libman.json @@ -6,7 +6,7 @@ "provider": "filesystem", "library": "../lib/local/kindeditor/", "destination": "wwwroot/lib/kindeditor/", - "files": [ "kindeditor-all-min.js", "lang/zh-CN.js", "themes/default/default.css", "themes/default/default.png", "themes/default/background.png" ] + "files": [ "kindeditor-all-min.js", "lang/zh-CN.js", "themes/default/default.css", "themes/default/default.png", "themes/default/background.png", "themes/common/loading.gif" ] }, { "provider": "filesystem", diff --git a/projects/WebMVC/wwwroot/lib/kindeditor/themes/common/loading.gif b/projects/WebMVC/wwwroot/lib/kindeditor/themes/common/loading.gif new file mode 100644 index 00000000..c69e9372 Binary files /dev/null and b/projects/WebMVC/wwwroot/lib/kindeditor/themes/common/loading.gif differ diff --git a/publish/src/linux-x64/publish/backup/backup.sh b/publish/src/linux-x64/publish/backup/backup.sh index e6b5a131..de65c7ef 100644 --- a/publish/src/linux-x64/publish/backup/backup.sh +++ b/publish/src/linux-x64/publish/backup/backup.sh @@ -1 +1,2 @@ +#!/bin/bash mysqldump -uroot -proot iotcenter > /root/publish/backup/backup-`date "+%Y-%m-%d_%H:%M:%S"`.sql \ No newline at end of file diff --git a/publish/src/linux-x64/publish/docker-compose.yml b/publish/src/linux-x64/publish/docker-compose.yml index 1775105a..33d446a8 100644 --- a/publish/src/linux-x64/publish/docker-compose.yml +++ b/publish/src/linux-x64/publish/docker-compose.yml @@ -79,8 +79,8 @@ services: - ./docker/data/mysql:/var/lib/mysql healthcheck: test: mysqladmin ping -h localhost -u $$MYSQL_USER --password=$$MYSQL_PASSWORD - timeout: 20s - retries: 10 + timeout: 10s + retries: 30 networks: default: ipv4_address: 172.172.0.30