free-sun
/
FS-IOT
15
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

webpack

release_0.0.2
yuan_yi 3 years ago
parent
7801359f73
commit
f638047ae7
5 changed files with 134 additions and 82 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 38
      code/VideoAccess-VCMP/api/app/lib/controllers/camera/create.js
  2. 7
      code/VideoAccess-VCMP/api/app/lib/controllers/camera/index.js
  3. 19
      code/VideoAccess-VCMP/api/app/lib/utils/rtmp2others.js
  4. 2
      code/VideoAccess-VCMP/web/config.js
  5. 150
      code/VideoAccess-VCMP/web/package.json

38
code/VideoAccess-VCMP/api/app/lib/controllers/camera/create.js
View File

@ -0,0 +1,38 @@
'use strict';
async function createYingshi (ctx) {
try {
const { models } = ctx.fs.dc
const { userId, token } = ctx.fs.api
const { id, name, cloudControl, highDefinition, memoryCard,
voice, kindId, abilityId, rtmp, } = ctx.request.body
let storageData = {
type: 'yingshi', name, cloudControl, highDefinition, memoryCard,
voice, longitude, latitude, kindId, abilityId, rtmp,
}
if (id) {
storageData.createTime = moment().format()
storageData.createUserId = userId
await models.Camera.update(storageData, {
where: {
id,
}
})
} else {
await models.Camera.create(storageData)
}
ctx.status = 204;
} catch (error) {
ctx.fs.logger.error(`path: ${ctx.path}, error: ${error}`);
ctx.status = 400;
ctx.body = {}
}
}
module.exports = {
};

7
code/VideoAccess-VCMP/api/app/lib/controllers/camera/index.js
View File

