fix: api

Author: wangdan-fit2cloud

ui/src/api/system/user-manage.ts

@@ -2,7 +2,7 @@ import {Result} from '@/request/Result'
 import {get, put, post, del} from '@/request/index'
 import type {pageRequest} from '@/api/type/common'
 import type {Ref} from 'vue'
-import type {CheckCodeRequest, ResetPasswordRequest} from "@/api/type/user.ts";
+
 
 const prefix = '/user_manage'
 /**
@@ -65,31 +65,7 @@ const putUserManagePassword: (
   return put(`${prefix}/${user_id}/re_password`, data, undefined, loading)
 }
 
-/**
- * 重置密码
- * @param request 重置密码请求参数
- * @param loading 接口加载器
- * @returns
- */
-const resetPassword: (
-  request: ResetPasswordRequest,
-  loading?: Ref<boolean>
-) => Promise<Result<boolean>> = (request, loading) => {
-  return post('/user/re_password', request, undefined, loading)
-}
 
-/**
- * 重置密码
- * @param request 重置密码请求参数
- * @param loading 接口加载器
- * @returns
- */
-const resetCurrentPassword: (
-  request: ResetPasswordRequest,
-  loading?: Ref<boolean>
-) => Promise<Result<boolean>> = (request, loading) => {
-  return post('/user/current/reset_password', request, undefined, loading)
-}
 
 /**
  * 获取系统默认密码
@@ -114,43 +90,14 @@ const getValid: (
   return get(`/valid/${valid_type}/${valid_count}`, undefined, loading)
 }
 
-/**
- * 校验验证码
- * @param request 请求对象
- * @param loading 接口加载器
- * @returns
- */
-const checkCode: (request: CheckCodeRequest, loading?: Ref<boolean>) => Promise<Result<boolean>> = (
-  request,
-  loading
-) => {
-  return post('/user/check_code', request, undefined, loading)
-}
-
-/**
- * 发送邮件
- * @param email  邮件地址
- * @param loading 接口加载器
- * @returns
- */
-const sendEmit: (
-  email: string,
-  type: 'register' | 'reset_password',
-  loading?: Ref<boolean>
-) => Promise<Result<boolean>> = (email, type, loading) => {
-  return post('/user/send_email', {email, type}, undefined, loading)
-}
 
 export default {
   getUserManage,
   putUserManage,
   delUserManage,
   postUserManage,
   putUserManagePassword,
-  resetPassword,
-  resetCurrentPassword,
   getSystemDefaultPassword,
   getValid,
-  checkCode,
-  sendEmit
+
 }

ui/src/api/type/user.ts

