feat: chat

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

@@ -83,23 +83,23 @@
   </el-dialog>
 </template>
 <script setup lang="ts">
-import {ref} from 'vue'
+import { ref } from 'vue'
-import type {ResetCurrentUserPasswordRequest} from '@/api/type/user'
+import type { ResetCurrentUserPasswordRequest } from '@/api/type/user'
-import type {FormInstance, FormRules} from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
 import UserApi from '@/api/user/user-manage'
 import useStore from '@/stores'
-import {useRouter} from 'vue-router'
+import { useRouter } from 'vue-router'
-import {t} from '@/locales'
+import { t } from '@/locales'
 
 const router = useRouter()
-const {user} = useStore()
+const { login } = useStore()
 
 const resetPasswordDialog = ref<boolean>(false)
 
 const resetPasswordForm = ref<ResetCurrentUserPasswordRequest>({
   code: '',
   password: '',
-  re_password: ''
+  re_password: '',
 })
 
 const resetPasswordFormRef1 = ref<FormInstance>()
@@ -114,26 +114,26 @@ const rules1 = ref<FormRules<ResetCurrentUserPasswordRequest>>({
     {
       required: true,
       message: t('views.login.enterPassword'),
-      trigger: 'blur'
+      trigger: 'blur',
     },
     {
       min: 6,
       max: 20,
       message: t('views.user.userForm.form.password.lengthMessage'),
-      trigger: 'blur'
+      trigger: 'blur',
-    }
+    },
   ],
   re_password: [
     {
       required: true,
       message: t('views.user.userForm.form.re_password.requiredMessage'),
-      trigger: 'blur'
+      trigger: 'blur',
     },
     {
       min: 6,
       max: 20,
       message: t('views.user.userForm.form.password.lengthMessage'),
-      trigger: 'blur'
+      trigger: 'blur',
     },
     {
       validator: (rule, value, callback) => {
@@ -143,9 +143,9 @@ const rules1 = ref<FormRules<ResetCurrentUserPasswordRequest>>({
           callback()
         }
       },
-      trigger: 'blur'
+      trigger: 'blur',
-    }
+    },
-  ]
+  ],
 })
 // const rules2 = ref<FormRules<ResetCurrentUserPasswordRequest>>({
 //   // @ts-ignore
@@ -186,7 +186,7 @@ const open = () => {
   resetPasswordForm.value = {
     //code: '',
     password: '',
-    re_password: ''
+    re_password: '',
   }
   resetPasswordDialog.value = true
   resetPasswordFormRef1.value?.resetFields()
@@ -194,17 +194,16 @@ const open = () => {
 }
 const resetPassword = () => {
   resetPasswordFormRef1.value?.validate().then(() => {
-    return UserApi.resetCurrentPassword(resetPasswordForm.value)
+    return UserApi.resetCurrentPassword(resetPasswordForm.value).then(() => {
-      .then(() => {
+      login.logout()
-        user.logout()
+      router.push({ name: 'login' })
-        router.push({name: 'login'})
+    })
-      })
   })
 }
 const close = () => {
   resetPasswordDialog.value = false
 }
 
-defineExpose({open, close})
+defineExpose({ open, close })
 </script>
 <style lang="scss" scope></style>

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

@@ -2,11 +2,11 @@
   <el-dropdown trigger="click" type="primary">
     <div class="flex-center cursor">
       <el-avatar :size="30">
-        <img src="@/assets/user-icon.svg" style="width: 54%" alt=""/>
+        <img src="@/assets/user-icon.svg" style="width: 54%" alt="" />
       </el-avatar>
       <span class="ml-8 color-text-primary">{{ user.userInfo?.username }}</span>
       <el-icon class="el-icon--right">
-        <CaretBottom/>
+        <CaretBottom />
       </el-icon>
     </div>
 
@@ -15,19 +15,16 @@
         <div class="userInfo flex align-center">
           <div class="mr-12 flex align-center">
             <el-avatar :size="30">
-              <img src="@/assets/user-icon.svg" style="width: 54%" alt=""/>
+              <img src="@/assets/user-icon.svg" style="width: 54%" alt="" />
             </el-avatar>
           </div>
           <div style="width: 90%">
             <p class="bold mb-4" style="font-size: 14px">{{ user.userInfo?.username }}</p>
-            <template
+            <template v-if="user.userInfo?.role && user.userInfo.role.length > 0">
-              v-if="user.userInfo?.role && user.userInfo.role.length > 0"
-            >
               <el-tag size="small" class="default-tag">{{ user.userInfo?.role[0] }}</el-tag>
               <el-tag size="small" class="default-tag ml-4" v-if="user.userInfo?.role?.length > 1"
-              >+{{ user.userInfo?.role?.length - 1 }}
+                >+{{ user.userInfo?.role?.length - 1 }}
-              </el-tag
+              </el-tag>
-              >
             </template>
           </div>
         </div>
@@ -44,7 +41,7 @@
             <div class="flex-between w-full" style="line-height: 22px; padding: 12px 11px">
               <span> {{ $t('layout.language') }}</span>
               <el-icon>
-                <ArrowRight/>
+                <ArrowRight />
               </el-icon>
             </div>
 
@@ -58,14 +55,14 @@
                   class="flex-between"
                 >
                   <span :class="lang.value === user.userInfo?.language ? 'primary' : ''">{{
-                      lang.label
+                    lang.label
-                    }}</span>
+                  }}</span>
 
                   <el-icon
                     :class="lang.value === user.userInfo?.language ? 'primary' : ''"
                     v-if="lang.value === user.userInfo?.language"
                   >
