Browse Source

(*)权限管理提交

master
peng.peng 2 years ago
parent
commit
57d06efb96
  1. 7
      api/app/lib/controllers/auth/index.js
  2. 139
      api/app/lib/controllers/member/index.js
  3. 10
      api/app/lib/models/user.js
  4. 23
      api/app/lib/routes/member/index.js
  5. 5
      web/client/src/app.js
  6. 44
      web/client/src/sections/memberManagement/actions/adapter.js
  7. 56
      web/client/src/sections/memberManagement/actions/dataSource.js
  8. 15
      web/client/src/sections/memberManagement/actions/example.js
  9. 14
      web/client/src/sections/memberManagement/actions/index.js
  10. 16
      web/client/src/sections/memberManagement/actions/log.js
  11. 69
      web/client/src/sections/memberManagement/actions/task.js
  12. 73
      web/client/src/sections/memberManagement/components/memberModal.js
  13. 6
      web/client/src/sections/memberManagement/components/style.less
  14. 26
      web/client/src/sections/memberManagement/components/taskModal.js
  15. 5
      web/client/src/sections/memberManagement/containers/index.js
  16. 218
      web/client/src/sections/memberManagement/containers/member.js
  17. 5
      web/client/src/sections/memberManagement/containers/style.less
  18. 15
      web/client/src/sections/memberManagement/index.js
  19. 15
      web/client/src/sections/memberManagement/nav-item.js
  20. 5
      web/client/src/sections/memberManagement/reducers/index.js
  21. 17
      web/client/src/sections/memberManagement/routes.js

7
api/app/lib/controllers/auth/index.js

