feat: 合并代码

2025-12-22 11:40:43 +08:00
parent 6ea7a611df c467f54dab
commit 3b02e08be6
14 changed files with 89 additions and 101 deletions
--- a/.env
+++ b/.env
@@ -0,0 +1,4 @@
+APIFOX_PROJECT_ID = 7574669
+APIFOX_ACCESS_TOKEN = APS-20xZ4VqkdY1I1GC63EPVJHbJGsM4VMqy
+
+VITE_SERVICE_URL = http://8.138.234.141/ingress
--- a/global.d.ts
+++ b/global.d.ts
@@ -60,7 +60,8 @@ declare global {
    isWindowMaximized: () => Promise<boolean>,
    viewIsReady: () => void
    app: {
-      setFrameless: (route?: string) => void
+      setFrameless: (route?: string) => void,
+      loadPage: (page: string) => void
    },
    tabs: {
      create: (url?: string) => void,
--- a/package-lock.json
+++ b/package-lock.json
@@ -1631,47 +1631,6 @@
      "dev": true,
      "license": "MIT"
    },
-    "node_modules/@humanwhocodes/config-array": {
-      "version": "0.13.0",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz",
-      "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==",
-      "deprecated": "Use @eslint/config-array instead",
-      "dev": true,
-      "license": "Apache-2.0",
-      "peer": true,
-      "dependencies": {
-        "@humanwhocodes/object-schema": "^2.0.3",
-        "debug": "^4.3.1",
-        "minimatch": "^3.0.5"
-      },
-      "engines": {
-        "node": ">=10.10.0"
-      }
-    },
-    "node_modules/@humanwhocodes/module-importer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
-      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "peer": true,
-      "engines": {
-        "node": ">=12.22"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/nzakas"
-      }
-    },
-    "node_modules/@humanwhocodes/object-schema": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz",
-      "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",
-      "deprecated": "Use @eslint/object-schema instead",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "peer": true
-    },
    "node_modules/@iconify-json/material-symbols": {
      "version": "1.2.50",
      "resolved": "https://registry.npmmirror.com/@iconify-json/material-symbols/-/material-symbols-1.2.50.tgz",
@@ -7502,7 +7461,7 @@
    },
    "node_modules/js-base64": {
      "version": "3.7.8",
-      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-3.7.8.tgz",
+      "resolved": "https://registry.npmmirror.com/js-base64/-/js-base64-3.7.8.tgz",
      "integrity": "sha512-hNngCeKxIUQiEUN3GPJOkz4wF/YvdUdbNL9hsBcMQTkKzboD7T/q3OYOuuPZLUE6dBxSGpwhk5mwuDud7JVAow==",
      "license": "BSD-3-Clause"
    },
