From f2805bdea79400c63760af02bbe642a51c2c97f7 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Wed, 4 Nov 2020 12:39:36 +0800 Subject: [PATCH] 1.0.0.20110401 Former-commit-id: 61d4efda046a0b3ac22c646179f18f3681b0dc1b Former-commit-id: bcd45d23609db818c4ca410217ae3c7874551e39 --- projects/IoTCenter/appsettings.Docker.json | 2 +- projects/IoTCenter/appsettings.json | 6 +++--- projects/JobServer/appsettings.Docker.json | 4 ++-- projects/JobServer/appsettings.json | 4 ++-- projects/StudyCenter/appsettings.Docker.json | 4 ++-- projects/StudyCenter/appsettings.json | 4 ++-- projects/UserCenter/appsettings.Docker.json | 4 ++-- projects/UserCenter/appsettings.json | 6 +++--- projects/WebMVC/wwwroot/components/iot/camera.html | 2 +- publish/src/linux-x64/publish/docker-compose.yml | 2 +- publish/src/linux-x64/publish/docker/conf/redis/redis.conf | 2 +- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/projects/IoTCenter/appsettings.Docker.json b/projects/IoTCenter/appsettings.Docker.json index 26ba5c10..67b2fd2c 100644 --- a/projects/IoTCenter/appsettings.Docker.json +++ b/projects/IoTCenter/appsettings.Docker.json @@ -4,7 +4,7 @@ }, "ConnectionStrings": { "postgresql": "User ID=root;Host=postgresql;Port=26257;Database=iotcenter;CommandTimeout=120", - "mysql": "Server=172.172.0.30;Port=3306;Database=iotcenter;Uid=root;Pwd=root;", + "mysql": "Server=172.172.0.30;Port=3306;Database=iotcenter;Uid=root;Pwd=aA123456!;", "redis": "172.172.0.40:6379,allowAdmin=true", "srs": "http://172.172.0.60:1985", "JobServer": "http://172.172.0.12/JobServer", diff --git a/projects/IoTCenter/appsettings.json b/projects/IoTCenter/appsettings.json index 8851e626..e9e2e87a 100644 --- a/projects/IoTCenter/appsettings.json +++ b/projects/IoTCenter/appsettings.json @@ -1,4 +1,4 @@ -{ +{ "server.urls": "http://*:8011", "BasePath": "/IoTCenter", "Logging": { @@ -58,8 +58,8 @@ "ConnectionStrings": { "postgresql": "User ID=root;Host=localhost;Port=26257;Database=iotcenter;CommandTimeout=600;TrustServerCertificate=true;", "sqlite": "Data Source=iotcenter.db", - "mysql": "Server=localhost;Port=3306;Database=iotcenter;Uid=root;Pwd=root;", - "redis": "localhost:6379,allowAdmin=true", + "mysql": "Server=localhost;Port=3306;Database=iotcenter;Uid=root;Pwd=aA123456!;", + "redis": "localhost:6379,password=aA123456!,allowAdmin=true", "srs": "http://localhost:1985", "JobServer": "http://localhost/JobServer", "JobCallBack": "http://localhost/IoTCenter/api/v1/Api/ExecTimer" diff --git a/projects/JobServer/appsettings.Docker.json b/projects/JobServer/appsettings.Docker.json index 366da8c2..7b3d896c 100644 --- a/projects/JobServer/appsettings.Docker.json +++ b/projects/JobServer/appsettings.Docker.json @@ -1,5 +1,5 @@ -{ +{ "ConnectionStrings": { - "HangfireConnection": "Server=172.172.0.30;Port=3306;Database=jobserver;Uid=root;Pwd=root;Allow User Variables=True;" + "HangfireConnection": "Server=172.172.0.30;Port=3306;Database=jobserver;Uid=root;Pwd=aA123456!;Allow User Variables=True;" } } \ No newline at end of file diff --git a/projects/JobServer/appsettings.json b/projects/JobServer/appsettings.json index f2ee4a43..748d63cc 100644 --- a/projects/JobServer/appsettings.json +++ b/projects/JobServer/appsettings.json @@ -1,8 +1,8 @@ -{ +{ "server.urls": "http://*:8013", "BasePath": "/JobServer", "ConnectionStrings": { - "HangfireConnection": "Server=localhost;Port=3306;Database=jobserver;Uid=root;Pwd=root;Allow User Variables=True;" + "HangfireConnection": "Server=localhost;Port=3306;Database=jobserver;Uid=root;Pwd=aA123456!;Allow User Variables=True;" }, "Logging": { "LogLevel": { diff --git a/projects/StudyCenter/appsettings.Docker.json b/projects/StudyCenter/appsettings.Docker.json index d3632532..a0e84786 100644 --- a/projects/StudyCenter/appsettings.Docker.json +++ b/projects/StudyCenter/appsettings.Docker.json @@ -1,8 +1,8 @@ -{ +{ "ConnectionStrings": { "postgresql": "User ID=root;Host=localhost;Port=26257;Database=iotdb;", "sqlite": "Data Source=studycenter.db", - "mysql": "Server=mysql;Port=3306;Database=studycenter;Uid=root;Pwd=root;" + "mysql": "Server=mysql;Port=3306;Database=studycenter;Uid=root;Pwd=aA123456!;" }, "AppSettings": { "database": "mysql", diff --git a/projects/StudyCenter/appsettings.json b/projects/StudyCenter/appsettings.json index 5053bf33..00e8c5e4 100644 --- a/projects/StudyCenter/appsettings.json +++ b/projects/StudyCenter/appsettings.json @@ -1,4 +1,4 @@ -{ +{ "server.urls": "http://*:8012", "tableprefix": "study", "Logging": { @@ -9,7 +9,7 @@ "ConnectionStrings": { "postgresql": "User ID=root;Host=localhost;Port=26257;Database=iotdb;", "sqlite": "Data Source=studycenter.db", - "mysql": "Server=localhost;Port=3306;Database=studycenter;Uid=root;Pwd=root;" + "mysql": "Server=localhost;Port=3306;Database=studycenter;Uid=root;Pwd=aA123456!;" }, "AppSettings": { "database": "sqlite", diff --git a/projects/UserCenter/appsettings.Docker.json b/projects/UserCenter/appsettings.Docker.json index 7bc8eec2..9af8c4ce 100644 --- a/projects/UserCenter/appsettings.Docker.json +++ b/projects/UserCenter/appsettings.Docker.json @@ -1,10 +1,10 @@ -{ +{ "AppSettings": { "database": "mysql" }, "ConnectionStrings": { "postgresql": "User ID=root;Host=postgresql;Port=26257;Database=usercenter;CommandTimeout=120", - "mysql": "Server=172.172.0.30;Port=3306;Database=usercenter;Uid=root;Pwd=root;", + "mysql": "Server=172.172.0.30;Port=3306;Database=usercenter;Uid=root;Pwd=aA123456!;", "redis": "172.172.0.40:6379,allowAdmin=true" }, "minio": { diff --git a/projects/UserCenter/appsettings.json b/projects/UserCenter/appsettings.json index 2c753fb6..94c73c3d 100644 --- a/projects/UserCenter/appsettings.json +++ b/projects/UserCenter/appsettings.json @@ -1,4 +1,4 @@ -{ +{ "server.urls": "http://*:8010", "BasePath": "/UserCenter", "tableprefix": "uc", @@ -47,8 +47,8 @@ "ConnectionStrings": { "postgresql": "User ID=root;Host=localhost;Port=26257;Database=usercenter;CommandTimeout=120", "sqlite": "Data Source=usercenter.db", - "mysql": "Server=localhost;Port=3306;Database=usercenter;Uid=root;Pwd=root;", - "redis": "localhost:6379,allowAdmin=true" + "mysql": "Server=localhost;Port=3306;Database=usercenter;Uid=root;Pwd=aA123456!;", + "redis": "localhost:6379,password=aA123456!,allowAdmin=true" }, "AppSettings": { "database": "mysql", diff --git a/projects/WebMVC/wwwroot/components/iot/camera.html b/projects/WebMVC/wwwroot/components/iot/camera.html index 1b6e5244..63d9bea2 100644 --- a/projects/WebMVC/wwwroot/components/iot/camera.html +++ b/projects/WebMVC/wwwroot/components/iot/camera.html @@ -252,7 +252,7 @@ //return getDeviceDataValue(this.device, 'flv'); }, isFlvSupported: function () { - return flvjs.isSupported() && window.navigator.userAgent.indexOf('Mac OS X') === -1;//AppleWebKit + return flvjs.isSupported() && window.navigator.userAgent.indexOf('iPhone') === -1;//AppleWebKit }, ptz: function () { if (this.getDeviceDataValue(this.device, '云台地址')) { diff --git a/publish/src/linux-x64/publish/docker-compose.yml b/publish/src/linux-x64/publish/docker-compose.yml index 87406c6f..5232e155 100644 --- a/publish/src/linux-x64/publish/docker-compose.yml +++ b/publish/src/linux-x64/publish/docker-compose.yml @@ -88,7 +88,7 @@ services: image: mysql:8.0.21 restart: always environment: - - MYSQL_ROOT_PASSWORD=root + - MYSQL_ROOT_PASSWORD=aA123456! - MYSQL_DATABASE=jobserver command: --default-authentication-plugin=mysql_native_password ports: diff --git a/publish/src/linux-x64/publish/docker/conf/redis/redis.conf b/publish/src/linux-x64/publish/docker/conf/redis/redis.conf index b2bf818a..c9e7d141 100644 --- a/publish/src/linux-x64/publish/docker/conf/redis/redis.conf +++ b/publish/src/linux-x64/publish/docker/conf/redis/redis.conf @@ -783,7 +783,7 @@ acllog-max-len 128 # AUTH as usually, or more explicitly with AUTH default # if they follow the new protocol: both will work. # -# requirepass foobared +requirepass aA123456! # Command renaming (DEPRECATED). #