@ -5,7 +5,7 @@ const MD5 = require('crypto-js/md5');
const moment = require('moment'); const moment = require('moment');
const uuid = require('uuid'); const uuid = require('uuid');
async function login (ctx, next) { async function login(ctx, next) {
// const transaction = await ctx.fs.dc.orm.transaction(); // const transaction = await ctx.fs.dc.orm.transaction();
try { try {
const models = ctx.fs.dc.models; const models = ctx.fs.dc.models;
@ -19,7 +19,8 @@ async function login (ctx, next) {
attributes: { exclude: ['password'] }, attributes: { exclude: ['password'] },
where: { where: {
username: params.username, username: params.username,
password: password password: password,
enabled: true
}, },
}); });
} }
@ -58,7 +59,7 @@ async function login (ctx, next) {
} }
} }
async function logout (ctx) { async function logout(ctx) {
try { try {
const models = ctx.fs.dc.models; const models = ctx.fs.dc.models;
const params = ctx.request.body; const params = ctx.request.body;

139
api/app/lib/controllers/member/index.js

@ -0,0 +1,139 @@
'use strict';
const moment = require('moment')
function getUserList(opts) {
return async function (ctx, next) {
const models = ctx.fs.dc.models;
const { page, limit, name, role } = ctx.query;
const Op = ctx.fs.dc.ORM.Op;
let errMsg = { message: '获取用户失败' }
try {
let searchWhere = {}
let option = {
where: searchWhere,
order: [["id", "desc"]],
attributes: { exclude: ['password'] },
}
if (name) {
searchWhere.name = { $like: name };
}
if (role) {
searchWhere.role = role;
}
option.where = searchWhere
let total = await models.User.findAll(option);
let limit_ = limit || 10;
let page_ = page || 1;
let offset = (page_ - 1) * limit_;
if (limit && page) {
option.limit = limit_
option.offset = offset
}
const res = await models.User.findAndCount(option);
ctx.status = 200;
ctx.body = res;
} catch (error) {
ctx.fs.logger.error(`path: ${ctx.path}, error: ${error}`);
ctx.status = 400;
ctx.body = errMsg
}
}
}
// 新增用户
function addUser(opts) {
return async function (ctx, next) {
const models = ctx.fs.dc.models;
try {
const { attributeName, attributeCode, modelType } = ctx.request.body
const checkName = await models.User.findOne({ where: { attributeName, modelType } });
const checkCode = await models.User.findOne({ where: { attributeCode, modelType } });
if (checkName || checkCode) {
ctx.status = 400;
ctx.body = { message: checkName ? '该属性名称已存在' : "该属性代码已存在" }
} else {
let rslt = ctx.request.body;
await models.User.create(Object.assign({}, rslt))
ctx.status = 204;
ctx.body = { message: '新建用户成功' }
}
} catch (error) {
ctx.fs.logger.error(`path: ${ctx.path}, error: ${error}`);
ctx.status = 400;
ctx.body = { message: '新建用户失败' }
}
}
}
// 修改用户
function editUser(opts) {
return async function (ctx, next) {
try {
const models = ctx.fs.dc.models;
const { id } = ctx.params;
const body = ctx.request.body;
let modelFind = await models.User.findOne({ where: { id: id } });
const { attributeName, attributeCode } = ctx.request.body;
const { modelType } = modelFind;
const checkName = await models.User.findOne({ where: { id: { $not: id }, attributeName, modelType } });
const checkCode = await models.User.findOne({ where: { id: { $not: id }, attributeCode, modelType } });
if (checkName || checkCode) {
ctx.status = 400;
ctx.body = { message: checkName ? '该属性名称已存在' : "该属性代码已存在" }
} else {
await models.User.update(
body,
{ where: { id: id, } }
)
ctx.status = 204;
ctx.body = { message: '修改用户成功' }
}
} catch (error) {
ctx.fs.logger.error(`path: ${ctx.path}, error: ${error}`);
ctx.status = 400;
ctx.body = { message: '修改用户失败' }
}
}
}
// 删除用户
function deleteUser(opts) {
return async function (ctx, next) {
try {
const models = ctx.fs.dc.models;
const { id } = ctx.params;
await models.User.destroy({
where: {
id: id
}
})
ctx.status = 204;
ctx.body = { message: '删除用户成功' }
} catch (error) {
ctx.fs.logger.error(`path: ${ctx.path}, error: ${error}`);
ctx.status = 400;
ctx.body = { message: '删除用户失败' }
}
}
}
module.exports = {
getUserList,
addUser,
editUser,
deleteUser,
}

10
api/app/lib/models/user.js

@ -51,7 +51,17 @@ module.exports = dc => {
primaryKey: false, primaryKey: false,
field: "role", field: "role",
autoIncrement: false autoIncrement: false
},
enabled: {
type: DataTypes.BOOLEAN,
allowNull: true,
defaultValue: true,
comment: "是否启用",
primaryKey: false,
field: "enabled",
autoIncrement: false
} }
}, { }, {
tableName: "t_user", tableName: "t_user",
comment: "", comment: "",

23
api/app/lib/routes/member/index.js

@ -0,0 +1,23 @@
'use strict';
const member = require('../../controllers/member/index');
module.exports = function (app, router, opts, AuthCode) {
app.fs.api.logAttr['POST/meta/member'] = { content: '增加用户', visible: true };
router.post('/meta/member', member.addUser(opts))
// 修改用户信息
app.fs.api.logAttr['PUT/meta/member/:id'] = { content: '修改用户信息', visible: true };
router.put('/meta/member/:id', member.editUser(opts))
// 删除用户信息
app.fs.api.logAttr['DEL/meta/member/:id'] = { content: '删除用户信息', visible: true };
router.del('/meta/member/:id', member.deleteUser(opts))
//获取用户信息列表
app.fs.api.logAttr['GET/meta/members'] = { content: '获取用户信息列表', visible: true };
router.get('/meta/members', member.getUserList(opts));
};

5
web/client/src/app.js

@ -8,6 +8,7 @@ import MetadataManagement from './sections/metadataManagement';
import MetadataAcquisition from './sections/metadataAcquisition'; import MetadataAcquisition from './sections/metadataAcquisition';
import resourceConsumption from './sections/resourceConsumption'; import resourceConsumption from './sections/resourceConsumption';
import resourceRetrieval from './sections/resourceRetrieval'; import resourceRetrieval from './sections/resourceRetrieval';
import memberManagement from './sections/memberManagement';
const App = props => { const App = props => {
const { projectName } = props const { projectName } = props
@ -24,7 +25,9 @@ const App = props => {
MetadataManagement, MetadataManagement,
MetadataAcquisition, MetadataAcquisition,
resourceConsumption, resourceConsumption,
resourceRetrieval]} resourceRetrieval,
memberManagement
]}
/> />
) )

