Browse Source

子应用打包模式

李富豪 1 year ago
parent
commit
abeebf7056
5 changed files with 29 additions and 18 deletions
  1. 8 0
      Web/env/.env.subsystem
  2. 2 1
      Web/package.json
  3. 4 2
      Web/src/pages/page-web/home.vue
  4. 11 11
      Web/src/router/index.ts
  5. 4 4
      Web/src/utils/logger.ts

+ 8 - 0
Web/env/.env.subsystem

@@ -0,0 +1,8 @@
+# 生产环境配置
+VITE_ENV = 'subsystem'
+
+# Api 地址
+VITE_API_URL = 'http://49.234.30.234:6789'
+
+# WebSocket 地址
+VITE_WEBSOCKET_URL = 'ws://49.234.30.234:6789/api/v1/ws'

+ 2 - 1
Web/package.json

@@ -8,7 +8,8 @@
     "start": "vite --mode development",
     "start:test": "vite --mode test",
     "start:prod": "vite --mode production",
-    "build": "vite build --mode production"
+    "build": "vite build --mode production",
+    "build:subsystem": "vite build --mode subsystem"
   },
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",

+ 4 - 2
Web/src/pages/page-web/home.vue

@@ -1,8 +1,8 @@
 <template>
   <a-layout class="width-100 flex-display" style="height: 100vh">
-    <Nav></Nav>
+    <Nav v-if="env !== 'subsystem'"></Nav>
     <a-layout>
-      <a-layout-header class="header">
+      <a-layout-header class="header" v-if="env !== 'subsystem'">
         <Topbar />
       </a-layout-header>
       <a-layout-content class="content">
@@ -26,6 +26,8 @@ interface FormState {
   password: string
 }
 
+const env = import.meta.env.VITE_ENV;
+
 const root = getRoot()
 
 const messageHandler = async (payload: any) => {

+ 11 - 11
Web/src/router/index.ts

@@ -105,17 +105,16 @@ const router = createRouter({
 
 const updateToken = async (data: SignLoginApiParams) => {
   try {
-    // const result = await apis.signLogin(data);
-    // if (result.code === 0) {
-    //   localStorage.setItem(ELocalStorageKey.Token, result.data.access_token)
-    //   localStorage.setItem(ELocalStorageKey.WorkspaceId, result.data.workspace_id)
-    //   localStorage.setItem(ELocalStorageKey.Username, result.data.username)
-    //   localStorage.setItem(ELocalStorageKey.UserId, result.data.user_id)
-    //   localStorage.setItem(ELocalStorageKey.Flag, EUserType.Web.toString())
-    // } else {
-    //   message.error(result.message)
-    // }
-    localStorage.setItem(ELocalStorageKey.WorkspaceId, data.workspace_id)
+    const result = await apis.signLogin(data);
+    if (result.code === 0) {
+      localStorage.setItem(ELocalStorageKey.Token, result.data.access_token)
+      localStorage.setItem(ELocalStorageKey.WorkspaceId, result.data.workspace_id)
+      localStorage.setItem(ELocalStorageKey.Username, result.data.username)
+      localStorage.setItem(ELocalStorageKey.UserId, result.data.user_id)
+      localStorage.setItem(ELocalStorageKey.Flag, EUserType.Web.toString())
+    } else {
+      message.error(result.message)
+    }
   } catch (e) {
     console.error(e);
   }
@@ -124,6 +123,7 @@ const updateToken = async (data: SignLoginApiParams) => {
 router.beforeEach(async (to, from, next) => {
   const { username, client_id, timestamp, workspace_id, workspace_name, signature } = to.query as any;
   if (username && client_id && timestamp && workspace_id && workspace_name && signature) {
+    localStorage.clear()
     await updateToken({ username, client_id, timestamp, workspace_id, workspace_name, signature })
     next();
   } else {

+ 4 - 4
Web/src/utils/logger.ts

@@ -4,25 +4,25 @@
  * @param args
  */
 export function consoleLog(...args: Parameters<typeof console.log>) {
-  if (import.meta.env.VITE_ENV !== 'production') {
+  if (import.meta.env.VITE_ENV !== 'production' && import.meta.env.VITE_ENV !== 'subsystem') {
     window.console.log.apply(null, args)
   }
 }
 
 export function consoleWarn(...args: Parameters<typeof console.warn>) {
-  if (import.meta.env.VITE_ENV !== 'production') {
+  if (import.meta.env.VITE_ENV !== 'production' && import.meta.env.VITE_ENV !== 'subsystem') {
     console.warn.apply(null, args)
   }
 }
 
 export function consoleError(...args: Parameters<typeof console.error>) {
-  if (import.meta.env.VITE_ENV !== 'production') {
+  if (import.meta.env.VITE_ENV !== 'production' && import.meta.env.VITE_ENV !== 'subsystem') {
     console.error.apply(null, args)
   }
 }
 
 export function testEnvLog(...args: Parameters<typeof console.log>) {
-  if (import.meta.env.VITE_ENV !== 'production') {
+  if (import.meta.env.VITE_ENV !== 'production' && import.meta.env.VITE_ENV !== 'subsystem') {
     console.log.apply(null, args)
   }
 }