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

user -vcmpUser

release_1.3.0
巴林闲侠 3 years ago
parent
cdf84d59fb
commit
00f4ca57ec
10 changed files with 136 additions and 116 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      code/VideoAccess-VCMP/api/app/lib/schedule/freshYingshiMsg.js
  2. 5
      code/VideoAccess-VCMP/web/client/src/layout/actions/global.js
  3. 2
      code/VideoAccess-VCMP/web/client/src/layout/actions/webSocket.js
  4. 29
      code/VideoAccess-VCMP/web/client/src/layout/index.jsx
  5. 10
      code/VideoAccess-VCMP/web/client/src/sections/auth/actions/auth.js
  6. 20
      code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/actions/nvr.js
  7. 2
      code/VideoAccess-VCMP/web/client/src/utils/func.js
  8. 5
      code/VideoAccess-VCMP/web/client/src/utils/index.js
  9. 11
      code/VideoAccess-VCMP/web/client/src/utils/webapi.js
  10. 3
      code/VideoAccess-VCMP/web/package.json

7
code/VideoAccess-VCMP/api/app/lib/schedule/freshYingshiMsg.js
View File

@ -91,6 +91,13 @@ module.exports = function (app, opts) {
// 播放地址更新
const playUrlRes = await getYingshiPlayUrl({ deviceSerial: d.deviceSerial, token: tokenYingshi })
storageD.playUrl = playUrlRes
// 生成 did
const yingshiCount = await models.GbCamera.count({
where: {
type: 'yingshi'
}
})
storageD.did = 'SE' + 'Dvs' + 'Y02' + 'T' + moment().format('YYMMDD') + (yingshiCount + 1) + Math.ceil(Math.random() * 99)
const yingshiRes = await models.GbCamera.create(storageD)
await models.Camera.update({
gbId: yingshiRes.id

5
code/VideoAccess-VCMP/web/client/src/layout/actions/global.js
View File

@ -1,6 +1,7 @@
'use strict';
import { RouteRequest } from '@peace/utils';
import { RouteTable } from '$utils'
// import { RouteRequest } from '@peace/utils';
import { RouteTable, RouteRequest } from '$utils'
export const INIT_LAYOUT = 'INIT_LAYOUT';
export function initLayout (title, copyright, sections, actions) {

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

@ -8,7 +8,7 @@ export function initWebSocket ({ ioUrl, token }) {
ioUrl = JSON.parse(ioUrl).root
}
if (!token) {
const user = sessionStorage.getItem('user')
const user = sessionStorage.getItem('vcmpUser')
if (user) {
token = JSON.parse(user).token
}

29
code/VideoAccess-VCMP/web/client/src/layout/index.jsx
View File

@ -171,21 +171,22 @@ const Root = props => {
// setAuthCrossLoading(false)
// MicroApp
const microAppListen = async (data) => {
console.log('xxxx', data);
if (data.action == 'initMicro') {
await store.dispatch(push('/noMatch'));
setMicroAppWaiting(false)
}
}
if (window.__MICRO_APP_ENVIRONMENT__) {
console.info('MicroApp')
setAuthCrossLoading(false)
window.microApp.addDataListener(microAppListen, true)
} else {
console.info('NOT MicroApp')
// const microAppListen = async (data) => {
// console.log('xxxx', data);
// if (data.action == 'initMicro') {
// await store.dispatch(push('/noMatch'));
// setMicroAppWaiting(false)
// }
// }
// if (window.__MICRO_APP_ENVIRONMENT__) {
// console.info('MicroApp')
// setAuthCrossLoading(false)
// window.microApp.addDataListener(microAppListen, true)
// } else {
// console.info('NOT MicroApp')
// setMicroAppWaiting(false)
// }
setMicroAppWaiting(false)
}
}, [])
return (

10
code/VideoAccess-VCMP/web/client/src/sections/auth/actions/auth.js
View File

@ -4,10 +4,10 @@ import { ApiTable, AxyRequest } from '$utils'
export const INIT_AUTH = 'INIT_AUTH';
export function initAuth (userData) {
const sessionUser = JSON.parse(sessionStorage.getItem('user'))
const sessionUser = JSON.parse(sessionStorage.getItem('vcmpUser'))
const user = userData || sessionUser || {};
if (user.authorized && !sessionUser) {
sessionStorage.setItem('user', JSON.stringify(user))
sessionStorage.setItem('vcmpUser', JSON.stringify(user))
}
return {
type: INIT_AUTH,
@ -44,7 +44,7 @@ export function login (username, password) {
return AxyRequest.post(ApiTable.login, { username, password, domain: 'anxinyun' })
.then(user => {
sessionStorage.setItem('user', JSON.stringify(user));
sessionStorage.setItem('vcmpUser', JSON.stringify(user));
return dispatch({
type: LOGIN_SUCCESS,
payload: { user: user },
@ -63,12 +63,12 @@ export function login (username, password) {
export const LOGOUT = 'LOGOUT';
export function logout () {
const user = JSON.parse(sessionStorage.getItem('user'))
const user = JSON.parse(sessionStorage.getItem('vcmpUser'))
user && user.token ?
AxyRequest.post(ApiTable.logout, {
token: user.token
}) : null;
sessionStorage.removeItem('user');
sessionStorage.removeItem('vcmpUser');
return {
type: LOGOUT
};

20
code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/actions/nvr.js
View File

@ -1,9 +1,9 @@
"use strict";
import { basicAction } from "@peace/utils";
import { ApiTable } from "$utils";
// import { basicAction } from "@peace/utils";
import { ApiTable, basicAction } from "$utils";
export function getMembers(orgId) {
export function getMembers (orgId) {
return (dispatch) =>
basicAction({
type: "get",
@ -15,7 +15,7 @@ export function getMembers(orgId) {
});
}
export function getNvr(query) {
export function getNvr (query) {
return (dispatch) =>
basicAction({
type: "get",
@ -28,7 +28,7 @@ export function getNvr(query) {
});
}
export function getNvrDetails(orgId) {
export function getNvrDetails (orgId) {
return (dispatch) =>
basicAction({
type: "get",
@ -39,7 +39,7 @@ export function getNvrDetails(orgId) {
reducer: { name: "nvrDetails" },
});
}
export function delNvr(orgId) {
export function delNvr (orgId) {
return (dispatch) =>
basicAction({
type: "del",
@ -53,7 +53,7 @@ export function delNvr(orgId) {
reducer: { name: "" },
});
}
export function addchangeNvr(data) {
export function addchangeNvr (data) {
return (dispatch) =>
basicAction({
type: "post",
@ -65,7 +65,7 @@ export function addchangeNvr(data) {
});
}
export function getVender() {
export function getVender () {
//获取设备厂商
return (dispatch) =>
basicAction({
@ -78,7 +78,7 @@ export function getVender() {
});
}
export function getExport() {
export function getExport () {
return (dispatch) =>
basicAction({
type: "get",
@ -91,7 +91,7 @@ export function getExport() {
}
export function getCheck(data) {
export function getCheck (data) {
return (dispatch) =>
basicAction({
type: "post",

2
code/VideoAccess-VCMP/web/client/src/utils/func.js
View File

@ -2,7 +2,7 @@
export const isAuthorized = (authcode) => {
if (JSON.parse(sessionStorage.getItem('user'))) {
const { resources } = JSON.parse(sessionStorage.getItem('user'));
const { resources } = JSON.parse(sessionStorage.getItem('vcmpUser'));
return resources.includes(authcode);
} else {
return false;

5
code/VideoAccess-VCMP/web/client/src/utils/index.js
View File

@ -4,7 +4,8 @@ import { AuthorizationCode } from './authCode';
import {
ApiTable, VideoServeApi,
RouteTable,
AuthRequest, AxyRequest, IotVideoServerRequest, YingshiRequest
AuthRequest, AxyRequest, IotVideoServerRequest, YingshiRequest,
basicAction,RouteRequest
} from './webapi'
import {
YS_PTZ_DIRECTION, ysptz,
@ -26,6 +27,8 @@ export {
AxyRequest,
IotVideoServerRequest,
YingshiRequest,
basicAction,
RouteRequest,
YS_PTZ_DIRECTION,
ysptz,

11
code/VideoAccess-VCMP/web/client/src/utils/webapi.js
View File

@ -1,11 +1,20 @@
"use strict";
import { ProxyRequest } from "@peace/utils";
import { ProxyRequest, customWebUtils } from "@peace/utils";
export const AuthRequest = new ProxyRequest("_auth");
export const AxyRequest = new ProxyRequest("_axy");
export const IotVideoServerRequest = new ProxyRequest("_vs");
export const YingshiRequest = new ProxyRequest("_yingshi");
export const webUtils = new customWebUtils({
userKey: 'vcmpUser'
});
const { basicAction, RouteRequest } = webUtils
export {
basicAction, RouteRequest
}
console.log(basicAction, RouteRequest);
export const ApiTable = {
login: "login",
logout: "logout",

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

@ -51,8 +51,7 @@
"@douyinfe/semi-webpack-plugin": "^2.13.0",
"@fs/attachment": "^1.0.0",
"@micro-zoe/micro-app": "^1.0.0-alpha.1",
"@peace/components": "0.0.35",
"@peace/utils": "0.0.53",
"@peace/utils": "0.0.64",
"@semi-bot/semi-theme-fscamera": "^1.0.0",
"@vitejs/plugin-react": "^1.3.1",
"@vitejs/plugin-react-refresh": "^1.3.6",

Write Preview
Loading…
Cancel
Save