44
web/client/src/sections/memberManagement/actions/adapter.js

@ -0,0 +1,44 @@
'use strict';
import { basicAction } from '@peace/utils'
import { ApiTable } from '$utils'
export function checkPostgreConnect(params) {
return (dispatch) => basicAction({
type: 'post',
data: params,
dispatch,
actionType: 'CHECK_POSTGRE_CONNECT',
url: ApiTable.pgCheckConnect,
msg: {
option: '',
},
});
}
export function addAdapter(params) {
return (dispatch) => basicAction({
type: 'post',
data: params,
dispatch,
actionType: 'ADD_ADAPTER',
url: ApiTable.addAdapter,
msg: {
option: '新增适配器',
},
});
}
export function getAdapters(query) {
return dispatch => basicAction({
type: 'get',
dispatch: dispatch,
query: query || {},
actionType: 'GET_ACQ_ADAPTERS',
url: `${ApiTable.getAdapters}`,
msg: { error: '获取适配器列表失败' },
reducer: { name: 'adapters' }
});
}

56
web/client/src/sections/memberManagement/actions/dataSource.js

@ -0,0 +1,56 @@
'use strict';
import { basicAction } from '@peace/utils'
import { ApiTable } from '$utils'
export function addDataSource(params, msg) {
return (dispatch) => basicAction({
type: 'post',
data: params,
dispatch,
actionType: 'ADD_DATSOURCE',
url: ApiTable.addDataSource,
msg: {
option: msg == '' ? '' : '新增数据源',
},
});
}
export function getDataSources(query) {
return dispatch => basicAction({
type: 'get',
dispatch: dispatch,
query: query || {},
actionType: 'GET_ACQ_DATASOURCES',
url: `${ApiTable.getDataSources}`,
msg: { error: '获取数据源列表失败' },
reducer: { name: 'datasources' }
});
}
export function deleteDataSource(id) {
return (dispatch) => basicAction({
type: 'del',
dispatch,
actionType: 'DELETE_ACQ_DATASOURCE',
url: ApiTable.modifyDataSource.replace('{id}', id),
msg: {
option: '数据源删除',
},
});
}
export function modifyDataSource(id, params, msg) {
return (dispatch) => basicAction({
type: 'put',
data: params,
dispatch,
actionType: 'MODIFY_ACQ_DATASOURCE',
url: ApiTable.modifyDataSource.replace('{id}', id),
msg: {
option: msg || '数据源编辑',
},
});
}

15
web/client/src/sections/memberManagement/actions/example.js

@ -0,0 +1,15 @@
'use strict';
import { basicAction } from '@peace/utils'
import { ApiTable } from '$utils'
// export function getMembers(orgId) {
// return dispatch => basicAction({
// type: 'get',
// dispatch: dispatch,
// actionType: 'GET_MEMBERS',
// url: `${ApiTable.getEnterprisesMembers.replace('{enterpriseId}', orgId)}`,
// msg: { error: '获取用户列表失败' },
// reducer: { name: 'members' }
// });
// }

14
web/client/src/sections/memberManagement/actions/index.js

@ -0,0 +1,14 @@
'use strict';
import * as example from './example'
import * as adapter from './adapter'
import * as dataSource from './dataSource'
import * as task from './task';
import * as log from './log';
export default {
...example,
...adapter,
...dataSource,
...task,
...log
}

16
web/client/src/sections/memberManagement/actions/log.js

@ -0,0 +1,16 @@
'use strict';
import { basicAction } from '@peace/utils'
import { ApiTable } from '$utils'
export function getLogs(query) {
return dispatch => basicAction({
type: 'get',
dispatch: dispatch,
query: query || {},
actionType: 'GET_ACQ_LOGS',
url: `${ApiTable.getLogs}`,
msg: { error: '获取采集日志失败' },
reducer: { name: 'acqlogs' }
});
}

69
web/client/src/sections/memberManagement/actions/task.js

