Browse Source

👣 编写基础模块客户端

master
wangxiang 3 years ago
parent
commit
8aa44984ef
  1. 7
      kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/OauthClientDetailsController.java
  2. 62
      kicc-ui/src/views/system/client/ClientDrawer.vue
  3. 102
      kicc-ui/src/views/system/client/ClientModal.vue
  4. 101
      kicc-ui/src/views/system/client/client.data.ts
  5. 139
      kicc-ui/src/views/system/client/index.vue
  6. 2
      kicc-ui/src/views/system/tenant/TenantModal.vue
  7. 4
      kicc-ui/src/views/system/tenant/tenant.data.ts

7
kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/OauthClientDetailsController.java

@ -1,5 +1,6 @@
package com.cloud.kicc.system.controller; package com.cloud.kicc.system.controller;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
@ -35,7 +36,7 @@ public class OauthClientDetailsController {
private LambdaQueryWrapper<OauthClientDetails> getQueryWrapper(OauthClientDetails oauthClientDetails) { private LambdaQueryWrapper<OauthClientDetails> getQueryWrapper(OauthClientDetails oauthClientDetails) {
return new LambdaQueryWrapper<OauthClientDetails>() return new LambdaQueryWrapper<OauthClientDetails>()
.like(StrUtil.isNotBlank(oauthClientDetails.getClientId()), OauthClientDetails::getClientId, oauthClientDetails.getClientId()) .eq(StrUtil.isNotBlank(oauthClientDetails.getClientId()), OauthClientDetails::getClientId, oauthClientDetails.getClientId())
.between(StrUtil.isNotBlank(oauthClientDetails.getBeginTime()) && StrUtil.isNotBlank(oauthClientDetails.getEndTime()), .between(StrUtil.isNotBlank(oauthClientDetails.getBeginTime()) && StrUtil.isNotBlank(oauthClientDetails.getEndTime()),
OauthClientDetails::getCreateTime, oauthClientDetails.getBeginTime(), oauthClientDetails.getEndTime()); OauthClientDetails::getCreateTime, oauthClientDetails.getBeginTime(), oauthClientDetails.getEndTime());
} }
@ -71,6 +72,10 @@ public class OauthClientDetailsController {
@DeleteMapping("/remove/{ids:[\\w,]+}") @DeleteMapping("/remove/{ids:[\\w,]+}")
@PreAuthorize("@pms.hasPermission('client_del')") @PreAuthorize("@pms.hasPermission('client_del')")
public R<Boolean> removeById(@PathVariable String[] ids) { public R<Boolean> removeById(@PathVariable String[] ids) {
// todo: 防止客户端删除,暂时处理手段
if(ArrayUtil.containsAny(ids, "kicc", "kicc_lock", "test")){
return R.error("不允许删除核心客户端");
}
oauthClientDetailsService.removeClientDetailsByIds(Arrays.asList(ids)); oauthClientDetailsService.removeClientDetailsByIds(Arrays.asList(ids));
return R.ok(); return R.ok();
} }

62
kicc-ui/src/views/system/client/ClientDrawer.vue

@ -1,62 +0,0 @@
<template>
<BasicDrawer
v-bind="$attrs"
showFooter
:title="getTitle"
width="500px"
@register="registerDrawer"
@ok="handleSubmit"
>
<BasicForm @register="registerForm"/>
</BasicDrawer>
</template>
<script lang="ts" setup>
import { ref, computed, unref } from 'vue';
import { BasicForm, useForm } from '/@/components/Form/index';
import { formSchema } from './client.data';
import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
import { TreeItem } from '/@/components/Tree';
//import { getMenuList } from '/@/api/system/role';
//import { set } from '/@/api/platform/system/controller/client';
const emit = defineEmits(['success', 'register']);
const isUpdate = ref(true);
const treeData = ref<TreeItem[]>([]);
const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({
labelWidth: 100,
schemas: formSchema,
showActionButtonGroup: false,
baseColProps: { lg: 12, md: 24 },
});
const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
resetFields();
setDrawerProps({ confirmLoading: false });
// setFieldsValuetreeDataTreekey not exist
if (unref(treeData).length === 0) {
//treeData.value = (await getMenuList()) as any as TreeItem[];
}
isUpdate.value = !!data?.isUpdate;
if (unref(isUpdate)) {
setFieldsValue({
...data.record,
});
}
});
const getTitle = computed(() => (!unref(isUpdate) ? '新增客户端' : '编辑客户端'));
async function handleSubmit() {
try {
const values = await validate();
setDrawerProps({ confirmLoading: true });
//await set(values);
closeDrawer();
emit('success');
} finally {
setDrawerProps({ confirmLoading: false });
}
}
</script>

