From 69648dfe1f18611ed9c654760730899ba65ac479 Mon Sep 17 00:00:00 2001 From: baiJinjin <66710700+baiJinjin@users.noreply.github.com> Date: Tue, 19 Sep 2023 23:50:22 +0800 Subject: [PATCH 1/2] Feature htl (#1471) * Add user log item Manage * edit Item Management * merge from develop * add router --- threadpool/console-new/craco.config.js | 6 + threadpool/console-new/package.json | 3 + threadpool/console-new/src/App.tsx | 1 + .../components/layout-com/index.module.less | 2 +- .../console-new/src/config/theme/index.ts | 2 +- threadpool/console-new/src/hooks/useUrlSet.ts | 18 +++ .../src/page/item/index.module.less | 5 + .../console-new/src/page/item/index.tsx | 120 ++++++++++++++++++ .../console-new/src/page/item/router.tsx | 8 ++ .../console-new/src/page/item/service.ts | 75 +++++++++++ .../src/page/log/index.module.less | 5 + threadpool/console-new/src/page/log/index.tsx | 120 ++++++++++++++++++ .../console-new/src/page/log/router.tsx | 8 ++ .../console-new/src/page/log/service.ts | 79 ++++++++++++ .../src/page/tenant/index.module.less | 5 + .../console-new/src/page/tenant/index.tsx | 65 +++++++--- .../console-new/src/page/tenant/service.ts | 95 +++++++++----- .../src/page/user/index.module.less | 5 + .../console-new/src/page/user/index.tsx | 120 ++++++++++++++++++ .../console-new/src/page/user/router.tsx | 8 ++ .../console-new/src/page/user/service.ts | 78 ++++++++++++ threadpool/console-new/src/route/index.tsx | 3 + .../console-new/src/utils/common/index.ts | 31 ++++- .../console-new/src/utils/request/index.ts | 4 +- yarn.lock | 76 ----------- 25 files changed, 815 insertions(+), 127 deletions(-) create mode 100644 threadpool/console-new/src/hooks/useUrlSet.ts create mode 100644 threadpool/console-new/src/page/item/index.module.less create mode 100644 threadpool/console-new/src/page/item/index.tsx create mode 100644 threadpool/console-new/src/page/item/router.tsx create mode 100644 threadpool/console-new/src/page/item/service.ts create mode 100644 threadpool/console-new/src/page/log/index.module.less create mode 100644 threadpool/console-new/src/page/log/index.tsx create mode 100644 threadpool/console-new/src/page/log/router.tsx create mode 100644 threadpool/console-new/src/page/log/service.ts create mode 100644 threadpool/console-new/src/page/tenant/index.module.less create mode 100644 threadpool/console-new/src/page/user/index.module.less create mode 100644 threadpool/console-new/src/page/user/index.tsx create mode 100644 threadpool/console-new/src/page/user/router.tsx create mode 100644 threadpool/console-new/src/page/user/service.ts delete mode 100644 yarn.lock diff --git a/threadpool/console-new/craco.config.js b/threadpool/console-new/craco.config.js index 5ad94a67..f94068ae 100644 --- a/threadpool/console-new/craco.config.js +++ b/threadpool/console-new/craco.config.js @@ -48,5 +48,11 @@ module.exports = { headers: { 'Access-Control-Allow-Origin': '*', }, + proxy: { + '/hippo4j': { + target: 'http://console.hippo4j.cn', + changeOrigin: true, + }, + }, }, }; diff --git a/threadpool/console-new/package.json b/threadpool/console-new/package.json index 353e4cf1..43c1e5f8 100644 --- a/threadpool/console-new/package.json +++ b/threadpool/console-new/package.json @@ -5,6 +5,7 @@ "dependencies": { "@ahooksjs/use-url-state": "^3.5.1", "@ant-design/icons": "^5.2.6", + "@tanem/react-nprogress": "^5.0.51", "@testing-library/jest-dom": "^5.16.5", "@testing-library/react": "^13.4.0", "@testing-library/user-event": "^13.5.0", @@ -13,6 +14,7 @@ "dayjs": "^1.11.9", "i18next": "^23.5.1", "i18next-browser-languagedetector": "^7.1.0", + "lodash": "^4.17.21", "qs": "^6.11.2", "react": "^18.2.0", "react-dom": "^18.2.0", @@ -50,6 +52,7 @@ "@craco/craco": "^7.1.0", "@types/http-errors": "^2.0.1", "@types/jest": "^27.5.2", + "@types/lodash": "^4.14.198", "@types/node": "^16.18.26", "@types/react": "^18.2.6", "@types/react-dom": "^18.2.4", diff --git a/threadpool/console-new/src/App.tsx b/threadpool/console-new/src/App.tsx index d03544f5..c983e76a 100644 --- a/threadpool/console-new/src/App.tsx +++ b/threadpool/console-new/src/App.tsx @@ -1,3 +1,4 @@ +// import { Suspense } from 'react'; import LayoutCom from './components/layout-com'; import { Routes, Route, Link } from 'react-router-dom'; diff --git a/threadpool/console-new/src/components/layout-com/index.module.less b/threadpool/console-new/src/components/layout-com/index.module.less index 05eeadc3..073f6d40 100644 --- a/threadpool/console-new/src/components/layout-com/index.module.less +++ b/threadpool/console-new/src/components/layout-com/index.module.less @@ -12,7 +12,7 @@ padding-top: 24px; } .content { - margin: 10px 10px 0px; + margin: 0; border-radius: 12px 12px 0 0; flex: 1; padding: 16px; diff --git a/threadpool/console-new/src/config/theme/index.ts b/threadpool/console-new/src/config/theme/index.ts index c1c656b4..7e40b52d 100644 --- a/threadpool/console-new/src/config/theme/index.ts +++ b/threadpool/console-new/src/config/theme/index.ts @@ -1,7 +1,7 @@ import { DefaultTheme } from 'styled-components'; export const lightDefaultTheme: DefaultTheme = { - primary: '#0d68a8', + primary: '#1890ff', baseColor: { // 前两个是固定的，用于，有颜色按钮 字体颜色等固定不会变的颜色值 bc1: '#fff', diff --git a/threadpool/console-new/src/hooks/useUrlSet.ts b/threadpool/console-new/src/hooks/useUrlSet.ts new file mode 100644 index 00000000..7669d5f3 --- /dev/null +++ b/threadpool/console-new/src/hooks/useUrlSet.ts @@ -0,0 +1,18 @@ +import useUrlState from '@ahooksjs/use-url-state'; + +export const useUrlSet = (options: { form: any }) => { + const { form } = options; + const [state, setState] = useUrlState({}); + + const setUrl = () => { + const params = form.getFieldsValue(); + Object.keys(params).forEach(key => { + if (!params[key]) { + params[key] = undefined; + } + }); + setState({ ...params }); + }; + + return { setUrl }; +}; diff --git a/threadpool/console-new/src/page/item/index.module.less b/threadpool/console-new/src/page/item/index.module.less new file mode 100644 index 00000000..5f59dc72 --- /dev/null +++ b/threadpool/console-new/src/page/item/index.module.less @@ -0,0 +1,5 @@ +.tenant_wrapper { + .opreate_btn { + padding: 0px; + } +} \ No newline at end of file diff --git a/threadpool/console-new/src/page/item/index.tsx b/threadpool/console-new/src/page/item/index.tsx new file mode 100644 index 00000000..8684894a --- /dev/null +++ b/threadpool/console-new/src/page/item/index.tsx @@ -0,0 +1,120 @@ +import { useAntdTable } from 'ahooks'; +import { Button, Form, Input, Row, Space, Table, Col } from 'antd'; +import { SearchOutlined, EditOutlined } from '@ant-design/icons'; +import React, { useState } from 'react'; +import { fetchItemList } from './service'; +import { useUrlSet } from '@/hooks/useUrlSet'; +import style from './index.module.less'; + +const baseColumns = [ + { + title: '序号', + dataIndex: 'index', + }, + { + title: '租户', + dataIndex: 'tenantId', + }, + { + title: '项目名称', + dataIndex: 'itemName', + }, + { + title: '负责人', + dataIndex: 'owner', + }, + { + title: '修改时间', + dataIndex: 'gmtModified', + }, +]; + +const Tenant: React.FC = () => { + const [editVisible, setEditVisible] = useState(false); + const [type, setType] = useState('add'); + const [form] = Form.useForm(); + const { setUrl } = useUrlSet({ form }); + const { tableProps, search } = useAntdTable(fetchItemList, { form }); + // const {run: delete} = useRequest(fetchDeleteTenant, { manual: true }); + const actions = (type: string, item?: any) => { + switch (type) { + case 'add': + setEditVisible(true); + break; + case 'edit': + setEditVisible(true); + break; + case 'delete': + // handleDelete(); + break; + default: + break; + } + }; + const handleSearch = () => { + setUrl(); + search.submit(); + }; + // const handleDelete = (item: any) => { + // Modal.confirm({ + // title: `此操作将删除${item.tenantName}, 是否继续?`, + // onOk: () => { + // search.submit(); + // }, + // }); + // }; + + return ( +
+
+ + + + + + + + + + + + + + + + + +
+ { + return ( + + + + + ); + }, + }, + ]} + /> + + ); +}; + +export default Tenant; diff --git a/threadpool/console-new/src/page/item/router.tsx b/threadpool/console-new/src/page/item/router.tsx new file mode 100644 index 00000000..c11cce05 --- /dev/null +++ b/threadpool/console-new/src/page/item/router.tsx @@ -0,0 +1,8 @@ +import { lazy } from 'react'; +import { IRouterList } from '@/typings'; + +const ItemManage = lazy(() => import('./index')); + +const routerList: IRouterList[] = [{ path: '/item', component: () => }]; + +export default routerList; diff --git a/threadpool/console-new/src/page/item/service.ts b/threadpool/console-new/src/page/item/service.ts new file mode 100644 index 00000000..cd426860 --- /dev/null +++ b/threadpool/console-new/src/page/item/service.ts @@ -0,0 +1,75 @@ +import request from '@/utils'; + +const fetchItemList = async ( + pageProps: { current: number; pageSize: number }, + formData: { tencent: string | number } +): Promise<{ total: number; list: Array }> => { + const res: any = await request('/hippo4j/v1/cs/item/query/page', { + method: 'POST', + headers: { + Authorization: + 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiI3LGJhb3hpbnlpX2FkbWluIiwiaXNzIjoiYWRtaW4iLCJleHAiOjE2OTUzOTg4NDksImlhdCI6MTY5NDc5NDA0OSwicm9sIjoiUk9MRV9BRE1JTiJ9.syRDshKpd-xETsSdeMPRtk956f4BJkPt4utVsUl4smgH71Woj8SUq4w2RX1YtGTC4aTZRJYdKOfkTqwK0g_dHQ', + cookie: + 'Admin-Token=Bearer%20eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiI3LGJhb3hpbnlpX2FkbWluIiwiaXNzIjoiYWRtaW4iLCJleHAiOjE2OTUzOTg4NDksImlhdCI6MTY5NDc5NDA0OSwicm9sIjoiUk9MRV9BRE1JTiJ9.syRDshKpd-xETsSdeMPRtk956f4BJkPt4utVsUl4smgH71Woj8SUq4w2RX1YtGTC4aTZRJYdKOfkTqwK0g_dHQ; userName=baoxinyi_admin', + }, + body: { + ...formData, + current: pageProps.current, + size: pageProps.pageSize, + desc: true, + }, + }); + if (res && res.success) { + return { + total: res.data.total, + list: res.data.records.map((item: any, index: number) => ({ index: index + 1, ...item })), + }; + } + throw new Error(res.msg || '服务器开小差啦~'); +}; + +const fetchAddTenant = async (params: { + itemDesc: string; // 项目简介 + itemId: string; // 项目 + itemName: string; // 项目名称 + owner: string; // 负责人 + tenantId: string; // 租户 + tenantDesc?: string; + tenantName?: string; +}) => { + const res = await request('/hippo4j/v1/cs/tenant/save', { + method: 'POST', + body: { ...params }, + }); + + if (res && res.success) { + return res; + } + throw new Error(res.msg || '服务器开小差啦~'); +}; + +const fetchDeleteItem = async (id: string) => { + const url = 'hippo4j/v1/cs/item/delete/prescription/' + id; + const res = await request(url, { + method: 'DELETE', + }); + + if (res && res.success) { + return res; + } + throw new Error(res.msg || '服务器开小差啦~'); +}; + +const fetchUpdateItem = async (id: string) => { + const res = await request('/hippo4j/v1/cs/item/update', { + method: 'POST', + params: { id }, + }); + + if (res && res.success) { + return res; + } + throw new Error(res.msg || '服务器开小差啦~'); +}; + +export { fetchItemList, fetchAddTenant, fetchDeleteItem, fetchUpdateItem }; diff --git a/threadpool/console-new/src/page/log/index.module.less b/threadpool/console-new/src/page/log/index.module.less new file mode 100644 index 00000000..5f59dc72 --- /dev/null +++ b/threadpool/console-new/src/page/log/index.module.less @@ -0,0 +1,5 @@ +.tenant_wrapper { + .opreate_btn { + padding: 0px; + } +} \ No newline at end of file diff --git a/threadpool/console-new/src/page/log/index.tsx b/threadpool/console-new/src/page/log/index.tsx new file mode 100644 index 00000000..a7c0b23f --- /dev/null +++ b/threadpool/console-new/src/page/log/index.tsx @@ -0,0 +1,120 @@ +import { useAntdTable } from 'ahooks'; +import { Button, Form, Input, Row, Space, Table, Col, Modal } from 'antd'; +import { SearchOutlined, EditOutlined } from '@ant-design/icons'; +import React, { useState } from 'react'; +import { fetchTenantList } from './service'; +import { useUrlSet } from '@/hooks/useUrlSet'; +import style from './index.module.less'; + +const baseColumns = [ + { + title: '序号', + dataIndex: 'id', + }, + { + title: '租户', + dataIndex: 'tenantId', + }, + { + title: '租户名称', + dataIndex: 'tenantName', + }, + { + title: '负责人', + dataIndex: 'owner', + }, + { + title: '修改时间', + dataIndex: 'gmtModified', + }, +]; + +const Tenant: React.FC = () => { + const [editVisible, setEditVisible] = useState(false); + const [type, setType] = useState('add'); + const [form] = Form.useForm(); + const { setUrl } = useUrlSet({ form }); + const { tableProps, search } = useAntdTable(fetchTenantList, { form }); + // const {run: delete} = useRequest(fetchDeleteTenant, { manual: true }); + const actions = (type: string, item?: any) => { + switch (type) { + case 'add': + setEditVisible(true); + break; + case 'edit': + setEditVisible(true); + break; + case 'delete': + // handleDelete(); + break; + default: + break; + } + }; + const handleSearch = () => { + setUrl(); + search.submit(); + }; + // const handleDelete = (item: any) => { + // Modal.confirm({ + // title: `此操作将删除${item.tenantName}, 是否继续?`, + // onOk: () => { + // search.submit(); + // }, + // }); + // }; + + return ( +
+
+ +
+ + + + + + + + + + + + + + + + +
{ + return ( + + + + + ); + }, + }, + ]} + /> + + ); +}; + +export default Tenant; diff --git a/threadpool/console-new/src/page/log/router.tsx b/threadpool/console-new/src/page/log/router.tsx new file mode 100644 index 00000000..d778e8be --- /dev/null +++ b/threadpool/console-new/src/page/log/router.tsx @@ -0,0 +1,8 @@ +import { lazy } from 'react'; +import { IRouterList } from '@/typings'; + +const LogManage = lazy(() => import('./index')); + +const routerList: IRouterList[] = [{ path: '/log', component: () => }]; + +export default routerList; diff --git a/threadpool/console-new/src/page/log/service.ts b/threadpool/console-new/src/page/log/service.ts new file mode 100644 index 00000000..2fab1ef7 --- /dev/null +++ b/threadpool/console-new/src/page/log/service.ts @@ -0,0 +1,79 @@ +import request from '@/utils'; + +const fetchTenantList = async ( + pageProps: { current: number; pageSize: number }, + formData: { tencent: string | number } +): Promise<{ total: number; list: Array }> => { + const res: any = await request('/hippo4j/v1/cs/tenant/query/page', { + method: 'POST', + headers: { + Authorization: + 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiI3LGJhb3hpbnlpX2FkbWluIiwiaXNzIjoiYWRtaW4iLCJleHAiOjE2OTUzOTg4NDksImlhdCI6MTY5NDc5NDA0OSwicm9sIjoiUk9MRV9BRE1JTiJ9.syRDshKpd-xETsSdeMPRtk956f4BJkPt4utVsUl4smgH71Woj8SUq4w2RX1YtGTC4aTZRJYdKOfkTqwK0g_dHQ', + cookie: + 'Admin-Token=Bearer%20eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiI3LGJhb3hpbnlpX2FkbWluIiwiaXNzIjoiYWRtaW4iLCJleHAiOjE2OTUzOTg4NDksImlhdCI6MTY5NDc5NDA0OSwicm9sIjoiUk9MRV9BRE1JTiJ9.syRDshKpd-xETsSdeMPRtk956f4BJkPt4utVsUl4smgH71Woj8SUq4w2RX1YtGTC4aTZRJYdKOfkTqwK0g_dHQ; userName=baoxinyi_admin', + }, + body: { + ...formData, + current: pageProps.current, + size: pageProps.pageSize, + desc: true, + }, + }); + if (res && res.success) { + return { + total: res.data.total, + list: res.data.records, + }; + } + throw new Error(res.msg || '服务器开小差啦~'); +}; + +const fetchAddTenant = async (id: string) => { + const res = await request('/hippo4j/v1/cs/tenant/save', { + method: 'POST', + params: { id }, + }); + + if (res && res.success) { + return res; + } + throw new Error(res.msg || '服务器开小差啦~'); +}; + +const fetchDeleteTenant = async (id: string) => { + const res = await request('/tenants', { + method: 'POST', + params: { id }, + }); + + if (res && res.success) { + return res; + } + throw new Error(res.msg || '服务器开小差啦~'); +}; + +const fetchUpdateTenant = async (id: string) => { + const res = await request('hippo4j/v1/cs/tenant/update', { + method: 'POST', + params: { id }, + }); + + if (res && res.success) { + return res; + } + throw new Error(res.msg || '服务器开小差啦~'); +}; + +const fetchTenantDetail = async (id: string) => { + const res = await request('/tenants', { + method: 'POST', + params: { id }, + }); + + if (res && res.success) { + return res; + } + throw new Error(res.msg || '服务器开小差啦~'); +}; + +export { fetchTenantList, fetchAddTenant, fetchDeleteTenant, fetchUpdateTenant, fetchTenantDetail }; diff --git a/threadpool/console-new/src/page/tenant/index.module.less b/threadpool/console-new/src/page/tenant/index.module.less new file mode 100644 index 00000000..5f59dc72 --- /dev/null +++ b/threadpool/console-new/src/page/tenant/index.module.less @@ -0,0 +1,5 @@ +.tenant_wrapper { + .opreate_btn { + padding: 0px; + } +} \ No newline at end of file diff --git a/threadpool/console-new/src/page/tenant/index.tsx b/threadpool/console-new/src/page/tenant/index.tsx index cecb767e..0d80beff 100644 --- a/threadpool/console-new/src/page/tenant/index.tsx +++ b/threadpool/console-new/src/page/tenant/index.tsx @@ -1,16 +1,20 @@ -import { useAntdTable } from 'ahooks'; -import { Button, Form, Input, Row, Space, Table, Col } from 'antd'; import React, { useState } from 'react'; +import { useAntdTable } from 'ahooks'; +import { Button, Form, Input, Row, Space, Table, Col, Modal } from 'antd'; +import { SearchOutlined, EditOutlined } from '@ant-design/icons'; +import { useUrlSet } from '@/hooks/useUrlSet'; import { fetchTenantList } from './service'; +import style from './index.module.less'; + const baseColumns = [ { title: '序号', - dataIndex: 'num', + dataIndex: 'id', }, { title: '租户', - dataIndex: 'tenant', + dataIndex: 'tenantId', }, { title: '租户名称', @@ -18,53 +22,78 @@ const baseColumns = [ }, { title: '负责人', - dataIndex: 'creator', + dataIndex: 'owner', }, { title: '修改时间', - dataIndex: 'data', + dataIndex: 'gmtModified', }, ]; const Tenant: React.FC = () => { const [editVisible, setEditVisible] = useState(false); + const [type, setType] = useState('add'); const [form] = Form.useForm(); + const { setUrl } = useUrlSet({ form }); const { tableProps, search } = useAntdTable(fetchTenantList, { form }); - const actions = (type: string) => { + // const {run: delete} = useRequest(fetchDeleteTenant, { manual: true }); + const actions = (type: string, item?: any) => { switch (type) { - case 'create': + case 'add': setEditVisible(true); break; case 'edit': setEditVisible(true); break; case 'delete': + // handleDelete(); break; default: break; } }; + const handleSearch = () => { + setUrl(); + search.submit(); + }; + // const handleDelete = (item: any) => { + // Modal.confirm({ + // title: `此操作将删除${item.tenantName}, 是否继续?`, + // onOk: () => { + // search.submit(); + // }, + // }); + // }; return ( -
-
+
+
- + - - + + + + + +
{ render: (text: string, record: any) => { return ( - - + + ); }, diff --git a/threadpool/console-new/src/page/tenant/service.ts b/threadpool/console-new/src/page/tenant/service.ts index a8b16d3d..2fab1ef7 100644 --- a/threadpool/console-new/src/page/tenant/service.ts +++ b/threadpool/console-new/src/page/tenant/service.ts @@ -3,44 +3,77 @@ import request from '@/utils'; const fetchTenantList = async ( pageProps: { current: number; pageSize: number }, formData: { tencent: string | number } -) => { - // mock request - return { - total: 3, - list: [ - { - num: '1', - tenant: 'admin', - tenantName: 'admin', - creator: 'admin', - data: 'admin', - }, - ], - }; - const res = await request('/tenants', { +): Promise<{ total: number; list: Array }> => { + const res: any = await request('/hippo4j/v1/cs/tenant/query/page', { method: 'POST', - params: { + headers: { + Authorization: + 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiI3LGJhb3hpbnlpX2FkbWluIiwiaXNzIjoiYWRtaW4iLCJleHAiOjE2OTUzOTg4NDksImlhdCI6MTY5NDc5NDA0OSwicm9sIjoiUk9MRV9BRE1JTiJ9.syRDshKpd-xETsSdeMPRtk956f4BJkPt4utVsUl4smgH71Woj8SUq4w2RX1YtGTC4aTZRJYdKOfkTqwK0g_dHQ', + cookie: + 'Admin-Token=Bearer%20eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiI3LGJhb3hpbnlpX2FkbWluIiwiaXNzIjoiYWRtaW4iLCJleHAiOjE2OTUzOTg4NDksImlhdCI6MTY5NDc5NDA0OSwicm9sIjoiUk9MRV9BRE1JTiJ9.syRDshKpd-xETsSdeMPRtk956f4BJkPt4utVsUl4smgH71Woj8SUq4w2RX1YtGTC4aTZRJYdKOfkTqwK0g_dHQ; userName=baoxinyi_admin', + }, + body: { ...formData, - pageNum: pageProps.current, - pageSize: pageProps.pageSize, + current: pageProps.current, + size: pageProps.pageSize, + desc: true, }, }); - if (res && res.success) { return { - total: 3, - list: [ - { - num: '1', - tenant: 'admin', - tenantName: 'admin', - creator: 'admin', - data: 'admin', - }, - ], + total: res.data.total, + list: res.data.records, }; } - throw new Error(res.msg || '接口异常'); + throw new Error(res.msg || '服务器开小差啦~'); +}; + +const fetchAddTenant = async (id: string) => { + const res = await request('/hippo4j/v1/cs/tenant/save', { + method: 'POST', + params: { id }, + }); + + if (res && res.success) { + return res; + } + throw new Error(res.msg || '服务器开小差啦~'); +}; + +const fetchDeleteTenant = async (id: string) => { + const res = await request('/tenants', { + method: 'POST', + params: { id }, + }); + + if (res && res.success) { + return res; + } + throw new Error(res.msg || '服务器开小差啦~'); +}; + +const fetchUpdateTenant = async (id: string) => { + const res = await request('hippo4j/v1/cs/tenant/update', { + method: 'POST', + params: { id }, + }); + + if (res && res.success) { + return res; + } + throw new Error(res.msg || '服务器开小差啦~'); +}; + +const fetchTenantDetail = async (id: string) => { + const res = await request('/tenants', { + method: 'POST', + params: { id }, + }); + + if (res && res.success) { + return res; + } + throw new Error(res.msg || '服务器开小差啦~'); }; -export { fetchTenantList }; +export { fetchTenantList, fetchAddTenant, fetchDeleteTenant, fetchUpdateTenant, fetchTenantDetail }; diff --git a/threadpool/console-new/src/page/user/index.module.less b/threadpool/console-new/src/page/user/index.module.less new file mode 100644 index 00000000..5f59dc72 --- /dev/null +++ b/threadpool/console-new/src/page/user/index.module.less @@ -0,0 +1,5 @@ +.tenant_wrapper { + .opreate_btn { + padding: 0px; + } +} \ No newline at end of file diff --git a/threadpool/console-new/src/page/user/index.tsx b/threadpool/console-new/src/page/user/index.tsx new file mode 100644 index 00000000..fb2504fd --- /dev/null +++ b/threadpool/console-new/src/page/user/index.tsx @@ -0,0 +1,120 @@ +import { useAntdTable } from 'ahooks'; +import { Button, Form, Input, Row, Space, Table, Col } from 'antd'; +import { SearchOutlined, EditOutlined } from '@ant-design/icons'; +import React, { useState } from 'react'; +import { fetchUserList } from './service'; +import { useUrlSet } from '@/hooks/useUrlSet'; +import style from './index.module.less'; + +const baseColumns = [ + { + title: '序号', + dataIndex: 'index', + }, + { + title: '用户名', + dataIndex: 'userName', + }, + { + title: '角色', + dataIndex: 'role', + }, + { + title: '创建时间', + dataIndex: 'gmtCreate', + }, + { + title: '修改时间', + dataIndex: 'gmtModified', + }, +]; + +const Tenant: React.FC = () => { + const [editVisible, setEditVisible] = useState(false); + const [type, setType] = useState('add'); + const [form] = Form.useForm(); + const { setUrl } = useUrlSet({ form }); + const { tableProps, search } = useAntdTable(fetchUserList, { form }); + // const {run: delete} = useRequest(fetchDeleteTenant, { manual: true }); + const actions = (type: string, item?: any) => { + switch (type) { + case 'add': + setEditVisible(true); + break; + case 'edit': + setEditVisible(true); + break; + case 'delete': + // handleDelete(); + break; + default: + break; + } + }; + const handleSearch = () => { + setUrl(); + search.submit(); + }; + // const handleDelete = (item: any) => { + // Modal.confirm({ + // title: `此操作将删除${item.tenantName}, 是否继续?`, + // onOk: () => { + // search.submit(); + // }, + // }); + // }; + + return ( +
+
+ +
+ + + + + + + + + + + + + + + + +
{ + return ( + + + + + ); + }, + }, + ]} + /> + + ); +}; + +export default Tenant; diff --git a/threadpool/console-new/src/page/user/router.tsx b/threadpool/console-new/src/page/user/router.tsx new file mode 100644 index 00000000..a84862be --- /dev/null +++ b/threadpool/console-new/src/page/user/router.tsx @@ -0,0 +1,8 @@ +import { lazy } from 'react'; +import { IRouterList } from '@/typings'; + +const UserManage = lazy(() => import('./index')); + +const routerList: IRouterList[] = [{ path: '/user', component: () => }]; + +export default routerList; diff --git a/threadpool/console-new/src/page/user/service.ts b/threadpool/console-new/src/page/user/service.ts new file mode 100644 index 00000000..51e68bff --- /dev/null +++ b/threadpool/console-new/src/page/user/service.ts @@ -0,0 +1,78 @@ +import request from '@/utils'; + +const fetchUserList = async ( + pageProps: { current: number; pageSize: number }, + formData: { tencent: string | number } +): Promise<{ total: number; list: Array }> => { + const res: any = await request('/hippo4j/v1/cs/auth/users/page', { + method: 'POST', + headers: { + Authorization: + 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiI3LGJhb3hpbnlpX2FkbWluIiwiaXNzIjoiYWRtaW4iLCJleHAiOjE2OTUzOTg4NDksImlhdCI6MTY5NDc5NDA0OSwicm9sIjoiUk9MRV9BRE1JTiJ9.syRDshKpd-xETsSdeMPRtk956f4BJkPt4utVsUl4smgH71Woj8SUq4w2RX1YtGTC4aTZRJYdKOfkTqwK0g_dHQ', + cookie: + 'Admin-Token=Bearer%20eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiI3LGJhb3hpbnlpX2FkbWluIiwiaXNzIjoiYWRtaW4iLCJleHAiOjE2OTUzOTg4NDksImlhdCI6MTY5NDc5NDA0OSwicm9sIjoiUk9MRV9BRE1JTiJ9.syRDshKpd-xETsSdeMPRtk956f4BJkPt4utVsUl4smgH71Woj8SUq4w2RX1YtGTC4aTZRJYdKOfkTqwK0g_dHQ; userName=baoxinyi_admin', + }, + body: { + ...formData, + current: pageProps.current, + size: pageProps.pageSize, + }, + }); + if (res && res.success) { + return { + total: res.data.total, + list: res.data.records.map((item: any, index: number) => ({ index: index + 1, ...item })), + }; + } + throw new Error(res.msg || '服务器开小差啦~'); +}; + +const fetchAddTenant = async (id: string) => { + const res = await request('/hippo4j/v1/cs/tenant/save', { + method: 'POST', + params: { id }, + }); + + if (res && res.success) { + return res; + } + throw new Error(res.msg || '服务器开小差啦~'); +}; + +const fetchDeleteTenant = async (id: string) => { + const res = await request('/tenants', { + method: 'POST', + params: { id }, + }); + + if (res && res.success) { + return res; + } + throw new Error(res.msg || '服务器开小差啦~'); +}; + +const fetchUpdateTenant = async (id: string) => { + const res = await request('hippo4j/v1/cs/tenant/update', { + method: 'POST', + params: { id }, + }); + + if (res && res.success) { + return res; + } + throw new Error(res.msg || '服务器开小差啦~'); +}; + +const fetchTenantDetail = async (id: string) => { + const res = await request('/tenants', { + method: 'POST', + params: { id }, + }); + + if (res && res.success) { + return res; + } + throw new Error(res.msg || '服务器开小差啦~'); +}; + +export { fetchUserList, fetchAddTenant, fetchDeleteTenant, fetchUpdateTenant, fetchTenantDetail }; diff --git a/threadpool/console-new/src/route/index.tsx b/threadpool/console-new/src/route/index.tsx index 8f0f3c93..7a2d8897 100644 --- a/threadpool/console-new/src/route/index.tsx +++ b/threadpool/console-new/src/route/index.tsx @@ -3,6 +3,9 @@ import homeRouter from '@/page/home/router'; import aboutRouter from '@/page/about/router'; import ThreadPoolRouter from '@/page/thread-pool/router'; import tenantRouter from '@/page/tenant/router'; +// import itemRouter from '@/page/item/router'; +// import userRouter from '@/page/user/router'; +// import logRouter from '@/page/log/router'; const routerList: IRouterList[] = [...homeRouter, ...aboutRouter, ...tenantRouter, ...ThreadPoolRouter]; export default routerList; diff --git a/threadpool/console-new/src/utils/common/index.ts b/threadpool/console-new/src/utils/common/index.ts index 8085a28c..2fd348e0 100644 --- a/threadpool/console-new/src/utils/common/index.ts +++ b/threadpool/console-new/src/utils/common/index.ts @@ -1,3 +1,5 @@ +import _ from 'lodash'; + // is plain object const isPlainObject = (obj: { [key: string]: any }): boolean => { let proto, Ctor; @@ -8,4 +10,31 @@ const isPlainObject = (obj: { [key: string]: any }): boolean => { return typeof Ctor === 'function' && Ctor === Object; // insure is new by Object or {} }; -export { isPlainObject }; +/** + * @description 忽略 object 中 value 为空的元素 + * @param obj + * @returns + */ +const filterEmptyField = (obj: { [key: string]: any }) => { + return _.omitBy(obj, isEmpty); +}; + +/** + * @description 判断基本类型是否为空 + * @param value + * @returns + */ +const isNilValue = (value: any) => { + return value === undefined || value === '' || value === null || Number.isNaN(value); +}; + +/** + * @description 判断对值「基本类型/对象」是否为空 + * @param value + * @returns + */ +const isEmpty = (value: any) => { + return typeof value === 'object' ? _.isEmpty(value) : isNilValue(value); +}; + +export { isPlainObject, isEmpty, filterEmptyField }; diff --git a/threadpool/console-new/src/utils/request/index.ts b/threadpool/console-new/src/utils/request/index.ts index 22a2a2c6..9d9a0f13 100644 --- a/threadpool/console-new/src/utils/request/index.ts +++ b/threadpool/console-new/src/utils/request/index.ts @@ -32,7 +32,7 @@ type Response = { code?: string | number; }; -let baseURL = 'http://127.0.0.1:9999'; +let baseURL = 'http://console.hippo4j.cn'; const inital: RequestOptions = { method: 'GET', @@ -104,6 +104,7 @@ function request(url: string, config: RequestOptions): Promise> { method = method.toUpperCase(); responseType = responseType.toUpperCase(); config = { + ...config, method, credentials, responseType, @@ -113,6 +114,7 @@ function request(url: string, config: RequestOptions): Promise> { } else { config.body = null; } + return fetch(url, config as any).then(function onfulfilled(response) { let { status, statusText } = response; if (status >= 200 && status < 400) { diff --git a/yarn.lock b/yarn.lock deleted file mode 100644 index 2b771a7a..00000000 --- a/yarn.lock +++ /dev/null @@ -1,76 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -"@babel/runtime@^7.21.0": - version "7.22.15" - resolved "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.22.15.tgz#38f46494ccf6cf020bd4eed7124b425e83e523b8" - integrity sha512-T0O+aa+4w0u06iNmapipJXMV4HoUir03hpx3/YqXXhu9xim3w+dVphjFWl1OH8NbZHw5Lbm9k45drDkgq2VNNA== - dependencies: - regenerator-runtime "^0.14.0" - -"@types/js-cookie@^2.x.x": - version "2.2.7" - resolved "https://registry.npmmirror.com/@types/js-cookie/-/js-cookie-2.2.7.tgz#226a9e31680835a6188e887f3988e60c04d3f6a3" - integrity sha512-aLkWa0C0vO5b4Sr798E26QgOkss68Un0bLjs7u9qxzPT5CG+8DuNTffWES58YzJs3hrVAOs1wonycqEBqNJubA== - -ahooks-v3-count@^1.0.0: - version "1.0.0" - resolved "https://registry.npmmirror.com/ahooks-v3-count/-/ahooks-v3-count-1.0.0.tgz#ddeb392e009ad6e748905b3cbf63a9fd8262ca80" - integrity sha512-V7uUvAwnimu6eh/PED4mCDjE7tokeZQLKlxg9lCTMPhN+NjsSbtdacByVlR1oluXQzD3MOw55wylDmQo4+S9ZQ== - -ahooks@^3.7.8: - version "3.7.8" - resolved "https://registry.npmmirror.com/ahooks/-/ahooks-3.7.8.tgz#3fa3c491cd153e884a32b0c4192fc72cf84c4332" - integrity sha512-e/NMlQWoCjaUtncNFIZk3FG1ImSkV/JhScQSkTqnftakRwdfZWSw6zzoWSG9OMYqPNs2MguDYBUFFC6THelWXA== - dependencies: - "@babel/runtime" "^7.21.0" - "@types/js-cookie" "^2.x.x" - ahooks-v3-count "^1.0.0" - dayjs "^1.9.1" - intersection-observer "^0.12.0" - js-cookie "^2.x.x" - lodash "^4.17.21" - resize-observer-polyfill "^1.5.1" - screenfull "^5.0.0" - tslib "^2.4.1" - -dayjs@^1.9.1: - version "1.11.9" - resolved "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.9.tgz#9ca491933fadd0a60a2c19f6c237c03517d71d1a" - integrity sha512-QvzAURSbQ0pKdIye2txOzNaHmxtUBXerpY0FJsFXUMKbIZeFm5ht1LS/jFsrncjnmtv8HsG0W2g6c0zUjZWmpA== - -intersection-observer@^0.12.0: - version "0.12.2" - resolved "https://registry.npmmirror.com/intersection-observer/-/intersection-observer-0.12.2.tgz#4a45349cc0cd91916682b1f44c28d7ec737dc375" - integrity sha512-7m1vEcPCxXYI8HqnL8CKI6siDyD+eIWSwgB3DZA+ZTogxk9I4CDnj4wilt9x/+/QbHI4YG5YZNmC6458/e9Ktg== - -js-cookie@^2.x.x: - version "2.2.1" - resolved "https://registry.npmmirror.com/js-cookie/-/js-cookie-2.2.1.tgz#69e106dc5d5806894562902aa5baec3744e9b2b8" - integrity sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ== - -lodash@^4.17.21: - version "4.17.21" - resolved "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" - integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== - -regenerator-runtime@^0.14.0: - version "0.14.0" - resolved "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz#5e19d68eb12d486f797e15a3c6a918f7cec5eb45" - integrity sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA== - -resize-observer-polyfill@^1.5.1: - version "1.5.1" - resolved "https://registry.npmmirror.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464" - integrity sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg== - -screenfull@^5.0.0: - version "5.2.0" - resolved "https://registry.npmmirror.com/screenfull/-/screenfull-5.2.0.tgz#6533d524d30621fc1283b9692146f3f13a93d1ba" - integrity sha512-9BakfsO2aUQN2K9Fdbj87RJIEZ82Q9IGim7FqM5OsebfoFC6ZHXgDq/KvniuLTPdeM8wY2o6Dj3WQ7KeQCj3cA== - -tslib@^2.4.1: - version "2.6.2" - resolved "https://registry.npmmirror.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae" - integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q== From d645c49450ca3daec8eea5be8e5f9921116d42ac Mon Sep 17 00:00:00 2001 From: bobowiki <69181829+bobowiki@users.noreply.github.com> Date: Wed, 20 Sep 2023 12:30:06 +0800 Subject: [PATCH 2/2] Feat login page (#1473) * feat: login * feat: recommmit remove node-module --------- Co-authored-by: yikai --- node_modules/.yarn-integrity | 12 ++ threadpool/console-new/.eslintrc.js | 2 + threadpool/console-new/.prettierignore | 3 +- threadpool/console-new/craco.config.js | 20 +-- threadpool/console-new/package.json | 2 + threadpool/console-new/src/App.tsx | 6 +- .../src/components/header/index.module.less | 2 +- .../src/components/header/index.tsx | 33 ++-- .../components/layout-com/index.module.less | 6 +- .../src/components/layout-com/index.tsx | 31 ++-- .../src/components/theme-com/index.tsx | 4 +- .../console-new/src/config/i18n/index.ts | 2 +- threadpool/console-new/src/context/index.tsx | 31 ++-- threadpool/console-new/src/hooks/index.ts | 1 - .../console-new/src/hooks/useThemeMode.ts | 14 -- .../console-new/src/page/home/index.tsx | 7 - .../src/page/login/index.module.less | 37 +++++ .../console-new/src/page/login/index.tsx | 141 +++++++++++++++++- .../console-new/src/page/login/router.ts | 6 + .../console-new/src/page/login/service.ts | 13 ++ threadpool/console-new/src/react-app-env.d.ts | 1 + threadpool/console-new/src/route/index.tsx | 3 +- threadpool/console-new/src/typings/index.ts | 17 +++ .../console-new/src/utils/common/index.ts | 44 +++++- .../console-new/src/utils/request/index.ts | 5 +- threadpool/console-new/yarn.lock | 26 +++- 26 files changed, 369 insertions(+), 100 deletions(-) create mode 100644 node_modules/.yarn-integrity delete mode 100644 threadpool/console-new/src/hooks/useThemeMode.ts create mode 100644 threadpool/console-new/src/page/login/index.module.less create mode 100644 threadpool/console-new/src/page/login/router.ts create mode 100644 threadpool/console-new/src/page/login/service.ts diff --git a/node_modules/.yarn-integrity b/node_modules/.yarn-integrity new file mode 100644 index 00000000..42a6cb98 --- /dev/null +++ b/node_modules/.yarn-integrity @@ -0,0 +1,12 @@ +{ + "systemParams": "darwin-arm64-93", + "modulesFolders": [ + "node_modules" + ], + "flags": [], + "linkedModules": [], + "topLevelPatterns": [], + "lockfileEntries": {}, + "files": [], + "artifacts": {} +} \ No newline at end of file diff --git a/threadpool/console-new/.eslintrc.js b/threadpool/console-new/.eslintrc.js index 38eb2edf..92c71e51 100644 --- a/threadpool/console-new/.eslintrc.js +++ b/threadpool/console-new/.eslintrc.js @@ -26,5 +26,7 @@ module.exports = { '@typescript-eslint/no-explicit-any': 0, '@typescript-eslint/no-non-null-assertion': 0, '@typescript-eslint/no-var-requires': 0, + 'import/no-anonymous-default-export': 0, + 'jsx-a11y/anchor-is-valid': 0, }, }; diff --git a/threadpool/console-new/.prettierignore b/threadpool/console-new/.prettierignore index 353efa09..473d9c18 100644 --- a/threadpool/console-new/.prettierignore +++ b/threadpool/console-new/.prettierignore @@ -1,3 +1,4 @@ /.git node_modules -build \ No newline at end of file +build +src/lib/* \ No newline at end of file diff --git a/threadpool/console-new/craco.config.js b/threadpool/console-new/craco.config.js index f94068ae..f06ec6af 100644 --- a/threadpool/console-new/craco.config.js +++ b/threadpool/console-new/craco.config.js @@ -1,4 +1,3 @@ -// craco.config.js const CracoLessPlugin = require('craco-less'); const lessModuleRegex = /\.module\.less$/; const path = require('path'); @@ -33,25 +32,28 @@ module.exports = { }, }, ], - // style: { - // modules: { - // localIdentName: '[local]_[hash:base64:5]', // 可以自定义你的类名生成规则 - // }, - // }, webpack: { alias: { '@': resolve('src'), }, }, devServer: { - port: 3001, + port: 3000, headers: { 'Access-Control-Allow-Origin': '*', }, proxy: { - '/hippo4j': { - target: 'http://console.hippo4j.cn', + '/hippo4j/v1/cs': { + target: 'http://console.hippo4j.cn:6691/hippo4j/v1/cs', + pathRewrite: { '^/hippo4j/v1/cs': '' }, changeOrigin: true, + secure: false, + onProxyReq: proxyReq => { + console.log(`Proxying request to: ${proxyReq.path}`); + }, + onProxyRes: proxyRes => { + console.log(`Received response with status: ${proxyRes.statusCode}`); + }, }, }, }, diff --git a/threadpool/console-new/package.json b/threadpool/console-new/package.json index 43c1e5f8..cef35383 100644 --- a/threadpool/console-new/package.json +++ b/threadpool/console-new/package.json @@ -11,6 +11,7 @@ "@testing-library/user-event": "^13.5.0", "ahooks": "^3.7.8", "antd": "^5.4.7", + "classnames": "^2.3.2", "dayjs": "^1.11.9", "i18next": "^23.5.1", "i18next-browser-languagedetector": "^7.1.0", @@ -69,6 +70,7 @@ "eslint-plugin-jsx-a11y": "^6.7.1", "eslint-plugin-prettier": "^4.2.1", "eslint-plugin-react": "^7.32.2", + "http-proxy-middleware": "^2.0.6", "husky": "^8.0.0", "less-loader": "^11.1.0", "lint-staged": "^13.2.2", diff --git a/threadpool/console-new/src/App.tsx b/threadpool/console-new/src/App.tsx index c983e76a..3dba11da 100644 --- a/threadpool/console-new/src/App.tsx +++ b/threadpool/console-new/src/App.tsx @@ -1,9 +1,6 @@ -// import { Suspense } from 'react'; import LayoutCom from './components/layout-com'; import { Routes, Route, Link } from 'react-router-dom'; - import routeList from './route'; -import Login from '@/page/login'; import { MenuProps } from 'antd'; import { useTran } from './hooks'; import { STR_MAP } from './config/i18n/locales/constants'; @@ -24,9 +21,8 @@ const App = () => { ]; return ( - + - {routeList.map(item => ( ))} diff --git a/threadpool/console-new/src/components/header/index.module.less b/threadpool/console-new/src/components/header/index.module.less index e4cf7f42..07c850e0 100644 --- a/threadpool/console-new/src/components/header/index.module.less +++ b/threadpool/console-new/src/components/header/index.module.less @@ -5,7 +5,7 @@ .logo { display: flex; flex-direction: column; - width: 200px; + width: 50px; img { flex: 1; object-fit: contain; diff --git a/threadpool/console-new/src/components/header/index.tsx b/threadpool/console-new/src/components/header/index.tsx index dddb3252..fdea38d5 100644 --- a/threadpool/console-new/src/components/header/index.tsx +++ b/threadpool/console-new/src/components/header/index.tsx @@ -2,13 +2,16 @@ import React, { useContext } from 'react'; import style from './index.module.less'; import { UserOutlined } from '@ant-design/icons'; import { Avatar, Button, Col, Dropdown, Row, Switch } from 'antd'; -import { useThemeMode } from '@/hooks'; import { MyContext } from '@/context'; import IconFont from '@/components/icon'; +import { LANG_NAME, MyStoreValues, THEME_NAME } from '@/typings'; +import { useNavigate } from 'react-router-dom'; const HeaderChild = () => { - const { isDark, setIsDark } = useThemeMode(); - const { lang, setLang } = useContext(MyContext); + const { lang, themeName, setLang, setThemeName } = useContext(MyContext); + const navigate = useNavigate(); + // console.log('setLang:::', setLang); + // setLang && setLang(LANG_NAME.EN); const items = [ { @@ -29,18 +32,14 @@ const HeaderChild = () => { }, { key: '3', - label: ( - - 登出 - - ), + label: navigate('/login')}>登出, }, ]; return (
-
- +
navigate('/home')}> +
@@ -51,18 +50,10 @@ const HeaderChild = () => {
- {/* { - lang === 'zh' ? setLang('en') : setLang('zh'); - }} - style={{ cursor: 'pointer' }} - > - {lang === 'zh' ? 'zh' : 'en'} - */} + + + + + + + ), + [form, loading, handleLogin] + ); + + const items: TabsProps['items'] = [ + { + key: TABS_KEY.LOGIN, + label: '账号密码登陆', + children: formNode, + }, + { + key: TABS_KEY.PHONE, + label: '手机号登陆', + children: formNode, + }, + ]; + return ( +
+
+
+
+ +
+ 全球最好用的线程池管理工具 +
+ +
+
+
+ ); }; export default Login; diff --git a/threadpool/console-new/src/page/login/router.ts b/threadpool/console-new/src/page/login/router.ts new file mode 100644 index 00000000..143acaaf --- /dev/null +++ b/threadpool/console-new/src/page/login/router.ts @@ -0,0 +1,6 @@ +import { IRouterList } from '@/typings'; +import Login from '.'; + +const routerList: IRouterList[] = [{ path: '/login', component: Login }]; + +export default routerList; diff --git a/threadpool/console-new/src/page/login/service.ts b/threadpool/console-new/src/page/login/service.ts new file mode 100644 index 00000000..0e9c9426 --- /dev/null +++ b/threadpool/console-new/src/page/login/service.ts @@ -0,0 +1,13 @@ +import request from '@/utils'; + +const fetchLogin = async (body: any) => { + const { data } = await request<{ data: string; roles: string[] }>('/hippo4j/v1/cs/auth/login', { + method: 'POST', + body, + }); + return data; +}; + +export default { + fetchLogin, +}; diff --git a/threadpool/console-new/src/react-app-env.d.ts b/threadpool/console-new/src/react-app-env.d.ts index bb172a71..6ab136be 100644 --- a/threadpool/console-new/src/react-app-env.d.ts +++ b/threadpool/console-new/src/react-app-env.d.ts @@ -1,2 +1,3 @@ /// declare module '*.less'; +declare module 'crypto-browserify' {} diff --git a/threadpool/console-new/src/route/index.tsx b/threadpool/console-new/src/route/index.tsx index 7a2d8897..54d9f987 100644 --- a/threadpool/console-new/src/route/index.tsx +++ b/threadpool/console-new/src/route/index.tsx @@ -3,9 +3,10 @@ import homeRouter from '@/page/home/router'; import aboutRouter from '@/page/about/router'; import ThreadPoolRouter from '@/page/thread-pool/router'; import tenantRouter from '@/page/tenant/router'; +import LoginRouter from '@/page/login/router'; // import itemRouter from '@/page/item/router'; // import userRouter from '@/page/user/router'; // import logRouter from '@/page/log/router'; -const routerList: IRouterList[] = [...homeRouter, ...aboutRouter, ...tenantRouter, ...ThreadPoolRouter]; +const routerList: IRouterList[] = [...homeRouter, ...aboutRouter, ...tenantRouter, ...ThreadPoolRouter, ...LoginRouter]; export default routerList; diff --git a/threadpool/console-new/src/typings/index.ts b/threadpool/console-new/src/typings/index.ts index 6c1f658c..d7610df2 100644 --- a/threadpool/console-new/src/typings/index.ts +++ b/threadpool/console-new/src/typings/index.ts @@ -1,6 +1,16 @@ import { ReactNode } from 'react'; import React from 'react'; +export enum THEME_NAME { + DEFAULT = 'default', + DARK = 'dark', +} + +export enum LANG_NAME { + ZH = 'zh', + EN = 'en', +} + export type IRouterList = { path: string; component: () => React.JSX.Element; @@ -11,3 +21,10 @@ export type IMenuList = { key: string; icon?: ReactNode; }; + +export interface MyStoreValues { + themeName?: THEME_NAME | undefined; + lang?: LANG_NAME; + setThemeName?: (name: THEME_NAME) => void; + setLang?: (lang: LANG_NAME) => void; +} diff --git a/threadpool/console-new/src/utils/common/index.ts b/threadpool/console-new/src/utils/common/index.ts index 2fd348e0..8ae65582 100644 --- a/threadpool/console-new/src/utils/common/index.ts +++ b/threadpool/console-new/src/utils/common/index.ts @@ -1,6 +1,44 @@ +import Cookie from 'js-cookie'; +// import { Buffer } from 'buffer'; +// import crypto from 'crypto-browserify'; + +// /** +// * generate key +// * @returns {string} key(length 16) +// */ +// export function genKey() { +// let chars = 'abcdefghijklmnopqrstuvwxyz0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ'; +// let result = ''; +// for (let i = 16; i > 0; --i) result += chars[Math.floor(Math.random() * chars.length)]; +// return result; +// } +// /** +// * encode message +// * @param msg message +// * @param key key +// * @returns {string} encoded message +// */ +// export function encrypt(msg: string, key: string) { +// try { +// let pwd = Buffer.from(key); +// let iv = (crypto as any).randomBytes(12); +// let cipher = (crypto as any).createCipheriv('aes-128-gcm', pwd, iv); +// let enc = cipher.update(msg, 'utf8', 'base64'); +// enc += cipher.final('base64'); +// let tags = cipher.getAuthTag(); +// enc = Buffer.from(enc, 'base64') as any; +// let totalLength = iv.length + enc.length + tags.length; +// let bufferMsg = Buffer.concat([iv, enc as any, tags], totalLength); +// return bufferMsg.toString('base64'); +// } catch (e) { +// console.log('Encrypt is error', e); +// return null; +// } +// } import _ from 'lodash'; // is plain object +const TokenKey = 'Admin-Token'; const isPlainObject = (obj: { [key: string]: any }): boolean => { let proto, Ctor; if (!obj || typeof obj !== 'object') return false; @@ -10,6 +48,10 @@ const isPlainObject = (obj: { [key: string]: any }): boolean => { return typeof Ctor === 'function' && Ctor === Object; // insure is new by Object or {} }; +const setToken = (token: string) => { + Cookie.set(TokenKey, token); +}; + /** * @description 忽略 object 中 value 为空的元素 * @param obj @@ -37,4 +79,4 @@ const isEmpty = (value: any) => { return typeof value === 'object' ? _.isEmpty(value) : isNilValue(value); }; -export { isPlainObject, isEmpty, filterEmptyField }; +export { isPlainObject, isEmpty, filterEmptyField, setToken }; diff --git a/threadpool/console-new/src/utils/request/index.ts b/threadpool/console-new/src/utils/request/index.ts index 9d9a0f13..7a537a87 100644 --- a/threadpool/console-new/src/utils/request/index.ts +++ b/threadpool/console-new/src/utils/request/index.ts @@ -32,7 +32,7 @@ type Response = { code?: string | number; }; -let baseURL = 'http://console.hippo4j.cn'; +let baseURL = ''; const inital: RequestOptions = { method: 'GET', @@ -40,6 +40,8 @@ const inital: RequestOptions = { body: null, headers: { 'Content-Type': 'application/json', + Authorization: + 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiIxMCxiYW94aW55aV91c2VyIiwiaXNzIjoiYWRtaW4iLCJleHAiOjE2OTU3MzAwNzYsImlhdCI6MTY5NTEyNTI3Niwicm9sIjoiUk9MRV9VU0VSIn0.4cWyhllP7u-aoRAIHs3nMggsgl4-LUCVBas8WE0FJYIe-YNS0wGf1_0RJq3TUGw00KmSaSRPKdoPgRTFqEphZA', }, credentials: true, responseType: 'JSON', @@ -117,6 +119,7 @@ function request(url: string, config: RequestOptions): Promise> { return fetch(url, config as any).then(function onfulfilled(response) { let { status, statusText } = response; + console.log('status:::', status, response); if (status >= 200 && status < 400) { let result; switch (responseType) { diff --git a/threadpool/console-new/yarn.lock b/threadpool/console-new/yarn.lock index dcdbc5fb..9bebc0fc 100644 --- a/threadpool/console-new/yarn.lock +++ b/threadpool/console-new/yarn.lock @@ -1196,7 +1196,7 @@ resolved "https://registry.npmmirror.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310" integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA== -"@babel/runtime@^7.10.1", "@babel/runtime@^7.10.4", "@babel/runtime@^7.11.1", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.16.3", "@babel/runtime@^7.16.7", "@babel/runtime@^7.18.0", "@babel/runtime@^7.18.3", "@babel/runtime@^7.19.4", "@babel/runtime@^7.20.0", "@babel/runtime@^7.20.7", "@babel/runtime@^7.21.0", "@babel/runtime@^7.22.5", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2": +"@babel/runtime@^7.10.1", "@babel/runtime@^7.10.4", "@babel/runtime@^7.11.1", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.16.3", "@babel/runtime@^7.16.7", "@babel/runtime@^7.18.0", "@babel/runtime@^7.18.3", "@babel/runtime@^7.19.4", "@babel/runtime@^7.20.0", "@babel/runtime@^7.20.7", "@babel/runtime@^7.21.0", "@babel/runtime@^7.22.15", "@babel/runtime@^7.22.5", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2": version "7.22.15" resolved "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.22.15.tgz#38f46494ccf6cf020bd4eed7124b425e83e523b8" integrity sha512-T0O+aa+4w0u06iNmapipJXMV4HoUir03hpx3/YqXXhu9xim3w+dVphjFWl1OH8NbZHw5Lbm9k45drDkgq2VNNA== @@ -2060,6 +2060,14 @@ "@svgr/plugin-svgo" "^5.5.0" loader-utils "^2.0.0" +"@tanem/react-nprogress@^5.0.51": + version "5.0.51" + resolved "https://registry.npmmirror.com/@tanem/react-nprogress/-/react-nprogress-5.0.51.tgz#6cbdb52a0a27ecf845f61d809ef6fd45b063662d" + integrity sha512-YxNUCpznuBVA+PhjEzFmxaa1czXgU+5Ojchw5JBK7DQS6SHIgNudpFohWpNBWMu2KWByGJ2OLH2OwbM/XyP18Q== + dependencies: + "@babel/runtime" "^7.22.15" + hoist-non-react-statics "^3.3.2" + "@testing-library/dom@^8.5.0": version "8.20.1" resolved "https://registry.npmmirror.com/@testing-library/dom/-/dom-8.20.1.tgz#2e52a32e46fc88369eef7eef634ac2a192decd9f" @@ -2332,6 +2340,11 @@ resolved "https://registry.npmmirror.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ== +"@types/lodash@^4.14.198": + version "4.14.198" + resolved "https://registry.npmmirror.com/@types/lodash/-/lodash-4.14.198.tgz#4d27465257011aedc741a809f1269941fa2c5d4c" + integrity sha512-trNJ/vtMZYMLhfN45uLq4ShQSw0/S7xCTLLVM+WM1rmFpba/VS42jVUgaO3w/NOLiWR/09lnYk0yMaA/atdIsg== + "@types/mime@*": version "3.0.1" resolved "https://registry.npmmirror.com/@types/mime/-/mime-3.0.1.tgz#5f8f2bca0a5863cb69bc0b0acd88c96cb1d4ae10" @@ -5598,6 +5611,13 @@ he@^1.2.0: resolved "https://registry.npmmirror.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== +hoist-non-react-statics@^3.3.2: + version "3.3.2" + resolved "https://registry.npmmirror.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45" + integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw== + dependencies: + react-is "^16.7.0" + hoopy@^0.1.4: version "0.1.4" resolved "https://registry.npmmirror.com/hoopy/-/hoopy-0.1.4.tgz#609207d661100033a9a9402ad3dea677381c1b1d" @@ -5711,7 +5731,7 @@ http-proxy-agent@^4.0.1: agent-base "6" debug "4" -http-proxy-middleware@^2.0.3: +http-proxy-middleware@^2.0.3, http-proxy-middleware@^2.0.6: version "2.0.6" resolved "https://registry.npmmirror.com/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz#e1a4dd6979572c7ab5a4e4b55095d1f32a74963f" integrity sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw== @@ -8996,7 +9016,7 @@ react-i18next@^13.2.2: "@babel/runtime" "^7.22.5" html-parse-stringify "^3.0.1" -react-is@^16.12.0, react-is@^16.13.1: +react-is@^16.12.0, react-is@^16.13.1, react-is@^16.7.0: version "16.13.1" resolved "https://registry.npmmirror.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==