@ -0,0 +1,69 @@
'use strict';
import { basicAction } from '@peace/utils'
import { ApiTable } from '$utils'
export function addTask(params, msg) {
return (dispatch) => basicAction({
type: 'post',
data: params,
dispatch,
actionType: 'ADD_ACQ_TASK',
url: ApiTable.addTask,
msg: {
option: msg || '新增采集任务',
},
});
}
export function getTasks(query) {
return dispatch => basicAction({
type: 'get',
dispatch: dispatch,
query: query || {},
actionType: 'GET_ACQ_TASKS',
url: `${ApiTable.getTasks}`,
msg: { error: '获取采集任务列表失败' },
reducer: { name: 'tasks' }
});
}
export function deleteTask(id) {
return (dispatch) => basicAction({
type: 'del',
dispatch,
actionType: 'DELETE_ACQ_TASK',
url: ApiTable.modifyTask.replace('{id}', id),
msg: {
option: '采集任务删除',
},
});
}
export function modifyTask(id, params, msg) {
return (dispatch) => basicAction({
type: 'put',
data: params,
dispatch,
actionType: 'MODIFY_ACQ_TASK',
url: ApiTable.modifyTask.replace('{id}', id),
msg: {
option: msg || '采集任务编辑',
},
});
}
export function runTask(params, msg) {
return (dispatch) => basicAction({
type: 'post',
data: params,
dispatch,
actionType: 'RUN_ACQ_TASK',
url: ApiTable.runTask,
msg: {
option: msg || '任务执行',
},
});
}

73
web/client/src/sections/memberManagement/components/memberModal.js

@ -0,0 +1,73 @@
import React, { useRef } from 'react';
import { Button, Form } from 'antd';
import { InfoCircleOutlined } from '@ant-design/icons';
import {
ModalForm,
ProFormSelect,
ProFormTextArea,
ProFormDigit,
ProFormText,
ProFormSwitch
} from '@ant-design/pro-form';
export default (props) => {
const { title, triggerRender, editData = null, onFinish, paramsName } = props;
const formItemLayout = { labelCol: { span: 6 }, wrapperCol: { span: 16 } };
const initialValues = editData ? {
...editData,
} : {};
const [form] = Form.useForm();
const formRef = useRef();
return (
<ModalForm
formRef={formRef}
title={title || ''}
initialValues={initialValues}
trigger={
triggerRender ? triggerRender : <Button type="primary" >
{title || ''}
</Button>
}
layout="horizontal"
grid={true}
{...formItemLayout}
modalProps={{
destroyOnClose: true,
onCancel: () => { },
}}
onFinish={async (values) => {
return onFinish && await onFinish(values, editData, form)
// return true;
}}
width={500}
>
<ProFormText
rules={[{ required: true, message: '请输入姓名' },
{ max: 255, message: '姓名长度不能大于255个字符' },
]}
name="name"
label="姓名"
/>
<ProFormText
rules={[{ required: true, message: '请输入用户名' },
{ max: 255, message: '用户名长度不能大于255个字符' },
]}
name="username"
label="用户名"
/>
<ProFormSelect
rules={[{ required: true, message: '请选择角色' }]}
options={[
{ label: '系统管理员', value: '系统管理员' },
{ label: '数据消费者', value: '数据消费者' },
]}
name="role"
label="角色"
/>
<ProFormSwitch name="enabled" label="是否启用" />
</ModalForm>
);
};

6
web/client/src/sections/memberManagement/components/style.less

@ -0,0 +1,6 @@
.step-footer {
display: flex;
justify-content: flex-end;
margin-top: 20px;
width: 100%;
}

26
web/client/src/sections/memberManagement/components/taskModal.js

@ -0,0 +1,26 @@
import React, { useEffect, useState } from 'react'
import { Tabs, Card, Modal } from 'antd'
import AdapterStep from './adapterStep';
import { STEP_CONFIG } from './steps/index'
function DataSourceModal(props) {
const { visible, editData, onFinish, onCancel,
type = 'postgre',//当前卡片的key (目前只有postgre,支持后续扩展)
dataSourceFilter,
} = props;
const { StepThree } = STEP_CONFIG[type];
// const onFinish = () => { }
return <>
<Modal
title={editData ? '编辑采集任务' : "新建采集任务"}
onCancel={() => { onCancel() }}
open={visible}
footer={null}
width={1200}
destroyOnClose={true}
>
<StepThree next={onFinish} dataSourceFilter={dataSourceFilter} editData={editData} />
</Modal>
</>
}
export default DataSourceModal