@ -149,11 +149,16 @@ async function detail (ctx) {
const otherUrls = await rtmp2others(cameraRes.rtmp) const otherUrls = await rtmp2others(cameraRes.rtmp)
const corUser = await ctx.app.fs.authRequest.get(`user/${cameraRes.createUserId}/message`, { query: { token } })
ctx.status = 200; ctx.status = 200;
ctx.body = { ctx.body = {
...cameraRes.dataValues, ...cameraRes.dataValues,
station: bindStations, station: bindStations,
videoUrl: otherUrls videoUrl: otherUrls,
createUser: {
namePresent: corUser[0].namePresent
}
} }
} catch (error) { } catch (error) {
ctx.fs.logger.error(`path: ${ctx.path}, error: ${error}`); ctx.fs.logger.error(`path: ${ctx.path}, error: ${error}`);

19
code/VideoAccess-VCMP/api/app/lib/utils/rtmp2others.js
View File

@ -4,11 +4,20 @@ async function rtmp2others (rtmp) {
return { return {
liveUrl: { liveUrl: {
rtmp: 'xx', hd: {// 高清
hls: 'xx', rtmp: 'xx',
flv: 'xx', hls: 'xx',
ezopen: 'xx', flv: 'xx',
onvif: 'xx', ezopen: 'xx',
onvif: 'xx',
},
sd: {// 标清
rtmp: 'xx',
hls: 'xx',
flv: 'xx',
ezopen: 'xx',
onvif: 'xx',
}
}, },
replayUrl: { replayUrl: {
cloud: 'xx', cloud: 'xx',

2
code/VideoAccess-VCMP/web/config.js
View File

@ -12,7 +12,7 @@ dev && console.log('\x1B[33m%s\x1b[0m', '请遵循并及时更新 readme.md，
// // 启动参数 // // 启动参数
args.option(['p', 'port'], '启动端口'); args.option(['p', 'port'], '启动端口');
args.option(['u', 'api-url'], 'webapi的URL'); args.option(['u', 'api-url'], 'webapi的URL');
args.option('apiAuthUrl', 'apiAuthUrl'); args.option('apiAuthUrl', 'IOT 鉴权 api');
const flags = args.parse(process.argv); const flags = args.parse(process.argv);

150
code/VideoAccess-VCMP/web/package.json
View File

@ -1,76 +1,76 @@
{ {
"name": "fs-anxincloud-4.0", "name": "fs-anxincloud-4.0",
"version": "1.0.0", "version": "1.0.0",
"description": "anxincloud-4.0", "description": "anxincloud-4.0",
"main": "server.js", "main": "server.js",
"scripts": { "scripts": {
"test": "mocha", "test": "mocha",
"start-vite": "cross-env NODE_ENV=developmentVite npm run start-params", "start-vite": "cross-env NODE_ENV=developmentVite npm run start-params",
"start": "cross-env NODE_ENV=development npm run start-params", "start": "cross-env NODE_ENV=development npm run start-params",
"start-params": "node server -p 5000 -u http://10.8.30.82:4000 --apiAuthUrl http://10.8.30.82:4200", "start-params": "node server -p 5000 -u http://10.8.30.82:4000 --apiAuthUrl http://10.8.30.82:4200",
"deploy": "export NODE_ENV=production&& npm run build && node server", "deploy": "export NODE_ENV=production&& npm run build && node server",
"build-dev": "export NODE_ENV=development&&webpack --config webpack.config.js", "build-dev": "cross-env NODE_ENV=development&&webpack --config webpack.config.js",
"build": "export NODE_ENV=production&&webpack --config webpack.config.prod.js" "build": "export NODE_ENV=production&&webpack --config webpack.config.prod.js"
}, },
"keywords": [ "keywords": [
"app" "app"
], ],
"author": "", "author": "",
"license": "ISC", "license": "ISC",
"devDependencies": { "devDependencies": {
"@babel/core": "^7.14.6", "@babel/core": "^7.14.6",
"@babel/plugin-proposal-class-properties": "^7.14.5", "@babel/plugin-proposal-class-properties": "^7.14.5",
"@babel/plugin-proposal-object-rest-spread": "^7.14.7", "@babel/plugin-proposal-object-rest-spread": "^7.14.7",
"@babel/plugin-transform-runtime": "^7.14.5", "@babel/plugin-transform-runtime": "^7.14.5",
"@babel/polyfill": "^7.12.1", "@babel/polyfill": "^7.12.1",
"@babel/preset-env": "^7.14.7", "@babel/preset-env": "^7.14.7",
"@babel/preset-react": "^7.14.5", "@babel/preset-react": "^7.14.5",
"babel-loader": "^8.2.2", "babel-loader": "^8.2.2",
"babel-plugin-import": "^1.13.3", "babel-plugin-import": "^1.13.3",
"connected-react-router": "^6.8.0", "connected-react-router": "^6.8.0",
"css-loader": "^3.5.0", "css-loader": "^3.5.0",
"express": "^4.17.1", "express": "^4.17.1",
"file-loader": "^6.0.0", "file-loader": "^6.0.0",
"html-webpack-plugin": "^4.5.0", "html-webpack-plugin": "^4.5.0",
"immutable": "^4.0.0-rc.12", "immutable": "^4.0.0-rc.12",
"less": "^3.12.2", "less": "^3.12.2",
"less-loader": "^7.0.2", "less-loader": "^7.0.2",
"nprogress": "^0.2.0", "nprogress": "^0.2.0",
"react": "^17.0.0", "react": "^17.0.0",
"react-dom": "^17.0.0", "react-dom": "^17.0.0",
"react-redux": "^7.2.1", "react-redux": "^7.2.1",
"react-router-dom": "^5.2.0", "react-router-dom": "^5.2.0",
"react-router-redux": "^4.0.8", "react-router-redux": "^4.0.8",
"redux": "^4.0.5", "redux": "^4.0.5",
"redux-thunk": "^2.3.0", "redux-thunk": "^2.3.0",
"style-loader": "^2.0.0", "style-loader": "^2.0.0",
"vite": "^2.9.5", "vite": "^2.9.5"
"webpack": "^5.3.2", },
"webpack-bundle-analyzer": "^4.1.0", "dependencies": {
"webpack-cli": "^4.2.0", "@douyinfe/semi-ui": "^2.8.0",
"webpack-dev-middleware": "^4.0.2", "@fs/attachment": "^1.0.0",
"webpack-dev-server": "^3.11.2", "@peace/components": "0.0.35",
"webpack-hot-middleware": "^2.25.0" "@peace/utils": "^0.0.48",
}, "@vitejs/plugin-react": "^1.3.1",
"dependencies": { "@vitejs/plugin-react-refresh": "^1.3.6",
"@douyinfe/semi-ui": "^2.8.0", "args": "^5.0.1",
"@fs/attachment": "^1.0.0", "copy-to-clipboard": "^3.3.1",
"@peace/components": "0.0.35", "cross-env": "^7.0.3",
"@peace/utils": "^0.0.48", "fs-web-server-scaffold": "^1.0.6",
"@vitejs/plugin-react": "^1.3.1", "koa-better-http-proxy": "^0.2.5",
"@vitejs/plugin-react-refresh": "^1.3.6", "koa-proxy": "^1.0.0-alpha.3",
"args": "^5.0.1", "koa-view": "^2.1.4",
"copy-to-clipboard": "^3.3.1", "moment": "^2.29.3",
"cross-env": "^7.0.3", "npm": "^7.20.6",
"fs-web-server-scaffold": "^1.0.6", "perfect-scrollbar": "^1.5.5",
"koa-better-http-proxy": "^0.2.5", "socket.io-client": "^4.5.0",
"koa-proxy": "^1.0.0-alpha.3", "socket.io-parser": "^4.2.0",
"koa-view": "^2.1.4", "superagent": "^6.1.0",
"moment": "^2.29.3", "webpack": "^5.3.2",
"npm": "^7.20.6", "webpack-bundle-analyzer": "^4.1.0",
"perfect-scrollbar": "^1.5.5", "webpack-cli": "^4.2.0",
"socket.io-client": "^4.5.0", "webpack-dev-middleware": "^4.0.2",
"socket.io-parser": "^4.2.0", "webpack-dev-server": "^3.11.2",
"superagent": "^6.1.0" "webpack-hot-middleware": "^2.25.0"
} }
} }
Write Preview
Loading…
Cancel
Save