浏览代码

优化代码

wallace5303 3 年之前
父节点
当前提交
51a98caf50
共有 43 个文件被更改,包括 43 次插入122 次删除
  1. 24 25
      electron/controller/example.js
  2. 0 2
      frontend/.env
  3. 1 4
      frontend/.env.development
  4. 0 21
      frontend/src/api/main.js
  5. 1 31
      frontend/src/views/base/db/Index.vue
  6. 7 29
      frontend/src/views/base/file/Index.vue
  7. 0 8
      frontend/src/views/base/testapi/Index.vue
  8. 1 1
      frontend/vue.config.js
  9. 1 0
      public/dist/css/chunk-20a0d95c.38f6334f.css
  10. 1 0
      public/dist/css/chunk-23ab9104.ffff7b55.css
  11. 1 0
      public/dist/css/chunk-3619a56a.bdc8e5ac.css
  12. 1 0
      public/dist/css/chunk-bc8b1b0c.6a9bab8f.css
  13. 1 1
      public/dist/index.html
  14. 0 0
      public/dist/js/app.4fc23d71.js
  15. 0 0
      public/dist/js/app.4fc23d71.js.map
  16. 0 0
      public/dist/js/chunk-20a0d95c.53d57c41.js
  17. 0 0
      public/dist/js/chunk-20a0d95c.53d57c41.js.map
  18. 2 0
      public/dist/js/chunk-23ab9104.7c9d30d1.js
  19. 0 0
      public/dist/js/chunk-23ab9104.7c9d30d1.js.map
  20. 0 0
      public/dist/js/chunk-26360310.4e0c0c29.js
  21. 0 0
      public/dist/js/chunk-26360310.4e0c0c29.js.map
  22. 0 0
      public/dist/js/chunk-26fcacb7.746a5c72.js
  23. 0 0
      public/dist/js/chunk-26fcacb7.746a5c72.js.map
  24. 0 0
      public/dist/js/chunk-2f42023a.5b250698.js
  25. 0 0
      public/dist/js/chunk-2f42023a.5b250698.js.map
  26. 0 0
      public/dist/js/chunk-3619a56a.3034aa50.js
  27. 0 0
      public/dist/js/chunk-3619a56a.3034aa50.js.map
  28. 0 0
      public/dist/js/chunk-490df4c2.783e1537.js
  29. 0 0
      public/dist/js/chunk-490df4c2.783e1537.js.map
  30. 0 0
      public/dist/js/chunk-4d0be246.8253a539.js
  31. 0 0
      public/dist/js/chunk-4d0be246.8253a539.js.map
  32. 0 0
      public/dist/js/chunk-72d90f2a.4a4f637c.js
  33. 0 0
      public/dist/js/chunk-72d90f2a.4a4f637c.js.map
  34. 0 0
      public/dist/js/chunk-9234b1da.374ed212.js
  35. 0 0
      public/dist/js/chunk-9234b1da.374ed212.js.map
  36. 0 0
      public/dist/js/chunk-94d99d1e.25bdad89.js
  37. 0 0
      public/dist/js/chunk-94d99d1e.25bdad89.js.map
  38. 0 0
      public/dist/js/chunk-b67071c4.1d279762.js
  39. 0 0
      public/dist/js/chunk-b67071c4.1d279762.js.map
  40. 0 0
      public/dist/js/chunk-b8ab1f0c.490535dc.js
  41. 0 0
      public/dist/js/chunk-b8ab1f0c.490535dc.js.map
  42. 2 0
      public/dist/js/chunk-bc8b1b0c.6446aab8.js
  43. 0 0
      public/dist/js/chunk-bc8b1b0c.6446aab8.js.map