5
web/client/src/sections/memberManagement/containers/index.js

@ -0,0 +1,5 @@
'use strict';
import DataSourceManagement from './member';
export { DataSourceManagement };

218
web/client/src/sections/memberManagement/containers/member.js

@ -0,0 +1,218 @@
import React, { useEffect, useState } from 'react'
import { Spin, Popconfirm, Select, Row, Col, Button, Input, Table } from 'antd';
import { connect } from 'react-redux';
import ProTable from '@ant-design/pro-table';
import moment from 'moment';
import MemberModal from '../components/memberModal';
import { useFsRequest, ApiTable } from '$utils';
import './style.less';
function Member(props) {
const { loading, clientHeight, actions, dispatch, dataSources, adapters } = props;
const [pageSize, setPageSize] = useState(10);
const [currentPage, setCurrentPage] = useState(1);
const [searchValue, setSearchValue] = useState('')
const [visible, setVisible] = useState(false);//是否展示新增编辑模态框
const [editData, setEditData] = useState(null);//模态框编辑数据
const [refreshTree, setRefreshTree] = useState(1);
const [searchRole, setSearchRole] = useState()
const queryData = (search) => {
const query = {
limit: search ? 10 : pageSize || 10,
page: search ? 1 : currentPage || 1,
name: searchValue
}
dispatch(actions.metadataAcquisition.getDataSources(query));
}
const { data: treeData = [] } = useFsRequest({
url: ApiTable.getResourceCatalog,
refreshDeps: [refreshTree]
});
useEffect(() => {
dispatch(actions.metadataAcquisition.getAdapters())
queryData();
}, [pageSize, currentPage]);
const handleDelete = (id) => {
dispatch(actions.metadataAcquisition.deleteDataSource(id)).then(() => {
queryData();
});
};
const columns = [
{
title: '序号',
dataIndex: 'index',
render: (text, record, index) => { return index + 1 }
},
{
title: '姓名',
dataIndex: 'name',
},
{
title: '用户名',
dataIndex: 'username',
},
{
title: '角色',
dataIndex: 'role',
},
{
title: '状态',
dataIndex: 'enabled',
},
{
title: '操作',
width: 160,
key: 'option',
valueType: 'option',
render: (text, record) => {
const options = [];
options.push(<a onClick={() => {
setVisible(true)
setEditData(record)
}} style={{ marginRight: 8 }}>编辑</a>)
options.push(
<Popconfirm
key="del"
placement="top"
title={<><div>是否确认删除该数据源</div>
<div>(将同步删除数据源下的元数据)</div></>}
onConfirm={() => handleDelete(record.id)}
okText="是"
cancelText="否"
>
<a>删除</a>
</Popconfirm>)
return options;
},
},
];
const onFinish = (values) => {
const { stepOneValues, stepTwoValues, } = values;
const adapterInfo = adapters?.find(x => x.adapterName == stepOneValues?.adapterName)
if (adapterInfo) {
const dataToSave = {
name: stepOneValues?.name,
audited: true,
adapterId: adapterInfo?.id,
mountPath: stepOneValues?.mountPath,
catalogKey: stepOneValues?.catalogKey,
description: stepOneValues?.description,
config: stepTwoValues,
time: moment()
}
if (editData) {
dispatch(actions.metadataAcquisition.modifyDataSource(editData?.id, dataToSave)).then(res => {
if (res.success) {
setVisible(false);
setEditData(null);
queryData();
}
})
} else {
dispatch(actions.metadataAcquisition.addDataSource(dataToSave)).then(res => {
if (res.success) {
setVisible(false);
setEditData(null);
queryData();
}
})
}
}
}
const refresh = () => {
// queryData();
setRefreshTree(refreshTree + 1)
}
return <Spin spinning={loading}>
<Row className='protable-title'>
<Col span={12}>
<MemberModal
triggerRender={<Button type='primary'>新建</Button>}
title="新建用户"
onFinish={onFinish}
key="addModel"
/>
</Col>
<Col span={12} style={{ display: 'flex', justifyContent: 'flex-end', alignItems: 'center' }}>
<span>用户姓名 </span> <Input
value={searchValue} onChange={e => { setSearchValue(e.target.value) }}
style={{ width: 220, marginRight: 15 }} placeholder="请输入" />
<span>角色 </span> <Select
value={searchRole} onChange={e => { setSearchRole(e) }}
style={{ width: 220, marginRight: 15 }} placeholder="请选择" >
<Select.Option value={'系统管理员'}>系统管理员</Select.Option>
<Select.Option value={'数据消费者'}>数据消费者</Select.Option>
</Select>
<Button onClick={() => {
setCurrentPage(1)
setPageSize(10)
queryData(true)
}} type='primary'>查询</Button></Col>
</Row>
<ProTable
columns={columns}
dateFormatter="string"
search={false}
scroll={
{
scrollToFirstRowOnChange: true,
y: clientHeight - 260
}
}
//1490 2256
pagination={{
size: 'large',
total: dataSources?.count,
showSizeChanger: true,
showQuickJumper: true,
current: currentPage,
pageSize: pageSize || 10,
defaultPageSize: 10,
pageSizeOptions: [10, 20, 50],
showTotal: (total) => {
return <span style={{ fontSize: 15 }}>{`${Math.ceil(total / pageSize)}页,${total}`}</span>
},
onShowSizeChange: (currentPage, pageSize) => {
setCurrentPage(currentPage);
setPageSize(pageSize);
},
onChange: (page, pageSize) => {
setCurrentPage(page);
setPageSize(pageSize);
}
}}
dataSource={dataSources?.rows || []}
options={false}
/>
</Spin>
}
function mapStateToProps(state) {
const {
auth, global, datasources, adapters
} = state;
return {
loading: datasources.isRequesting || adapters?.isRequesting,
clientHeight: global.clientHeight,
actions: global.actions,
dataSources: datasources?.data || {},
adapters: adapters?.data || []
};
}
export default connect(mapStateToProps)(Member);

