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

docker 文件 ，部分播放器样式

release_0.0.2
巴林闲侠 2 years ago
parent
0594201af5
commit
0debdb7c1d
9 changed files with 134 additions and 70 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. 88
      code/VideoAccess-VCMP/api/.vscode/launch.json
  2. 22
      code/VideoAccess-VCMP/api/Dockerfile
  3. 27
      code/VideoAccess-VCMP/api/app/lib/service/mqttVideoServer.js
  4. 19
      code/VideoAccess-VCMP/api/jenkinsfile
  5. 20
      code/VideoAccess-VCMP/web/Dockerfile
  6. 2
      code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoOperation.jsx
  7. 5
      code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlay.jsx
  8. 2
      code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/camera.jsx
  9. 19
      code/VideoAccess-VCMP/web/jenkinsfile

88
code/VideoAccess-VCMP/api/.vscode/launch.json
View File

@ -1,46 +1,46 @@
{ {
// 使用 IntelliSense 了解相关属性。 // 使用 IntelliSense 了解相关属性。
// 悬停以查看现有属性的描述。 // 悬停以查看现有属性的描述。
// 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387 // 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0", "version": "0.2.0",
"configurations": [ "configurations": [
{ {
"type": "node", "type": "node",
"request": "launch", "request": "launch",
"name": "启动API", "name": "启动API",
"program": "${workspaceRoot}/server.js", "program": "${workspaceRoot}/server.js",
"env": { "env": {
"NODE_ENV": "development" "NODE_ENV": "development"
}, },
"args": [ "args": [
"-p 4000", "-p 4000",
"-f http://localhost:4000", "-f http://localhost:4000",
"-g postgres://postgres:123@10.8.30.32:5432/video_access", "-g postgres://postgres:123@10.8.30.32:5432/video_access",
"--redisHost 127.0.0.1", "--redisHost 127.0.0.1",
"--redisPort 6379", "--redisPort 6379",
"--axyApiUrl http://127.0.0.1:4100", "--axyApiUrl http://127.0.0.1:4100",
"--iotAuthApi http://127.0.0.1:4200", "--iotAuthApi http://127.0.0.1:4200",
"--iotVideoServerUrl http://221.230.55.27:8081", "--iotVideoServerUrl http://221.230.55.27:8081",
"--godUrl https://restapi.amap.com/v3", "--godUrl https://restapi.amap.com/v3",
"--godKey 21c2d970e1646bb9a795900dd00093ce", "--godKey 21c2d970e1646bb9a795900dd00093ce",
"--mqttVideoServer mqtt://127.0.0.1" "--mqttVideoServer tcp://tee2b1be.cn.emqx.cloud:12847"
] ]
}, },
{ {
"type": "node", "type": "node",
"request": "launch", "request": "launch",
"name": "run mocha", "name": "run mocha",
"program": "${workspaceRoot}/node_modules/mocha/bin/_mocha", "program": "${workspaceRoot}/node_modules/mocha/bin/_mocha",
"stopOnEntry": false, "stopOnEntry": false,
"args": [ "args": [
"app/test/*.test.js", "app/test/*.test.js",
"--no-timeouts" "--no-timeouts"
], ],
"cwd": "${workspaceRoot}", "cwd": "${workspaceRoot}",
"runtimeExecutable": null, "runtimeExecutable": null,
"env": { "env": {
"NODE_ENV": "development" "NODE_ENV": "development"
} }
} }
] ]
} }

22
code/VideoAccess-VCMP/api/Dockerfile
View File

