哆啦好梦 2 years ago
parent
commit
0802bdade9

+ 1 - 1
electron/addon/autoUpdater/index.js

@@ -1,6 +1,6 @@
 const { app: electronApp } = require('electron');
 const { autoUpdater } = require("electron-updater");
-const is = require('electron-is');
+const is = require('ee-core/utils/is');
 const Log = require('ee-core/log');
 const Conf = require('ee-core/config');
 const Electron = require('ee-core/electron');

+ 1 - 2
electron/addon/javaServer/server.js

@@ -1,12 +1,11 @@
 const _ = require("lodash");
 const assert = require("assert");
 const fs = require("fs");
-const is = require('electron-is');
 const path = require("path");
 const { exec, execSync } = require("child_process");
 const ps = require("./ps");
 const Log = require('ee-core/log');
-const Conf = require('ee-core/config');
+const is = require('ee-core/utils/is');
 const UtilsPs = require('ee-core/ps');
 
 /**

+ 1 - 1
electron/config/encrypt.js

@@ -10,7 +10,7 @@ module.exports = {
   confusionOptions: {
     compact: true,      
     stringArray: true,
-    stringArrayEncoding: ['base64'],
+    stringArrayEncoding: ['none'],
     deadCodeInjection: false,
   }
 };

+ 1 - 2
package.json

@@ -1,6 +1,6 @@
 {
   "name": "ee",
-  "version": "2.5.0",
+  "version": "3.0.0",
   "description": "A fast, desktop software development framework",
   "main": "main.js",
   "scripts": {
@@ -112,7 +112,6 @@
     "better-sqlite3": "^7.6.0",
     "dayjs": "^1.10.7",
     "ee-core": "^2.0.0",
-    "electron-is": "^3.0.0",
     "electron-updater": "^5.3.0",
     "lodash": "^4.17.21"
   }