diff --git a/code/VideoAccess-VCMP/api/.vscode/launch.json b/code/VideoAccess-VCMP/api/.vscode/launch.json index d2b588d..14736de 100644 --- a/code/VideoAccess-VCMP/api/.vscode/launch.json +++ b/code/VideoAccess-VCMP/api/.vscode/launch.json @@ -16,7 +16,7 @@ "-p 4000", "-f http://localhost:4000", "-g postgres://postgres:123@10.8.30.32:5432/video_access", - "--redisHost 127.0.0.1", + "--redisHost 10.8.30.34", "--redisPort 6379", "--axyApiUrl http://127.0.0.1:4100", "--iotAuthApi http://127.0.0.1:4200", diff --git a/code/VideoAccess-VCMP/api/app/lib/models/application.js b/code/VideoAccess-VCMP/api/app/lib/models/application.js index 527a521..e51fd54 100644 --- a/code/VideoAccess-VCMP/api/app/lib/models/application.js +++ b/code/VideoAccess-VCMP/api/app/lib/models/application.js @@ -25,7 +25,7 @@ module.exports = dc => { autoIncrement: false }, type: { - type: array, + type: DataTypes.ARRAY(DataTypes.STRING), allowNull: true, defaultValue: null, comment: "web / app / wxapp / other", diff --git a/code/VideoAccess-VCMP/api/app/lib/schedule/freshYingshiMsg.js b/code/VideoAccess-VCMP/api/app/lib/schedule/freshYingshiMsg.js index ce3b087..612ded3 100644 --- a/code/VideoAccess-VCMP/api/app/lib/schedule/freshYingshiMsg.js +++ b/code/VideoAccess-VCMP/api/app/lib/schedule/freshYingshiMsg.js @@ -4,9 +4,8 @@ const moment = require('moment') module.exports = function (app, opts) { const freshYingshiState = app.fs.scheduleInit( { - interval: '0 */5 * * * *', - interval: '*/10 * * * *', - immediate: false, + interval: '0 */4 * * * *', + // interval: '*/3 * * * *', // immediate: true, // proRun: true, }, @@ -34,6 +33,7 @@ module.exports = function (app, opts) { deviceList = deviceList.concat.apply(deviceList, deviceRes.data) for (let d of deviceRes.data) { + const existD = await models.GbCamera.findOne({ where: { streamid: d.deviceSerial