+ 24 - 25
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 {
 
+  constructor(ctx) {
+    super(ctx);
+  }
+
   /**
    * 所有方法接收两个参数
-   * @param args 前端 或 egg,传的参数(单个参数,或参数数组)
+   * @param args 前端传的参数
    * @param event - IpcMainEvent 文档:https://www.electronjs.org/docs/latest/api/structures/ipc-main-event
    */
 
-  constructor(ctx) {
-    super(ctx);
-  }
-
   /**
    * 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);
-
-    console.log("[api] [example] [loadExtension] extension id:", extensionId);
-    unzip(crxFile, extensionDir).then(() => {    
-      console.log("[api] [example] [loadExtension] unzip success!");
-      chromeExtension.load(extensionId);
-    });
-
-    return true;
-  }
+  // 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);
+  //   });
+
+  //   return true;
+  // }
 
   /**
    * 创建系统通知

+ 0 - 2
frontend/.env

@@ -1,5 +1,3 @@
 NODE_ENV=production
 VUE_APP_PREVIEW=false
-
-# 生产环境,请留空,不要占用该属性
 VUE_APP_API_BASE_URL=

+ 1 - 4
frontend/.env.development

@@ -1,6 +1,3 @@
 NODE_ENV=development
-
 VUE_APP_PREVIEW=true
-
-# 开发环境时,要调用的egg服务地址 
-VUE_APP_API_BASE_URL=http://localhost:7068
+VUE_APP_API_BASE_URL=

+ 0 - 21
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
 }

+ 1 - 31
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);

+ 7 - 29
frontend/src/views/base/file/Index.vue

@@ -57,7 +57,7 @@
   </div>
 </template>
 <script>
-import { requestEggApi, ipcApiRoute } from '@/api/main'
+import { ipcApiRoute } from '@/api/main'
 
 const fileList = [
   {
@@ -103,38 +103,16 @@ export default {
 		messageShow(type) {
       const self = this;
       console.log('[messageShow] type:', type)
-      if (type == 'http') {
-        requestEggApi('messageShow', {}).then(res => {
-          if (res.code !== 0) {
-            return false
-          }
-          console.log('res:', res)
-        }).catch(err => {
-          self.$message.error(err + '异常')
-        })
-      } else { 
-        self.$ipcCall(ipcApiRoute.messageShow, '').then(r => {
-          self.$message.info(r);
-        })
-      }
+      this.$ipcCall(ipcApiRoute.messageShow, '').then(r => {
+        self.$message.info(r);
+      })
     },    
     messageShowConfirm(type) {
       const self = this;
       console.log('[messageShowConfirm] type:', type)
-      if (type == 'http') {
-        requestEggApi('messageShowConfirm', {}).then(res => {
-          if (res.code !== 0) {
-            return false
-          }
-          console.log('res:', res)
-        }).catch(err => {
-          self.$message.error(err + '异常')
-        })
-      } else {
-        self.$ipcCall(ipcApiRoute.messageShowConfirm, '').then(r => {
-          self.$message.info(r);
-        })
-      }
+      this.$ipcCall(ipcApiRoute.messageShowConfirm, '').then(r => {
+        self.$message.info(r);
+      })
     },
   }
 };

+ 0 - 8
frontend/src/views/base/testapi/Index.vue

@@ -11,7 +11,6 @@
   </div>
 </template>
 <script>
-import { requestEggApi } from '@/api/main'
 
 export default {
   data() {
@@ -24,13 +23,6 @@ export default {
       const params = {
         id: id
       }
-			requestEggApi('test1', params).then(res => {
-				if (res.code !== 0) {
-					return false
-				}
-			}).catch(err => {
-				console.log('err:', err)
-			})
     },
   }
 };

+ 1 - 1
frontend/vue.config.js

@@ -12,7 +12,7 @@ module.exports = {
       config
         .plugin('html')
         .tap(args => {
-          args[0].title= 'EE' // 设置title
+          args[0].title= 'EE框架' // 设置title
           return args
         })
     },

+ 1 - 0
public/dist/css/chunk-20a0d95c.38f6334f.css

@@ -0,0 +1 @@
+#app-base-file[data-v-a9872e50]{padding:0 10px;text-align:left;width:100%}#app-base-file .one-block-1[data-v-a9872e50]{font-size:16px;padding-top:10px}#app-base-file .footer[data-v-a9872e50],#app-base-file .one-block-2[data-v-a9872e50]{padding-top:10px}

+ 1 - 0
public/dist/css/chunk-23ab9104.ffff7b55.css

@@ -0,0 +1 @@
+#app-base-test-api[data-v-3604c322]{padding:0 10px;text-align:left;width:100%}#app-base-test-api .one-block-1[data-v-3604c322]{font-size:16px;padding-top:10px}#app-base-test-api .one-block-2[data-v-3604c322]{padding-top:10px}

+ 1 - 0
public/dist/css/chunk-3619a56a.bdc8e5ac.css

@@ -0,0 +1 @@
+#app-base-db[data-v-2e0e3bf7]{padding:0 10px;text-align:left;width:100%}#app-base-db .one-block-1[data-v-2e0e3bf7]{font-size:16px;padding-top:10px}#app-base-db .one-block-2[data-v-2e0e3bf7]{padding-top:10px}

+ 1 - 0
public/dist/css/chunk-bc8b1b0c.6a9bab8f.css

@@ -0,0 +1 @@
+#app-other[data-v-041b2204]{padding:0 10px;text-align:left;width:100%}#app-other .one-block-1[data-v-041b2204]{font-size:16px;padding-top:10px}#app-other .one-block-2[data-v-041b2204]{padding-top:10px}

文件差异内容过多而无法显示
+ 1 - 1
public/dist/index.html


文件差异内容过多而无法显示
+ 0 - 0
public/dist/js/app.4fc23d71.js


文件差异内容过多而无法显示
+ 0 - 0
public/dist/js/app.4fc23d71.js.map


文件差异内容过多而无法显示
+ 0 - 0
public/dist/js/chunk-20a0d95c.53d57c41.js


文件差异内容过多而无法显示
+ 0 - 0
public/dist/js/chunk-20a0d95c.53d57c41.js.map


+ 2 - 0
public/dist/js/chunk-23ab9104.7c9d30d1.js

@@ -0,0 +1,2 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-23ab9104"],{7961:function(t,n,e){},ac99:function(t,n,e){"use strict";e("7961")},acbf:function(t,n,e){"use strict";e.r(n);var c=function(){var t=this,n=t.$createElement,e=t._self._c||n;return e("div",{attrs:{id:"app-base-test-api"}},[t._m(0),e("div",{staticClass:"one-block-2"},[e("a-button",{on:{click:function(n){return t.exec(1)}}},[t._v(" 点击 ")])],1)])},a=[function(){var t=this,n=t.$createElement,e=t._self._c||n;return e("div",{staticClass:"one-block-1"},[e("span",[t._v(" 1. 测试一些操作系统api ")])])}],i={data:function(){return{type:1}},methods:{exec:function(t){}}},s=i,o=(e("ac99"),e("2877")),u=Object(o["a"])(s,c,a,!1,null,"3604c322",null);n["default"]=u.exports}}]);
+//# sourceMappingURL=chunk-23ab9104.7c9d30d1.js.map

文件差异内容过多而无法显示
+ 0 - 0
public/dist/js/chunk-23ab9104.7c9d30d1.js.map


文件差异内容过多而无法显示
+ 0 - 0
public/dist/js/chunk-26360310.4e0c0c29.js


文件差异内容过多而无法显示
+ 0 - 0
public/dist/js/chunk-26360310.4e0c0c29.js.map


文件差异内容过多而无法显示
+ 0 - 0
public/dist/js/chunk-26fcacb7.746a5c72.js


文件差异内容过多而无法显示
+ 0 - 0
public/dist/js/chunk-26fcacb7.746a5c72.js.map


文件差异内容过多而无法显示
+ 0 - 0
public/dist/js/chunk-2f42023a.5b250698.js


文件差异内容过多而无法显示
+ 0 - 0
public/dist/js/chunk-2f42023a.5b250698.js.map


文件差异内容过多而无法显示
+ 0 - 0
public/dist/js/chunk-3619a56a.3034aa50.js


文件差异内容过多而无法显示
+ 0 - 0
public/dist/js/chunk-3619a56a.3034aa50.js.map


文件差异内容过多而无法显示
+ 0 - 0
public/dist/js/chunk-490df4c2.783e1537.js


文件差异内容过多而无法显示
+ 0 - 0
public/dist/js/chunk-490df4c2.783e1537.js.map


文件差异内容过多而无法显示
+ 0 - 0
public/dist/js/chunk-4d0be246.8253a539.js


文件差异内容过多而无法显示
+ 0 - 0
public/dist/js/chunk-4d0be246.8253a539.js.map


文件差异内容过多而无法显示
+ 0 - 0
public/dist/js/chunk-72d90f2a.4a4f637c.js


文件差异内容过多而无法显示
+ 0 - 0
public/dist/js/chunk-72d90f2a.4a4f637c.js.map


文件差异内容过多而无法显示
+ 0 - 0
public/dist/js/chunk-9234b1da.374ed212.js


文件差异内容过多而无法显示
+ 0 - 0
public/dist/js/chunk-9234b1da.374ed212.js.map


文件差异内容过多而无法显示
+ 0 - 0
public/dist/js/chunk-94d99d1e.25bdad89.js


文件差异内容过多而无法显示
+ 0 - 0
public/dist/js/chunk-94d99d1e.25bdad89.js.map


文件差异内容过多而无法显示
+ 0 - 0
public/dist/js/chunk-b67071c4.1d279762.js


文件差异内容过多而无法显示
+ 0 - 0
public/dist/js/chunk-b67071c4.1d279762.js.map


文件差异内容过多而无法显示
+ 0 - 0
public/dist/js/chunk-b8ab1f0c.490535dc.js


文件差异内容过多而无法显示
+ 0 - 0
public/dist/js/chunk-b8ab1f0c.490535dc.js.map


+ 2 - 0
public/dist/js/chunk-bc8b1b0c.6446aab8.js

@@ -0,0 +1,2 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-bc8b1b0c"],{"0f0d":function(t,n,e){},2034:function(t,n,e){"use strict";e.r(n);var c=function(){var t=this,n=t.$createElement;t._self._c;return t._m(0)},s=[function(){var t=this,n=t.$createElement,e=t._self._c||n;return e("div",{attrs:{id:"app-other"}},[e("div",{staticClass:"one-block-1"},[e("span",[t._v(" 待开发... ")])]),e("div",{staticClass:"one-block-2"})])}],a={data:function(){return{}},methods:{test:function(){}}},i=a,o=(e("dfa9"),e("2877")),r=Object(o["a"])(i,c,s,!1,null,"041b2204",null);n["default"]=r.exports},dfa9:function(t,n,e){"use strict";e("0f0d")}}]);
+//# sourceMappingURL=chunk-bc8b1b0c.6446aab8.js.map

文件差异内容过多而无法显示
+ 0 - 0
public/dist/js/chunk-bc8b1b0c.6446aab8.js.map


部分文件因为文件数量过多而无法显示