102
kicc-ui/src/views/system/client/ClientModal.vue

@ -0,0 +1,102 @@
<template>
<BasicModal v-bind="$attrs"
width="720px"
@register="registerModal"
@ok="handleSubmit"
>
<BasicForm @register="registerForm"/>
</BasicModal>
</template>
<script lang="ts" setup>
/**
* 提供模板规范代码参考,请尽量保证编写代码风格跟模板规范代码一致
* 采用vben-动态表格表单封装组件编写,采用 setup 写法
* Copyright © 2020-2022 <a href="http://www.entfrm.com/">entfrm</a> All rights reserved.
* author entfrm开发团队-王翔
*/
import { ref, unref } from 'vue';
import { BasicForm, useForm } from '/@/components/Form/index';
import { formSchema } from './client.data';
import { addClient, editClient, getClient, listClient } from '/@/api/platform/system/controller/client';
import { BasicModal, ModalProps, useModalInner } from '/@/components/Modal';
import { isEmpty } from '/@/utils/is';
/** 通用变量统一声明区域 */
const tag = ref<Nullable<string>>('');
/** https://v3.cn.vuejs.org/api/options-data.html#emits */
const emit = defineEmits(['success', 'register']);
const [registerForm, { resetFields, setFieldsValue, validate, clearValidate, updateSchema }] = useForm({
labelWidth: 100,
schemas: formSchema,
showActionButtonGroup: false,
baseColProps: { span: 24 }
});
const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data: WindowInnerData = { _tag: '' }) => {
//
await resetFields();
await clearValidate();
//
tag.value = data._tag;
const clientId = data.record?.clientId;
const props: Partial<ModalProps> = { confirmLoading: false };
await updateSchema({
field: 'clientId',
componentProps: {
disabled: unref(tag) != 'add'
},
rules: [
{
required: true,
whitespace: true,
message: '请输入客户端编码'
},
{
validator: async (rule, value) => {
if (!isEmpty(value)) {
const result = await listClient({ clientId: value });
const list = result.data?.filter(item => item.clientId != clientId);
if(list?.length > 0) return Promise.reject('该客户端编码已存在');
}
return Promise.resolve();
},
validateTrigger: 'blur'
}]
});
// tag
switch (unref(tag)) {
case 'add':
props.title = '新增客户端';
break;
case 'edit':
props.title = '编辑客户端';
await setFieldsValue(await getClient(clientId));
break;
}
// :
setModalProps(props);
});
/** 处理弹出框提交 */
async function handleSubmit() {
try {
//
const formData = await validate();
//
setModalProps({ confirmLoading: true });
// tag
switch (unref(tag)) {
case 'add':
await addClient(formData);
break;
case 'edit':
await editClient(formData);
break;
}
//
closeModal();
emit('success');
} finally {
setModalProps({ confirmLoading: false });
}
}
</script>

101
kicc-ui/src/views/system/client/client.data.ts

