From 2510046e4e09c929cdb0d5adcecde62fd3a20cf4 Mon Sep 17 00:00:00 2001
From: chenyincheng <501753378@qq.com>
Date: 星期六, 07 一月 2023 11:45:19 +0800
Subject: [PATCH] 更新外网订阅
---
electron/main/index.ts | 63 +++++++++++++++++++++++--------
1 files changed, 46 insertions(+), 17 deletions(-)
diff --git a/electron/main/index.ts b/electron/main/index.ts
index a2fa9a9..6245fad 100644
--- a/electron/main/index.ts
+++ b/electron/main/index.ts
@@ -3,6 +3,36 @@
import { join } from 'path'
import fs from 'fs'
import iconv from 'iconv-lite'
+//koa----
+import Koa from 'koa';
+import Router from 'koa-router';
+const koaBody = require('koa-body');
+const creatorKoa=(win)=>{
+ const app = new Koa();
+ const router = new Router();
+ app.use(koaBody({
+ multipart: true
+ }));
+
+ router.get('/', async (ctx) => {
+ ctx.body = 'Hello World!';
+ });
+ router.post('/postResult', async (ctx)=>{
+ const body=ctx.request.body
+ win?.webContents.send('message-koa',body)
+ ctx.body={
+ "code": 200,
+ "data": body,
+ "message": "接收成功"
+ }
+ })
+
+ app.use(router.routes());
+
+ app.listen(3131,()=>{
+ console.log('koa Service start, port:3131')
+ });
+}
// 配制文件的读写实例
const Store = require('electron-store');
@@ -36,8 +66,8 @@
async function createWindow() {
win = new BrowserWindow({
title: 'Main window',
- fullscreen: true,
- autoHideMenuBar:true,
+ fullscreen: true,// 开启默认全屏
+ // autoHideMenuBar:true, //关闭菜单栏
webPreferences: {
preload: splash,
nodeIntegration: true,
@@ -53,10 +83,10 @@
// Test active push message to Renderer-process
// 测试推送消息到Renderer进程
win.webContents.on('did-finish-load', () => {
- // win?.webContents.send('main-process-message', new Date().toLocaleString())
+ creatorKoa(win)
win?.webContents.send('getScreenTimeout',store.get('screenTimeout'))
win?.webContents.send('getPcName',store.get('machineName'))
- win?.webContents.send('getConfigData',store.get('clientCode'),store.get('devices'),store.path)
+ win?.webContents.send('getConfigData',store.get(),store.path)
})
// Make all links open with the browser, not with the application
@@ -75,7 +105,7 @@
app.on('second-instance', () => {
if (win) {
- // Focus on the main window if the user tried to open another
+ // 如果用户试图打开另一个窗口，则将焦点放在主窗口上
if (win.isMinimized()) win.restore()
win.focus()
}
@@ -90,7 +120,7 @@
}
})
-// new window example arg: new windows url
+// 新窗口示例arg:新的Windows url
ipcMain.handle("open-win", (event, arg) => {
const childWindow = new BrowserWindow({
webPreferences: {
@@ -118,18 +148,17 @@
"clientCode": arg.clientCode,
"machineName": arg.machineName,
"screenTimeout": arg.screenTimeout,
- "devices":arg.devices
}
- //对比两端配置文件
- if(JSON.stringify(mode1)!=JSON.stringify(mode2)){
- //更新cofing.json
- console.log('update confing.json')
- store.set(mode2)
- // 重新建立sockte 通讯
- win?.webContents.send('getScreenTimeout',store.get('screenTimeout'))
- win?.webContents.send('getPcName',store.get('machineName'))
- win?.webContents.send('getConfigData',store.get('clientCode'),store.get('devices'),store.path)
- }
+ // //对比两端配置文件
+ // if(JSON.stringify(mode1)!=JSON.stringify(mode2)){
+ // //更新cofing.json
+ // console.log('update confing.json')
+ // store.set(mode2)
+ // // 重新建立sockte 通讯
+ // win?.webContents.send('getScreenTimeout',store.get('screenTimeout'))
+ // win?.webContents.send('getPcName',store.get('machineName'))
+ // win?.webContents.send('getConfigData',store.get('clientCode'),store.path)
+ // }
})
\ No newline at end of file
--
Gitblit v1.8.0