@ -1,7 +1,4 @@
FROM repository.anxinyun.cn/devops/node:12-dev as builder
FROM repository.anxinyun.cn/base-images/nodejs12:20.10.12.2
MAINTAINER liuxinyi "liu.xinyi@free-sun.com.cn"
COPY . /var/app COPY . /var/app
@ -9,6 +6,19 @@ WORKDIR /var/app
EXPOSE 8080 EXPOSE 8080
CMD ["-g", "postgres://FashionAdmin:123456@iota-m1:5433/SmartRiver", "--qnak", "5XrM4wEB9YU6RQwT64sPzzE6cYFKZgssdP5Kj3uu", "--qnsk", "w6j2ixR_i-aelc6I7S3HotKIX-ukMzcKmDfH6-M5", "--qnbkt", "anxinyun-test", "--qndmn", "http://test.resources.anxinyun.cn"] RUN npm config set registry=http://10.8.30.22:7000
RUN echo "{\"time\":\"$BUILD_TIMESTAMP\",\"build\": \"$BUILD_NUMBER\",\"revision\": \"$SVN_REVISION_1\",\"URL\":\"$SVN_URL_1\"}" > version.json
RUN npm cache clean -f
RUN npm install --registry http://10.8.30.22:7000
RUN npm run build
RUN rm -rf client/src
RUN rm -rf node_modules
RUN npm install --production --registry http://10.8.30.22:7000
FROM repository.anxinyun.cn/devops/node:12-dev
WORKDIR /app
COPY --from=builder /var/app .
ENTRYPOINT [ "node", "server.js" ] CMD ["node", "server.js"]

27
code/VideoAccess-VCMP/api/app/lib/service/mqttVideoServer.js
View File

@ -2,21 +2,22 @@
const mqtt = require('mqtt'); const mqtt = require('mqtt');
module.exports = async function factory (app, opts) { module.exports = async function factory (app, opts) {
// const client = mqtt.connect(opts.mqtt.mqttVideoServer); console.info(`mqtt connecting ${opts.mqtt.mqttVideoServer}`);
// client.on('connect', function () { const client = mqtt.connect(opts.mqtt.mqttVideoServer);
// console.info(`mqtt connect success ${opts.mqtt.mqttVideoServer}`);
// })
// client.on('error', function (e) {
// console.error(`mqtt connect failed ${opts.mqtt.mqttVideoServer}`);
// app.fs.logger.error('info', '[FS-AUTH-MQTT]', `mqtt connect failed ${opts.mqtt.mqttVideoServer}`);
// })
// client.subscribe('test', { qos: 2 });//订阅主题为test的消息 client.on('connect', function () {
console.info(`mqtt connect success ${opts.mqtt.mqttVideoServer}`);
client.subscribe('test', { qos: 2 });//订阅主题为test的消息
})
client.on('error', function (e) {
console.error(`mqtt connect failed ${opts.mqtt.mqttVideoServer}`);
app.fs.logger.error('info', '[FS-AUTH-MQTT]', `mqtt connect failed ${opts.mqtt.mqttVideoServer}`);
})
// client.on('message', function (top, message) { client.on('message', function (top, message) {
// console.log(message.toString()); console.log(message.toString());
// }); });
// app.mqttVideoServer = client app.mqttVideoServer = client
} }

19
code/VideoAccess-VCMP/api/jenkinsfile
View File

@ -0,0 +1,19 @@
pipeline {
agent {
node{
label 'jnlp-slave'
}
}
stages {
stage('Testing vcmp ......') {
steps {
sh 'switch-auth.sh vcmp'
buildName "#${BUILD_NUMBER} ~/fs-cloud/${JOB_NAME}:${IMAGE_VERSION}"
buildDescription "registry.cn-hangzhou.aliyuncs.com/${CLOUD}/${JOB_NAME}:${IMAGE_VERSION}"
sh 'docker build -t registry.cn-hangzhou.aliyuncs.com/${CLOUD}/${JOB_NAME}:${IMAGE_VERSION} .'
sh 'docker push registry.cn-hangzhou.aliyuncs.com/${CLOUD}/${JOB_NAME}:${IMAGE_VERSION}'
}
}
}
}

20
code/VideoAccess-VCMP/web/Dockerfile
View File