5
web/client/src/sections/memberManagement/containers/style.less

@ -0,0 +1,5 @@
.protable-title {
margin-bottom: 16px;
padding-left: 24px;
padding-right: 24px;
}

15
web/client/src/sections/memberManagement/index.js

@ -0,0 +1,15 @@
'use strict';
import reducers from './reducers';
import routes from './routes';
import actions from './actions';
import { getNavItem } from './nav-item';
export default {
key: 'memberManagement',
name: '元数据采集',
reducers: reducers,
routes: routes,
actions: actions,
getNavItem: getNavItem
};

15
web/client/src/sections/memberManagement/nav-item.js

@ -0,0 +1,15 @@
import React from 'react';
import { Link } from 'react-router-dom';
import { Menu } from 'antd';
import { BarChartOutlined } from '@ant-design/icons';
const SubMenu = Menu.SubMenu;
export function getNavItem() {
return (
<SubMenu key="memberManagement" icon={<BarChartOutlined />} title='用户管理'>
<Menu.Item key="auth">
<Link to="/memberManagement/auth">用户权限</Link>
</Menu.Item>
</ SubMenu >
);
}

5
web/client/src/sections/memberManagement/reducers/index.js

@ -0,0 +1,5 @@
'use strict';
export default {
}

17
web/client/src/sections/memberManagement/routes.js

@ -0,0 +1,17 @@
'use strict';
import { Adapter, DataSourceManagement, AcquisitionTask, AcquisitionLog, AdapterDetail } from './containers';
export default [{
type: 'inner',
route: {
path: '/memberManagement',
key: 'memberManagement',
breadcrumb: '元数据采集',
// 不设置 component 则面包屑禁止跳转
childRoutes: [{
path: '/auth',
key: 'auth',
component: DataSourceManagement,
breadcrumb: '权限管理'
}]
}
}];
Loading…
Cancel
Save