Merge branch 'master' of https://g.civnet.cn:8443/ReactWeb5/maintenance

package.json

@@ -95,7 +95,7 @@
         "@wisdom-cesium/cesium": "1.1.12",
         "@wisdom-cesium/krpano": "^1.0.29-60",
         "@wisdom-map/amap":"^2.0.15",
-        "@wisdom-map/arcgismap":"^2.0.96",
+        "@wisdom-map/arcgismap":"^2.0.97",
         "@wisdom-map/basemap":"^2.0.4",
         "@wisdom-utils/components": "0.1.337",
         "@wisdom-utils/utils": "0.1.377",
@@ -129,7 +129,7 @@
         "jszip": "^3.10.1",
         "lodash": "4.17.11",
         "minimist": "1.2.0",
-        "panda-xform": "6.10.56",
+        "panda-xform": "6.10.69",
         "parseForm": "^2.3.8",
         "prop-types": "15.7.2",
         "qrcode.react": "^3.1.0",

src/services/videoManger/videoManger.js

 import { get, post, PUBLISH_SERVICE, CITY_SERVICE } from '@/services/index';
+import {param} from "express/lib/router";
 
 // 获取视频配置列表
 export const GetVideoConfigList = param =>
@@ -19,3 +20,6 @@ export const deleteInsertVideoConfig = data =>
 // 导入配置
 export const ImportVideoConfig = data =>
   post(`${PUBLISH_SERVICE}/VideoManager/ImportVideoConfig`, data);
+// 获取萤石云视频地址
+export const getYSYVideoSource = param =>
+  get('/CityInterface/rest/services/VideoPlatform.svc/VideoManage/RefreshVideoLiveAddress', param);