修复登陆资料存储问题

src/App.vue

@@ -16,7 +16,7 @@ export default defineComponent({
     const $q = useQuasar()
     let timer = null as any
     if(localStorage.vuex){
-      localStorage.removeItem('vuex')
+      localStorage.clear()
     }
     onBeforeUnmount(() => {
       if (timer !== void 0) {

src/api/request.ts

 import service from "./axios";
 import Store from '../store'
 import md5 from "md5-ts";
-import { HttpResponse } from "@/@types";
+import { HttpResponse } from "../@types";
 import * as OpenCC from 'opencc-js'
 import { i18n } from '../boot/i18n'
 import { DirtionmaryHelper } from '../config/dictionary'
@@ -28,17 +28,17 @@ const request = (cmd:string,msg:any): Promise<HttpResponse>=>{
 		currencyCode = 'JPY'
 	}
 	msg = datas??{}
-	let token = localStorage.getItem(DirtionmaryHelper.TOKEN_KEYS);
-	let key = "";
-	let groupId = localStorage.getItem(DirtionmaryHelper.GROUPID_KEYS)
+	let token = ''
+	let key = ""
+	let groupId = ''
 	let timestamp = (new Date()).valueOf();
-	// if (Store.state && Store.state.user?.token) {
-	// 	token = Store.state.user?.token?.access_token
-	// 	key = Store.state.user?.secretKey
-	// }
-	// if (Store.state && Store.state.user?.userDetail) {
-	// 	groupId = Store.state.user?.userDetail?.groupId
-	// }
+	if (Store.state && Store.state.user?.token) {
+		token = Store.state.user?.token?.access_token
+		key = Store.state.user?.secretKey
+	}
+	if (Store.state && Store.state.user?.userDetail) {
+		groupId = Store.state.user?.userDetail?.groupId
+	}
 	var encodeMsg = encodeURIComponent(JSON.stringify(msg)).toLowerCase();
 	var md5Str = md5(`cmd=${cmd}&msg=${encodeMsg}&timestamp=${timestamp}&token=${token}&key=${key}`);
 	var postData = {
@@ -54,4 +54,4 @@ const request = (cmd:string,msg:any): Promise<HttpResponse>=>{
     return service.post('', postData)
 }
 
-export default request;
+export default request;
\ No newline at end of file

src/api/requestJava.ts

 import service from "./axiosJava";
-import Store from '../store'
 import md5 from "md5-ts";
-import { HttpResponse } from "@/@types";
+import { HttpResponse } from "../@types";
 import * as OpenCC from 'opencc-js'
+import Store from '../store'
 import { i18n } from '../boot/i18n'
 let {locale} =i18n.global
 let converterSW = OpenCC.Converter({ from: 'tw', to: 'cn' }) //转简
@@ -31,11 +31,11 @@ const request = (cmd:string,msg:any): Promise<HttpResponse>=>{
 	let key = "";
 	let groupId = 0
 	let timestamp = (new Date()).valueOf();
-	if (Store.state && Store.state.user?.token) {
+	if (Store.state.user?.token) {
 		token = Store.state.user?.token?.access_token
 		key = Store.state.user?.secretKey
 	}
-	if (Store.state && Store.state.user?.userDetail) {
+	if (Store.state.user?.userDetail) {
 		groupId = Store.state.user?.userDetail?.groupId
 	}
 	var encodeMsg = encodeURIComponent(JSON.stringify(msg)).toLowerCase();
@@ -53,4 +53,4 @@ const request = (cmd:string,msg:any): Promise<HttpResponse>=>{
     return service.post(process.env.JAVA_URL_API+cmd, postData)
 }
 
-export default request;
+export default request;
\ No newline at end of file

src/config/dictionary.ts

@@ -8,15 +8,7 @@ const userDictionmary = {
 }
 
 class DirtionmaryHelper {
-  /**
-   * groupId
-   */
-   static readonly GROUPID_KEYS='groupId_keys'
-   
-  /**
-   * token
-   */
-   static readonly TOKEN_KEYS='token_keys'
+
 
   /**
    * 菜單選項

src/layouts/MainLayout.vue

@@ -25,7 +25,7 @@
           </div>
           <q-avatar size="40px" rounded class="bg-blue-2 cursor-pointer">
             <q-img :src="userInfo.photo" v-if="userInfo?.photo" mode="cover" />
-            <span class="text-primary text-h6" v-else>{{ userInfo.name.substring(0, 1) }}</span>
+            <span class="text-primary text-h6" v-else>{{ userInfo.name?.substring(0, 1) }}</span>
             <q-popup-proxy :offset="[0,15]" class="no-shadow">
              <user-info :user="userInfo"></user-info>
             </q-popup-proxy>
@@ -61,7 +61,7 @@
 </template>
 
 <script lang="ts">
-import { inject, provide, reactive, ref, toRefs, onMounted } from 'vue'
+import { inject, provide, reactive, ref, toRefs, onMounted, computed } from 'vue'
 import { getStoreGetter } from '../store/utils'
 import { UserGetter } from '../store/modules/user/getters'
 import svgIcon from '../components/global/svg-icon.vue'
@@ -89,6 +89,10 @@ export default {
     const activeMenu=ref(0)
     provide(DirtionmaryHelper.MENU_KEYS, activeMenu)
     data.userInfo = getStoreGetter<UserGetter>('user', 'getUser')
+    // const userInfo = computed(()=>{
+    //   //console.log(getStoreGetter<UserGetter>('user', 'getUser'),'....')
+    //   return getStoreGetter<UserGetter>('user', 'getUser')
+    // })
     data.scrollStyle = useScrollModule().scrollStyle
     const methods = {
       toggleLeftDrawer() {
@@ -104,7 +108,7 @@ export default {
         },200)
       }, 1000);
     })
-    data.version = AppConfig.$version
+    data.version = AppConfig.$version??''
     return {
       ...toRefs(data),
       ...methods,

src/store/index.ts

@@ -8,10 +8,10 @@ import mutations from './mutations'
 import modules from './modules'
 import { StateType } from '../@types'
 import SecureLS from "secure-ls";
-var ls = new SecureLS({ 
+var ls = new SecureLS({
   encodingType: "aes",    //加密类型
-  isCompression: false,   
-  encryptionSecret: "encryption",   //PBKDF2值
+  isCompression: false,
+  encryptionSecret: "Viitto@2023",   //PBKDF2值
 });
 
 // provide typings for `this.$store`
@@ -41,7 +41,8 @@ const store: VuexStore<StateType> = createStore<StateType>({
     //   paths: ['app', 'user']
     // })
     createPersistedState({
-      key: "vuex",
+      key: "SETLT",
+      paths: ['app', 'user'],
       storage: {
         getItem: (key) => ls.get(key),
         setItem: (key, value) => ls.set(key, value),

src/store/modules/user/actions.ts

@@ -67,7 +67,7 @@ const userActions = {
       let loginResult = await UserService.login(param)
       if(loginResult.data.resultCode==ApiResult.SUCCESS){
         console.log(loginResult.data.data,'-----loginResult.data.data')
-        
+
           message.successMsg(t("login.success"))
           setStoreState('user', 'userDetail', loginResult.data.data)
           setStoreState('user', 'menuList', loginResult.data.data.MenuList)
@@ -77,8 +77,6 @@ const userActions = {
           }
           const expireTime = 72 * 60 * 60 * 1000 + new Date().getTime()
           setStoreState('user', 'token', { ...token, expireTime })
-          localStorage.setItem(DirtionmaryHelper.TOKEN_KEYS,loginResult.data.data.token)
-          localStorage.setItem(DirtionmaryHelper.GROUPID_KEYS,loginResult.data.data.groupId)
         flag[0]=true;
 
       }else {

src/store/modules/user/getters.ts

@@ -4,15 +4,11 @@ import { DirtionmaryHelper } from '../../../config/dictionary'
 
 const userGetter = {
   getUserToken() {
-    // const token = store.state.user.token
-    // return token.access_token ?? ResultType.Empty
-    console.log(localStorage.getItem(DirtionmaryHelper.TOKEN_KEYS),'----')
-    const token = localStorage.getItem(DirtionmaryHelper.TOKEN_KEYS)
-    return token ?? ResultType.Empty
+    const token = store.state.user.token
+    return token.access_token ?? ResultType.Empty
   },
   getUserAllAuth() {
     const menuList: any[] = store.state.user.menuList
-    console.log((menuList.length > 0 ? menuList : ResultType.EmptyArray),menuList.length,menuList)
     return menuList.length > 0 ? menuList : ResultType.EmptyArray
   },
   getUser(){

src/utils/auth.ts

@@ -6,7 +6,8 @@ import { ResultType } from '../@types/enumHelper'
  * @description 获取授权信息
  */
 export function getAuth() {
-  const token = getStoreGetter<UserGetter>('user', 'getUserToken') ?? ResultType.Empty
+  const token = getStoreGetter<UserGetter>('user', 'getUserToken') ??
+  ResultType.Empty
   return token != ResultType.Empty
 }