2023年4月18日 将信息转为真实的后台数据

src/api/sys/user.ts

@@ -8,6 +8,7 @@ import { setAuthCache } from '/@/utils/auth';
 import { TOKEN_KEY } from '/@/enums/cacheEnum';
 import { router } from '/@/router';
 import { PageEnum } from '/@/enums/pageEnum';
+import { SysConfigInfo } from '/#/store';
 
 const { createErrorModal } = useMessage();
 enum Api {
@@ -15,6 +16,7 @@ enum Api {
   phoneLogin = '/sys/phoneLogin',
   Logout = '/sys/logout',
   GetUserInfo = '/sys/user/getUserInfo',
+  GetSysConfigInfo = '/kcSysConfig/kcSysConfig/queryById',
   // 获取系统权限
   // 1、查询用户拥有的按钮/表单访问权限
   // 2、所有权限
@@ -91,6 +93,24 @@ export function getUserInfo() {
   });
 }
 
+/**
+ * @description:
+ */
+export function getSysConfigInfo() {
+  return defHttp.get<SysConfigInfo>({ url: Api.GetSysConfigInfo, params: { id: '1' } }, { }).catch((e) => {
+    // update-begin--author:zyf---date:20220425---for:【VUEN-76】捕获接口超时异常,跳转到登录界面
+    if (e && (e.message.includes('timeout') || e.message.includes('401'))) {
+      //接口不通时跳转到登录界面
+      const userStore = useUserStoreWithOut();
+      userStore.setToken('');
+      setAuthCache(TOKEN_KEY, null);
+      router.push(PageEnum.BASE_LOGIN);
+    }
+    // update-end--author:zyf---date:20220425---for:【VUEN-76】捕获接口超时异常,跳转到登录界面
+  });
+}
+
+
 export function getPermCode() {
   return defHttp.get({ url: Api.GetPermCode });
 }

src/enums/cacheEnum.ts

@@ -32,6 +32,9 @@ export const TENANT_ID = 'TENANT_ID';
 // login info key
 export const LOGIN_INFO_KEY = 'LOGIN__INFO__';
 
+// login info key
+export const SYS_CONFIG_INFO_KEY = 'SYS__CONFIG__INFO__';
+
 // 聊天UID key
 export const JEECG_CHAT_UID = 'JEECG_CHAT_UID';
 

src/router/guard/permissionGuard.ts

