diff --git a/composables/useGroups.ts b/composables/useGroups.ts
new file mode 100644
index 0000000..0873d51
--- /dev/null
+++ b/composables/useGroups.ts
@@ -0,0 +1,56 @@
+const { $api } = useNuxtApp();
+export const useGroups = () => {
+  /**
+   * Get all groups
+   *
+   * @returns
+   */
+  const groupList = async () => {
+    return await $api.get('/groups');
+  };
+
+  /**
+   * get group info
+   * @param name
+   * @returns
+   */
+  const getGroupInfo = async (name: string) => {
+    return await $api.get(`/group/${encodeURIComponent(name)}`);
+  };
+
+  /**
+   * add group
+   * @param data
+   * @returns
+   */
+  const groupAdd = async (data: any) => {
+    return await $api.post('/groups', data);
+  };
+
+  /**
+   * delete group
+   * @param name
+   * @returns
+   */
+  const groupDelete = async (name: string) => {
+    return await $api.delete(`/group/${encodeURIComponent(name)}`, {});
+  };
+
+  /**
+   * update group
+   * @param name
+   * @param data
+   * @returns
+   */
+  const groupUpdate = async (name: string, data: any) => {
+    return await $api.put(`/group/${encodeURIComponent(name)}`, data);
+  };
+
+  return {
+    groupList,
+    getGroupInfo,
+    groupAdd,
+    groupDelete,
+    groupUpdate,
+  };
+};
diff --git a/composables/usePolicies.ts b/composables/usePolicies.ts
new file mode 100644
index 0000000..ccdf881
--- /dev/null
+++ b/composables/usePolicies.ts
@@ -0,0 +1,57 @@
+const { $api } = useNuxtApp();
+export const usePolicies = () => {
+  /**
+   * 获取策略列表
+   * @returns
+   */
+  const ListPolicies = async () => {
+    return await $api.get('/policies');
+  };
+
+  /**
+   * 添加策略
+   * @param data
+   * @returns
+   */
+  const addPolicy = async (data: any) => {
+    return await $api.post('/policies', data);
+  };
+
+  /**
+   * 获取策略详情
+   * @param policyName
+   * @returns
+   */
+  const getPolicyInfo = async (policyName: string) => {
+    return await $api.get(`/policy/${encodeURIComponent(policyName)}`);
+  };
+
+  /**
+   * 获取策略用户列表
+   * @param policyName
+   * @returns
+   */
+  const listUsersForPolicy = async (policyName: string) => {
+    return await $api.get(`/policy/${encodeURIComponent(policyName)}/users`);
+  };
+
+  /**
+   * 获取策略组列表
+   * @param policyName
+   * @returns
+   */
+  const listGroupsForPolicy = async (policyName: string) => {
+    return await $api.get(`/policy/${encodeURIComponent(policyName)}/groups`);
+  };
+
+  /**
+   * 删除策略
+   * @param policyName
+   * @returns
+   */
+  const deletePolicy = async (policyName: string) => {
+    return await $api.delete(`/policy/${encodeURIComponent(policyName)}`, {});
+  };
+
+  return { ListPolicies, getPolicyInfo, addPolicy, deletePolicy, listUsersForPolicy, listGroupsForPolicy };
+};
diff --git a/composables/useUsers.ts b/composables/useUsers.ts
new file mode 100644
index 0000000..9eaf900
--- /dev/null
+++ b/composables/useUsers.ts
@@ -0,0 +1,7 @@
+const { $api } = useNuxtApp();
+export const useUsers = () => {
+  const ListUsers = async () => {
+    return await $api.get('/users');
+  };
+  return { ListUsers };
+};
diff --git a/pages/users/components/newGroup.vue b/pages/users/components/newGroup.vue
index be5ef0a..a24c02c 100644
--- a/pages/users/components/newGroup.vue
+++ b/pages/users/components/newGroup.vue
@@ -7,6 +7,8 @@ interface Props {
 const { visible } = defineProps<Props>();
 const message = useMessage();
 const { $api } = useNuxtApp();
+const group = useGroups();
+const user = useUsers();
 
 const emit = defineEmits<Emits>();
 const defaultFormModal = {
@@ -20,7 +22,20 @@ interface Emits {
   (e: 'search'): void;
 }
 
+// 用户列表
 const users = ref([]);
+const getUserList = async () => {
+  // const res = await user.ListUsers();
+  const res = await $api.get('/users');
+
+  users.value = res.users.map((item: any) => {
+    return {
+      label: item.accessKey,
+      value: item.accessKey,
+    };
+  });
+};
+getUserList();
 
 const modalVisible = computed({
   get() {
@@ -35,10 +50,13 @@ function closeModal(visible = false) {
 }
 
 async function submitForm() {
+  if (formModel.value.group.trim() === '') {
+    message.error('请输入用户组名称');
+    return;
+  }
   try {
-    const res = await $api.post('/group', {
-      body: formModel.value,
-    });
+    const res = await group.groupAdd({ ...formModel.value });
+
     message.success('添加成功');
     closeModal();
     emit('search');
@@ -61,7 +79,7 @@ async function submitForm() {
     }">
     <n-form label-placement="left" :model="formModel" label-align="right" :label-width="130">
       <n-grid :cols="24" :x-gap="18">
-        <n-form-item-grid-item :span="24" label="名称" path="group">
+        <n-form-item-grid-item :span="24" label="名称" path="group" required>
           <n-input v-model:value="formModel.group" />
         </n-form-item-grid-item>
         <n-form-item-grid-item :span="24" label="用户" path="members">
diff --git a/pages/users/index.vue b/pages/users/index.vue
index 0809e5a..af08fc7 100644
--- a/pages/users/index.vue
+++ b/pages/users/index.vue
@@ -6,7 +6,7 @@
       </template>
     </page-header>
     <page-content>
-      <n-tabs type="card" :size="size">
+      <n-tabs type="card">
         <n-tab-pane name="users" tab="用户">
           <userTab></userTab>
         </n-tab-pane>
diff --git a/pages/users/tabs/groupTab.vue b/pages/users/tabs/groupTab.vue
index dff10e6..6b51341 100644
--- a/pages/users/tabs/groupTab.vue
+++ b/pages/users/tabs/groupTab.vue
@@ -31,18 +31,35 @@
         </n-flex>
       </n-form>
     </n-card>
-    <n-data-table ref="tableRef" :columns="columns" :data="listData" :pagination="false" :bordered="false" max-height="calc(100vh - 320px)" :row-key="rowKey" @update:checked-row-keys="handleCheck" />
+    <n-data-table
+      ref="tableRef"
+      :columns="columns"
+      :data="listData"
+      :pagination="false"
+      :bordered="false"
+      max-height="calc(100vh - 320px)"
+      :row-key="rowKey"
+      @update:checked-row-keys="handleCheck" />
+    <newGroup v-model:visible="newItemVisible" @search="getDataList" ref="newItemRef"></newGroup>
   </div>
 </template>
 
 <script setup lang="ts">
-import { type DataTableColumns, type DataTableInst, type DataTableRowKey, NButton, NPopconfirm, NSpace } from 'naive-ui';
+import {
+  type DataTableColumns,
+  type DataTableInst,
+  type DataTableRowKey,
+  NButton,
+  NPopconfirm,
+  NSpace,
+} from 'naive-ui';
 import { Icon } from '#components';
-// import { ChangePassword, EditItem, NewItem } from './components';
+import { newGroup } from '../components';
 
 const { $api } = useNuxtApp();
 const dialog = useDialog();
 const message = useMessage();
+const group = useGroups();
 
 const searchForm = reactive({
   name: '',
@@ -66,7 +83,7 @@ const columns: DataTableColumns<RowData> = [
   {
     title: '操作',
     key: 'actions',
-    width: 180,
+    width: 320,
     render: (row: any) => {
       return h(
         NSpace,
@@ -84,7 +101,20 @@ const columns: DataTableColumns<RowData> = [
                 onClick: () => openEditItem(row),
               },
               {
-                default: () => '编辑',
+                default: () => '分配策略',
+                icon: () => h(Icon, { name: 'ri:edit-2-line' }),
+              }
+            ),
+            h(
+              NButton,
+              {
+                type: 'info',
+                size: 'small',
+                secondary: true,
+                onClick: () => openEditItem(row),
+              },
+              {
+                default: () => '成员管理',
                 icon: () => h(Icon, { name: 'ri:edit-2-line' }),
               }
             ),
@@ -127,6 +157,7 @@ onMounted(() => {
 // 获取数据
 const getDataList = async () => {
   try {
+    // const res = await group.groupList();
     const res = await $api.get('/groups');
     listData.value =
       res.groups.map((item: string) => {
@@ -159,6 +190,7 @@ function openEditItem(row: any) {
 /** ***********************************删除 */
 async function deleteItem(row: any) {
   try {
+    // const res = await group.groupDelete(row.name);
     const res = await $api.delete(`/group/${encodeURIComponent(row.name)}`, {});
     message.success('删除成功');
     getDataList();
@@ -189,7 +221,8 @@ function deleteByList() {
         return;
       }
       checkedKeys.value.forEach(async (element: any) => {
-        const res = await $api.delete(`/group/${encodeURIComponent(element)}`, {});
+        // const res = await group.groupDelete(element);
+        const res = $api.delete(`/group/${encodeURIComponent(element)}`, {});
       });
 
       getDataList();
diff --git a/pages/users/tabs/userTab.vue b/pages/users/tabs/userTab.vue
index 3f1452b..7379c20 100644
--- a/pages/users/tabs/userTab.vue
+++ b/pages/users/tabs/userTab.vue
@@ -31,24 +31,40 @@
         </n-flex>
       </n-form>
     </n-card>
-    <n-data-table ref="tableRef" :columns="columns" :data="listData" :pagination="false" :bordered="false" max-height="calc(100vh - 320px)" :row-key="rowKey" @update:checked-row-keys="handleCheck" />
+    <n-data-table
+      ref="tableRef"
+      :columns="columns"
+      :data="listData"
+      :pagination="false"
+      :bordered="false"
+      max-height="calc(100vh - 320px)"
+      :row-key="rowKey"
+      @update:checked-row-keys="handleCheck" />
   </div>
 </template>
 
 <script setup lang="ts">
-import { type DataTableColumns, type DataTableInst, type DataTableRowKey, NButton, NPopconfirm, NSpace } from 'naive-ui';
+import {
+  type DataTableColumns,
+  type DataTableInst,
+  type DataTableRowKey,
+  NButton,
+  NPopconfirm,
+  NSpace,
+} from 'naive-ui';
 import { Icon } from '#components';
 // import { ChangePassword, EditItem, NewItem } from './components';
 
 const { $api } = useNuxtApp();
+const user = useUsers();
 const dialog = useDialog();
 const message = useMessage();
 
 const searchForm = reactive({
-  name: '',
+  accessKey: '',
 });
 interface RowData {
-  name: string;
+  accessKey: string;
 }
 
 const columns: DataTableColumns<RowData> = [
@@ -58,7 +74,7 @@ const columns: DataTableColumns<RowData> = [
   {
     title: '名称',
     align: 'left',
-    key: 'name',
+    key: 'accessKey',
   },
   {
     title: '操作',
@@ -113,7 +129,7 @@ const tableRef = ref<DataTableInst>();
 function filterName(value: string) {
   tableRef.value &&
     tableRef.value.filter({
-      name: [value],
+      accessKey: [value],
     });
 }
 const listData = ref<any[]>([]);
@@ -124,8 +140,9 @@ onMounted(() => {
 // 获取数据
 const getDataList = async () => {
   try {
-    const res = await $api.get('service-accounts');
-    listData.value = res || [];
+    const res = await $api.get('/users');
+    // const res = await user.ListUsers();
+    listData.value = res.users || [];
   } catch (error) {
     message.error('获取数据失败');
   }
@@ -147,14 +164,6 @@ const editItemRef = ref();
 function openEditItem(row: any) {
   editItemRef.value.openDialog(row.accessKey);
 }
-/** **********************************修改密码 */
-const changePasswordModalRef = ref();
-const changePasswordVisible = ref(false);
-
-function changePassword() {
-  changePasswordVisible.value = true;
-}
-
 /** ***********************************删除 */
 async function deleteItem(row: any) {
   try {