Browse Source

socket 优化

pull/3/head
yuan_yi 3 years ago
parent
commit
caa85094bd
  1. 1
      code/VideoAccess-VCMP/api/app/lib/index.js
  2. 40
      code/VideoAccess-VCMP/api/app/lib/models/ax_project.js
  3. 2
      code/VideoAccess-VCMP/web/client/src/layout/actions/webSocket.js
  4. 8
      code/VideoAccess-VCMP/web/package.json

1
code/VideoAccess-VCMP/api/app/lib/index.js

@ -31,4 +31,5 @@ module.exports.models = function (dc) { // dc = { orm: Sequelize对象, ORM: Seq
require('./models/camera')(dc);
require('./models/nvr')(dc);
require('./models/vender')(dc);
require('./models/ax_project')(dc);
};

40
code/VideoAccess-VCMP/api/app/lib/models/ax_project.js

@ -0,0 +1,40 @@
/* eslint-disable*/
'use strict';
module.exports = dc => {
const DataTypes = dc.ORM;
const sequelize = dc.orm;
const AxProject = sequelize.define("axProject", {
id: {
type: DataTypes.INTEGER,
allowNull: false,
defaultValue: null,
comment: null,
primaryKey: true,
field: "id",
autoIncrement: false,
unique: "ax_project_id_uindex"
},
name: {
type: DataTypes.STRING,
allowNull: false,
defaultValue: null,
comment: null,
primaryKey: false,
field: "name",
autoIncrement: false
}
}, {
tableName: "ax_project",
comment: "",
indexes: []
});
const Nvr = dc.models.Nvr;
// Nvr.belongsTo(User, { foreignKey: 'userId', targetKey: 'id' });
// User.hasMany(Nvr, { foreignKey: 'userId', sourceKey: 'id' });
dc.models.AxProject = AxProject;
return AxProject;
};

2
code/VideoAccess-VCMP/web/client/src/layout/actions/webSocket.js

@ -8,8 +8,10 @@ export function initWebSocket ({ ioUrl, token }) {
}
if (!token) {
const user = sessionStorage.getItem('user')
if (user) {
token = JSON.parse(user).token
}
}
if (!ioUrl || !token) {
return {
type: '',

8
code/VideoAccess-VCMP/web/package.json

@ -44,10 +44,12 @@
"redux": "^4.0.5",
"redux-thunk": "^2.3.0",
"style-loader": "^2.0.0",
"vite": "^2.9.5",
"webpack": "^5.3.2",
"webpack-bundle-analyzer": "^4.1.0",
"webpack-cli": "^4.2.0",
"webpack-dev-middleware": "^4.0.2",
"webpack-dev-server": "^3.11.2",
"webpack-hot-middleware": "^2.25.0"
},
"dependencies": {
@ -66,8 +68,8 @@
"moment": "^2.22.0",
"npm": "^7.20.6",
"perfect-scrollbar": "^1.5.5",
"superagent": "^6.1.0",
"vite": "^2.9.5",
"webpack-dev-server": "^3.11.2"
"socket.io-client": "^4.5.0",
"socket.io-parser": "^4.2.0",
"superagent": "^6.1.0"
}
}

Loading…
Cancel
Save