Merge remote-tracking branch 'origin/dev' into dev

src/apis/system/option.ts

@@ -10,7 +10,7 @@ export function listOption(query: System.OptionQuery) {
 
 /** @desc 修改参数 */
 export function updateOption(data: any) {
-  return http.patch(`${BASE_URL}`, data)
+  return http.put(`${BASE_URL}`, data)
 }
 
 /** @desc 重置参数 */

src/components/GiCell/GiCellTag.vue

@@ -1,12 +1,12 @@
 <template>
   <span v-if="!dictItem"></span>
-  <span v-else-if="!dictItem.color">{{ dictItem.label }}</span>
-  <a-tag v-else-if="dictItem.color === 'primary'" color="arcoblue">{{ dictItem.label }}</a-tag>
-  <a-tag v-else-if="dictItem.color === 'success'" color="green">{{ dictItem.label }}</a-tag>
-  <a-tag v-else-if="dictItem.color === 'warning'" color="orangered">{{ dictItem.label }}</a-tag>
-  <a-tag v-else-if="dictItem.color === 'error'" color="red">{{ dictItem.label }}</a-tag>
-  <a-tag v-else-if="dictItem.color === 'default'" color="gray">{{ dictItem.label }}</a-tag>
-  <a-tag v-else :color="dictItem.color">{{ dictItem.label }}</a-tag>
+  <span v-else-if="!dictItem.extend">{{ dictItem.label }}</span>
+  <a-tag v-else-if="dictItem.extend === 'primary'" color="arcoblue">{{ dictItem.label }}</a-tag>
+  <a-tag v-else-if="dictItem.extend === 'success'" color="green">{{ dictItem.label }}</a-tag>
+  <a-tag v-else-if="dictItem.extend === 'warning'" color="orangered">{{ dictItem.label }}</a-tag>
+  <a-tag v-else-if="dictItem.extend === 'error'" color="red">{{ dictItem.label }}</a-tag>
+  <a-tag v-else-if="dictItem.extend === 'default'" color="gray">{{ dictItem.label }}</a-tag>
+  <a-tag v-else :color="dictItem.extend">{{ dictItem.label }}</a-tag>
 </template>
 
 <script lang="ts" setup>

src/layout/components/HeaderRightBar/index.vue

@@ -93,7 +93,7 @@ onBeforeUnmount(() => {
 const unreadMessageCount = ref(0)
 // 初始化 WebSocket
 const initWebSocket = (token: string) => {
-  socket = new WebSocket(`${import.meta.env.VITE_API_WS_URL}/ws?token=${token}`)
+  socket = new WebSocket(`${import.meta.env.VITE_API_WS_URL}/websocket?token=${token}`)
   socket.onopen = () => {
     // console.log('WebSocket connection opened')
   }

src/router/index.ts

@@ -1,4 +1,4 @@
-import { type RouteRecordRaw, createRouter, createWebHashHistory } from 'vue-router'
+import { type RouteRecordRaw, createRouter, createWebHistory } from 'vue-router'
 import { useRouteStore } from '@/stores'
 
 /** 默认布局 */
@@ -19,6 +19,7 @@ export const constantRoutes: RouteRecordRaw[] = [
   },
   {
     path: '/login',
+    name: 'Login',
     component: () => import('@/views/login/index.vue'),
     meta: { hidden: true }
   },
@@ -75,7 +76,7 @@ export const constantRoutes: RouteRecordRaw[] = [
 ]
 
 const router = createRouter({
-  history: createWebHashHistory(import.meta.env.BASE_URL),
+  history: createWebHistory(import.meta.env.BASE_URL),
   routes: constantRoutes,
   scrollBehavior: () => ({ left: 0, top: 0 })
 })

src/stores/modules/route.ts

@@ -58,7 +58,6 @@ const formatAsyncRoutes = (menus: RouteItem[]) => {
         title: item.title,
         hidden: item.isHidden,
         keepAlive: item.isCache,
-        alwaysShow: item.type === 1,
         icon: item.icon
       }
     }

src/types/global.d.ts

@@ -11,7 +11,7 @@ interface Options {
 export interface LabelValueState {
   label: string
   value: any
-  color?: string
+  extend?: string
 }
 
 /** 字典类型 */

src/views/login/social/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-spin :loading="loading" :tip="isLogin() ? '绑定中。。。' : '登录中。。。'">
+  <a-spin :loading="loading" :tip="isLogin() ? '绑定中...' : '登录中...'">
     <div></div>
   </a-spin>
 </template>
@@ -8,10 +8,12 @@
 import { Message } from '@arco-design/web-vue'
 import { useRoute, useRouter } from 'vue-router'
 import { bindSocialAccount } from '@/apis'
+import { useUserStore } from '@/stores'
 import { isLogin } from '@/utils/auth'
 
 const route = useRoute()
 const router = useRouter()
+const userStore = useUserStore()
 const source = route.query.source as string
 const loading = ref(false)
 
@@ -50,14 +52,14 @@ const handleBindSocial = () => {
   loading.value = true
   const { ...othersQuery } = router.currentRoute.value.query
   bindSocialAccount(source, othersQuery)
-    .then((res) => {
+    .then(() => {
       router.push({
         path: '/setting/profile',
         query: {
           ...othersQuery
         }
       })
-      proxy.$message.success(res.msg)
+      Message.success('绑定成功')
     })
     .catch(() => {
       router.push({
@@ -80,6 +82,10 @@ if (isLogin()) {
 </script>
 
 <style scoped lang="less">
+:deep(.arco-spin-mask) {
+  background-color: transparent;
+}
+
 div {
   width: 150px;
   height: 150px;

src/views/setting/components/VerifyModel.vue

@@ -11,7 +11,7 @@
   >
     <GiForm ref="formRef" v-model="form" :options="options" :columns="columns">
       <template #captcha>
-        <a-input v-model="form.captcha" placeholder="请输入验证码" :max-length="4" allow-clear style="flex: 1 1" />
+        <a-input v-model="form.captcha" placeholder="请输入验证码" :max-length="6" allow-clear style="flex: 1 1" />
         <a-button
           class="captcha-btn"
           :loading="captchaLoading"
@@ -36,8 +36,8 @@
 <script setup lang="ts">
 import { useWindowSize } from '@vueuse/core'
 import { Message } from '@arco-design/web-vue'
-// import { getSmsCaptcha, getEmailCaptcha, updateUserEmail, updateUserPhone } from '@/apis'
-import { updateUserPassword } from '@/apis'
+import { getEmailCaptcha, updateUserEmail, updateUserPassword } from '@/apis'
+
 import { encryptByRsa } from '@/utils/encrypt'
 import { useUserStore } from '@/stores'
 import { type Columns, GiForm } from '@/components/GiForm'
@@ -199,9 +199,9 @@ const getCaptcha = async () => {
       //   phone: form.phone
       // })
     } else if (verifyType.value === 'email') {
-      // await getEmailCaptcha({
-      //   email: form.email
-      // })
+      await getEmailCaptcha({
+        email: form.email
+      })
     }
     captchaLoading.value = false
     captchaDisable.value = true
@@ -234,11 +234,11 @@ const save = async () => {
       //   oldPassword: encryptByRsa(form.oldPassword) as string
       // })
     } else if (verifyType.value === 'email') {
-      // await updateUserEmail({
-      //   email: form.email,
-      //   captcha: form.captcha,
-      //   oldPassword: encryptByRsa(form.oldPassword) as string
-      // })
+      await updateUserEmail({
+        email: form.email,
+        captcha: form.captcha,
+        oldPassword: encryptByRsa(form.oldPassword) as string
+      })
     } else if (verifyType.value === 'password') {
       if (form.newPassword !== form.rePassword) {
         Message.error('两次新密码不一致')

src/views/setting/profile/Social.vue

@@ -44,33 +44,38 @@
 </template>
 
 <script setup lang="ts">
+import { Message } from '@arco-design/web-vue'
 import type { ModeItem } from '../type'
 import VerifyModel from '../components/VerifyModel.vue'
 import { listUserSocial, socialAuth, unbindSocialAccount } from '@/apis'
-import { useUserStore } from '@/stores'
-
-const userStore = useUserStore()
 
 const socialList = ref<any>([])
 const modeList = ref<ModeItem[]>([])
-modeList.value = [
-  {
-    title: '绑定 Gitee',
-    icon: 'gitee',
-    subtitle: `${socialList.value.includes('gitee') ? '' : '绑定后，'}可通过 Gitee 进行登录`,
-    jumpMode: 'link',
-    type: 'gitee',
-    status: socialList.value.includes('gitee')
-  },
-  {
-    title: '绑定 GitHub',
-    icon: 'github',
-    subtitle: `${socialList.value.includes('gitee') ? '' : '绑定后，'}可通过 GitHub 进行登录`,
-    type: 'github',
-    jumpMode: 'link',
-    status: socialList.value.includes('github')
-  }
-]
+
+// 初始化数据
+const initData = () => {
+  listUserSocial().then((res) => {
+    socialList.value = res.data.map((el) => el.source)
+    modeList.value = [
+      {
+        title: '绑定 Gitee',
+        icon: 'gitee',
+        subtitle: `${socialList.value.includes('GITEE') ? '' : '绑定后，'}可通过 Gitee 进行登录`,
+        jumpMode: 'link',
+        type: 'gitee',
+        status: socialList.value.includes('GITEE')
+      },
+      {
+        title: '绑定 GitHub',
+        icon: 'github',
+        subtitle: `${socialList.value.includes('GITHUB') ? '' : '绑定后，'}可通过 GitHub 进行登录`,
+        type: 'github',
+        jumpMode: 'link',
+        status: socialList.value.includes('GITHUB')
+      }
+    ]
+  })
+}
 
 // 绑定
 const onBinding = (type: string, status: boolean) => {
@@ -79,10 +84,9 @@ const onBinding = (type: string, status: boolean) => {
       window.open(res.data.authorizeUrl, '_self')
     })
   } else {
-    unbindSocialAccount(type).then((res) => {
-      if (res.code === 200) {
-        userStore.getInfo()
-      }
+    unbindSocialAccount(type).then(() => {
+      initData()
+      Message.success('解绑成功')
     })
   }
 }
@@ -93,13 +97,6 @@ const onUpdate = (type: string) => {
   verifyModelRef.value?.open(type)
 }
 
-// 初始化数据
-const initData = () => {
-  listUserSocial().then((res) => {
-    socialList.value = res.data.map((el) => el.source)
-  })
-}
-
 onMounted(() => {
   initData()
 })