Merge branch 'main' into example

src/locales/langs/en-us.ts

@@ -1,6 +1,10 @@
 const local: App.I18n.Schema = {
   system: {
-    title: 'SoybeanAdmin'
+    title: 'SoybeanAdmin',
+    updateTitle: 'System Version Update Notification',
+    updateContent: 'A new version of the system has been detected. Do you want to refresh the page immediately?',
+    updateConfirm: 'Refresh immediately',
+    updateCancel: 'Later'
   },
   common: {
     action: 'Action',

src/locales/langs/zh-cn.ts

@@ -1,6 +1,10 @@
 const local: App.I18n.Schema = {
   system: {
-    title: 'Soybean 管理系统'
+    title: 'Soybean 管理系统',
+    updateTitle: '系统版本更新通知',
+    updateContent: '检测到系统有新版本发布，是否立即刷新页面？',
+    updateConfirm: '立即刷新',
+    updateCancel: '稍后再说'
   },
   common: {
     action: '操作',

src/main.ts

@@ -1,6 +1,6 @@
 import { createApp } from 'vue';
 import './plugins/assets';
-import { setupDayjs, setupIconifyOffline, setupLoading, setupNProgress } from './plugins';
+import { setupAppVersionNotification, setupDayjs, setupIconifyOffline, setupLoading, setupNProgress } from './plugins';
 import { setupStore } from './store';
 import { setupRouter } from './router';
 import { setupI18n } from './locales';
@@ -23,6 +23,8 @@ async function setupApp() {
 
   setupI18n(app);
 
+  setupAppVersionNotification();
+
   app.mount('#app');
 }
 

src/plugins/app.ts

@@ -0,0 +1,53 @@
+import { h } from 'vue';
+import { NButton } from 'naive-ui';
+import { $t } from '../locales';
+
+export function setupAppVersionNotification() {
+  document.addEventListener('visibilitychange', async () => {
+    const buildTime = await getHtmlBuildTime();
+
+    if (buildTime !== BUILD_TIME && document.visibilityState === 'visible') {
+      const n = window.$notification?.create({
+        title: $t('system.updateTitle'),
+        content: $t('system.updateContent'),
+        action() {
+          return h('div', { style: { display: 'flex', justifyContent: 'end', gap: '12px', width: '325px' } }, [
+            h(
+              NButton,
+              {
+                onClick() {
+                  n?.destroy();
+                }
+              },
+              $t('system.updateCancel')
+            ),
+            h(
+              NButton,
+              {
+                type: 'primary',
+                onClick() {
+                  location.reload();
+                }
+              },
+              $t('system.updateConfirm')
+            )
+          ]);
+        }
+      });
+    }
+  });
+}
+
+async function getHtmlBuildTime() {
+  const baseURL = import.meta.env.VITE_BASE_URL;
+
+  const res = await fetch(`${baseURL}index.html`);
+
+  const html = await res.text();
+
+  const match = html.match(/<meta name="buildTime" content="(.*)">/);
+
+  const buildTime = match?.[1] || '';
+
+  return buildTime;
+}

src/plugins/index.ts

@@ -2,3 +2,4 @@ export * from './loading';
 export * from './nprogress';
 export * from './iconify';
 export * from './dayjs';
+export * from './app';

src/router/guard/route.ts

@@ -92,6 +92,7 @@ export function createRouteGuard(router: Router) {
  * @param to to route
  */
 async function initRoute(to: RouteLocationNormalized): Promise<RouteLocationRaw | null> {
+  const authStore = useAuthStore();
   const routeStore = useRouteStore();
 
   const notFoundRoute: RouteKey = 'not-found';
@@ -125,6 +126,9 @@ async function initRoute(to: RouteLocationNormalized): Promise<RouteLocationRaw
   // the auth route is initialized
   // it is not the "not-found" route, then it is allowed to access
   if (routeStore.isInitAuthRoute && !isNotFoundRoute) {
+    // update user info
+    await authStore.updateUserInfo();
+
     return null;
   }
   // it is captured by the "not-found" route, then check whether the route exists

src/store/modules/auth/index.ts

@@ -8,7 +8,7 @@ import { fetchGetUserInfo, fetchLogin } from '@/service/api';
 import { localStg } from '@/utils/storage';
 import { $t } from '@/locales';
 import { useRouteStore } from '../route';
-import { clearAuthStorage, getToken, getUserInfo } from './shared';
+import { clearAuthStorage, getToken } from './shared';
 
 export const useAuthStore = defineStore(SetupStoreId.Auth, () => {
   const route = useRoute();
@@ -18,7 +18,12 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => {
 
   const token = ref(getToken());
 
-  const userInfo: Api.Auth.UserInfo = reactive(getUserInfo());
+  const userInfo: Api.Auth.UserInfo = reactive({
+    userId: '',
+    userName: '',
+    roles: [],
+    buttons: []
+  });
 
   /** is super role in static route */
   const isStaticSuper = computed(() => {
@@ -87,14 +92,23 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => {
     localStg.set('token', loginToken.token);
     localStg.set('refreshToken', loginToken.refreshToken);
 
+    // 2. get user info and update store
+    const pass = await updateUserInfo();
+
+    if (pass) {
+      token.value = loginToken.token;
+
+      return true;
+    }
+
+    return false;
+  }
+
+  async function updateUserInfo() {
     const { data: info, error } = await fetchGetUserInfo();
 
     if (!error) {
-      // 2. store user info
-      localStg.set('userInfo', info);
-
-      // 3. update store
-      token.value = loginToken.token;
+      // update store
       Object.assign(userInfo, info);
 
       return true;
@@ -110,6 +124,7 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => {
     isLogin,
     loginLoading,
     resetStore,
-    login
+    login,
+    updateUserInfo
   };
 });

src/store/modules/auth/shared.ts

@@ -5,27 +5,8 @@ export function getToken() {
   return localStg.get('token') || '';
 }
 
-/** Get user info */
-export function getUserInfo() {
-  const emptyInfo: Api.Auth.UserInfo = {
-    userId: '',
-    userName: '',
-    roles: [],
-    buttons: []
-  };
-  const userInfo = localStg.get('userInfo') || emptyInfo;
-
-  // fix new property: buttons, this will be removed in the next version `1.1.0`
-  if (!userInfo.buttons) {
-    userInfo.buttons = [];
-  }
-
-  return userInfo;
-}
-
 /** Clear auth storage */
 export function clearAuthStorage() {
   localStg.remove('token');
   localStg.remove('refreshToken');
-  localStg.remove('userInfo');
 }

src/typings/app.d.ts

@@ -251,6 +251,10 @@ declare namespace App {
     type Schema = {
       system: {
         title: string;
+        updateTitle: string;
+        updateContent: string;
+        updateConfirm: string;
+        updateCancel: string;
       };
       common: {
         action: string;

src/typings/storage.d.ts

@@ -18,8 +18,6 @@ declare namespace StorageType {
     mixSiderFixed: CommonType.YesOrNo;
     /** The refresh token */
     refreshToken: string;
-    /** The user info */
-    userInfo: Api.Auth.UserInfo;
     /** The theme color */
     themeColor: string;
     /** The theme settings */

src/views/_builtin/login/modules/register.vue

@@ -6,7 +6,7 @@ import { useFormRules, useNaiveForm } from '@/hooks/common/form';
 import { useCaptcha } from '@/hooks/business/captcha';
 
 defineOptions({
-  name: 'CodeLogin'
+  name: 'Register'
 });
 
 const { toggleLoginModule } = useRouterPush();