@ -1,115 +1,164 @@
/**
* @program: kicc-ui
* @description:
* @author: entfrm开发团队-
* @create: 2022/4/21
*/
import { BasicColumn } from '/@/components/Table'; import { BasicColumn } from '/@/components/Table';
import { FormSchema } from '/@/components/Table'; import { FormSchema } from '/@/components/Table';
/** 表格列配置 */
export const columns: BasicColumn[] = [ export const columns: BasicColumn[] = [
{ {
title: '客户端Id', title: '客户端Id',
dataIndex: 'clientId', dataIndex: 'clientId',
width: 100, width: 100
}, },
{ {
title: '客户端密钥', title: '客户端密钥',
dataIndex: 'clientSecret', dataIndex: 'clientSecret',
width: 100, width: 100
}, },
{ {
title: '授权类型', title: '授权类型',
dataIndex: 'authorizedGrantTypes', dataIndex: 'authorizedGrantTypes',
width: 130, width: 130
}, },
{ {
title: '授权范围', title: '授权范围',
dataIndex: 'scope', dataIndex: 'scope',
width: 90, width: 90
}, },
{ {
title: '令牌过期秒数', title: '令牌过期秒数',
dataIndex: 'accessTokenValidity', dataIndex: 'accessTokenValidity',
width: 130, width: 130
}, },
{ {
title: '令牌过期秒数', title: '令牌过期秒数',
dataIndex: 'refreshTokenValidity', dataIndex: 'refreshTokenValidity',
width: 130, width: 130
}, },
{ {
title: '创建时间', title: '创建时间',
dataIndex: 'createTime', dataIndex: 'createTime',
width: 100, width: 100
}, }
]; ];
/** 搜索表单配置 */
export const searchFormSchema: FormSchema[] = [ export const searchFormSchema: FormSchema[] = [
{ {
field: 'keyword', field: 'clientId',
label: '关键字', label: '客户端编码',
component: 'Input', component: 'Input',
componentProps: { componentProps: {
placeholder: '请输入客户端Id/编码', placeholder: '请输入客户端编码',
}, },
colProps: { span: 8 }, colProps: { span: 8 },
}, },
{ {
field: 'startDate', field: 'dateRange',
label: '起始时间', label: '创建时间',
component: 'DatePicker', component: 'RangePicker',
colProps: { span: 8 }, componentProps: {
}, style: { width:'100%' },
{ valueFormat: 'YYYY-MM-DD',
field: 'endDate', placeholder: ['开始日期','结束日期']
label: '截止时间',
component: 'DatePicker',
colProps: { span: 8 },
}, },
colProps: { span: 8 }
}
]; ];
/** 表单配置 */
export const formSchema: FormSchema[] = [ export const formSchema: FormSchema[] = [
{ {
field: 'id', field: 'id',
label: 'ID', label: 'ID',
component: 'Input', component: 'Input',
show: false, show: false
}, },
{ {
field: 'clientId', field: 'clientId',
label: '客户端Id', label: '客户端Id',
component: 'Input', component: 'Input',
required: true,
colProps: {
span: 12
}
}, },
{ {
field: 'clientSecret', field: 'clientSecret',
label: '客户端密钥', label: '客户端密钥',
component: 'Input', component: 'Input',
required: true,
colProps: {
span: 12
}
}, },
{ {
field: 'authorizedGrantTypes', field: 'authorizedGrantTypes',
label: '授权类型', label: '授权类型',
component: 'InputTextArea', component: 'InputTextArea',
colProps: { lg: 24, md: 24 }, required:true,
componentProps: {
rows: 3
},
colProps: {
span: 24
}
}, },
{ {
field: 'scope', field: 'scope',
label: '授权范围', label: '授权范围',
component: 'Input', component: 'Input',
required:true,
colProps: {
span: 12
}
}, },
{ {
field: 'accessTokenValidity', field: 'accessTokenValidity',
label: '过期秒数', label: '过期秒数',
component: 'Input', component: 'InputNumber',
componentProps: {
style: { width:'100%' },
min: 0
},
colProps: {
span: 12
}
}, },
{ {
field: 'refreshTokenValidity', field: 'refreshTokenValidity',
label: '刷新秒数', label: '刷新秒数',
component: 'Input', component: 'InputNumber',
componentProps: {
style: { width:'100%' },
min: 0
},
colProps: {
span: 12
}
}, },
{ {
field: 'webServerRedirectUri', field: 'webServerRedirectUri',
label: '回调地址', label: '回调地址',
component: 'Input', component: 'Input',
colProps: {
span: 12
}
}, },
{ {
field: 'additionalInformation', field: 'additionalInformation',
label: '附加说明', label: '附加说明',
component: 'InputTextArea', component: 'InputTextArea',
colProps: { lg: 24, md: 24 }, componentProps: {
rows: 6
}, },
colProps: {
span: 24
}
}
]; ];

