Bläddra i källkod

Revert "fix electron read config.js"

This reverts commit a93a3e740326d73aec810854122bb58a4ac0c5d5.
Michael Wang 6 år sedan
förälder
incheckning
01d0c97f22
1 ändrade filer med 2 tillägg och 3 borttagningar
  1. 2 3
      src/features/Login/Login.vue

+ 2 - 3
src/features/Login/Login.vue

@@ -113,8 +113,7 @@ export default {
     if (typeof nodeRequire != "undefined") {
       var that = this;
       var fs = nodeRequire("fs");
-      var path = nodeRequire("path");
-      var config = fs.readFileSync(path.join(__dirname, "/config.js"), "utf-8");
+      var config = fs.readFileSync(process.cwd() + "/" + "config.js", "utf-8");
       var nameJson = JSON.parse(config);
       const electronConfig = (await this.$http.get(
         "https://ecs.qmth.com.cn:8878/electron-config/" + nameJson.name + ".js"
@@ -124,7 +123,7 @@ export default {
       if (electronConfig.otherConfig.checkRomateControl) {
         nodeRequire("node-cmd").get("Project1.exe", function(data) {
           var applicationNames = fs.readFileSync(
-            path.join(__dirname, "/remoteApplication.txt"),
+            "remoteApplication.txt",
             "utf-8"
           );
           if (applicationNames && applicationNames.trim()) {