-                    <Check/>
+                    <Check />
                   </el-icon>
                 </el-dropdown-item>
               </el-dropdown-menu>
@@ -89,24 +86,24 @@
       </el-dropdown-menu>
     </template>
   </el-dropdown>
-  <APIKeyDialog :user-id="user.userInfo?.id" ref="APIKeyDialogRef"/>
+  <APIKeyDialog :user-id="user.userInfo?.id" ref="APIKeyDialogRef" />
   <ResetPassword ref="resetPasswordRef"></ResetPassword>
   <!-- <AboutDialog ref="AboutDialogRef"></AboutDialog>
   -->
   <!-- <UserPwdDialog ref="UserPwdDialogRef" /> -->
 </template>
 <script setup lang="ts">
-import {ref, onMounted} from 'vue'
+import { ref, onMounted } from 'vue'
 import useStore from '@/stores'
-import {useRouter} from 'vue-router'
+import { useRouter } from 'vue-router'
 import ResetPassword from './ResetPassword.vue'
 // import AboutDialog from './AboutDialog.vue'
 // import UserPwdDialog from '@/views/user-manage/component/UserPwdDialog.vue'
 import APIKeyDialog from './APIKeyDialog.vue'
-import {ComplexPermission} from '@/utils/permission/type'
+import { ComplexPermission } from '@/utils/permission/type'
-import {langList} from '@/locales/index'
+import { langList } from '@/locales/index'
 
-const {user} = useStore()
+const { user, login } = useStore()
 const router = useRouter()
 
 const AboutDialogRef = ref()
