gaoshuaixing 5 rokov pred
rodič
commit
4b7ce90834
3 zmenil súbory, kde vykonal 13 pridanie a 7 odobranie
  1. 4 2
      app.js
  2. 4 2
      app/service/storage.js
  3. 5 3
      electron/storage.js

+ 4 - 2
app.js

@@ -10,7 +10,9 @@ const lowdb = require('lowdb');
 const FileSync = require('lowdb/adapters/FileSync');
 const utils = require('./app/utils/utils');
 const os = require('os');
-const storageDir = path.normalize(os.userInfo().homedir + '/electron-egg-storage/');
+const pkg = require('./package.json');
+const storageDir = path.normalize(os.userInfo().homedir + '/' + pkg.name + '/');
+const storageDb = pkg.build.appId + '_db.json';
 
 class AppBootHook {
   constructor(app) {
@@ -45,7 +47,7 @@ class AppBootHook {
       utils.mkdir(storageDir);
       utils.chmodPath(storageDir, '777');
     }
-    const file = storageDir + 'db.json';
+    const file = storageDir + storageDb;
     const adapter = new FileSync(file);
     const db = lowdb(adapter);
     if (!db.has('default').value()) {

+ 4 - 2
app/service/storage.js

@@ -8,7 +8,9 @@ const FileSync = require('lowdb/adapters/FileSync');
 const storageKey = require('../const/storageKey');
 const fs = require('fs');
 const os = require('os');
-const storageDir = path.normalize(os.userInfo().homedir + '/electron-egg-storage/');
+const pkg = require('../../package.json');
+const storageDir = path.normalize(os.userInfo().homedir + '/' + pkg.name + '/');
+const storageDb = pkg.build.appId + '_db.json';
 
 class StorageService extends BaseService {
   /*
@@ -16,7 +18,7 @@ class StorageService extends BaseService {
    */
   instance(file = null) {
     if (!file) {
-        file = path.normalize(storageDir +'db.json');
+        file = path.normalize(storageDir + storageDb);
     }
     const isExist = fs.existsSync(file);
     if (!isExist) {

+ 5 - 3
electron/storage.js

@@ -8,7 +8,9 @@ const getPort = require('get-port');
 const utils = require('../app/utils/utils');
 const storageKey = require('../app/const/storageKey');
 const os = require('os');
-const storageDir = path.normalize(os.homedir() + '/electron-egg-storage/');
+const pkg = require('../package.json');
+const storageDir = path.normalize(os.userInfo().homedir + '/' + pkg.name + '/');
+const storageDb = pkg.build.appId + '_db.json';
 
 exports.setup = function () {
   // console.log('storageDir', storageDir);
@@ -16,7 +18,7 @@ exports.setup = function () {
     utils.mkdir(storageDir);
     utils.chmodPath(storageDir, '777');
   }
-  const file = storageDir + 'db.json';
+  const file = storageDir + storageDb;
   const adapter = new FileSync(file);
   const db = lowdb(adapter);
   const eggConfigKey = storageKey.EGG_CONFIG;
@@ -29,7 +31,7 @@ exports.setup = function () {
 
 exports.instance = function (file = null) {
   if (!file) {
-      file = path.normalize(storageDir +'db.json');
+      file = path.normalize(storageDir + storageDb);
   }
   const isExist = fs.existsSync(file);
   if (!isExist) {