@@ -28,6 +28,7 @@ interface User {
   XPACK_LICENSE_IS_VALID?: boolean
   language?: string
   workspace_list?: Array<any>
+  role_name?: Array<any>
 }
 
 interface LoginRequest {

ui/src/api/user/user.ts

@@ -1,8 +1,7 @@
 import { Result } from '@/request/Result'
 import { get, post } from '@/request/index'
-import type { User, ResetPasswordRequest } from '@/api/type/user'
+import type { User, ResetPasswordRequest, CheckCodeRequest } from '@/api/type/user'
 import type { Ref } from 'vue'
-
 /**
  * 获取用户基本信息
  * @param loading 接口加载器
@@ -35,22 +34,65 @@ const getUserList: (loading?: Ref<boolean>) => Promise<Result<Record<string, any
   return get('/user/list', undefined, loading)
 }
 
+/**
+ * 校验验证码
+ * @param request 请求对象
+ * @param loading 接口加载器
+ * @returns
+ */
+const checkCode: (request: CheckCodeRequest, loading?: Ref<boolean>) => Promise<Result<boolean>> = (
+  request,
+  loading,
+) => {
+  return post('/user/check_code', request, undefined, loading)
+}
+
+/**
+ * 发送邮件
+ * @param email  邮件地址
+ * @param loading 接口加载器
+ * @returns
+ */
+const sendEmit: (
+  email: string,
+  type: 'register' | 'reset_password',
+  loading?: Ref<boolean>,
+) => Promise<Result<boolean>> = (email, type, loading) => {
+  return post('/user/send_email', { email, type }, undefined, loading)
+}
+
 /**
  * 重置密码
  * @param request 重置密码请求参数
  * @param loading 接口加载器
  * @returns
  */
-const resetPassword: (
+const postResetPassword: (
   request: ResetPasswordRequest,
   loading?: Ref<boolean>,
 ) => Promise<Result<boolean>> = (request, loading) => {
   return post('/user/re_password', request, undefined, loading)
 }
 
+/**
+ * 重置密码
+ * @param request 重置密码请求参数
+ * @param loading 接口加载器
+ * @returns
+ */
+const resetCurrentPassword: (
+  request: ResetPasswordRequest,
+  loading?: Ref<boolean>,
+) => Promise<Result<boolean>> = (request, loading) => {
+  return post('/user/current/reset_password', request, undefined, loading)
+}
+
 export default {
   getUserProfile,
   getProfile,
   getUserList,
-  resetPassword,
+  postResetPassword,
+  checkCode,
+  sendEmit,
+  resetCurrentPassword,
 }

ui/src/layout/layout-header/avatar/ResetPassword.vue

@@ -47,7 +47,7 @@
 import { ref } from 'vue'
 import type { ResetCurrentUserPasswordRequest } from '@/api/type/user'
 import type { FormInstance, FormRules } from 'element-plus'
-import UserApi from '@/api/system/user-manage'
+import UserApi from '@/api/user/user'
 import useStore from '@/stores'
 import { useRouter } from 'vue-router'
 import { t } from '@/locales'

ui/src/views/chat/user-login/ForgotPassword.vue

@@ -127,7 +127,7 @@ const loading = ref<boolean>(false)
 const resetPassword = () => {
   resetPasswordFormRef.value
     ?.validate()
-    .then(() => UserApi.resetPassword(resetPasswordForm.value, loading))
+    .then(() => UserApi.postResetPassword(resetPasswordForm.value, loading))
     .then(() => {
       MsgSuccess(t('common.modifySuccess'))
       router.push({ name: 'login' })

ui/src/views/chat/user-login/ResetPassword.vue

@@ -61,7 +61,7 @@ import type { ResetPasswordRequest } from '@/api/type/user'
 import { useRouter, useRoute } from 'vue-router'
 import { MsgSuccess } from '@/utils/message'
 import type { FormInstance, FormRules } from 'element-plus'
-import UserApi from '@/api/system/user-manage'
+import UserApi from '@/api/user/user'
 import { t } from '@/locales'
 const router = useRouter()
 const route = useRoute()
@@ -127,7 +127,7 @@ const loading = ref<boolean>(false)
 const resetPassword = () => {
   resetPasswordFormRef.value
     ?.validate()
-    .then(() => UserApi.resetPassword(resetPasswordForm.value, loading))
+    .then(() => UserApi.postResetPassword(resetPasswordForm.value, loading))
     .then(() => {
       MsgSuccess(t('common.modifySuccess'))
       router.push({ name: 'login' })

ui/src/views/login/ForgotPassword.vue

@@ -73,7 +73,7 @@ import LoginLayout from '@/layout/login-layout/LoginLayout.vue'
 import type { CheckCodeRequest } from '@/api/type/user'
 import { useRouter } from 'vue-router'
 import type { FormInstance, FormRules } from 'element-plus'
-import UserApi from '@/api/system/user-manage'
+import UserApi from '@/api/user/user'
 import { MsgSuccess } from '@/utils/message'
 import { t } from '@/locales'
 import useStore from '@/stores'

ui/src/views/login/ResetPassword.vue

@@ -61,7 +61,7 @@ import type { ResetPasswordRequest } from '@/api/type/user'
 import { useRouter, useRoute } from 'vue-router'
 import { MsgSuccess } from '@/utils/message'
 import type { FormInstance, FormRules } from 'element-plus'
-import UserApi from '@/api/system/user-manage'
+import UserApi from '@/api/user/user'
 import { t } from '@/locales'
 const router = useRouter()
 const route = useRoute()
@@ -127,7 +127,7 @@ const loading = ref<boolean>(false)
 const resetPassword = () => {
   resetPasswordFormRef.value
     ?.validate()
-    .then(() => UserApi.resetPassword(resetPasswordForm.value, loading))
+    .then(() => UserApi.postResetPassword(resetPasswordForm.value, loading))
     .then(() => {
       MsgSuccess(t('common.modifySuccess'))
       router.push({ name: 'login' })