@@ -131,8 +128,8 @@ const openResetPassword = () => {
 }
 
 const logout = () => {
-  user.logout().then(() => {
+  login.logout().then(() => {
-    router.push({name: 'login'})
+    router.push({ name: 'login' })
   })
 }
 

ui/src/stores/modules/login.ts

@@ -1,6 +1,6 @@
 import { defineStore } from 'pinia'
 import { type Ref } from 'vue'
-import loginApi from '@/api/user/login'
+import LoginApi from '@/api/user/login'
 import type { LoginRequest } from '@/api/type/login'
 import useUserStore from './user'
 
@@ -30,7 +30,7 @@ const useLoginStore = defineStore('login', {
     },
 
     async asyncLogin(data: LoginRequest, loading?: Ref<boolean>) {
-      return loginApi.login(data).then((ok) => {
+      return LoginApi.login(data).then((ok) => {
         this.token = ok?.data?.token
         localStorage.setItem('token', ok?.data?.token)
         const user = useUserStore()
@@ -38,13 +38,68 @@ const useLoginStore = defineStore('login', {
       })
     },
     async asyncLdapLogin(data: LoginRequest, loading?: Ref<boolean>) {
-      return loginApi.ldapLogin(data).then((ok) => {
+      return LoginApi.ldapLogin(data).then((ok) => {
         this.token = ok?.data?.token
         localStorage.setItem('token', ok?.data?.token)
         const user = useUserStore()
         return user.profile(loading)
       })
     },
+    async dingCallback(code: string) {
+      return LoginApi.getDingCallback(code).then((ok) => {
+        this.token = ok.data
+        localStorage.setItem('token', ok.data)
+        const user = useUserStore()
+        return user.profile()
+      })
+    },
+    async dingOauth2Callback(code: string) {
+      return LoginApi.getDingOauth2Callback(code).then((ok) => {
+        this.token = ok.data
+        localStorage.setItem('token', ok.data)
+        const user = useUserStore()
+        return user.profile()
+      })
+    },
+    async wecomCallback(code: string) {
+      return LoginApi.getWecomCallback(code).then((ok) => {
+        this.token = ok.data
+        localStorage.setItem('token', ok.data)
+        const user = useUserStore()
+        return user.profile()
+      })
+    },
+    async larkCallback(code: string) {
+      return LoginApi.getLarkCallback(code).then((ok) => {
+        this.token = ok.data
+        localStorage.setItem('token', ok.data)
+        const user = useUserStore()
+        return user.profile()
+      })
+    },
+
+    async logout() {
+      return LoginApi.logout().then(() => {
+        localStorage.removeItem('token')
+        return true
+      })
+    },
+    async getAuthType() {
+      return LoginApi.getAuthType().then((ok) => {
+        return ok.data
+      })
+    },
+    async getQrType() {
+      return LoginApi.getQrType().then((ok) => {
+        return ok.data
+      })
+    },
+    async getQrSource() {
+      return LoginApi.getQrSource().then((ok) => {
+        return ok.data
+      })
+    },
+
   },
 })
 

ui/src/stores/modules/user.ts

@@ -3,14 +3,16 @@ import { type Ref } from 'vue'
 import type { User } from '@/api/type/user'
 import UserApi from '@/api/user/user'
 import LoginApi from '@/api/user/login'
-import {cloneDeep} from 'lodash'
+import { cloneDeep } from 'lodash'
 import ThemeApi from '@/api/system-settings/theme'
-// import { defaultPlatformSetting } from '@/utils/theme'
 import { useLocalStorage } from '@vueuse/core'
+// import { defaultPlatformSetting } from '@/utils/theme'
+
 import { localeConfigKey, getBrowserLang } from '@/locales/index'
 import useThemeStore from './theme'
 import { useElementPlusTheme } from 'use-element-plus-theme'
 import { defaultPlatformSetting } from '@/utils/theme.ts'
+import useLoginStore from './login'
 
 export interface userStateTypes {
   userType: number // 1 系统操作者 2 对话用户
@@ -19,10 +21,9 @@ export interface userStateTypes {
   license_is_valid: boolean
   edition: 'CE' | 'PE' | 'EE'
   themeInfo: any
-  token: any
 }
 
-const useLoginStore = defineStore('user', {
+const useUserStore = defineStore('user', {
   state: (): userStateTypes => ({
     userType: 1, // 1 系统操作者 2 对话用户
     userInfo: null,
@@ -30,7 +31,6 @@ const useLoginStore = defineStore('user', {
     license_is_valid: false,
     edition: 'CE',
     themeInfo: null,
-    token: '',
   }),
   actions: {
     getLanguage() {
@@ -124,61 +124,12 @@ const useLoginStore = defineStore('user', {
     isEE() {
       return this.edition == 'EE' && this.license_is_valid
     },
-    // changeUserType(num: number, token?: string) {
+    changeUserType(num: number, token?: string) {
-    //   this.userType = num
+      this.userType = num
-    //   this.userAccessToken = token
+      const login = useLoginStore()
-    // },
+      login.userAccessToken = token || ''
-
-    async dingCallback(code: string) {
-      return LoginApi.getDingCallback(code).then((ok) => {
-        this.token = ok.data
-        localStorage.setItem('token', ok.data)
-        return this.profile()
-      })
-    },
-    async dingOauth2Callback(code: string) {
-      return LoginApi.getDingOauth2Callback(code).then((ok) => {
-        this.token = ok.data
-        localStorage.setItem('token', ok.data)
-        return this.profile()
-      })
-    },
-    async wecomCallback(code: string) {
-      return LoginApi.getWecomCallback(code).then((ok) => {
-        this.token = ok.data
-        localStorage.setItem('token', ok.data)
-        return this.profile()
-      })
-    },
-    async larkCallback(code: string) {
-      return LoginApi.getLarkCallback(code).then((ok) => {
-        this.token = ok.data
-        localStorage.setItem('token', ok.data)
-        return this.profile()
-      })
     },
 
-    async logout() {
-      return LoginApi.logout().then(() => {
-        localStorage.removeItem('token')
-        return true
-      })
-    },
-    async getAuthType() {
-      return LoginApi.getAuthType().then((ok) => {
-        return ok.data
-      })
-    },
-    async getQrType() {
-      return LoginApi.getQrType().then((ok) => {
-        return ok.data
-      })
-    },
-    async getQrSource() {
-      return LoginApi.getQrSource().then((ok) => {
-        return ok.data
-      })
-    },
     async postUserLanguage(lang: string, loading?: Ref<boolean>) {
       return new Promise((resolve, reject) => {
         LoginApi.postLanguage({ language: lang }, loading)
@@ -195,4 +146,4 @@ const useLoginStore = defineStore('user', {
   },
 })
 
-export default useLoginStore
+export default useUserStore