perf: 实现退出登录

 # port
 # port
-VITE_DEV_PORT = '8001'
+VITE_DEV_PORT = 5555
 
 
 # development path
 # development path
 VITE_DEV_PATH = '/'
 VITE_DEV_PATH = '/'

+export enum ProjectRuntimeEnvEnum {
+  DEV = 'development',
+  PROD = 'production',
+  DEV_ALONE = 'alone.dev',
+  PROD_ALONE = 'alone.prod'
+}

 import { resolve } from "path"
 import { resolve } from "path"
 import { ConfigEnv } from "vite"
 import { ConfigEnv } from "vite"
 
 
-export enum ProjectRuntimeEnvEnum {
-  DEV = 'development',
-  PROD = 'production',
-  DEV_ALONE = 'alone.dev',
-  PROD_ALONE = 'alone.prod'
-}
 
 
 export function parseEnv(env: ImportMetaEnv) {
 export function parseEnv(env: ImportMetaEnv) {
   const res: Record<string, any> = {}
   const res: Record<string, any> = {}
@@ -35,7 +29,7 @@ export function parseEnv(env: ImportMetaEnv) {
 
 
   }
   }
 
 
-  return res
+  return res as ViteEnv
 }
 }
 
 
 export function getEnvConfig(match = 'VITE_GLOB_',) {
 export function getEnvConfig(match = 'VITE_GLOB_',) {

@@ -22,6 +22,7 @@ import { GoSystemInfo } from '@/components/GoSystemInfo/index'
 import Person from './person.png'
 import Person from './person.png'
 
 
 import { icon } from '@/plugins'
 import { icon } from '@/plugins'
+import { useUserStore } from '@/store/external/module/user'
 const { ChatboxEllipsesIcon, PersonIcon, LogOutOutlineIcon, SettingsSharpIcon } = icon.ionicons5
 const { ChatboxEllipsesIcon, PersonIcon, LogOutOutlineIcon, SettingsSharpIcon } = icon.ionicons5
 
 
 const t = window['$t']
 const t = window['$t']
@@ -97,6 +98,8 @@ const sysInfoHandle = () => {
   modelShowInfo.value = true
   modelShowInfo.value = true
 }
 }
 
 
+// THINGS_KIT 修改退出登录
+const userStore = useUserStore()
 const handleSelect = (key: string) => {
 const handleSelect = (key: string) => {
   switch (key) {
   switch (key) {
     case 'contact':
     case 'contact':
@@ -106,7 +109,9 @@ const handleSelect = (key: string) => {
       sysSetHandle()
       sysSetHandle()
       break
       break
     case 'logout':
     case 'logout':
-      logout()
+      // THINGS_KIT 修改退出登录
+      userStore.logout(true)
+      // logout()
       break
       break
   }
   }
 }
 }

-export enum RuntimeEnvironment {
-  DEVELOPMENT = 'development',
-  PRODUCTION = 'production',
-  INDEPENDENCE = 'independence'
-}
+import { ProjectRuntimeEnvEnum } from '../../../build/external/envEnum'
+
+export { ProjectRuntimeEnvEnum }

+import { PageEnum as NPageEnum } from '../pageEnum'
 export const PageEnum = {
 export const PageEnum = {
-  SYSTEM_PASSWORD: '/system/changePassword',
   // basic login path
   // basic login path
   BASE_LOGIN: '/login',
   BASE_LOGIN: '/login',
   // basic home path 
   // basic home path 
-  BASE_HOME: '/dashboard/workbench',
-  // error page path
-  ERROR_PAGE: '/exception',
-  // error log page path
-  ERROR_LOG_PAGE: '/error-log/list',
-  //消息配置
-  MESSAGE_CONFIG: '/message/config',
-  //设备配置
-  DEVICE_PROFILE: '/product/profiles',
-  DEVICE_LIST: '/device/list',
+  BASE_HOME: NPageEnum.BASE_HOME_ITEMS,
 };
 };

-import { RuntimeEnvironment } from "@/enums/external/envEnum";
-import { PageEnum } from "@/enums/pageEnum";
+import { ProjectRuntimeEnvEnum } from "@/enums/external/envEnum";
+import { PageEnum } from "@/enums/external/pageEnum";
 import { useUserStoreWithOut } from "@/store/external/module/user";
 import { useUserStoreWithOut } from "@/store/external/module/user";
-import { RouteLocationRaw, Router } from "vue-router";
+import { NavigationGuardNext, NavigationGuardWithThis, RouteLocationNormalized, RouteLocationRaw, Router } from "vue-router";
 
 
 
 
 const whitePathList: string[] = [PageEnum.BASE_LOGIN];
 const whitePathList: string[] = [PageEnum.BASE_LOGIN];
 
 
-const isIndependenceMode = import.meta.env.MODE === RuntimeEnvironment.INDEPENDENCE
+const isAloneMode = [ProjectRuntimeEnvEnum.DEV_ALONE, ProjectRuntimeEnvEnum.PROD_ALONE].includes(import.meta.env.MODE as ProjectRuntimeEnvEnum)
 
 
-const toIotPlatformLogin = () => {
-  const { origin } = window.location
+const toIotPlatformLogin = ({ to, from, next }: { to: RouteLocationNormalized, from: RouteLocationNormalized, next: NavigationGuardNext }) => {
+  const { origin, port } = window.location
+  if (Number(port) === Number(import.meta.env.VITE_DEV_PORT)) {
+    if (whitePathList.includes(to.path)) {
+      next() 
+      return
+    } else {
+      next(PageEnum.BASE_LOGIN)
+    }
+    return
+  }
   window.location.replace(`${origin}/login?redirect=${import.meta.env.VITE_GLOB_PUBLIC_PATH}`)
   window.location.replace(`${origin}/login?redirect=${import.meta.env.VITE_GLOB_PUBLIC_PATH}`)
 }
 }
 
 
 export function createPermissionGuard(router: Router) {
 export function createPermissionGuard(router: Router) {
-  const userStore = useUserStoreWithOut()
+  const userStore = useUserStoreWithOut() 
 
 
   router.beforeEach((to, from, next) => {
   router.beforeEach((to, from, next) => {
     if (from.path === '/' &&
     if (from.path === '/' &&
@@ -22,7 +31,6 @@ export function createPermissionGuard(router: Router) {
       userStore.getUserInfo.homePath &&
       userStore.getUserInfo.homePath &&
       userStore.getUserInfo.homePath !== PageEnum.BASE_HOME
       userStore.getUserInfo.homePath !== PageEnum.BASE_HOME
     ) {
     ) {
-      console.log(userStore.getUserInfo.homePath)
       next(userStore.getUserInfo.homePath)
       next(userStore.getUserInfo.homePath)
       return
       return
     }
     }
@@ -33,7 +41,7 @@ export function createPermissionGuard(router: Router) {
       if (to.path === PageEnum.BASE_LOGIN && token) {
       if (to.path === PageEnum.BASE_LOGIN && token) {
         const isSessionTimeout = userStore.getSessionTimeout
         const isSessionTimeout = userStore.getSessionTimeout
         try {
         try {
-          if (!isSessionTimeout) {
+          if (isSessionTimeout) {
             next('/')
             next('/')
           }
           }
         } catch (error) {
         } catch (error) {
@@ -41,8 +49,9 @@ export function createPermissionGuard(router: Router) {
         }
         }
       }
       }
       else {
       else {
-        if (isIndependenceMode) {
-          toIotPlatformLogin()
+        if (!isAloneMode) {
+          console.log({ to, from })
+          toIotPlatformLogin({ to, from, next })
           return
           return
         }
         }
         next()
         next()
@@ -55,8 +64,9 @@ export function createPermissionGuard(router: Router) {
         path: PageEnum.BASE_LOGIN,
         path: PageEnum.BASE_LOGIN,
         redirect: true
         redirect: true
       } as RouteLocationRaw
       } as RouteLocationRaw
-      if (isIndependenceMode) {
-        toIotPlatformLogin()
+      if (!isAloneMode) {
+        console.log({ to, from })
+        toIotPlatformLogin({ to, from, next })
         return
         return
       }
       }
       next(redirectData)
       next(redirectData)

@@ -2,7 +2,7 @@ import type { UserInfo, UserUpdateInfo } from '/#/external/store';
 import type { ErrorMessageMode } from '/#/external/axios';
 import type { ErrorMessageMode } from '/#/external/axios';
 import { defineStore } from 'pinia';
 import { defineStore } from 'pinia';
 import { pinia as store } from '@/store';
 import { pinia as store } from '@/store';
-import { RoleEnum } from '@/enums/external/roleEnum'; 
+import { RoleEnum } from '@/enums/external/roleEnum';
 import { JWT_TOKEN_KEY, REFRESH_TOKEN_KEY, ROLES_KEY, USER_INFO_KEY } from '@/enums/external/cacheEnum';
 import { JWT_TOKEN_KEY, REFRESH_TOKEN_KEY, ROLES_KEY, USER_INFO_KEY } from '@/enums/external/cacheEnum';
 import { getAuthCache, setAuthCache } from '@/utils/external/auth';
 import { getAuthCache, setAuthCache } from '@/utils/external/auth';
 import {
 import {
@@ -16,7 +16,7 @@ import router from '@/router';
 import { createLocalStorage } from '@/utils/external/cache';
 import { createLocalStorage } from '@/utils/external/cache';
 import { useI18n } from 'vue-i18n';
 import { useI18n } from 'vue-i18n';
 import { useDialog } from 'naive-ui';
 import { useDialog } from 'naive-ui';
-import { PageEnum } from '@/enums/pageEnum';
+import { PageEnum } from '@/enums/external/pageEnum';
 
 
 interface UserState {
 interface UserState {
   platInfo: any;
   platInfo: any;
@@ -177,9 +177,9 @@ export const useUserStore = defineStore({
       this.setSessionTimeout(false);
       this.setSessionTimeout(false);
       setAuthCache(REFRESH_TOKEN_KEY, undefined);
       setAuthCache(REFRESH_TOKEN_KEY, undefined);
       this.setUserInfo(null);
       this.setUserInfo(null);
-      goLogin && router.push(PageEnum.BASE_LOGIN);
       window.localStorage.clear();
       window.localStorage.clear();
       window.localStorage.removeItem('updateUserInfo');
       window.localStorage.removeItem('updateUserInfo');
+      goLogin && router.push(PageEnum.BASE_LOGIN);
     },
     },
 
 
     async doRefresh() {
     async doRefresh() {

@@ -2,12 +2,13 @@ import type { GlobEnvConfig } from '/#/external/config';
 
 
 // import pkg from '../../../../package.json';
 // import pkg from '../../../../package.json';
 import { getGlobalConfigName } from '../../../../build/external/vite/plugins/globConfig/getGlobConfigName';
 import { getGlobalConfigName } from '../../../../build/external/vite/plugins/globConfig/getGlobConfigName';
-import { RuntimeEnvironment } from '@/enums/external/envEnum';
+import { ProjectRuntimeEnvEnum } from '@/enums/external/envEnum';
+
 
 
 export function getCommonStoragePrefix() {
 export function getCommonStoragePrefix() {
   // const { VITE_GLOB_APP_SHORT_NAME } = getAppEnvConfig();
   // const { VITE_GLOB_APP_SHORT_NAME } = getAppEnvConfig();
   const VITE_GLOB_APP_SHORT_NAME = 'undefined'
   const VITE_GLOB_APP_SHORT_NAME = 'undefined'
-  const ENV = [RuntimeEnvironment.DEVELOPMENT, RuntimeEnvironment.INDEPENDENCE].includes(import.meta.env.MODE as RuntimeEnvironment) ? RuntimeEnvironment.DEVELOPMENT : RuntimeEnvironment.PRODUCTION
+  const ENV = [ProjectRuntimeEnvEnum.DEV, ProjectRuntimeEnvEnum.DEV_ALONE].includes(import.meta.env.MODE as ProjectRuntimeEnvEnum) ? ProjectRuntimeEnvEnum.DEV : ProjectRuntimeEnvEnum.PROD
   return `${VITE_GLOB_APP_SHORT_NAME}__${ENV.toUpperCase()}`.toUpperCase();
   return `${VITE_GLOB_APP_SHORT_NAME}__${ENV.toUpperCase()}`.toUpperCase();
 }
 }
 
 

 <template>
 <template>
   <div class="go-items-list">
   <div class="go-items-list">
-    <n-grid
-        :x-gap="20"
-        :y-gap="20"
-        cols="2 s:2 m:3 l:4 xl:4 xxl:4"
-        responsive="screen"
-    >
+    <n-grid :x-gap="20" :y-gap="20" cols="2 s:2 m:3 l:4 xl:4 xxl:4" responsive="screen">
       <n-grid-item v-for="(item, index) in list" :key="item.id">
       <n-grid-item v-for="(item, index) in list" :key="item.id">
-        <project-items-card
-            :cardData="item"
-            @resize="resizeHandle"
-            @delete="deleteHandle($event, index)"
-            @edit="editHandle"
-        ></project-items-card>
+        <project-items-card :cardData="item" @resize="resizeHandle" @delete="deleteHandle($event, index)"
+          @edit="editHandle"></project-items-card>
       </n-grid-item>
       </n-grid-item>
     </n-grid>
     </n-grid>
     <div class="list-pagination">
     <div class="list-pagination">
-      <n-pagination
-          :item-count="10"
-          :page-sizes="[10, 20, 30, 40]"
-          show-size-picker
-      />
+      <n-pagination :item-count="10" :page-sizes="[10, 20, 30, 40]" show-size-picker />
     </div>
     </div>
   </div>
   </div>
-  <project-items-modal-card
-      v-if="modalData"
-      :modalShow="modalShow"
-      :cardData="modalData"
-      @close="closeModal"
-      @edit="editHandle"
-  ></project-items-modal-card>
+  <project-items-modal-card v-if="modalData" :modalShow="modalShow" :cardData="modalData" @close="closeModal"
+    @edit="editHandle"></project-items-modal-card>
 </template>
 </template>
 
 
 <script setup lang="ts">
 <script setup lang="ts">
-import {ProjectItemsCard} from '../ProjectItemsCard/index'
-import {ProjectItemsModalCard} from '../ProjectItemsModalCard/index'
-import {icon} from '@/plugins'
-import {useModalDataInit} from './hooks/useModal.hook'
-import {useDataListInit} from './hooks/useData.hook'
-import {getDataViewList} from "@/api/external/contentSave/content";
-import {onMounted, ref} from "vue";
+import { ProjectItemsCard } from '../ProjectItemsCard/index'
+import { ProjectItemsModalCard } from '../ProjectItemsModalCard/index'
+import { icon } from '@/plugins'
+import { useModalDataInit } from './hooks/useModal.hook'
+import { useDataListInit } from './hooks/useData.hook'
+import { getDataViewList } from "@/api/external/contentSave/content";
+import { onMounted, ref } from "vue";
 // THINGS_KIT
 // THINGS_KIT
-import {ChartList} from '../../index.d'
+import { ChartList } from '../../index.d'
 
 
-const {CopyIcon, EllipsisHorizontalCircleSharpIcon} = icon.ionicons5
-const {deleteHandle} = useDataListInit()
-const {modalData, modalShow, closeModal, resizeHandle, editHandle} = useModalDataInit()
+const { CopyIcon, EllipsisHorizontalCircleSharpIcon } = icon.ionicons5
+const { deleteHandle } = useDataListInit()
+const { modalData, modalShow, closeModal, resizeHandle, editHandle } = useModalDataInit()
 
 
 // THINGS_KIT
 // THINGS_KIT
 const list = ref<ChartList>([])
 const list = ref<ChartList>([])
 onMounted(async () => {
 onMounted(async () => {
-  const {items} = await getDataViewList({page: 1, pageSize: 10})
-  list.value = items
+  try {
+    const { items } = await getDataViewList({ page: 1, pageSize: 10 })
+    list.value = items
+  } catch (error) {
+    console.log(error)
+  }
 })
 })
 
 
 </script>
 </script>
 
 
 <style lang="scss" scoped>
 <style lang="scss" scoped>
 $contentHeight: 250px;
 $contentHeight: 250px;
+
 @include go('items-list') {
 @include go('items-list') {
   display: flex;
   display: flex;
   flex-direction: column;
   flex-direction: column;
   justify-content: space-between;
   justify-content: space-between;
   min-height: calc(100vh - #{$--header-height} * 2 - 2px);
   min-height: calc(100vh - #{$--header-height} * 2 - 2px);
+
   .list-content {
   .list-content {
     position: relative;
     position: relative;
     height: $contentHeight;
     height: $contentHeight;
   }
   }
+
   .list-pagination {
   .list-pagination {
     display: flex;
     display: flex;
     justify-content: flex-end;
     justify-content: flex-end;

@@ -89,7 +89,7 @@ export default defineConfig(({ mode, command }) => {
       chunkSizeWarningLimit: chunkSizeWarningLimit
       chunkSizeWarningLimit: chunkSizeWarningLimit
     },
     },
     server: {
     server: {
-      port: 5555,
+      port: viteEnv.VITE_DEV_PORT,
       proxy: createProxy(viteEnv),
       proxy: createProxy(viteEnv),
     }, 
     }, 
   }
   }