1.0.0.20110401

Former-commit-id: 61d4efda046a0b3ac22c646179f18f3681b0dc1b
Former-commit-id: bcd45d23609db818c4ca410217ae3c7874551e39

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",

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"

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;"
   }
 }

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": {

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",

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",

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": {

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",

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, '云台地址')) {

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:

publish/src/linux-x64/publish/docker/conf/redis/redis.conf

@@ -783,7 +783,7 @@ acllog-max-len 128
 # AUTH <password> as usually, or more explicitly with AUTH default <password>
 # if they follow the new protocol: both will work.
 #
-# requirepass foobared
+requirepass aA123456!
 
 # Command renaming (DEPRECATED).
 #