代码优化

dromara · Jul 16, 2021 · 0d44673 · 0d44673
1 parent d4b5fff
commit 0d44673
Show file tree

Hide file tree

Showing 13 changed files with 83 additions and 123 deletions.
diff --git a/app.js b/app.js
@@ -3,7 +3,6 @@
  * @param app
  */
 'use strict';
-global.CODE = require('./app/const/statusCode');
 
 class AppBootHook {
   constructor(app) {

diff --git a/app/config/openAuthConfig.js b/app/config/openAuthConfig.js
diff --git a/app/const/common.js b/app/const/common.js
diff --git a/app/controller/v1/example.js b/app/controller/v1/example.js
@@ -146,6 +146,41 @@ class ExampleController extends BaseController {
 
     self.sendSuccess(data);
   }
+
+  async autoLaunchEnable() {
+    const { service } = this;
+
+    await service.example.autoLaunchEnable();
+    const data = {
+      isEnabled: true
+    };
+
+    this.sendSuccess(data);
+  }
+
+  async autoLaunchDisable() {
+    const { service } = this;
+
+    await service.example.autoLaunchDisable();
+    const data = {
+      isEnabled: false
+    };
+
+    this.sendSuccess(data);
+  }
+
+  async autoLaunchIsEnabled() {
+    const { service } = this;
+
+    const data = {
+      isEnabled: null
+    };
+
+    const isEnabled = await service.example.autoLaunchIsEnabled();
+    data.isEnabled = isEnabled;
+
+    this.sendSuccess(data);
+  }
 }
 
 module.exports = ExampleController;
diff --git a/app/controller/v1/setting.js b/app/controller/v1/setting.js
diff --git a/app/router/example.js b/app/router/example.js
@@ -23,4 +23,10 @@ module.exports = app => {
   router.post('/api/v1/example/getTestData', controller.v1.example.getTestData);
   // set shortcut
   router.post('/api/v1/example/setShortcut', controller.v1.example.setShortcut);
+  // open launch
+  router.post('/api/v1/example/autoLaunchEnable', controller.v1.example.autoLaunchEnable);
+  // close launch 
+  router.post('/api/v1/example/autoLaunchDisable', controller.v1.example.autoLaunchDisable);
+  // is launch 
+  router.post('/api/v1/example/autoLaunchIsEnabled', controller.v1.example.autoLaunchIsEnabled);
 };
diff --git a/app/router/index.js b/app/router/index.js
@@ -8,13 +8,9 @@ module.exports = app => {
   // home
   router.get('/', controller.v1.home.index);
 
-  // hello
-  //router.get('/', controller.v1.home.hello);
-
   // html
   router.get('/home', controller.v1.home.index);
 
   // 引入其他路由
   require('./example')(app);
-  require('./setting')(app);
 };
diff --git a/app/router/setting.js b/app/router/setting.js
diff --git a/app/service/example.js b/app/service/example.js
@@ -59,6 +59,24 @@ class ExampleService extends BaseService {
 
     return res;
   }
+
+  async autoLaunchEnable() {
+    const callResult = await this.ipcCall('example.autoLaunchEnable');
+
+    return callResult.data;
+  }
+
+  async autoLaunchDisable() {
+    const callResult = await this.ipcCall('example.autoLaunchDisable');
+
+    return callResult.data;
+  }
+
+  async autoLaunchIsEnabled() {
+    const callResult = await this.ipcCall('example.autoLaunchIsEnabled');
+
+    return callResult.data;
+  }
 }
 
 module.exports = ExampleService;
diff --git a/app/service/setting.js b/app/service/setting.js
diff --git a/electron/apis/base.js b/electron/apis/base.js
diff --git a/electron/apis/example.js b/electron/apis/example.js
@@ -1,11 +1,9 @@
 'use strict';
 
 const path = require('path');
-const {
-  app,
-  webContents,
-  shell
-} = require('electron');
+
+const {app, webContents, shell} = require('electron');
+const AutoLaunchManager = require('../lib/autoLaunch');
 const shortcut = require('../lib/shortcut');
 
 exports.getPath = function () {
@@ -36,6 +34,24 @@ exports.setShortcut = function (shortcutObj) {
   return true;
 }
 
+exports.autoLaunchEnable = function () {
+  const autoLaunchManager = new AutoLaunchManager()
+  const enable = autoLaunchManager.enable()
+  return enable
+}
+
+exports.autoLaunchDisable = function () {
+  const autoLaunchManager = new AutoLaunchManager()
+  const disable = autoLaunchManager.disable()
+  return disable
+}
+
+exports.autoLaunchIsEnabled = function () {
+  const autoLaunchManager = new AutoLaunchManager()
+  const isEnable = autoLaunchManager.isEnabled()
+  return isEnable
+}
+
 function getElectronPath(filepath) {
   //filepath = path.resolve(filepath);
   filepath = filepath.replace("resources", "");

diff --git a/frontend/src/api/main.js b/frontend/src/api/main.js
@@ -7,9 +7,9 @@ const mainApi = {
   uploadFile: '/api/v1/example/uploadFile',
   executeJS: '/api/v1/example/executeJS',
   setShortcut: '/api/v1/example/setShortcut',
-  autoLaunchEnable: '/api/v1/setting/autoLaunchEnable',
-  autoLaunchDisable: '/api/v1/setting/autoLaunchDisable',
-  autoLaunchIsEnabled: '/api/v1/setting/autoLaunchIsEnabled'
+  autoLaunchEnable: '/api/v1/example/autoLaunchEnable',
+  autoLaunchDisable: '/api/v1/example/autoLaunchDisable',
+  autoLaunchIsEnabled: '/api/v1/example/autoLaunchIsEnabled'
 }
 
 /**