--- a/src/common/constants.ts
+++ b/src/common/constants.ts
@@ -7,6 +7,7 @@ export enum IPC_EVENTS {
  WINDOW_CLOSE = 'window-close',
  IS_WINDOW_MAXIMIZED = 'is-window-maximized',
  APP_SET_FRAMELESS = 'app:set-frameless',
+  APP_LOAD_PAGE = 'app:load-page',
  TAB_CREATE = 'tab:create',
  TAB_LIST = 'tab:list',
  TAB_NAVIGATE = 'tab:navigate',
--- a/src/main/service/window-service/index.ts
+++ b/src/main/service/window-service/index.ts
@@ -90,6 +90,10 @@ class WindowService {
    ipcMain.on(IPC_EVENTS.WINDOW_MINIMIZE, handleMinimizeWindow);
    ipcMain.on(IPC_EVENTS.WINDOW_MAXIMIZE, handleMaximizeWindow);
    ipcMain.handle(IPC_EVENTS.IS_WINDOW_MAXIMIZED, handleIsWindowMaximized);
+    ipcMain.handle(IPC_EVENTS.APP_LOAD_PAGE, (e: IpcMainInvokeEvent, page: string) => {
+      const win = BrowserWindow.fromWebContents(e.sender);
+      if (win) this._loadPage(win, page);
+    });
  }

  public static getInstance(): WindowService {
@@ -211,12 +215,16 @@ class WindowService {
    }
  }

-  private _loadWindowTemplate(window: BrowserWindow, name: WindowNames) {
-    // 检查是否存在开发服务器 URL，若存在则表示处于开发环境
+  private _loadPage(window: BrowserWindow, pageName: string) {
    if (MAIN_WINDOW_VITE_DEV_SERVER_URL) {
-      return window.loadURL(`${MAIN_WINDOW_VITE_DEV_SERVER_URL}${'/html/' + (name === 'main' ? '' : name)}`);
+      return window.loadURL(`${MAIN_WINDOW_VITE_DEV_SERVER_URL}/html/${pageName}.html`);
    }
-    window.loadFile(path.join(__dirname, `../renderer/${MAIN_WINDOW_VITE_NAME}/html/${name === 'main' ? 'login' : name}.html`));
+    window.loadFile(path.join(__dirname, `../renderer/${MAIN_WINDOW_VITE_NAME}/html/${pageName}.html`));
+  }
+
+  private _loadWindowTemplate(window: BrowserWindow, name: WindowNames) {
+    const page = name === 'main' ? 'login' : name;
+    this._loadPage(window, page);
  }


--- a/src/preload.ts
+++ b/src/preload.ts
@@ -16,7 +16,8 @@ const api: WindowApi = {
  viewIsReady: () => ipcRenderer.send(IPC_EVENTS.RENDERER_IS_READY),

  app: {
-    setFrameless: (route?: string) => ipcRenderer.invoke(IPC_EVENTS.APP_SET_FRAMELESS, route)
+    setFrameless: (route?: string) => ipcRenderer.invoke(IPC_EVENTS.APP_SET_FRAMELESS, route),
+    loadPage: (page: string) => ipcRenderer.invoke(IPC_EVENTS.APP_LOAD_PAGE, page)
  },

  tabs: {
--- a/src/renderer/api/oauth2.ts
+++ b/src/renderer/api/oauth2.ts
@@ -16,6 +16,7 @@ export function authOauth2TokenUsingPost({
    method: 'POST',
    headers: {
      'Content-Type': 'application/x-www-form-urlencoded',
+      'Authorization': 'Basic Y3VzdG9tUEM6Y3VzdG9tUEM=',
    },
    data: body,
    ...(options || {}),
--- a/src/renderer/main.ts
+++ b/src/renderer/main.ts
@@ -3,8 +3,12 @@ import { createPinia } from "pinia"
 import errorHandler from "@utils/errorHandler"
 import router from "./router"
 import App from "./App.vue"
+
+// 引入 Element Plus 组件库
 import ElementPlus from 'element-plus'
 import locale from 'element-plus/es/locale/lang/zh-cn'
+
+// 引入 i18n 插件
 import i18n from './i18n'
 // import './permission'

--- a/src/renderer/router/index.ts
+++ b/src/renderer/router/index.ts
@@ -1,20 +1,16 @@
-/*
- * @Author: kongbeiwu lishaohua-520@qq.com
- * @Date: 2025-12-22 01:28:13
- * @LastEditors: kongbeiwu lishaohua-520@qq.com
- * @LastEditTime: 2025-12-22 01:31:48
- * @FilePath: /project/zn-ai/src/renderer/router/index.ts
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- */
 import { createRouter, createMemoryHistory } from "vue-router";

 const routes = [
  {
-    path: "/",
-    component: () => import("@renderer/views/login/index.vue"),
-    name: "Login",
-    meta: { requiresAuth: false },
-  }
+    path: '/',
+    redirect: '/home'
+  },
+  {
+    path: "/home",
+    component: () => import("@renderer/views/home/index.vue"),
+    name: "Home",
+    meta: { requiresAuth: true },
+  },
 ];

 const router = createRouter({
@@ -29,24 +25,4 @@ const router = createRouter({
  },
 });

-// router.beforeEach((to: any, from: any, next: any) => {
-//   const token = localStorage.getItem("token");
-//   if (to.meta && (to.meta as any).requiresAuth && !token) {
-//     next({ path: "/login" });
-//     return;
-//   }
-
-//   if (token && to.path === "/login") {
-//     next({ path: "/home" });
-//     return;
-//   }
-
-//   if (token && to.path === "/") {
-//     next({ path: "/home" });
-//     return;
-//   }
-  
-//   next();
-// });
-
 export default router;
--- a/src/renderer/utils/request.ts
+++ b/src/renderer/utils/request.ts
@@ -6,7 +6,8 @@ import { getToken } from '@utils/auth'
 import { tansParams } from '@utils/tansParams'

 // 获取.env中的服务地址
-const { VITE_SERVICE_URL } = (import.meta as any).env
+const { VITE_SERVICE_URL, DEV } = (import.meta as any).env
+console.log("🚀 ~ DEV:", DEV)

 // 是否显示重新登录
 export let isRelogin = { show: false }
@@ -15,7 +16,7 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'

 // 创建axios对象
 const instance = axios.create({
-  baseURL: VITE_SERVICE_URL,
+  baseURL: DEV ? '/ingress' : VITE_SERVICE_URL,
  // 超时
  timeout: 10000
 })
--- a/src/renderer/views/home/index.vue
+++ b/src/renderer/views/home/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="bg-white box-border w-full h-full rounded-[16px] flex">
    首页
  </div>
 </template>
--- a/src/renderer/views/login/index.ts
+++ b/src/renderer/views/login/index.ts
@@ -1,16 +1,38 @@
-import '@renderer/styles/index.css'
-
+import { createApp, type Plugin } from "vue"
 import errorHandler from '@utils/errorHandler'
+
+// 引入 Element Plus 组件库
+import ElementPlus from 'element-plus'
+import locale from 'element-plus/es/locale/lang/zh-cn'
+
+// 引入 i18n 插件
 import i18n from '@renderer/i18n'
-import HeaderBar from '@renderer/components/HeaderBar/index.vue'
-import DragRegion from '@renderer/components/DragRegion/index.vue'

 import Login from './index.vue'

-createApp(Login)
-  .use(i18n)
-  .use(createPinia())
-  .use(errorHandler)
-  .component('HeaderBar', HeaderBar)
-  .component('DragRegion', DragRegion)
-  .mount('#app')
+// 样式文件隔离
+import '@renderer/styles/index.css'
+import 'element-plus/dist/index.css'
+
+// 引入全局组件
+import HeaderBar from '@components/HeaderBar/index.vue'
+import DragRegion from '@components/DragRegion/index.vue'
+
+const components: Plugin =  (app) => {
+  app.component('HeaderBar', HeaderBar);
+  app.component('DragRegion', DragRegion);
+}
+
+// 创建 Vue 应用实例
+const app = createApp(Login);
+const pinia = createPinia();
+
+// 使用 Pinia 状态管理
+app.use(pinia);
+app.use(ElementPlus, { locale })
+app.use(components)
+app.use(i18n)
+app.use(errorHandler)
+
+// 挂载应用到 DOM
+app.mount("#app");
--- a/src/renderer/views/login/index.vue
+++ b/src/renderer/views/login/index.vue
@@ -32,7 +32,8 @@
          </el-form-item>
          <el-form-item prop="password">
            <div class="text-[14px] text-gray-600">密码</div>
-            <el-input class="h-[40px]" v-model.trim="form.password" placeholder="请输入密码" clearable autocomplete="off">
+            <el-input class="h-[40px]" v-model.trim="form.password" type="password" placeholder="请输入密码" clearable
+              autocomplete="off">
              <template #prefix>
                <RiKey2Fill size="20px" color="#99A0AE" />
              </template>
@@ -75,12 +76,12 @@
        </el-form>

        <!-- Copy Right -->
-        <div class="text-[14px] text-gray-500 text-center mt-auto">
+        <!-- <div class="text-[14px] text-gray-500 text-center mt-auto">
          © 2025 贵州智念科技服务有限公司 版权所有
-        </div>
+        </div> -->
      </div>

-      <img class="w-[540px]" src="@assets/images/login/logo.png" />
+      <!-- <img class="w-[540px]" src="@assets/images/login/logo.png" /> -->
    </main>
  </div>
 </template>
@@ -122,8 +123,7 @@ const onSubmit = async () => {

  try {
    userStore.login(form).then(() => {
-      // window.location.href = 'index.html'
-      console.log(form)
+      window.api.app.loadPage('index');
    })
  } finally {
    getVerifyCode()
--- a/vite.renderer.config.ts
+++ b/vite.renderer.config.ts
@@ -25,6 +25,7 @@ export default defineConfig(async () => {
          resolve(__dirname, 'html/index.html'),
          resolve(__dirname, 'html/dialog.html'),
          resolve(__dirname, 'html/setting.html'),
+          resolve(__dirname, 'html/login.html'),
        ]
      }
    },
@@ -44,5 +45,14 @@ export default defineConfig(async () => {
        "@locales": resolve(__dirname, "locales"),
      },
    },
+
+    server: {
+      proxy: {
+        '/ingress': {
+          target: 'http://8.138.234.141',
+          changeOrigin: true,
+        },
+      },
+    },
  }
 });