@@ -117,6 +117,7 @@ export function createPermissionGuard(router: Router) {
     if (userStore.getLastUpdateTime === 0) {
       try {
         await userStore.getUserInfoAction();
+        await userStore.getSysConfigInfoAction();
       } catch (err) {
         console.info(err);
         next();

src/store/modules/user.ts

@@ -1,13 +1,13 @@
-import type { UserInfo, LoginInfo } from '/#/store';
+import type { UserInfo, LoginInfo, SysConfigInfo } from '/#/store';
 import type { ErrorMessageMode } from '/#/axios';
 import { defineStore } from 'pinia';
 import { store } from '/@/store';
 import { RoleEnum } from '/@/enums/roleEnum';
 import { PageEnum } from '/@/enums/pageEnum';
-import { ROLES_KEY, TOKEN_KEY, USER_INFO_KEY, LOGIN_INFO_KEY, DB_DICT_DATA_KEY, TENANT_ID } from '/@/enums/cacheEnum';
+import { ROLES_KEY, TOKEN_KEY, USER_INFO_KEY, LOGIN_INFO_KEY, SYS_CONFIG_INFO_KEY, DB_DICT_DATA_KEY, TENANT_ID } from '/@/enums/cacheEnum';
 import { getAuthCache, setAuthCache, removeAuthCache } from '/@/utils/auth';
 import { GetUserInfoModel, LoginParams, ThirdLoginParams } from '/@/api/sys/model/userModel';
-import { doLogout, getUserInfo, loginApi, phoneLoginApi, thirdLogin } from '/@/api/sys/user';
+import { doLogout, getUserInfo, getSysConfigInfo, loginApi, phoneLoginApi, thirdLogin } from '/@/api/sys/user';
 import { useI18n } from '/@/hooks/web/useI18n';
 import { useMessage } from '/@/hooks/web/useMessage';
 import { router } from '/@/router';
@@ -27,6 +27,7 @@ interface UserState {
   lastUpdateTime: number;
   tenantid?: string | number;
   loginInfo?: Nullable<LoginInfo>;
+  sysConfigInfo?: Nullable<SysConfigInfo>;
 }
 
 export const useUserStore = defineStore({
@@ -48,6 +49,8 @@ export const useUserStore = defineStore({
     tenantid: '',
     //登录返回信息
     loginInfo: null,
+    //系统配置信息
+    sysConfigInfo: null,
   }),
   getters: {
     getUserInfo(): UserInfo {
@@ -56,6 +59,9 @@ export const useUserStore = defineStore({
     getLoginInfo(): LoginInfo {
       return this.loginInfo || getAuthCache<LoginInfo>(LOGIN_INFO_KEY) || {};
     },
+    getSysConfigInfo(): SysConfigInfo {
+      return this.sysConfigInfo || getAuthCache<SysConfigInfo>(SYS_CONFIG_INFO_KEY) || {};
+    },
     getToken(): string {
       return this.token || getAuthCache<string>(TOKEN_KEY);
     },
@@ -93,6 +99,10 @@ export const useUserStore = defineStore({
       this.loginInfo = info;
       setAuthCache(LOGIN_INFO_KEY, info);
     },
+    setSysConfigInfo(info: SysConfigInfo | null) {
+      this.sysConfigInfo = info;
+      setAuthCache(SYS_CONFIG_INFO_KEY, info);
+    },
     setAllDictItems(dictItems) {
       this.dictItems = dictItems;
       setAuthCache(DB_DICT_DATA_KEY, dictItems);
@@ -106,6 +116,7 @@ export const useUserStore = defineStore({
     },
     resetState() {
       this.userInfo = null;
+      this.sysConfigInfo = null;
       this.dictItems = [];
       this.token = '';
       this.roleList = [];
@@ -152,6 +163,7 @@ export const useUserStore = defineStore({
       if (!this.getToken) return null;
       //获取用户信息
       const userInfo = await this.getUserInfoAction();
+      await this.getSysConfigInfoAction();
       const sessionTimeout = this.sessionTimeout;
       if (sessionTimeout) {
         this.setSessionTimeout(false);
@@ -201,7 +213,7 @@ export const useUserStore = defineStore({
       if (!this.getToken) {
         return null;
       }
-      const { userInfo, sysAllDictItems } = await getUserInfo();
+      const { userInfo, sysAllDictItems } = <GetUserInfoModel> await getUserInfo();
       if (userInfo) {
         const { roles = [] } = userInfo;
         if (isArray(roles)) {
@@ -223,6 +235,16 @@ export const useUserStore = defineStore({
       }
       return userInfo;
     },
+    async getSysConfigInfoAction(): Promise<SysConfigInfo | null> {
+      const sysConfigInfo = <SysConfigInfo | null> await getSysConfigInfo();
+      if(sysConfigInfo){
+        await this.setSysConfigInfo(sysConfigInfo);
+      } else {
+        await this.setSysConfigInfo(<SysConfigInfo>{});
+      }
+      return sysConfigInfo;
+    },
+
     /**
      * 退出登录
      */

src/utils/cache/memory.ts

@@ -1,4 +1,4 @@
-import { TOKEN_KEY, ROLES_KEY, USER_INFO_KEY, DB_DICT_DATA_KEY, TENANT_ID, LOGIN_INFO_KEY, PROJ_CFG_KEY } from '/@/enums/cacheEnum';
+import { TOKEN_KEY, ROLES_KEY, USER_INFO_KEY, DB_DICT_DATA_KEY, TENANT_ID, LOGIN_INFO_KEY, SYS_CONFIG_INFO_KEY, PROJ_CFG_KEY } from '/@/enums/cacheEnum';
 import { omit } from 'lodash-es';
 
 export interface Cache<V = any> {
@@ -103,7 +103,7 @@ export class Memory<T = any, V = any> {
     });
     //update-begin---author:liusq  Date:20220108  for：不删除登录用户的租户id，其他缓存信息都清除----
     this.cache = {
-      ...omit(this.cache, [TOKEN_KEY, USER_INFO_KEY, ROLES_KEY, DB_DICT_DATA_KEY, TENANT_ID, LOGIN_INFO_KEY, PROJ_CFG_KEY]),
+      ...omit(this.cache, [TOKEN_KEY, USER_INFO_KEY, ROLES_KEY, DB_DICT_DATA_KEY, TENANT_ID, LOGIN_INFO_KEY, SYS_CONFIG_INFO_KEY, PROJ_CFG_KEY]),
     };
     //update-end---author:liusq  Date:20220108  for：不删除登录用户的租户id，其他缓存信息都清除----
   }

src/utils/cache/persistent.ts

@@ -1,4 +1,4 @@
-import type { LockInfo, UserInfo, LoginInfo } from '/#/store';
+import type { LockInfo, UserInfo, LoginInfo, SysConfigInfo } from '/#/store';
 import type { ProjectConfig } from '/#/config';
 import type { RouteLocationNormalized } from 'vue-router';
 
@@ -16,6 +16,7 @@ import {
   DB_DICT_DATA_KEY,
   TENANT_ID,
   LOGIN_INFO_KEY,
+  SYS_CONFIG_INFO_KEY,
 } from '/@/enums/cacheEnum';
 import { DEFAULT_CACHE_TIME } from '/@/settings/encryptionSetting';
 import { toRaw } from 'vue';
@@ -31,6 +32,7 @@ interface BasicStore {
   [DB_DICT_DATA_KEY]: string;
   [TENANT_ID]: string;
   [LOGIN_INFO_KEY]: LoginInfo;
+  [SYS_CONFIG_INFO_KEY]: SysConfigInfo;
 }
 
 type LocalStore = BasicStore;

src/views/site/utils/index.ts

@@ -1,10 +1,40 @@
 import { defHttp } from '/@/utils/http/axios';
+import { useUserStore } from '/@/store/modules/user';
+
+
+/**
+ * 项目名称
+ */
+export const projectName = import.meta.env.VITE_GLOB_APP_TITLE;
+
+/**
+ * 是否开启单点登录
+ */
+export const isOpenSSO = import.meta.env.VITE_GLOB_APP_OPEN_SSO;
 
 export const getUserId = () => {
-  return '2016900057';
+  if(isOpenSSO){
+    const { userInfo } = useUserStore();
+    //正常取用户
+    return userInfo?.username;
+  }else{
+    //固定某值
+    return '2016900057';
+  }
 }
 
+//S:学生 T:教师
+export const getUserSf = () => {
+  const { userInfo } = useUserStore();
+  if(userInfo?.userIdentity == 1){
+    return 'S';
+  }else if(userInfo?.userIdentity == 2){
+    return 'T';
+  }
+}
 
 // export const getSysConfig = () => defHttp.get({ url: '/kcSysConfig/kcSysConfig/queryById', params:{id:'1'} })
-export const getSysConfig = () => ({bxqkssj:'2023-02-19',bxqjssj:'2023-07-19'})
+export const getSysConfig = () => {
- 
+  const { sysConfigInfo } = useUserStore();
+  return sysConfigInfo;
+}

types/store.d.ts

@@ -57,3 +57,32 @@ export interface BeforeMiniState {
   menuMode?: MenuModeEnum;
   menuType?: MenuTypeEnum;
 }
+
+export interface SysConfigInfo {
+	/**主键*/
+  id?: string;
+	/**创建人*/
+  createBy: string;
+	/**创建日期*/
+  createTime?: string;
+	/**更新人*/
+  updateBy: string;
+	/**更新日期*/
+  updateTime?: string;
+	/**所属部门*/
+  sysOrgCode?: string;
+	/**本学期课程开始时间*/
+  bxqkssj?: string;
+	/**本学期课程结束时间*/
+  bxqjssj?: string;
+	/**预留字段1*/
+  flag1?: string;
+	/**预留字段2*/
+  flag2?: string;
+	/**预留字段3*/
+  flag3?: string;
+	/**预留字段4*/
+  flag4?: string;
+	/**预留字段5*/
+  flag5?: string;
+}