From 51a98caf50794fb0812720b17f967c267b83170e Mon Sep 17 00:00:00 2001
From: wallace5303 <530353222@qq.com>
Date: Wed, 23 Feb 2022 23:49:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
electron/controller/example.js | 47 +++++++++----------
frontend/.env | 2 -
frontend/.env.development | 5 +-
frontend/src/api/main.js | 21 ---------
frontend/src/views/base/db/Index.vue | 32 +------------
frontend/src/views/base/file/Index.vue | 36 +++-----------
frontend/src/views/base/testapi/Index.vue | 8 ----
frontend/vue.config.js | 2 +-
public/dist/css/chunk-20a0d95c.38f6334f.css | 1 +
public/dist/css/chunk-23ab9104.ffff7b55.css | 1 +
public/dist/css/chunk-3619a56a.bdc8e5ac.css | 1 +
public/dist/css/chunk-bc8b1b0c.6a9bab8f.css | 1 +
public/dist/index.html | 4 +-
public/dist/js/app.4fc23d71.js | 2 +
public/dist/js/app.4fc23d71.js.map | 1 +
public/dist/js/chunk-20a0d95c.53d57c41.js | 2 +
public/dist/js/chunk-20a0d95c.53d57c41.js.map | 1 +
public/dist/js/chunk-23ab9104.7c9d30d1.js | 2 +
public/dist/js/chunk-23ab9104.7c9d30d1.js.map | 1 +
public/dist/js/chunk-26360310.4e0c0c29.js | 2 +
public/dist/js/chunk-26360310.4e0c0c29.js.map | 1 +
public/dist/js/chunk-26fcacb7.746a5c72.js | 2 +
public/dist/js/chunk-26fcacb7.746a5c72.js.map | 1 +
public/dist/js/chunk-2f42023a.5b250698.js | 2 +
public/dist/js/chunk-2f42023a.5b250698.js.map | 1 +
public/dist/js/chunk-3619a56a.3034aa50.js | 2 +
public/dist/js/chunk-3619a56a.3034aa50.js.map | 1 +
public/dist/js/chunk-490df4c2.783e1537.js | 2 +
public/dist/js/chunk-490df4c2.783e1537.js.map | 1 +
public/dist/js/chunk-4d0be246.8253a539.js | 2 +
public/dist/js/chunk-4d0be246.8253a539.js.map | 1 +
public/dist/js/chunk-72d90f2a.4a4f637c.js | 2 +
public/dist/js/chunk-72d90f2a.4a4f637c.js.map | 1 +
public/dist/js/chunk-9234b1da.374ed212.js | 2 +
public/dist/js/chunk-9234b1da.374ed212.js.map | 1 +
public/dist/js/chunk-94d99d1e.25bdad89.js | 2 +
public/dist/js/chunk-94d99d1e.25bdad89.js.map | 1 +
public/dist/js/chunk-b67071c4.1d279762.js | 2 +
public/dist/js/chunk-b67071c4.1d279762.js.map | 1 +
public/dist/js/chunk-b8ab1f0c.490535dc.js | 2 +
public/dist/js/chunk-b8ab1f0c.490535dc.js.map | 1 +
public/dist/js/chunk-bc8b1b0c.6446aab8.js | 2 +
public/dist/js/chunk-bc8b1b0c.6446aab8.js.map | 1 +
43 files changed, 84 insertions(+), 122 deletions(-)
create mode 100644 public/dist/css/chunk-20a0d95c.38f6334f.css
create mode 100644 public/dist/css/chunk-23ab9104.ffff7b55.css
create mode 100644 public/dist/css/chunk-3619a56a.bdc8e5ac.css
create mode 100644 public/dist/css/chunk-bc8b1b0c.6a9bab8f.css
create mode 100644 public/dist/js/app.4fc23d71.js
create mode 100644 public/dist/js/app.4fc23d71.js.map
create mode 100644 public/dist/js/chunk-20a0d95c.53d57c41.js
create mode 100644 public/dist/js/chunk-20a0d95c.53d57c41.js.map
create mode 100644 public/dist/js/chunk-23ab9104.7c9d30d1.js
create mode 100644 public/dist/js/chunk-23ab9104.7c9d30d1.js.map
create mode 100644 public/dist/js/chunk-26360310.4e0c0c29.js
create mode 100644 public/dist/js/chunk-26360310.4e0c0c29.js.map
create mode 100644 public/dist/js/chunk-26fcacb7.746a5c72.js
create mode 100644 public/dist/js/chunk-26fcacb7.746a5c72.js.map
create mode 100644 public/dist/js/chunk-2f42023a.5b250698.js
create mode 100644 public/dist/js/chunk-2f42023a.5b250698.js.map
create mode 100644 public/dist/js/chunk-3619a56a.3034aa50.js
create mode 100644 public/dist/js/chunk-3619a56a.3034aa50.js.map
create mode 100644 public/dist/js/chunk-490df4c2.783e1537.js
create mode 100644 public/dist/js/chunk-490df4c2.783e1537.js.map
create mode 100644 public/dist/js/chunk-4d0be246.8253a539.js
create mode 100644 public/dist/js/chunk-4d0be246.8253a539.js.map
create mode 100644 public/dist/js/chunk-72d90f2a.4a4f637c.js
create mode 100644 public/dist/js/chunk-72d90f2a.4a4f637c.js.map
create mode 100644 public/dist/js/chunk-9234b1da.374ed212.js
create mode 100644 public/dist/js/chunk-9234b1da.374ed212.js.map
create mode 100644 public/dist/js/chunk-94d99d1e.25bdad89.js
create mode 100644 public/dist/js/chunk-94d99d1e.25bdad89.js.map
create mode 100644 public/dist/js/chunk-b67071c4.1d279762.js
create mode 100644 public/dist/js/chunk-b67071c4.1d279762.js.map
create mode 100644 public/dist/js/chunk-b8ab1f0c.490535dc.js
create mode 100644 public/dist/js/chunk-b8ab1f0c.490535dc.js.map
create mode 100644 public/dist/js/chunk-bc8b1b0c.6446aab8.js
create mode 100644 public/dist/js/chunk-bc8b1b0c.6446aab8.js.map
diff --git a/electron/controller/example.js b/electron/controller/example.js
index 2467f48..66c7ff1 100644
--- a/electron/controller/example.js
+++ b/electron/controller/example.js
@@ -5,12 +5,11 @@ const path = require('path');
const fs = require('fs');
const is = require('electron-is');
const { exec } = require('child_process');
-const unzip = require("unzip-crx-3");
const Controller = require('ee-core').Controller;
const Utils = require('ee-core').Utils;
const electronApp = require('electron').app;
-const {dialog, webContents, shell, BrowserWindow, BrowserView, Notification, powerMonitor, screen, nativeTheme} = require('electron');
-const chromeExtension = require('../library/chromeExtension');
+const {dialog, webContents, shell, BrowserWindow, BrowserView,
+ Notification, powerMonitor, screen, nativeTheme} = require('electron');
const autoLaunchManager = require('../library/autoLaunch');
let myTimer = null;
@@ -23,16 +22,16 @@ let notificationObj = null;
*/
class ExampleController extends Controller {
- /**
- * 所有方法接收两个参数
- * @param args 前端 或 egg,传的参数(单个参数,或参数数组)
- * @param event - IpcMainEvent 文档:https://www.electronjs.org/docs/latest/api/structures/ipc-main-event
- */
-
constructor(ctx) {
super(ctx);
}
+ /**
+ * 所有方法接收两个参数
+ * @param args 前端传的参数
+ * @param event - IpcMainEvent 文档:https://www.electronjs.org/docs/latest/api/structures/ipc-main-event
+ */
+
/**
* test
*/
@@ -236,23 +235,23 @@ class ExampleController extends Controller {
/**
* 加载扩展程序
*/
- async loadExtension (args) {
- const crxFile = args[0];
- if (_.isEmpty(crxFile)) {
- return false;
- }
- const extensionId = path.basename(crxFile, '.crx');
- const chromeExtensionDir = chromeExtension.getDirectory();
- const extensionDir = path.join(chromeExtensionDir, extensionId);
+ // async loadExtension (args) {
+ // const crxFile = args[0];
+ // if (_.isEmpty(crxFile)) {
+ // return false;
+ // }
+ // const extensionId = path.basename(crxFile, '.crx');
+ // const chromeExtensionDir = chromeExtension.getDirectory();
+ // const extensionDir = path.join(chromeExtensionDir, extensionId);
- console.log("[api] [example] [loadExtension] extension id:", extensionId);
- unzip(crxFile, extensionDir).then(() => {
- console.log("[api] [example] [loadExtension] unzip success!");
- chromeExtension.load(extensionId);
- });
+ // console.log("[api] [example] [loadExtension] extension id:", extensionId);
+ // unzip(crxFile, extensionDir).then(() => {
+ // console.log("[api] [example] [loadExtension] unzip success!");
+ // chromeExtension.load(extensionId);
+ // });
- return true;
- }
+ // return true;
+ // }
/**
* 创建系统通知
diff --git a/frontend/.env b/frontend/.env
index 14fc0a8..b73cd6c 100644
--- a/frontend/.env
+++ b/frontend/.env
@@ -1,5 +1,3 @@
NODE_ENV=production
VUE_APP_PREVIEW=false
-
-# 生产环境,请留空,不要占用该属性
VUE_APP_API_BASE_URL=
\ No newline at end of file
diff --git a/frontend/.env.development b/frontend/.env.development
index 63f02bf..8ea9687 100644
--- a/frontend/.env.development
+++ b/frontend/.env.development
@@ -1,6 +1,3 @@
NODE_ENV=development
-
VUE_APP_PREVIEW=true
-
-# 开发环境时,要调用的egg服务地址
-VUE_APP_API_BASE_URL=http://localhost:7068
\ No newline at end of file
+VUE_APP_API_BASE_URL=
\ No newline at end of file
diff --git a/frontend/src/api/main.js b/frontend/src/api/main.js
index 4a3a003..6fa8674 100644
--- a/frontend/src/api/main.js
+++ b/frontend/src/api/main.js
@@ -1,14 +1,5 @@
import request from '@/utils/request'
-const eggApiroute = {
- uploadFile: '/api/example/uploadFile',
- openSoftware: '/api/example/openSoftware',
- messageShow: '/api/example/messageShow',
- messageShowConfirm: '/api/example/messageShowConfirm',
- dbOperation: '/api/example/dbOperation',
- test1: '/api/example/test1',
-}
-
const ipcApiRoute = {
messageShow: 'controller.example.messageShow',
messageShowConfirm: 'controller.example.messageShowConfirm',
@@ -38,19 +29,7 @@ const specialIpcRoute = {
appUpdater: 'app.updater' // 此频道在后端也有相同定义
}
-/**
- * 访问egg api
- */
-const requestEggApi = (uri, parameter) => {
- return request({
- url: eggApiroute[uri],
- method: 'post',
- data: parameter
- })
-}
-
export {
- requestEggApi,
ipcApiRoute,
specialIpcRoute
}
\ No newline at end of file
diff --git a/frontend/src/views/base/db/Index.vue b/frontend/src/views/base/db/Index.vue
index 9d7fbfa..4bcd004 100644
--- a/frontend/src/views/base/db/Index.vue
+++ b/frontend/src/views/base/db/Index.vue
@@ -161,19 +161,8 @@ export default {
if (res.all_list.length == 0) {
return false;
}
- self.all_list = res.data.all_list;
+ self.all_list = res.all_list;
})
- // requestEggApi('dbOperation', params).then(res => {
- // if (res.code !== 0) {
- // return false
- // }
- // if (res.data.all_list.length == 0) {
- // return false;
- // }
- // self.all_list = res.data.all_list;
- // }).catch(err => {
- // console.log('err:', err)
- // })
},
dbOperation (ac) {
const self = this;
@@ -191,25 +180,6 @@ export default {
if (ac == 'add' && this.name.length == 0) {
self.$message.error(`请填写数据`);
}
- // requestEggApi('dbOperation', params).then(res => {
- // if (res.code !== 0) {
- // return false
- // }
- // if (ac == 'get') {
- // if (res.data.result.length == 0) {
- // self.$message.error(`没有数据`);
- // return;
- // }
- // self.userList = res.data.result;
- // }
- // if (res.data.all_list.length == 0) {
- // return;
- // }
- // self.all_list = res.data.all_list;
- // self.$message.success(`success`);
- // }).catch(err => {
- // console.log('err:', err)
- // })
this.$ipcCall(ipcApiRoute.dbOperation, params).then(res => {
console.log('res:', res);
diff --git a/frontend/src/views/base/file/Index.vue b/frontend/src/views/base/file/Index.vue
index b96a21f..86e4ab7 100644
--- a/frontend/src/views/base/file/Index.vue
+++ b/frontend/src/views/base/file/Index.vue
@@ -57,7 +57,7 @@