139
kicc-ui/src/views/system/client/index.vue

@ -1,89 +1,140 @@
<template> <template>
<PageWrapper dense <div>
contentFullHeight <BasicTable @register="registerTable"
fixedHeight @selection-change="handleSelectionChange"
contentClass="flex"
> >
<BasicTable @register="registerTable">
<template #toolbar> <template #toolbar>
<a-button type="primary" @click="handleCreate">新增客户端</a-button> <a-button v-auth="['client_add']"
type="primary"
@click="handleAdd()"
>新增客户端</a-button>
<a-button v-auth="['client_edit']"
type="primary"
:disabled="state.single"
@click="handleEdit()"
>修改客户端</a-button>
<a-button v-auth="['client_del']"
type="primary"
:disabled="state.multiple"
@click="handleDel()"
>删除客户端</a-button>
</template> </template>
<template #action="{ record }"> <template #action="{ record }">
<TableAction <TableAction :actions="[
:actions="[
{ {
icon: 'clarity:note-edit-line', label: '编辑',
onClick: handleEdit.bind(null, record), icon: 'fa6-regular:pen-to-square',
auth: ['client_edit'],
onClick: handleEdit.bind(null, record)
}, },
{ {
label: '删除',
icon: 'ant-design:delete-outlined', icon: 'ant-design:delete-outlined',
color: 'error', color: 'error',
popConfirm: { auth: ['client_del'],
title: '是否确认删除', onClick: handleDel.bind(null, record)
confirm: handleDelete.bind(null, record), }]"
},
},
]"
/> />
</template> </template>
</BasicTable> </BasicTable>
<ClientDrawer @register="registerDrawer" @success="handleSuccess"/> <!--弹出窗体区域-->
</PageWrapper> <ClientModal @register="registerModal" @success="handleRefreshTable"/>
</div>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
// /**
import { PageWrapper } from '/@/components/Page'; * 提供模板规范代码参考,请尽量保证编写代码风格跟模板规范代码一致
* 采用vben-动态表格表单封装组件编写,采用 setup 写法
* Copyright © 2020-2022 <a href="http://www.entfrm.com/">entfrm</a> All rights reserved.
* author entfrm开发团队-王翔
*/
import { reactive, toRaw } from 'vue';
import { BasicTable, useTable, TableAction } from '/@/components/Table'; import { BasicTable, useTable, TableAction } from '/@/components/Table';
// import { listClient, delClient } from '/@/api/platform/system/controller/client';
import { useModal } from '/@/components/Modal';
import ClientModal from './ClientModal.vue';
import { columns, searchFormSchema } from './client.data'; import { columns, searchFormSchema } from './client.data';
// API
//import { page, del } from '/@/api/platform/system/controller/client';
import { useDrawer } from '/@/components/Drawer';
import ClientDrawer from './ClientDrawer.vue';
import { useMessage } from '/@/hooks/web/useMessage'; import { useMessage } from '/@/hooks/web/useMessage';
const { createMessage } = useMessage(); /** 类型规范统一声明定义区域 */
const [registerDrawer, { openDrawer }] = useDrawer(); interface TableState {
const [registerTable, { reload }] = useTable({ single: boolean;
multiple: boolean;
}
/** 通用变量统一声明区域 */
const state = reactive<TableState>({
//
single: true,
//
multiple: true
});
const { createConfirm, createMessage } = useMessage();
const [registerModal, { openModal }] = useModal();
const [registerTable, { reload, clearSelectedRowKeys, getSelectRowKeys }] = useTable({
title: '客户端列表', title: '客户端列表',
//api: page, api: listClient,
rowKey: 'clientId',
columns, columns,
formConfig: { formConfig: {
labelWidth: 120, labelWidth: 120,
schemas: searchFormSchema, schemas: searchFormSchema,
autoSubmitOnEnter: true,
fieldMapToTime: [['dateRange', ['beginTime', 'endTime'], 'YYYY-MM-DD']]
}, },
rowSelection: { type: 'checkbox' },
useSearchForm: true, useSearchForm: true,
showTableSetting: true, showTableSetting: true,
bordered: true, bordered: true,
clickToRowSelect: false,
showIndexColumn: false, showIndexColumn: false,
actionColumn: { actionColumn: {
width: 80, width: 220,
title: '操作', title: '操作',
dataIndex: 'action', dataIndex: 'action',
slots: { customRender: 'action' }, slots: { customRender: 'action' },
fixed: undefined, fixed: false
}, },
handleSearchInfoFn: () => clearSelectedRowKeys()
}); });
function handleCreate() { /** 处理多选框选中数据 */
openDrawer(true, { function handleSelectionChange(selection?: Recordable) {
isUpdate: false, const rowSelection = toRaw(selection?.keys) || [];
}); state.single = rowSelection.length != 1;
state.multiple = !rowSelection.length;
} }
function handleEdit(record: Recordable) {
openDrawer(true, { /** 新增按钮操作,行内新增与工具栏局域新增通用 */
record, function handleAdd() {
isUpdate: true, openModal(true,{ _tag: 'add' });
}); }
/** 编辑按钮操作,行内编辑 */
function handleEdit(record?: Recordable) {
record = record || { clientId: getSelectRowKeys() };
openModal(true, { _tag: 'edit', record });
} }
async function handleDelete(record: Recordable) { /** 删除按钮操作,行内删除 */
//await del({ ids: record.id }); async function handleDel(record?: Recordable) {
const clientIds = record?.clientId || getSelectRowKeys();
createConfirm({
iconType: 'warning',
title: '警告',
content: `是否确认删除客户端编号为${clientIds}客户端吗?`,
onOk: async () => {
await delClient(clientIds);
createMessage.success('删除成功!'); createMessage.success('删除成功!');
handleSuccess(); handleRefreshTable();
}
});
} }
function handleSuccess() { /** 处理表格刷新 */
function handleRefreshTable() {
clearSelectedRowKeys();
reload(); reload();
} }
</script> </script>

