src/main/index.js

@@ -5,13 +5,9 @@ import icon from '../../resources/icon.png?asset'
 import File from './file'
 
 File({ app, shell, BrowserWindow, ipcMain })
-
+function createWindow() {
-let mainWindow, loginWindow
+  // Create the browser window.
-
+  const mainWindow = new BrowserWindow({
-//登录窗口
-function createLoginWindow(){
-  if(loginWindow) return
-  loginWindow = new BrowserWindow({
     width: 888,
     height: 520,
     show: false,
@@ -23,113 +19,57 @@ function createLoginWindow(){
       sandbox: false,
       nodeIntegration: true
     }
-   
-  })
-  const loginURL = is.dev ? `http://localhost:5173/#/login` : `file://${__dirname}/index.html/login`
-  loginWindow.loadURL(loginURL)
-
-  loginWindow.once('ready-to-show', () => {
-    loginWindow.show()
-  })
-
-  loginWindow.on('closed', () => {
-    loginWindow = null
-  })
-}
-//主窗口
-function createMainWindow() {
-  mainWindow = new BrowserWindow({
-    width: 1200,
-    height: 700,
-    show: false,
-    frame: false,
-    autoHideMenuBar: true,
-    ...(process.platform === 'linux' ? { icon } : {}),
-    webPreferences: {
-      preload: join(__dirname, '../preload/index.js'),
-      sandbox: false,
-      nodeIntegration: true
-    }
   })
 
   mainWindow.on('ready-to-show', () => {
     mainWindow.show()
   })
+
+  
+
   mainWindow.webContents.setWindowOpenHandler((details) => {
     shell.openExternal(details.url)
     return { action: 'deny' }
   })
   mainWindow.webContents.openDevTools()
-
+  // HMR for renderer base on electron-vite cli.
+  // Load the remote URL for development or the local html file for production.
   if (is.dev && process.env['ELECTRON_RENDERER_URL']) {
     mainWindow.loadURL(process.env['ELECTRON_RENDERER_URL'])
+   
+    // mainWindow.loadURL('https://file.ysaix.com:7868/')
+
   } else {
+    // mainWindow.loadURL('https://file.ysaix.com:7868/')
     mainWindow.loadFile(join(__dirname, '../renderer/index.html'))
   }
 }
 
-// 初始化完成
+// This method will be called when Electron has finished
-app.on('ready',()=>{
+// initialization and is ready to create browser windows.
-  // 设置应用程序用户模型标识符
+// Some APIs can only be used after this event occurs.
+app.whenReady().then(() => {
+  // Set app user model id for windows
   electronApp.setAppUserModelId('com.electron')
 
-  //一个新的browserWindow 被创建时触发
+  // Default open or close DevTools by F12 in development
+  // and ignore CommandOrControl + R in production.
+  // see https://github.com/alex8088/electron-toolkit/tree/master/packages/utils
   app.on('browser-window-created', (_, window) => {
     optimizer.watchWindowShortcuts(window)
   })
 
-  //窗口 最大、最小、关闭
-  ipcMain.on('minimize-window', () => {
-    if (loginWindow) {
-      loginWindow.minimize()
-    }
-    if (mainWindow) {
-      mainWindow.minimize()
-    }
-  });
-  
-  ipcMain.on('maximize-window', () => {
-    mainWindow.isMaximized() ? mainWindow.unmaximize() :  mainWindow.maximize();
-  });
-  
-  ipcMain.on('close-window', () => {
-    if (loginWindow) {
-      loginWindow.destroy()
-    }
-    if (mainWindow) {
-      mainWindow.destroy()
-    }
-  });
 
 
-  // 打开主窗口
+  createWindow()
-  ipcMain.on('openMainWindow', () => {
-    if (!mainWindow) {
-      createMainWindow()
-    }
 
-    loginWindow.destroy()
-    loginWindow = null
-  })
-  // 打开登录窗口
-  ipcMain.on('openLoginWindow', () => {
-    if (!loginWindow) {
-      createLoginWindow()
-    }
-    mainWindow.destroy()
-    loginWindow.show()
-    loginWindow.focus()
-  })
-
-  createLoginWindow()
   app.on('activate', function () {
-    if (BrowserWindow.getAllWindows().length === 0) createLoginWindow()
+    // On macOS it's common to re-create a window in the app when the
+    // dock icon is clicked and there are no other windows open.
+    if (BrowserWindow.getAllWindows().length === 0) createWindow()
   })
-
 })
 
-
-
 // Quit when all windows are closed, except on macOS. There, it's common
 // for applications and their menu bar to stay active until the user quits
 // explicitly with Cmd + Q.
@@ -138,3 +78,35 @@ app.on('window-all-closed', () => {
     app.quit()
   }
 })
+
+ipcMain.on('toggle-top', (event) => {
+  const win = BrowserWindow.getFocusedWindow();
+  const isAlwaysOnTop = win.isAlwaysOnTop();
+  win.setAlwaysOnTop(!isAlwaysOnTop);
+  event.sender.send('top-status-changed', !isAlwaysOnTop);
+})
+
+
+ipcMain.on('minimize-window', () => {
+  const win = BrowserWindow.getFocusedWindow();
+  win.minimize();
+});
+
+ipcMain.on('maximize-window', () => {
+  const win = BrowserWindow.getFocusedWindow();
+  if (win.isMaximized()) {
+    win.unmaximize();
+  } else {
+    win.maximize();
+  }
+});
+
+ipcMain.on('close-window', () => {
+  const win = BrowserWindow.getFocusedWindow();
+  win.close();
+});
+ipcMain.on('set-winsize', (e, {x, y})=>{
+  const win = BrowserWindow.getFocusedWindow();
+  win.setSize(x,y);
+  win.center()
+})

src/renderer/src/layout/components/Header.vue

@@ -44,7 +44,7 @@ import { ElMessageBox } from 'element-plus'
 import WindowTools from '@/components/window-tools/index.vue'
 import useUserStore from '@/store/modules/user'
 
-const { ipcRenderer } = window.electron || {}
+
 const userStore = useUserStore()
 const router = useRouter()
 const currentRoute = ref('')
@@ -100,11 +100,9 @@ function logout() {
     type: 'warning'
   }).then(() => {
     userStore.logOut().then(() => {
-      // router.replace('/login')
+      router.replace('/login')
-      ipcRenderer && ipcRenderer.send('openLoginWindow')
     }).catch(()=>{
-      // router.replace('/login')
+      router.replace('/login')
-      ipcRenderer && ipcRenderer.send('openLoginWindow')
     })
   }).catch(() => { });
 }

src/renderer/src/layout/index.vue

@@ -18,6 +18,8 @@ import uploaderState from '@/store/modules/uploader'
 import { ref } from 'vue'
 let uploaderStore = ref(uploaderState())
 
+const { ipcRenderer } = window.electron || {}
+ipcRenderer ? ipcRenderer .send('set-winsize', { x: 1200, y: 700 }) : ''
 </script>
 
 <style lang="scss" scoped>

src/renderer/src/router/index.js

@@ -12,7 +12,7 @@ export const constantRoutes = [
   {
     path: '/',
     component: Layout,
-    redirect: '/resource',
+    redirect: '/login',
     children: [
       {
         path: '/resource',

src/renderer/src/utils/request.js

@@ -4,7 +4,6 @@ import { getToken } from '@/utils/auth'
 import errorCode from '@/utils/errorCode'
 import { tansParams, blobValidate } from '@/utils/ruoyi'
 import cache from '@/plugins/cache'
-const { ipcRenderer } = window.electron || {}
 
 import useUserStore from '@/store/modules/user'
 
@@ -82,7 +81,7 @@ service.interceptors.response.use(res => {
         ElMessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => {
           isRelogin.show = false;
           useUserStore().logOut().then(() => {
-            ipcRenderer && ipcRenderer.send('openLoginWindow')
+            location.href = '/index#/login';
           })
       }).catch(() => {
         isRelogin.show = false;

src/renderer/src/views/login/index.vue

@@ -35,16 +35,21 @@
 </template>
 <script setup>
 import { onMounted, reactive, ref } from 'vue'
+import { useRouter } from 'vue-router'
 import { ElMessage } from 'element-plus'
+import Cookies from 'js-cookie'
 import { encrypt, decrypt } from '@/utils/jsencrypt'
 import useUserStore from '@/store/modules/user'
 import leftBg2 from '@/assets/images/login/left-bg2.png'
 import WindowTools from '@/components/window-tools/index.vue'
 import SelectSubject from '@/components/select-subject/index.vue'
 
+
 const { ipcRenderer } = window.electron || {}
 const formRef = ref()
 const userStore = useUserStore()
+const router = useRouter()
+const isMaxSize = ref(false)
 const btnLoading = ref(false)
 const isSubject = ref(false)
 //表单
@@ -59,6 +64,8 @@ const rules = reactive({
   password: [{ required: true, trigger: 'blur', message: '请输入您的密码' }]
 })
 
+ipcRenderer ? ipcRenderer.send('set-winsize', { x: 888, y: 520 }) : ''
+
 //登录
 const submitForm = async (formEl) => {
   if (!formEl) return
@@ -82,12 +89,13 @@ const submitForm = async (formEl) => {
         await userStore.getInfo()
         if(userStore.user.edustage || userStore.user.edusubject){
           ElMessage.success('登录成功')
-          ipcRenderer && ipcRenderer.send('openMainWindow')
+          router.push('/resource')
         }
         else{
           isSubject.value = true
         }
         
+
       }finally{
         btnLoading.value = false
       }
@@ -98,7 +106,7 @@ const submitForm = async (formEl) => {
 const successEditSubject = ()=>{
   isSubject.value = false
   ElMessage.success('登录成功')
-  ipcRenderer && ipcRenderer.send('openMainWindow')
+  router.push('/resource')
 }
 
 const getCookie = () => {
@@ -113,6 +121,19 @@ const getCookie = () => {
 onMounted(()=>{
   getCookie()
 })
+// 最小化
+const minimizeWindow = () => {
+  ipcRenderer.send('minimize-window')
+}
+//最大化
+const maximizeWindow = () => {
+  ipcRenderer.send('maximize-window')
+  isMaxSize.value = !isMaxSize.value
+}
+//关闭
+const closeWindow = () => {
+  ipcRenderer.send('close-window')
+}
 </script>
 <style lang="scss" scoped>
 .login-container {