资产增加环境

src/util/axios.js

 
 import axios from 'axios';
+import LocalStorage from 'local-storage';
 
 import { IsArr, showMessage, isSzseEnv } from './index';
 
@@ -8,7 +9,7 @@ const baseURL = '/api/';
 
 const instance = axios.create({
   baseURL,
-  timeout: 40000,
+  timeout: 15000,
   headers: {
     //'X-Custom-Header': 'rest',
     'Cache-Control': 'no-cache,no-store,must-revalidate,max-age=-1,private'
@@ -21,7 +22,7 @@ const instance = axios.create({
 
 const textplain = axios.create({
   baseURL,
-  timeout: 40000,
+  timeout: 15000,
   headers: {
     //'X-Custom-Header': 'rest',
     'Cache-Control': 'no-cache,no-store,must-revalidate,max-age=-1,private'
@@ -67,7 +68,7 @@ textplain.interceptors.request.use(
 
 const fileplain = axios.create({
   baseURL,
-  timeout: 40000,
+  timeout: 15000,
   headers:{'Content-Type':'multipart/form-data'},
   processData:false,
   validateStatus: (status) => {
@@ -101,8 +102,10 @@ const callback = resp => {
 
 export function Get(url, params) {
   const cancelToken = __source ? __source.token : null;
+  const env = LocalStorage.get('assetsEnv');
+
   return textplain.get(url, {
-    params, cancelToken
+    params: {...params, env}, cancelToken
   }).then(
     callback
   )
@@ -110,8 +113,10 @@ export function Get(url, params) {
 
 export function GetJSON(url, params) {
   const cancelToken = __source ? __source.token : null;
+  const env = LocalStorage.get('assetsEnv');
+
   return instance.get(url, {
-    params, cancelToken,
+    params: {...params, env}, cancelToken,
     validateStatus: false
   }).then(
     callback
@@ -120,8 +125,10 @@ export function GetJSON(url, params) {
 
 export function Delete(url, params) {
   const cancelToken = __source ? __source.token : null;
+  const env = LocalStorage.get('assetsEnv');
+
   return instance.delete(url, {
-    params, cancelToken,
+    params: {...params, env}, cancelToken,
   }).then(
     callback
   )
@@ -130,13 +137,14 @@ export function Delete(url, params) {
 export function PostJSON(url, payload) {
   const { params = null, data = null } = payload||{};
   const cancelToken = __source ? __source.token : null;
+  const env = LocalStorage.get('assetsEnv');
 
   return IsArr(data) ? instance.post(url, data, {
-    params, cancelToken
+    params: {...params, env}, cancelToken
   }).then(
     callback
   ) : instance.post(url, null, {
-    params, data, cancelToken
+    params: {...params, env}, data, cancelToken
   }).then(
     callback
   )
@@ -145,8 +153,10 @@ export function PostJSON(url, payload) {
 export function Post(url, payload) {
   const { params = null, data = null } = payload||{};
   const cancelToken = __source ? __source.token : null;
+  const env = LocalStorage.get('assetsEnv');
+
   return textplain.post(url, null, {
-    params, data, cancelToken
+    params: {...params, env}, data, cancelToken
   }).then(
     callback
   )
@@ -154,12 +164,14 @@ export function Post(url, payload) {
 
 export function PostFile(url, payload) {
   const { fileList = null, params = null } = payload||{};
+  const env = LocalStorage.get('assetsEnv');
+
   let formData = new FormData();
   (fileList||[]).forEach(file=> {
     formData.append('file', file);
   });
 
-  return fileplain.post(url, formData, { params }  ).then(
+  return fileplain.post(url, formData, { params: {...params, env} }  ).then(
     callback
   )
 }
\ No newline at end of file

src/view/Manage/AssetManage/Component/AssetDirectory.jsx

 import React, { useEffect, useState } from 'react';
 import { Spin, Tooltip, Typography, Dropdown, Menu } from 'antd';
+import LocalStorage from 'local-storage';
 
 import { dispatch } from '../../../../model';
 import { AssetBrowseReference, AssetManageReference, ResourceBrowseReference } from '../../../../util/constant';
@@ -95,7 +96,9 @@ const AssetDirectory = (props) => {
   }
 
   const onExportElementBtnClick = () => {
-    window.open('/api/dataassetmanager/elementApi/export');
+    const env = LocalStorage.get('assetsEnv');
+
+    window.open(`/api/dataassetmanager/elementApi/export?env=${env}`);
   }
 
   const onFilterElementClick = () => {

src/view/Manage/AssetManage/Component/AssetManageTree.jsx

@@ -3,6 +3,7 @@ import {Card, Spin, Tooltip, Tree, Dropdown, Menu, Modal, AutoComplete} from 'an
 import { PlusOutlined, ImportOutlined,ExportOutlined,ReloadOutlined, SettingOutlined } from '@ant-design/icons';
 import classNames from 'classnames';
 import { useContextMenu, Menu as RcMenu, Item as RcItem } from "react-contexify";
+import LocalStorage from 'local-storage';
 
 import { dispatch } from '../../../../model';
 import ImportDirectory from './ImportDirectory'; 
@@ -410,7 +411,9 @@ const AssetManageTree = (props) => {
   }
 
   const exportAllDir = () => {
-    window.open('/api/dataassetmanager/directoryApi/export');
+    const env = LocalStorage.get('assetsEnv');
+
+    window.open(`/api/dataassetmanager/directoryApi/export?env=${env}`);
   }
 
   const exportCurrentDir = () => {
@@ -421,7 +424,9 @@ const AssetManageTree = (props) => {
           dirId: currentDirId
         },
         callback: data => {
-          window.open(`/api/dataassetmanager/directoryApi/export?parentPath=${data.path}`);  
+          const env = LocalStorage.get('assetsEnv');
+
+          window.open(`/api/dataassetmanager/directoryApi/export?parentPath=${data.path}&env=${env}`);  
         }
       })
     } else {

src/view/Manage/AssetManage/Component/AssetTable.jsx

@@ -549,11 +549,15 @@ const AssetTable = (props) => {
         title: '提示',
         content: '是否导出选中目录下的所有资产?',
         onOk: () => {
-          window.open(`/api/dataassetmanager/dataAssetApi/exportByDataAssetIds?dirId=${nodeId}&recursive=${recursive}`);
+          const env = LocalStorage.get('assetsEnv');
+
+          window.open(`/api/dataassetmanager/dataAssetApi/exportByDataAssetIds?dirId=${nodeId}&recursive=${recursive}&env=${env}`);
         }
       })
     } else {
-      window.open(`/api/dataassetmanager/dataAssetApi/exportByDataAssetIds?dataAssetIds=${checkedKeys.join(',')}`);
+      const env = LocalStorage.get('assetsEnv');
+      
+      window.open(`/api/dataassetmanager/dataAssetApi/exportByDataAssetIds?dataAssetIds=${checkedKeys.join(',')}&env=${env}`);
     }
   }
 

src/view/Manage/AssetManage/Component/ImportAssetDrawer.jsx

 import React, { useState, useEffect, useContext } from 'react';
 import { Button, Upload, Drawer, Table, Pagination, Divider, Form } from 'antd';
 import { UploadOutlined, DownloadOutlined } from '@ant-design/icons';
+import LocalStorage from 'local-storage';
 
 import { dispatch } from '../../../../model';
 import { showMessage, formatDate } from '../../../../util';
@@ -79,7 +80,9 @@ const ImportAssetDrawer = (props) => {
   }, [visible])
 
   const downloadTemplate = () => {
-    window.open("/api/dataassetmanager/dataAssetApi/getImportTemplate");
+    const env = LocalStorage.get('assetsEnv');
+
+    window.open(`/api/dataassetmanager/dataAssetApi/getImportTemplate?env=${env}`);
   }
 
   const getLogs = (p = 1, s = 20) => {

src/view/Manage/AssetManage/Component/ImportDirectory.jsx

 import React, { useEffect, useState } from 'react';
 import { Modal, Form, Upload, Button, Radio, Space } from 'antd';
 import { UploadOutlined } from '@ant-design/icons';
+import LocalStorage from 'local-storage';
 
 import { dispatch } from '../../../../model';
 import { showNotifaction } from '../../../../util';
@@ -41,7 +42,9 @@ const ImportDirectory = (props) => {
   }
 
   const download = () => {
-    window.open('/api/dataassetmanager/directoryApi/getImportTemplate');
+    const env = LocalStorage.get('assetsEnv');
+
+    window.open(`/api/dataassetmanager/directoryApi/getImportTemplate?env=${env}`);
   }
 
   const upload = async (ignoreRepeatPath = false) => {

src/view/Manage/AssetManage/Component/ImportElement.jsx

 import React, { useState } from 'react';
 import { Button, Upload, Modal } from 'antd';
 import { DownloadOutlined, UploadOutlined } from '@ant-design/icons';
+import LocalStorage from 'local-storage';
 
 import { dispatchLatest } from '../../../../model'; 
 import { showMessage } from '../../../../util';
@@ -11,7 +12,9 @@ const ImportElement = (props) => {
   const [ confirmLoading, setConfirmLoading ] = useState(false);
 
   const downloadTemplate = () => {
-    window.open('/api/dataassetmanager/elementApi/getImportTemplate');
+    const env = LocalStorage.get('assetsEnv');
+
+    window.open(`/api/dataassetmanager/elementApi/getImportTemplate?env=${env}`);
   }
 
   const uploadProps = {