2
kicc-ui/src/views/system/tenant/TenantModal.vue

@ -19,7 +19,7 @@
import { formSchema } from './tenant.data'; import { formSchema } from './tenant.data';
import {addTenant, editTenant, getTenant, listTenant} from '/@/api/platform/system/controller/tenant'; import {addTenant, editTenant, getTenant, listTenant} from '/@/api/platform/system/controller/tenant';
import { BasicModal, ModalProps, useModalInner } from '/@/components/Modal'; import { BasicModal, ModalProps, useModalInner } from '/@/components/Modal';
import {isEmpty} from "/@/utils/is"; import {isEmpty} from '/@/utils/is';
/** 通用变量统一声明区域 */ /** 通用变量统一声明区域 */
const tag = ref<Nullable<string>>(''); const tag = ref<Nullable<string>>('');

4
kicc-ui/src/views/system/tenant/tenant.data.ts

@ -9,8 +9,6 @@ import { BasicColumn } from '/@/components/Table';
import { FormSchema } from '/@/components/Table'; import { FormSchema } from '/@/components/Table';
import { h } from 'vue'; import { h } from 'vue';
import { Tag } from 'ant-design-vue'; import { Tag } from 'ant-design-vue';
import { listTenant } from '/@/api/platform/system/controller/tenant';
import { isEmpty } from '/@/utils/is';
/** 表格列配置 */ /** 表格列配置 */
export const columns: BasicColumn[] = [ export const columns: BasicColumn[] = [
@ -88,7 +86,7 @@ export const searchFormSchema: FormSchema[] = [
} }
]; ];
/** 用户表单配置 */ /** 表单配置 */
export const formSchema: FormSchema[] = [ export const formSchema: FormSchema[] = [
{ {
field: 'id', field: 'id',

Loading…
Cancel
Save