@ -1,5 +1,4 @@
FROM repository.anxinyun.cn/devops/node:12-dev as builder
FROM repository.anxinyun.cn/base-images/nodejs12:20.10.12.2
COPY . /var/app COPY . /var/app
@ -7,6 +6,19 @@ WORKDIR /var/app
EXPOSE 8080 EXPOSE 8080
CMD ["-u", "http://localhost:8088"] RUN npm config set registry=http://10.8.30.22:7000
RUN echo "{\"time\":\"$BUILD_TIMESTAMP\",\"build\": \"$BUILD_NUMBER\",\"revision\": \"$SVN_REVISION_1\",\"URL\":\"$SVN_URL_1\"}" > version.json
RUN npm cache clean -f
RUN npm install --registry http://10.8.30.22:7000
RUN npm run build
RUN rm -rf client/src
RUN rm -rf node_modules
RUN npm install --production --registry http://10.8.30.22:7000
FROM repository.anxinyun.cn/devops/node:12-dev
WORKDIR /app
COPY --from=builder /var/app .
ENTRYPOINT [ "node", "server.js" ] CMD ["node", "server.js"]

2
code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoOperation.jsx
View File

@ -71,7 +71,7 @@ const VideoOperation = ({
operation.map(p => { operation.map(p => {
return <img return <img
src={`/assets/images/background/video-icon-${p.key}-${operationState[p.key].select ? 'select' : 'unselect'}.png`} src={`/assets/images/background/video-icon-${p.key}-${operationState[p.key].select ? 'select' : 'unselect'}.png`}
height={26} height={18}
style={{ marginRight: 24, cursor: 'pointer' }} style={{ marginRight: 24, cursor: 'pointer' }}
onClick={p.click} onClick={p.click}
/> />

5
code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlay.jsx
View File

@ -7,7 +7,10 @@ import './videoPlay.less';
const VideoPlay = ({ height, width }) => { const VideoPlay = ({ height, width }) => {
const [jessibuca, setjessibuca] = useState(null) const [jessibuca, setjessibuca] = useState(null)
const [playUrl, setPlayUrl] = useState('http://flv.bdplay.nodemedia.cn/live/bbb.flv') const [playUrl, setPlayUrl] = useState(
// 'http://flv.bdplay.nodemedia.cn/live/bbb.flv'
'http://221.230.55.27:2020/hdl/34020000001110000077/34020000001310000001.flv'
)
const [isPlaying, setIsPlaying] = useState(false) const [isPlaying, setIsPlaying] = useState(false)
const [operationState, setoperationState] = useState() const [operationState, setoperationState] = useState()
const [voiceDisY, setVoiceDisY] = useState(0) const [voiceDisY, setVoiceDisY] = useState(0)

2
code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/camera.jsx
View File

@ -721,7 +721,7 @@ const CameraHeader = (props) => {
"" ""
)} )}
{ {
// <VideoPlayModal visible={true} /> // <VideoPlayModal visible={true} />
} }
</> </>
); );

19
code/VideoAccess-VCMP/web/jenkinsfile
View File

@ -0,0 +1,19 @@
pipeline {
agent {
node{
label 'jnlp-slave'
}
}
stages {
stage('Testing vcmp ......') {
steps {
sh 'switch-auth.sh vcmp'
buildName "#${BUILD_NUMBER} ~/fs-cloud/${JOB_NAME}:${IMAGE_VERSION}"
buildDescription "registry.cn-hangzhou.aliyuncs.com/${CLOUD}/${JOB_NAME}:${IMAGE_VERSION}"
sh 'docker build -t registry.cn-hangzhou.aliyuncs.com/${CLOUD}/${JOB_NAME}:${IMAGE_VERSION} .'
sh 'docker push registry.cn-hangzhou.aliyuncs.com/${CLOUD}/${JOB_NAME}:${IMAGE_VERSION}'
}
}
}
}
Write Preview
Loading…
Cancel
Save