wanggang
/
iot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

1.0.0.20110401

Browse Source 
Former-commit-id: 61d4efda046a0b3ac22c646179f18f3681b0dc1b
Former-commit-id: bcd45d23609db818c4ca410217ae3c7874551e39
TSXN
wanggang 5 years ago
parent 9abd31105c
commit f2805bdea7
11 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File

2
projects/IoTCenter/appsettings.Docker.json
Unescape View File

@ -4,7 +4,7 @@
}, },
"ConnectionStrings": { "ConnectionStrings": {
"postgresql": "User ID=root;Host=postgresql;Port=26257;Database=iotcenter;CommandTimeout=120", "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", "redis": "172.172.0.40:6379,allowAdmin=true",
"srs": "http://172.172.0.60:1985", "srs": "http://172.172.0.60:1985",
"JobServer": "http://172.172.0.12/JobServer", "JobServer": "http://172.172.0.12/JobServer",

6
projects/IoTCenter/appsettings.json
Unescape View File

@ -1,4 +1,4 @@
{ {
"server.urls": "http://*:8011", "server.urls": "http://*:8011",
"BasePath": "/IoTCenter", "BasePath": "/IoTCenter",
"Logging": { "Logging": {
@ -58,8 +58,8 @@
"ConnectionStrings": { "ConnectionStrings": {
"postgresql": "User ID=root;Host=localhost;Port=26257;Database=iotcenter;CommandTimeout=600;TrustServerCertificate=true;", "postgresql": "User ID=root;Host=localhost;Port=26257;Database=iotcenter;CommandTimeout=600;TrustServerCertificate=true;",
"sqlite": "Data Source=iotcenter.db", "sqlite": "Data Source=iotcenter.db",
"mysql": "Server=localhost;Port=3306;Database=iotcenter;Uid=root;Pwd=root;", "mysql": "Server=localhost;Port=3306;Database=iotcenter;Uid=root;Pwd=aA123456!;",
"redis": "localhost:6379,allowAdmin=true", "redis": "localhost:6379,password=aA123456!,allowAdmin=true",
"srs": "http://localhost:1985", "srs": "http://localhost:1985",
"JobServer": "http://localhost/JobServer", "JobServer": "http://localhost/JobServer",
"JobCallBack": "http://localhost/IoTCenter/api/v1/Api/ExecTimer" "JobCallBack": "http://localhost/IoTCenter/api/v1/Api/ExecTimer"

4
projects/JobServer/appsettings.Docker.json
Unescape View File

@ -1,5 +1,5 @@
{ {
"ConnectionStrings": { "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;"
} }
} }

4
projects/JobServer/appsettings.json
Unescape View File

@ -1,8 +1,8 @@
{ {
"server.urls": "http://*:8013", "server.urls": "http://*:8013",
"BasePath": "/JobServer", "BasePath": "/JobServer",
"ConnectionStrings": { "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": { "Logging": {
"LogLevel": { "LogLevel": {

4
projects/StudyCenter/appsettings.Docker.json
Unescape View File

@ -1,8 +1,8 @@
{ {
"ConnectionStrings": { "ConnectionStrings": {
"postgresql": "User ID=root;Host=localhost;Port=26257;Database=iotdb;", "postgresql": "User ID=root;Host=localhost;Port=26257;Database=iotdb;",
"sqlite": "Data Source=studycenter.db", "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": { "AppSettings": {
"database": "mysql", "database": "mysql",

4
projects/StudyCenter/appsettings.json
Unescape View File

@ -1,4 +1,4 @@
{ {
"server.urls": "http://*:8012", "server.urls": "http://*:8012",
"tableprefix": "study", "tableprefix": "study",
"Logging": { "Logging": {
@ -9,7 +9,7 @@
"ConnectionStrings": { "ConnectionStrings": {
"postgresql": "User ID=root;Host=localhost;Port=26257;Database=iotdb;", "postgresql": "User ID=root;Host=localhost;Port=26257;Database=iotdb;",
"sqlite": "Data Source=studycenter.db", "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": { "AppSettings": {
"database": "sqlite", "database": "sqlite",

4
projects/UserCenter/appsettings.Docker.json
Unescape View File

@ -1,10 +1,10 @@
{ {
"AppSettings": { "AppSettings": {
"database": "mysql" "database": "mysql"
}, },
"ConnectionStrings": { "ConnectionStrings": {
"postgresql": "User ID=root;Host=postgresql;Port=26257;Database=usercenter;CommandTimeout=120", "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" "redis": "172.172.0.40:6379,allowAdmin=true"
}, },
"minio": { "minio": {

6
projects/UserCenter/appsettings.json
Unescape View File

@ -1,4 +1,4 @@
{ {
"server.urls": "http://*:8010", "server.urls": "http://*:8010",
"BasePath": "/UserCenter", "BasePath": "/UserCenter",
"tableprefix": "uc", "tableprefix": "uc",
@ -47,8 +47,8 @@
"ConnectionStrings": { "ConnectionStrings": {
"postgresql": "User ID=root;Host=localhost;Port=26257;Database=usercenter;CommandTimeout=120", "postgresql": "User ID=root;Host=localhost;Port=26257;Database=usercenter;CommandTimeout=120",
"sqlite": "Data Source=usercenter.db", "sqlite": "Data Source=usercenter.db",
"mysql": "Server=localhost;Port=3306;Database=usercenter;Uid=root;Pwd=root;", "mysql": "Server=localhost;Port=3306;Database=usercenter;Uid=root;Pwd=aA123456!;",
"redis": "localhost:6379,allowAdmin=true" "redis": "localhost:6379,password=aA123456!,allowAdmin=true"
}, },
"AppSettings": { "AppSettings": {
"database": "mysql", "database": "mysql",

2
projects/WebMVC/wwwroot/components/iot/camera.html
Unescape View File

@ -252,7 +252,7 @@
//return getDeviceDataValue(this.device, 'flv'); //return getDeviceDataValue(this.device, 'flv');
}, },
isFlvSupported: function () { 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 () { ptz: function () {
if (this.getDeviceDataValue(this.device, '云台地址')) { if (this.getDeviceDataValue(this.device, '云台地址')) {

2
publish/src/linux-x64/publish/docker-compose.yml
Unescape View File

@ -88,7 +88,7 @@ services:
image: mysql:8.0.21 image: mysql:8.0.21
restart: always restart: always
environment: environment:
- MYSQL_ROOT_PASSWORD=root - MYSQL_ROOT_PASSWORD=aA123456!
- MYSQL_DATABASE=jobserver - MYSQL_DATABASE=jobserver
command: --default-authentication-plugin=mysql_native_password command: --default-authentication-plugin=mysql_native_password
ports: ports:

2
publish/src/linux-x64/publish/docker/conf/redis/redis.conf
Unescape View File

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

Write Preview
Loading…
Cancel
Save