@jiangood/springboot-admin-starter 0.0.3 → 0.0.4

package/src/pages/{api/doc.jsx → system/api/ApiDoc.jsx}

@@ -1,10 +1,10 @@
 import React from "react";
-import {HttpUtil, PageUtil} from "../../framework";
-import {Button, Descriptions, Table, Typography} from "antd";
+import {FieldRemoteSelect, HttpUtils, PageUtils} from "../../../framework";
+import {Button, Descriptions, message, Space, Table, Typography} from "antd";
 
 const {Title, Paragraph, Text, Link} = Typography;
 
-export default class extends React.Component {
+export  class ApiDoc extends React.Component {
 
     state = {
         url: null,
@@ -29,45 +29,50 @@ export default class extends React.Component {
     ]
 
     componentDidMount() {
-        const id = PageUtil.currentParams().id
-
-        HttpUtil.get('admin/apiAccount/docInfo', {id}).then(rs => {
-            this.setState(rs)
-        })
+        const id = PageUtils.currentParams().id
+        this.loadData(id);
 
         let url = window.location.protocol + '//' + window.location.host
         this.setState({url})
     }
 
-    print() {
-        window.print();
+    async loadData(id) {
+        const hide = message.loading('加载中...', 0)
+        const rs = await HttpUtils.get('admin/apiAccount/docInfo', {id})
+        this.setState(rs)
+        hide()
     }
 
+
+
     render() {
         const {apiList} = this.state
-        return <div style={{padding: 24}}>
-            <Button type='primary' onClick={this.print} className='no-print'>打印文档</Button>
+        return <div>
+
+            <Space>
+                <FieldRemoteSelect url='admin/apiAccount/accountOptions' placeholder='请选择账号' onChange={v=>this.loadData(v)}/>
+                <Button type='primary' >导出PDF</Button>
+            </Space>
             <div id='doc-content'>
-                <Title level={1}>开发接口说明文档</Title>
+                <Title level={1}>接口说明文档</Title>
 
-                <Title level={2}>接口数据</Title>
+                <Title level={2}>一、基本信息</Title>
                 <Paragraph>
                     <Descriptions column={1} bordered size='small'>
                         <Descriptions.Item label='请求地址'>
-                            {this.state.url}/api/gateway/路径
+                            {this.state.url}/api/gateway/接口名称
                         </Descriptions.Item>
                         <Descriptions.Item label='appId'>
-                            {this.state.appId}
+                            私发
                         </Descriptions.Item>
                         <Descriptions.Item label='appSecret'>
-                            ****** (私发给相应)
+                            私发
                         </Descriptions.Item>
                     </Descriptions>
 
                 </Paragraph>
 
 
-                <Title level={2}>1 接口说明</Title>
                 <Paragraph>
                     <Typography.Text>
                         <div>
@@ -78,57 +83,61 @@ export default class extends React.Component {
                 </Paragraph>
 
 
-                <Title level={4}>请求公共请求头说明</Title>
+                <Title level={4}>请求头</Title>
 
-                <Table columns={this.columns} bordered dataSource={[
+                <Table rowKey='name' columns={this.columns} bordered dataSource={[
                     {name: 'appId', type: 'String', required: true, desc: '账号标识,appId'},
                     {name: 'timestamp', type: 'String', required: true, desc: '时间戳，当前UNIX时间戳，13位，精确到毫秒'},
                     {name: 'sign', type: 'String', required: true, desc: '数据签名，appId + appSecret + timestamp拼接后，进行md5摘要，值为32位小写'},
                 ]} size='small' pagination={false}>
                 </Table>
 
-                <Title level={4}>返回公共参数说明 </Title>
-                <Table columns={this.columns} bordered dataSource={[
-                    {name: 'code', type: 'int', required: true, desc: '返回码,成功返回0，其他表示操作错误'},
-                    {name: 'message', type: 'String', required: false, desc: '结果提示信息'},
-                    {name: 'data', type: 'String', required: false, desc: '返回数据JSON'}
-                ]} size='small' pagination={false}>
-                </Table>
 
 
+                <Typography.Title level={4}>公共错误码</Typography.Title>
+                <Table  columns={[
+                    {dataIndex:'code',title:'错误码'},
+                    {dataIndex:'message', title:'错误描述'}
+                ]} rowKey='code' bordered dataSource={this.state.errorList} size='small' pagination={false}>
+                </Table>
 
-                <Typography.Title level={2}>2 接口列表</Typography.Title>
+                <Typography.Title level={2}>二、接口列表</Typography.Title>
                 {apiList.map((api, index) => {
-                    return <>
-                        <Typography.Title level={3}>{'2.' + (index + 1) + " " + api.name} </Typography.Title>
+                    return <div key={index}>
+                        <Typography.Title level={3}>{ api.name} </Typography.Title>
+                        <p>接口名称： {api.action}</p>
                         <p>功能描述：{api.desc}</p>
-                        <p>请求路径： /api/gateway/{api.action}</p>
 
 
-                        <Title level={5}>请求参数说明</Title>
-                        <Table columns={this.columns} bordered dataSource={api.parameterList}
+                        <Title level={5}>请求参数</Title>
+                        <Table rowKey='name' columns={this.columns} bordered dataSource={api.parameterList}
                                size='small' pagination={false}>
                         </Table>
 
-                        <Title level={5}>返回参数说明</Title>
-                        <Typography.Text>
-                            返回对象：{api.returnType}
-                        </Typography.Text>
+                        <Title level={5}>响应数据</Title>
+                        <Table columns={this.columns} bordered
+                               rowKey={'name'}
+                               dataSource={[
+                            {name: 'code', type: 'int', required: true, desc: '响应码，0表示成功'},
+                            {name: 'message', type: 'String', required: false, desc: '结果提示信息'},
+                            {name: 'data', type: api.returnType, required: false, desc: '返回数据'}
+                        ]} size='small' pagination={false}>
+                        </Table>
+                        {api.returnList != null && api.returnList.length > 0 && <>
+                            <Title level={5}>data 对象 {api.returnType} 说明</Title>
 
-                        {api.returnList != null && api.returnList.length > 0 &&
-                            <Table columns={this.columns} bordered
+                            <Table columns={this.columns}
+                                   rowKey={'name'}
+                                   bordered
                                    dataSource={api.returnList} size='small' pagination={false}>
-                            </Table>}
+                            </Table>
+                        </>
+                        }
 
-                    </>
+                    </div>
                 })}
 
-                <Typography.Title level={2}>3 公共错误码</Typography.Title>
-                <Table columns={[
-                    {dataIndex:'code',title:'错误码'},
-                    {dataIndex:'message', title:'错误描述'}
-                ]} rowKey='code' bordered dataSource={this.state.errorList} size='small' pagination={false}>
-                </Table>
+
             </div>
         </div>
     }

package/src/pages/system/api/index.jsx

@@ -0,0 +1,268 @@
+import {PlusOutlined} from '@ant-design/icons'
+import {Button, Form, Input, Modal, Popconfirm, Tabs} from 'antd'
+import React from 'react'
+import {
+    ButtonList,
+    FieldBoolean,
+    FieldDate, HttpUtils,
+    Page,
+    PageUtils,
+    ProTable,
+    StringUtils,
+    ViewPassword
+} from "../../../framework";
+import {ApiDoc} from "./ApiDoc";
+
+
+export default class extends React.Component {
+
+    state = {
+        formValues: {},
+        formOpen: false
+    }
+
+    formRef = React.createRef()
+    tableRef = React.createRef()
+
+    columns = [
+        {
+            title: '名称',
+            dataIndex: 'name',
+        },
+        {
+            title: 'appId',
+            dataIndex: 'appId',
+        },
+
+        {
+            title: 'appSecret',
+            dataIndex: 'appSecret',
+            render(v) {
+                return <ViewPassword value={v}></ViewPassword>;
+            }
+        },
+        {
+            title: '准入IP',
+            dataIndex: 'accessIp',
+        },
+        {
+            title: '有效期',
+            dataIndex: 'endTime',
+        },
+        {
+            title: '启用',
+            dataIndex: 'enable',
+            render(v) {
+                return v == null ? null : (v ? '是' : '否')
+            },
+        },
+        {
+            title: '操作',
+            dataIndex: 'option',
+            render: (_, record) => (
+                <ButtonList>
+                    <Button size='small' perm='api'
+                            onClick={() => PageUtils.open('/system/api/perm?accountId=' + record.id, '账户权限')}
+                            type='primary'>权限</Button>
+                    <Button size='small' perm='api' onClick={() => this.handleEdit(record)}>编辑</Button>
+                    <Popconfirm perm='api' title='是否确定删除接口访客' onConfirm={() => this.handleDelete(record)}>
+                        <Button size='small'>删除</Button>
+                    </Popconfirm>
+                </ButtonList>
+            ),
+        },
+    ]
+
+    handleAdd = () => {
+        this.setState({formOpen: true, formValues: {}})
+    }
+
+    handleEdit = record => {
+        this.setState({formOpen: true, formValues: record})
+    }
+
+
+    onFinish = values => {
+        HttpUtils.post('admin/apiAccount/save', values).then(rs => {
+            this.setState({formOpen: false})
+            this.tableRef.current.reload()
+        })
+    }
+
+
+    handleDelete = record => {
+        HttpUtils.get('admin/apiAccount/delete', {id: record.id}).then(rs => {
+            this.tableRef.current.reload()
+        })
+    }
+
+    randomAppSecret = () => {
+        const appSecret = StringUtils.random(32)
+        this.formRef.current.setFieldsValue({appSecret})
+    }
+
+    render() {
+        return <Page padding>
+            <Tabs items={[
+
+                {
+                    label: '接口列表',
+                    key: '2',
+                    children: <ProTable
+                        rowKey='action'
+                        columns={[
+                            {dataIndex: 'name', title: '名称'},
+                            {dataIndex: 'action', title: '动作'},
+                            {dataIndex: 'desc', title: '描述'},
+
+                        ]}
+                        request={(params,) => HttpUtils.get('admin/api/resource/page', params)}
+                    />
+                },
+
+                {
+                    label: '账号列表',
+                    key: '1',
+                    children: <ProTable
+                        actionRef={this.tableRef}
+                        toolBarRender={() => {
+                            return <ButtonList>
+                                <Button perm='api' type='primary' onClick={this.handleAdd}>
+                                    <PlusOutlined/> 新增
+                                </Button>
+                            </ButtonList>
+                        }}
+                        request={(params) => HttpUtils.get('admin/apiAccount/page', params)}
+                        columns={this.columns}
+                    />
+                }, {
+                    label: '接口文档',
+                    key: '3',
+                    children: <ApiDoc/>
+                },
+                {
+                    label: '访问记录',
+                    key: '4',
+                    children: <ProTable
+                        request={(params) => HttpUtils.get('admin/apiAccessLog/page', params)}
+                        columns={[
+
+                            {
+                                title: '接口名称',
+                                dataIndex: 'name',
+
+
+                            },
+
+                            {
+                                title: '接口',
+                                dataIndex: 'action',
+
+
+                            },
+
+                            {
+                                title: 'requestId',
+                                dataIndex: 'requestId',
+
+                            },
+
+                            {
+                                title: '请求数据',
+                                dataIndex: 'requestData',
+
+
+                            },
+
+                            {
+                                title: '响应数据',
+                                dataIndex: 'responseData',
+
+
+                            },
+
+                            {
+                                title: 'ip',
+                                dataIndex: 'ip',
+
+
+                            },
+
+                            {
+                                title: 'ipLocation',
+                                dataIndex: 'ipLocation',
+
+
+                            },
+
+                            {
+                                title: '执行时间',
+                                dataIndex: 'executionTime',
+
+
+                            },
+
+                            {
+                                title: '接口账户',
+                                dataIndex: 'accountName',
+
+
+                            },
+
+
+                        ]}
+                    />
+                },
+
+            ]}>
+
+            </Tabs>
+
+
+            <Modal title='接口访客'
+                   open={this.state.formOpen}
+                   onOk={() => this.formRef.current.submit()}
+                   onCancel={() => this.setState({formOpen: false})}
+                   destroyOnHidden
+                   maskClosable={false}
+            >
+
+                <Form ref={this.formRef} labelCol={{flex: '100px'}}
+                      initialValues={this.state.formValues}
+                      onFinish={this.onFinish}
+
+                >
+                    <Form.Item name='id' noStyle></Form.Item>
+
+                    <Form.Item label='名称' name='name' rules={[{required: true}]}>
+                        <Input/>
+                    </Form.Item>
+
+
+                    <Form.Item label='appId' name='appId'>
+                        <Input placeholder='多个用逗号分隔'/>
+                    </Form.Item>
+                    <Form.Item label='appSecret' name='appSecret' rules={[{required: true}, {len: 32}]}
+                               help={<Button size='small' type='link' onClick={this.randomAppSecret}>随机生成</Button>}
+                    >
+                        <Input/>
+                    </Form.Item>
+
+                    <Form.Item label='准入IP' name='accessIp'>
+                        <Input placeholder='多个用逗号分隔'/>
+                    </Form.Item>
+                    <Form.Item label='有效期' name='endTime' style={{marginTop: 32}}>
+                        <FieldDate type='YYYY-MM-DD'/>
+                    </Form.Item>
+                    <Form.Item label='启用' name='enable' rules={[{required: true}]}>
+                        <FieldBoolean/>
+                    </Form.Item>
+
+                </Form>
+            </Modal>
+        </Page>
+
+
+    }
+}
+

package/src/pages/system/api/perm.jsx

@@ -0,0 +1,69 @@
+import {message, Switch} from 'antd'
+import React from 'react'
+import {ArrUtils, HttpUtils, Page, PageUtils, ProTable} from "../../../framework";
+
+
+export default class extends React.Component {
+
+
+    constructor(props) {
+        super(props);
+        this.accountId = PageUtils.currentParams().accountId
+    }
+
+    state = {
+        perms: []
+    }
+
+    async componentDidMount() {
+        const rs = await HttpUtils.get('admin/apiAccount/get', {id: this.accountId})
+        this.setState({perms: rs.perms})
+    }
+
+    onChange = async (action, checked) => {
+        const hide = message.loading('保存中...', 0)
+        await HttpUtils.post('admin/apiAccount/grant', {accountId: this.accountId, action, checked});
+
+        const perms = this.state.perms
+        if (checked) {
+            ArrUtils.add(perms, action)
+        } else {
+            ArrUtils.remove(perms, action)
+        }
+        this.setState({perms})
+        hide();
+    }
+
+
+    render() {
+        return <Page>
+
+
+            <ProTable
+                rowKey='action'
+                columns={[
+                    {dataIndex: 'name', title: '名称'},
+                    {dataIndex: 'action', title: '动作'},
+                    {dataIndex: 'desc', title: '描述'},
+                    {
+                        dataIndex: 'option', title: '操作',
+                        render: (_, record) => {
+                            let action = record.action;
+                            return <Switch checked={this.state.perms.includes(action)}
+                                           onChange={(checked) => {
+                                               this.onChange(action, checked)
+
+                                           }}> </Switch>
+                        }
+                    }
+                ]}
+                request={(params,) => HttpUtils.get('admin/api/resource/page', params)}
+            />
+
+        </Page>
+
+
+    }
+}
+
+

package/src/pages/system/config/index.jsx

@@ -1,7 +1,7 @@
 import {Button, Card, Form, Modal, Table} from 'antd'
 import React from 'react'
 
-import {ButtonList, HttpUtil, ValueType} from '../../../framework'
+import {ButtonList, HttpUtils, ValueType} from '../../../framework'
 
 
 export default class extends React.Component {
@@ -65,7 +65,7 @@ export default class extends React.Component {
     }
 
     loadData() {
-        HttpUtil.get('admin/sysConfig/page').then(rs => {
+        HttpUtils.get('admin/sysConfig/page').then(rs => {
             this.setState({data: rs})
         })
     }
@@ -76,7 +76,7 @@ export default class extends React.Component {
 
 
     onFinish = values => {
-        HttpUtil.post('admin/sysConfig/save', values).then(rs => {
+        HttpUtils.post('admin/sysConfig/save', values).then(rs => {
             this.setState({formOpen: false})
             this.loadData()
         })

package/src/pages/system/dict/Dict.jsx

@@ -1,6 +1,5 @@
 import React from 'react'
-import {HttpUtil, ProTable} from "../../../framework";
-
+import {HttpUtils, ProTable} from "../../../framework";
 
 
 export default class extends React.Component {
@@ -40,7 +39,7 @@ export default class extends React.Component {
             <ProTable
                 actionRef={this.tableRef}
 
-                request={(params) => HttpUtil.pageData('admin/sysDict/page', params)}
+                request={(params) => HttpUtils.get('admin/sysDict/page', params)}
                 columns={this.columns}
                 rowKey='id'
 

package/src/pages/system/dict/DictItem.jsx

@@ -2,7 +2,7 @@ import {PlusOutlined} from '@ant-design/icons'
 import {Button, Col, Form, Input, InputNumber, Modal, Popconfirm, Row, Tag} from 'antd'
 import React from 'react'
 
-import {ButtonList, FieldRadioBoolean, HttpUtil, ProTable} from '../../../framework'
+import {ButtonList, FieldBoolean, HttpUtils, ProTable} from '../../../framework'
 
 
 export default class extends React.Component {
@@ -88,7 +88,7 @@ export default class extends React.Component {
 
     onFinish = values => {
         values.sysDict = {id: this.props.sysDictId}
-        HttpUtil.post('admin/sysDictItem/save', values).then(rs => {
+        HttpUtils.post('admin/sysDictItem/save', values).then(rs => {
             this.setState({formOpen: false})
             this.tableRef.current.reload()
         })
@@ -96,7 +96,7 @@ export default class extends React.Component {
 
 
     handleDelete = row => {
-        HttpUtil.get('admin/sysDictItem/delete', row).then(rs => {
+        HttpUtils.get('admin/sysDictItem/delete', row).then(rs => {
             this.tableRef.current.reload()
         })
     }
@@ -115,7 +115,7 @@ export default class extends React.Component {
                 }}
                 request={(params) => {
                     params.sysDictId = this.props.sysDictId
-                    return HttpUtil.pageData('admin/sysDictItem/page', params);
+                    return HttpUtils.get('admin/sysDictItem/page', params);
                 }}
                 columns={this.columns}
                 rowKey='id'
@@ -162,7 +162,7 @@ export default class extends React.Component {
                     </Row>
 
                     <Form.Item label='启用' name='enabled' rules={[{required: true}]}>
-                        <FieldRadioBoolean/>
+                       <FieldBoolean />
                     </Form.Item>
 
                 </Form>

package/src/pages/system/file/index.jsx

@@ -1,6 +1,14 @@
 import {Button, Form, Input, Modal, Popconfirm} from 'antd'
 import React from 'react'
-import {ButtonList, FieldDateRange, FieldDictSelect, FieldUploadFile, HttpUtil, ProTable, SysUtil} from "../../../framework";
+import {
+    ButtonList,
+    FieldDateRange,
+    FieldDictSelect,
+    FieldUploadFile,
+    HttpUtils,
+    ProTable,
+    SysUtils
+} from "../../../framework";
 import {CloudUploadOutlined} from "@ant-design/icons";
 
 
@@ -54,14 +62,14 @@ export default class extends React.Component {
             title: '预览',
             dataIndex: 'id',
             render(id,record){
-                const nodes = [  <a href={SysUtil.wrapServerUrl( 'sysFile/preview/' + record.id) } target='_blank'>预览</a>]
+                const nodes = [  <a href={'/admin/sysFile/preview/' + record.id } target='_blank'>预览</a>]
 
 
                 if(record.imageUrls?.length > 0){
                    for(let item of record.imageUrls){
                        let url = item.url;
                        let label = item.label;
-                       nodes.push(<a href={SysUtil.wrapServerUrl( url) } target='_blank' style={{marginLeft:8}} >{label}</a>)
+                       nodes.push(<a href={( url) } target='_blank' style={{marginLeft:8}} >{label}</a>)
                    }
                 }
 
@@ -85,7 +93,7 @@ export default class extends React.Component {
 
 
     handleDelete = row => {
-        HttpUtil.get('admin/sysFile/delete', row).then(rs => {
+        HttpUtils.get('admin/sysFile/delete', row).then(rs => {
             this.tableRef.current.reload()
         })
     }
@@ -103,7 +111,7 @@ export default class extends React.Component {
                     </Button>
                 }}
                 request={(params) => {
-                    return HttpUtil.pageData('admin/sysFile/page', params);
+                    return HttpUtils.get('admin/sysFile/page', params);
                 }}
 
                 columns={this.columns}