网关问题修改，数据库管理，用户中心，应用中心，系统 日志模块新接口替换

src/pages/database/InitDataBase.jsx

@@ -163,12 +163,9 @@ const InitDataBase = props => {
   }, []);
   // 获取日志
   const doInitLog = () => {
-    getInitDBLog({
-      _version: 9999,
-      _dc: Date.now(),
-    })
+    getInitDBLogNew()
       .then(res => {
-        if (res.success) {
+        if (res.code==0) {
           if (res.content) {
             let arr = [];
             arr.push(
@@ -408,11 +405,9 @@ const InitDataBase = props => {
   const handeleChangeSQLDirName = val => {
     setTableSQLDirName({
       dirName: val,
-      _version: 9999,
-      _dc: new Date().getTime(),
     })
       .then(res => {
-        if (res.success) {
+        if (res.code==0) {
           notification.success({
             message: '提示',
             duration: 3,
@@ -491,10 +486,8 @@ const InitDataBase = props => {
   const delConfirm = value => {
     const { key = '' } = value;
     setTableLoading(true);
-    deleteConn({
+    deleteConnNew({
       rowIndex: key,
-      _version: 9999,
-      _dc: new Date().getTime(),
     })
       .then(res => {
         setTableLoading(false);

src/pages/database/ManagementDataBase.jsx

@@ -133,15 +133,12 @@ const ManagementDataBase = () => {
   // 升级功能
   const handleUpdate = () => {
     setCheckLoading(true);
-    updateDateBase({
-      _version: 9999,
-      _dc: Date.now(),
-    })
+    updateDateBase()
       .then(res => {
         setCheckLoading(false);
         setCheckFlag(checkFlag + 1);
         setUpFlag(upFlag + 1);
-        if (res.success) {
+        if (res.code===0) {
           notification.success({
             message: '通知',
             duration: 3,

src/pages/mobileConfig/addConfig.jsx

@@ -50,7 +50,7 @@ const AddConfig = props => {
         })
           .then(res => {
             setLoading(false);
-            if (res.success) {
+            if (res.code===0) {
               addCallback(params.title);
               notification.success({
                 message: '提示',

src/pages/mobileConfig/menuconfig/miniMenu.jsx

@@ -199,12 +199,10 @@ const MiniMenu = props => {
     setLoading(true);
     getMenuInfo({
       menuID,
-      _version: 9999,
-      _dc: Date.now(),
     })
       .then(res => {
         setLoading(false);
-        if (res.success) {
+        if (res.code===0) {
           setInfo({ ...res });
         } else {
           notification.error({

src/pages/userCenter/roleManage/AddModal.jsx

@@ -66,12 +66,10 @@ const AddModal = props => {
           description: res.description,
           group: res.group,
           subSystemValue: res.subSystemValue || '',
-          _version: 9999,
-          _dc: new Date().getTime(),
         })
           .then(res => {
             setLoading(false);
-            if (res.success) {
+            if (res.msg==='') {
               let id = res.roleID;
               form.resetFields();
               notification.success({
@@ -84,7 +82,7 @@ const AddModal = props => {
               notification.error({
                 message: '提示',
                 duration: 15,
-                description: res.message,
+                description: res.msg,
               });
             }
           })

src/pages/userCenter/roleManage/DelModal.jsx

@@ -9,12 +9,10 @@ const DelModal = props => {
     setLoading(true);
     deleteRole({
       roleID: itemObj.roleID || '',
-      _version: 9999,
-      _dc: new Date().getTime(),
     })
       .then(res => {
         setLoading(false);
-        if (res.success) {
+        if (res.msg==='') {
           notification.success({
             message: '通知',
             duration: 3,
@@ -25,7 +23,7 @@ const DelModal = props => {
           notification.error({
             message: '提示',
             duration: 3,
-            description: res.message,
+            description: res.msg,
           });
         }
       })

src/pages/userCenter/roleManage/EditGroup.jsx

@@ -20,12 +20,10 @@ const EditGroup = props => {
       subSystemValue: itemObj.visibleValue || itemObj.subSystemValue,
       oldName: itemObj.groupflag,
       newName: form.getFieldsValue().newName,
-      _version: 9999,
-      _dc: new Date().getTime(),
     })
       .then(res => {
         setLoading(false);
-        if (res.success) {
+        if (res.msg==='') {
           form.resetFields();
           notification.success({
             message: '提示',
@@ -37,7 +35,7 @@ const EditGroup = props => {
           notification.error({
             message: '提示',
             duration: 15,
-            description: res.message,
+            description: res.msg,
           });
         }
       })

src/pages/userCenter/roleManage/EditModal.jsx

@@ -32,12 +32,10 @@ const AddModal = props => {
           description: res.description,
           group: res.group,
           subSystemValue: itemObj.subSystemValue || itemObj.visibleValue || '',
-          _version: 9999,
-          _dc: new Date().getTime(),
         })
           .then(res => {
             setLoading(false);
-            if (res.success) {
+            if (res.msg==='') {
               form.resetFields();
               notification.success({
                 message: '提示',
@@ -49,7 +47,7 @@ const AddModal = props => {
               notification.error({
                 message: '提示',
                 duration: 3,
-                description: res.message,
+                description: res.msg,
               });
             }
           })

src/pages/userCenter/roleManage/RoleManage.jsx

@@ -142,8 +142,6 @@ const SiteManage = () => {
       roleID: itemObj.roleID,
       subSystemValue: itemObj.subSystemValue,
       subSystemName: itemObj.subSystemValue,
-      _version: 9999,
-      _dc: new Date().getTime(),
     })
       .then(res => {
         const list = [];
@@ -438,7 +436,7 @@ const SiteManage = () => {
     )
       .then(res => {
         setBtnLoading(false);
-        if (res.success) {
+        if (res.msg==='Ok') {
           setValueList([...results.flat()]);
           notification.success({
             message: '提示',

src/pages/userCenter/roleManage/UserModal.jsx

@@ -149,7 +149,7 @@ const UserModal = props => {
             .then(res => {
 
 
-                if (res.success) {
+                if (res.msg==='') {
                     setSelectList([]);
                     setUpdateCheck(updateCheck + 1);
                     confirmModal(itemObj.roleID)

src/pages/userCenter/siteManage/AddModal.jsx

@@ -17,12 +17,10 @@ const AddModal = props => {
         addStation({
           stationName: res.stationName,
           description: res.description,
-          _version: 9999,
-          _dc: new Date().getTime(),
         })
           .then(res => {
             setLoading(false);
-            if (res.success) {
+            if (res.msg==='') {
               form.resetFields();
               notification.success({
                 message: '通知',

src/pages/userCenter/siteManage/DelModal.jsx

@@ -9,12 +9,10 @@ const DelModal = props => {
     setLoading(true);
     deleteStation({
       stationID: stationId,
-      _version: 9999,
-      _dc: new Date().getTime(),
     })
       .then(res => {
         setLoading(false);
-        if (res.success) {
+        if (res.msg==='') {
           notification.success({
             message: '通知',
             duration: 3,
@@ -25,7 +23,7 @@ const DelModal = props => {
           notification.error({
             message: '提示',
             duration: 3,
-            description: res.message,
+            description: res.msg,
           });
         }
       })

src/pages/userCenter/siteManage/EditModal.jsx

@@ -19,12 +19,10 @@ const EditModal = props => {
           stationName: res.stationName,
           description: res.description,
           stationID: stationObj,
-          _version: 9999,
-          _dc: new Date().getTime(),
         })
           .then(res => {
             setLoading(false);
-            if (res.success) {
+            if (res.msg==='') {
               form.resetFields();
               notification.success({
                 message: '通知',
@@ -36,7 +34,7 @@ const EditModal = props => {
               notification.error({
                 message: '提示',
                 duration: 3,
-                description: res.message,
+                description: res.msg,
               });
             }
           })

src/pages/userCenter/siteManage/SiteManage.jsx

@@ -73,14 +73,12 @@ const SiteManage = props => {
     getWebModuleTree({
       userMode: userMode || 'super',
       select: '',
-      _version: 9999,
-      _dc: Date.now(),
       node: -2,
     })
       .then(res => {
         handleShowModal('spinLoading', false);
         let arr = [];
-        if (res) {
+        if (code===0) {
           arr.push(res.find(item => item.id === 'Web4StationRoot'));
         }
         if (arr[0]) {
@@ -350,7 +348,7 @@ const SiteManage = props => {
       .then(res => {
         handleShowModal('btnLoading', false);
 
-        if (res.success) {
+        if (res.msg==='') {
           setSelectList([]);
           setUpdate1(update1 + 1);
           notification.success({

src/pages/userCenter/siteManageV2/siteManage.jsx

@@ -435,7 +435,7 @@ const SiteManageV2 = () => {
             .then(res => {
                 handleShowModal('btnLoading', false);
 
-                if (res.success) {
+                if (res.msg==='') {
                     setSelectList([]);
                     setUpdateCheck(updateCheck + 1);
                     notification.success({

src/pages/userCenter/siteManageV2/siteManage.less

@@ -378,6 +378,7 @@
 
   .ant-tree-list-holder {
     overflow: auto;
+    overflow-x: hidden;
     height: 40vh;
   }
 

src/pages/userCenter/userManage/DeleteOrgModal.jsx

@@ -20,7 +20,7 @@ const DeleteOrgModal = props => {
         } else {
           notification.error({
             message: '提交失败',
-            description: res.message,
+            description: res.msg,
           });
         }
       })

src/pages/userCenter/userManage/UserManage.js

@@ -45,7 +45,6 @@ import {
   addToOrg,
   addToOrgs,
   getOneOUUserListNew,
-  getUserByKey,
   getUserRelationList,
   getUserTree,
   deleteUser as postDeleteUser,
@@ -423,12 +422,12 @@ const UserManage = () => {
           <span className={styles.tip}>
             <Tooltip title="" className={styles.fs}>
               <Dropdown overlay={orgButtonMenu} disabled={currentOrgOperate}>
-                <PlusOutlined style={{ marginLeft: 20 }} />
+                <PlusOutlined style={{ marginLeft: 20 }} onClick={e => e.stopPropagation()} />
               </Dropdown>
             </Tooltip>
 
             <Dropdown overlay={orgButtonMenu1} disabled={currentOrgOperate}>
-              <EllipsisOutlined style={{ marginLeft: 10 ,fontSize: '20px'}} />
+              <EllipsisOutlined style={{ marginLeft: 10 ,fontSize: '20px'}} onClick={e => e.stopPropagation()} />
             </Dropdown>
           </span>
         </div>
@@ -593,9 +592,6 @@ const UserManage = () => {
     }
     return arr;
   };
-  const editorMenu = (e) => {
-    e.stopPropagation();
-  }
   // 添加用户
   const addUser = (e) => {
     setUserVisible(true);
@@ -606,7 +602,7 @@ const UserManage = () => {
     setOrgID('-1');
   };
   // 添加下级机构
-  const addSubOrg = () => {
+  const addSubOrg = (e) => {
     setAddOrgVisible(true);
   };
   // 编辑机构
@@ -1114,9 +1110,29 @@ const onTypeChange = (value) => {
         message.error(err);
       });
   };
-
+//重置默认第一个
   const handleReset = () => {
-    setSearchWord('');
+    GetOUTreeNew({ selectOU: -1 })
+      .then(newres => {
+        if (newres.code === 0) {
+          let res = newres.data;
+          setTreeLoading(false);
+          setSearchWord('');
+          // 第一次加载，默认选择第一个组织
+            onSelect([res[0].id], false);
+        } else {
+          setTreeLoading(false);
+          notification.error({
+            message: '获取失败',
+            // eslint-disable-next-line no-undef
+            description: res.message,
+          });
+        }
+      })
+      .catch(err => {
+        setTreeLoading(false);
+        message.error(err);
+      });
 }
   // 更改机构范围
   const submitExtent = (extent, areaName) => {
@@ -1368,7 +1384,7 @@ const onTypeChange = (value) => {
           }}
           okText="确认"
           cancelText="取消"
-          width="330px"
+          width="500px"
         >
           <span>请选择要更改的目标机构：</span>
           {changeOrgVisible && treeDataCopy.length > 0 && (

src/pages/userCenter/userManage/UserManage.less

@@ -245,6 +245,7 @@
     }
     .ant-tree-list-holder{
         overflow: auto;
+        overflow-x:hidden;
         height: 40vh;
     }
     .ant-tabs-content-holder{

src/services/appConfig/api.js

@@ -91,9 +91,7 @@ export const getRoleList = () =>
   });
 // 编辑-获取菜单
 export const getMenuInfo = id =>
-  get(`${CITY_SERVICE}/OMS.svc/Mini_GetMenuInfo`, {
-    _version: 9999,
-    _dc: new Date().getTime(),
+  get(`${PUBLISH_SERVICE}/PlatformCenter/Mini_GetMenuInfo`, {
     menuID: id,
   });
 // 编辑-提交菜单

src/services/database/api.js

@@ -18,14 +18,11 @@ export const connectionTest = params =>
   get(`${PUBLISH_SERVICE}/DBManager/ConnectionTest`, params);
 
 // 获取数据库配置信息
-export const getDataBaseConfig = params =>
-  get(`${CITY_SERVICE}/OMS.svc/S_GetDataBaseConfig`, params);
 export const getDataBaseConfigNew = params =>
   get(`${PUBLISH_SERVICE}/DBManager/GetDataBaseConfig`, params)
 
 // 获取数据库连接记录
-export const getConnRecord = params =>
-  get(`${CITY_SERVICE}/OMS.svc/S_GetConnRecord`, params);
+
 export const getConnRecordNew = params =>
   get(`${PUBLISH_SERVICE}/DBManager/GetConnRecord`, params);
 
@@ -34,8 +31,8 @@ export const getConnectionTest = params =>
   get(`${CITY_SERVICE}/OMS.svc/S_GetConnectionTest`, params);
 
 // 保存数据库连接
-export const saveConnection = params =>
-  get(`${CITY_SERVICE}/OMS.svc/S_SaveConnection`, params);
+// export const saveConnection = params =>
+//   get(`${CITY_SERVICE}/OMS.svc/S_SaveConnection`, params);
 export const saveConnectionNew = params =>
   get(`${PUBLISH_SERVICE}/DBManager/SaveConnection`, params);
 
@@ -45,20 +42,20 @@ export const getDataBaseList = params =>
   get(`${CITY_SERVICE}/OMS.svc/S_GetDataBaseList`, params);
 
 // 数据库初始化
-export const initDBv4 = params =>
-  get(`${CITY_SERVICE}/OMS.svc/S_InitDBv4`, params);
+// export const initDBv4 = params =>
+//   get(`${CITY_SERVICE}/OMS.svc/S_InitDBv4`, params);
 export const initDBv4new = params =>
   get(`${PUBLISH_SERVICE}/DBManager/InitDB`, params);
 
 // 更新描述
-export const updateConnDesc = params =>
-  get(`${CITY_SERVICE}/OMS.svc/S_UpdateConnDesc`, params);
+// export const updateConnDesc = params =>
+//   get(`${CITY_SERVICE}/OMS.svc/S_UpdateConnDesc`, params);
 export const updateConnDescNew = params =>
   get(`${PUBLISH_SERVICE}/DBManager/UpdateConnDesc`, params);
 
 // 获取日志
-export const getInitDBLog = params =>
-  get(`${CITY_SERVICE}/OMS.svc/S_GetInitDBLog`, params);
+// export const getInitDBLog = params =>
+//   get(`${CITY_SERVICE}/OMS.svc/S_GetInitDBLog`, params);
 export const getInitDBLogNew = params =>
   get(`${PUBLISH_SERVICE}/DBManager/GetInitDBLog`, params);
 
@@ -68,13 +65,13 @@ export const deleteInitDBLog = params =>
 export const deleteInitDBLogNew = params =>
   get(`${PUBLISH_SERVICE}/DBManager/DeleteInitDBLog`, params);
 
-// 修改产品解决方案
+// 设置数据库初始化类型
 export const setTableSQLDirName = params =>
-  get(`${CITY_SERVICE}/OMS.svc/S_SetTableSQLDirName`, params);
+  get(`${PUBLISH_SERVICE}/DBManager/SetTableSQLDirName`, params);
 
 // 删除数据库连接记录
-export const deleteConn = params =>
-  get(`${CITY_SERVICE}/OMS.svc/S_DeleteConn`, params);
+// export const deleteConn = params =>
+//   get(`${CITY_SERVICE}/OMS.svc/S_DeleteConn`, params);
 export const deleteConnNew = params =>
   get(`${PUBLISH_SERVICE}/DBManage/DeleteConnection`, params);
 
@@ -97,27 +94,27 @@ export const changeSolution = params =>
  * @数据库标准化管理
  */
 // 检查数据库表
-export const tableCheck = params =>
-  get(`${CITY_SERVICE}/OMS.svc/TableCheck`, params);
+// export const tableCheck = params =>
+//   get(`${CITY_SERVICE}/OMS.svc/TableCheck`, params);
 export const tableCheckNew = params =>
   get(`${PUBLISH_SERVICE}/DBManager/TableCheck`, params);
 
 // 获取数据库升级记录
-export const databaseStandardGetLog = params =>
-  get(`${CITY_SERVICE}/OMS.svc/DatabaseStandard_GetLog`, params);
+// export const databaseStandardGetLog = params =>
+//   get(`${CITY_SERVICE}/OMS.svc/DatabaseStandard_GetLog`, params);
 export const databaseStandardGetLogNew = params =>
   get(`${PUBLISH_SERVICE}/DBManager/GetUpdateDBLog`, params);
 
 // 更新
 export const updateDateBase = params =>
-  get(`${CITY_SERVICE}/OMS.svc/DatabaseStandard_UpdateDateBase`, params);
+  get(`${PUBLISH_SERVICE}/DBManager/UpdateDataBase`, params);
 
 /**
  * @数据库连接配置
  */
-// 删除数据库连接
-export const deleteConnString = params =>
-  get(`${CITY_SERVICE}/OMS.svc/S_DeleteConnString`, params);
+
+// export const deleteConnString = params =>
+//   get(`${CITY_SERVICE}/OMS.svc/S_DeleteConnString`, params);
 // SQL数据库连接
 export const getSQLServerConnString = params =>
   get(`${CITY_SERVICE}/OMS.svc/S_GetSQLServerConnString`, params);
@@ -185,12 +182,16 @@ export const editMySQLConnString = params =>
     timeout: 300000,
   });
 
+  //获取数据库链接字符串
   export const GetConnString = params =>
   get(`${PUBLISH_SERVICE}/DBManager/GetConnString`, params);
+  //添加数据库链接字符串
   export const AddConnString = params =>
   get(`${PUBLISH_SERVICE}/DBManager/AddConnString`, params);
+  //编辑数据库链接字符串
   export const EditConnString = params =>
   get(`${PUBLISH_SERVICE}/DBManager/EditConnString`, params);
+  // 删除数据库连接
   export const DeleteConnString = params =>
   get(`${PUBLISH_SERVICE}/DBManager/DeleteConnString`, params);
   export const GetConnTest = params =>

src/services/mobileConfig/api.js

@@ -74,7 +74,7 @@ export const addMenu = params =>
  * }
  */
 export const getMenuInfo = params =>
-  get(`${CITY_SERVICE}/OMS.svc/Mini_GetMenuInfo`, params);
+  get(`${PUBLISH_SERVICE}/PlatformCenter/Mini_GetMenuInfo`, params);
 
 // 编辑菜单
 export const editMenu = params =>

src/services/orgnazation/api.js

-import { get, post, CITY_SERVICE } from '../index';
+/*
+ * @Description: 
+ * @Author: leizhe
+ * @Date: 2021-05-27 16:31:05
+ * @LastEditTime: 2021-07-07 16:10:30
+ * @LastEditors: leizhe
+ */
+import { get, post, CITY_SERVICE, PUBLISH_SERVICE } from '../index';
 
 export const orgTest = params =>
   get(
-    `${CITY_SERVICE}/OMS.svc/W4_GetMenuByRoleWithLevel?roleID=6&subSystemValue=city&subSystemName=city&_version=9999&_dc=1604051878230`,
+    `${PUBLISH_SERVICE}/UserCenter/GetMenuByRoleWithLevel?roleID=6&subSystemValue=city&subSystemName=city&_version=9999&_dc=1604051878230`,
     params,
   );
 

src/services/userCenter/RoleManage/api.js

+/*
+ * @Description: 
+ * @Author: leizhe
+ * @Date: 2021-05-27 16:31:05
+ * @LastEditTime: 2021-07-07 17:50:49
+ * @LastEditors: leizhe
+ */
 import { get, post, PUBLISH_SERVICE, CITY_SERVICE } from '@/services/index';
 
 // 新增站点
@@ -5,15 +12,15 @@ export const addStation = params =>
   get(`${CITY_SERVICE}/OMS.svc/W4_AddStation`, params);
 // 删除站点
 export const deleteStation = params =>
-  get(`${CITY_SERVICE}/OMS.svc/P_DeleteStation`, params);
+  get(`${PUBLISH_SERVICE}/UserCenter/DeleteStation`, params);
 // 编辑站点
 export const editStation = params =>
-  get(`${CITY_SERVICE}/OMS.svc/P_EditStation`, params);
+  get(`${PUBLISH_SERVICE}/UserCenter/EditStation`, params);
 
-// 保存站点选择人员
+// 角色关联用户
 export const chooseUserToStation = (params, options) =>
-  post(
-    `${CITY_SERVICE}/OMS.svc/P_ChooseUserToStation?_version=9999`,
+  get(
+    `${PUBLISH_SERVICE}/UserCenter/ChooseUserToStation?`,
     params,
     options,
   );
@@ -25,7 +32,7 @@ export const getUserRelationList = params =>
 // 角色管理保存选择
 export const setMenuToRole = (params, options) =>
   post(
-    `${CITY_SERVICE}/OMS.svc/P_SetMenuToRole?_version: 9999`,
+    `${PUBLISH_SERVICE}/UserCenter/SetMenuToRole?`,
     params,
     options,
   );
@@ -39,24 +46,24 @@ export const getRoleGroupList = params =>
 
 // 新增角色
 export const addRole = params =>
-  get(`${CITY_SERVICE}/OMS.svc/P_AddRole`, params);
+  get(`${PUBLISH_SERVICE}/UserCenter/AddRole`, params);
 
 // 获取分组列表
 export const getRoleGroup = params =>
   get(`${CITY_SERVICE}/OMS.svc/P_GetRoleGroup`, params);
 // 编辑角色
 export const editRole = params =>
-  get(`${CITY_SERVICE}/OMS.svc/P_EditRole`, params);
+  get(`${PUBLISH_SERVICE}/UserCenter/EditRole`, params);
 // 删除角色
 export const deleteRole = params =>
-  get(`${CITY_SERVICE}/OMS.svc/P_DeleteRole`, params);
+  get(`${PUBLISH_SERVICE}/UserCenter/DeleteRole`, params);
 // 编辑分组名称
 export const setRoleGroupName = params =>
-  get(`${CITY_SERVICE}/OMS.svc/P_SetRoleGroupName`, params);
+  get(`${PUBLISH_SERVICE}/UserCenter/SetRoleGroupName`, params);
 
-// 保存选择的功能
+// 通过角色id获取组件菜单
 export const getMenuByRoleWithLevel = params =>
-  get(`${CITY_SERVICE}/OMS.svc/W4_GetMenuByRoleWithLevel`, params);
+  get(`${PUBLISH_SERVICE}/UserCenter/GetMenuByRoleWithLevel`, params);
 
 // 获取角色类别
 export const getWebConfigTypes = params =>

src/services/userCenter/siteManage/api.js

@@ -7,22 +7,26 @@ import { get, post, CITY_SERVICE, PUBLISH_SERVICE } from '@/services/index';
 export const getOUTree = params =>
   get(`${CITY_SERVICE}/OMS.svc/U_GetOUTree?_version=9999&node=-1`, params);
 // 获取站点信息
-export const getWebModuleTree = params =>
-  get(`${CITY_SERVICE}/OMS.svc/W4_GetWeb4ModuleTree`, params);
+export const getWebModuleTree = userMode =>
+  get(
+    `${PUBLISH_SERVICE}/PlatformCenter/WebModuleTree?${qs.stringify({
+      userMode,
+    })}`,
+  );
 
 // 新增站点
 export const addStation = params =>
-  get(`${CITY_SERVICE}/OMS.svc/W4_AddStation`, params);
+  get(`${PUBLISH_SERVICE}/UserCenter/AddStation`, params);
 // 删除站点
 export const deleteStation = params =>
-  get(`${CITY_SERVICE}/OMS.svc/P_DeleteStation`, params);
+  get(`${PUBLISH_SERVICE}/UserCenter/DeleteStation`, params);
 // 编辑站点
 export const editStation = params =>
-  get(`${CITY_SERVICE}/OMS.svc/P_EditStation`, params);
+  get(`${PUBLISH_SERVICE}/UserCenter/EditStation`, params);
 // 保存站点选择人员
 export const chooseUserToStation = (params, options) =>
-  post(
-    `${CITY_SERVICE}/OMS.svc/P_ChooseUserToStation?_version=9999`,
+  get(
+    `${PUBLISH_SERVICE}/UserCenter/ChooseUserToStation?`,
     params,
     options,
   );

src/services/userCenter/userManage/api.js

@@ -24,12 +24,15 @@ export const getOneOUUserListNew = OUID =>
  * 查询用户
  * @param {*} key
  */
-export const getUserByKey = key =>
-  get(`${CITY_SERVICE}/OMS.svc/U_GetUserByKey`, {
-    _version: 9999,
-    _dc: new Date().getTime(),
-    key,
-  });
+// export const getUserByKey = key =>
+//   get(`${CITY_SERVICE}/OMS.svc/U_GetUserByKey`, {
+//     _version: 9999,
+//     _dc: new Date().getTime(),
+//     key,
+//   });
+
+export const GetUserByKeyNew = params =>
+get(`${PUBLISH_SERVICE}/UserCenter/GetUserByKey`, params)
 
 /**
  * 添加用户
@@ -155,9 +158,6 @@ export const GetOUTreeNew = params =>
   export const GetUserRelationListNew = params =>
   get(`${PUBLISH_SERVICE}/UserCenter/GetUserRelationList`, params)
 
-  export const GetUserByKeyNew = params =>
-  get(`${PUBLISH_SERVICE}/UserCenter/GetUserByKey`, params)
-
   export const AddUserNew = params =>
   get(`${PUBLISH_SERVICE}/UserCenter/AddUser`, params)
 
@@ -182,8 +182,8 @@ export const GetOUTreeNew = params =>
   export const SetUserRelationListNew = params =>
   get(`${PUBLISH_SERVICE}/UserCenter/SetUserRelationList`, params)
 
-  export const DeleteOUNew = params =>
-  get(`${PUBLISH_SERVICE}/UserCenter/DeleteOU`, params)
+  // export const DeleteOUNew = params =>
+  // get(`${PUBLISH_SERVICE}/UserCenter/DeleteOU`, params)
 
 
 

src/services/webConfig/api.js

@@ -38,7 +38,7 @@ export const getMapCofigs = () =>
  * @param {*} title 网站标题
  */
 export const getWebconfig = title =>
-  get(`${CITY_SERVICE}/OMS.svc/W4_GetWebsite`, { title });
+  get(`${PUBLISH_SERVICE}/WebSite/GetWebsite`, { title });
 
 /**
  * 编辑或添加网站。默认编辑模式
@@ -53,7 +53,7 @@ export const postEditWebConfig = (config, isAdd = false) => {
     }
   });
   return post(
-    `${CITY_SERVICE}/OMS.svc/${isAdd ? 'W4_AddWebsite' : 'W4_EditWebsite'
+    `${PUBLISH_SERVICE}/WebSite/${isAdd ? 'AddWebsite' : 'W4_EditWebsite'
     }?_version=9999`,
     qs.stringify({ config: JSON.stringify(obj) }),
     {

src/utils/request/index.js

@@ -30,7 +30,7 @@ axios.defaults.withCredentials = true
 axios.interceptors.request.use( function (request){
   const token = localStorage.getItem('token')
   const pandaPublish = localStorage.getItem('panda-publish')
-  const getWay = '/PandaOMS/GateWay'
+  const getWay = '/PandaCore/GateWay'
   if(token){
     request.headers.Authorization = 'Bearer ' + token
   }