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

# Conflicts:
#	.env.base

src/store/modules/dict.ts

@@ -75,7 +75,7 @@ export const useDictStore = defineStore('dict', {
     },
     async resetDict() {
       cache.session.delete(CACHE_KEY.DICT_CACHE)
-      const res = await listSimpleDictData()
+      const res = (await listSimpleDictData()) || []
       // 设置数据
       const dictDataMap = new Map<string, any>()
       res.forEach((dictData: DictDataVO) => {

src/store/modules/user.ts

@@ -2,7 +2,8 @@ import { store } from '../index'
 import { defineStore } from 'pinia'
 import { getAccessToken, removeToken } from '@/utils/auth'
 import { CACHE_KEY } from '@/hooks/web/useCache'
-import { getInfo, loginOut } from '@/api/login'
+import { loginOut } from '@/api/login'
+import { getUser as getUserInfo } from '@/api/system/user'
 
 import cache from '@/plugins/cache'
 
@@ -50,11 +51,17 @@ export const useUserStore = defineStore('admin-user', {
         return null
       }
       let userInfo = cache.local.get(CACHE_KEY.USER)
-      if (!userInfo || !userInfo?.menus || userInfo.menus.length == 0) {
+      // if (!userInfo || !userInfo?.menus || userInfo.menus.length == 0) {
-        userInfo = await getInfo({})
+      //   userInfo = await getInfo({})
+      // }
+      if (!userInfo?.user) {
+        const userId = localStorage.getItem('userId')
+        userInfo = {
+          user: await getUserInfo(Number(userId))
         }
-      this.permissions = userInfo.permissions
+      }
-      this.roles = userInfo.roles
+      // this.permissions = userInfo.permissions
+      // this.roles = userInfo.roles
       this.user = userInfo.user
       this.isSetUser = true
       cache.local.set(CACHE_KEY.USER, userInfo)
@@ -63,7 +70,7 @@ export const useUserStore = defineStore('admin-user', {
     async loginOut() {
       await loginOut()
       removeToken()
-      cache.local.clear()
+      // cache.local.clear()
       this.resetState()
     },
     resetState() {

src/utils/auth.ts

@@ -9,26 +9,34 @@ const RefreshTokenKey = 'REFRESH_TOKEN'
 // 获取token
 export const getAccessToken = () => {
   // 此处与TokenKey相同，此写法解决初始化时Cookies中不存在TokenKey报错
-  return cache.local.get(AccessTokenKey)
+  return localStorage.getItem(AccessTokenKey)
-    ? cache.local.get(AccessTokenKey)
+    ? localStorage.getItem(AccessTokenKey)
-    : cache.local.get('ACCESS_TOKEN')
+    : localStorage.getItem('ACCESS_TOKEN')
+  // return cache.local.get(AccessTokenKey)
+  //   ? cache.local.get(AccessTokenKey)
+  //   : cache.local.get('ACCESS_TOKEN')
 }
 
 // 刷新token
 export const getRefreshToken = () => {
-  return cache.local.get(RefreshTokenKey)
+  return localStorage.getItem(RefreshTokenKey)
+  // return cache.local.get(RefreshTokenKey)
 }
 
 // 设置token
 export const setToken = (token: TokenType) => {
-  cache.local.set(RefreshTokenKey, token.refreshToken)
+  localStorage.setItem(AccessTokenKey, token.accessToken)
-  cache.local.set(AccessTokenKey, token.accessToken)
+  localStorage.setItem(RefreshTokenKey, token.refreshToken)
+  // cache.local.set(RefreshTokenKey, token.refreshToken)
+  // cache.local.set(AccessTokenKey, token.accessToken)
 }
 
 // 删除token
 export const removeToken = () => {
-  cache.local.delete(AccessTokenKey)
+  localStorage.removeItem(AccessTokenKey)
-  cache.local.delete(RefreshTokenKey)
+  localStorage.removeItem(RefreshTokenKey)
+  // cache.local.delete(AccessTokenKey)
+  // cache.local.delete(RefreshTokenKey)
 }
 
 /** 格式化token（jwt格式） */

src/views/Error/403.vue

@@ -1,5 +1,5 @@
 <template>
-  <Error type="403" @error-click="push('/Home/index')" />
+  <Error type="403" @error-click="push('/index')" />
 </template>
 <script lang="ts" name="Error403" setup>
 const { push } = useRouter()

src/views/Error/404.vue

@@ -1,5 +1,5 @@
 <template>
-  <Error @error-click="push('/Home/index')" />
+  <Error @error-click="push('/index')" />
 </template>
 <script lang="ts" name="Error404" setup>
 const { push } = useRouter()

src/views/Error/500.vue

@@ -1,5 +1,5 @@
 <template>
-  <Error type="500" @error-click="push('/Home/index')" />
+  <Error type="500" @error-click="push('/index')" />
 </template>
 <script lang="ts" name="Error500" setup>
 const { push } = useRouter()

src/views/Home/index.vue

@@ -6,11 +6,16 @@
         v-for="item in appList"
         :key="item.id"
         shadow="hover"
-        class="width-200px"
+        class="app-card"
         @click="handleAppClick(item)"
       >
         <!-- card body -->
-        <el-image :src="item.clientLogo" fit="fill" :lazy="true" style="width: 180px" />
+        <el-image
+          :src="item.clientLogo"
+          fit="fill"
+          :lazy="true"
+          style="width: 180px; height: 180px; border-radius: 10px; background-color: #fff"
+        />
         <div class="cutout-text">{{ item.clientName }}</div>
 
         <template #footer v-if="item.clientDescription">
@@ -42,10 +47,14 @@ function handleAppClick(item) {
 </script>
 
 <style lang="scss" scoped>
+::v-deep(.app-card) {
+  cursor: pointer;
+}
 ::v-deep(.el-card__body) {
-  background-color: #001529;
+  background-color: #000;
   padding: 5px;
   text-align: center;
+  min-width: 260px;
 }
 
 .cutout-text {
@@ -53,7 +62,7 @@ function handleAppClick(item) {
   font-size: 40px;
   font-weight: bold;
   -webkit-text-stroke: 1px #9a9acc;
-  color: #001529;
+  color: #000;
   &::before {
     content: ' ';
     width: 100%;
@@ -72,7 +81,7 @@ function handleAppClick(item) {
     width: 200%;
     height: 100%;
     background: radial-gradient(circle, #fff, #000 50%);
-    background-size: 25% 30%;
+    background-size: 25% 1%;
     mix-blend-mode: color-dodge;
     animation: mix 4s linear infinite;
     background-repeat: repeat;

src/views/Login/components/LoginForm.vue

@@ -200,6 +200,8 @@ const handleLogin = async (params) => {
     if (res?.tenantId) {
       authUtil.setTenantId(res.tenantId)
     }
+    // 设置userId
+    localStorage.setItem('userId', res.userId)
 
     ElLoading.service({
       lock: true,