meixifrontserve 0.4.0 → 0.4.2

package/bin/index.js

@@ -1,6 +1,8 @@
 #! /usr/bin/env node
 const {program} = require('commander');
 const EnvByServerController = require('../scripts/envByServerController');
+const EnvByTestServerController = require('../scripts/envByTestServerController')
+const EnvByDevServerController = require('../scripts/envByDevServerController')
 const EnvByBetaController = require('../scripts/envByBetaController');
 const EnvByPreController = require('../scripts/envByPreController');
 const EnvByProdController = require('../scripts/envByProdController')
@@ -9,9 +11,11 @@ const RollupBuildController = require('../scripts/rollupBuildController');
 const checkUpdate = require('../scripts/checkUpdate');
 
 
-// 开发环境
-program.option('--name <char>').option('-serve');
-// 测试
+// 开发正常环境
+program.option('--name <char>').option('-serveByDev');
+// 开发测试环境
+program.option('--name <char>').option('-serveByTest');
+// 测试打包
 program.option('--name <char>').option('-beta')
 // 预上线
 program.option('--name <char>').option('-pre')
@@ -26,13 +30,25 @@ program.parse();
 const run = async () => {
 
     const programOps = program.opts();
-    const {name,env} = programOps
+    const {name, env} = programOps
     // 如果是开发
-    if (programOps.Serve) {
+    if (programOps.ServeByDev) {
         //  检查更新
         let flag = await checkUpdate();
         if (flag) {
-            let envByServerController = new EnvByServerController(name);
+            try {
+                let envByServerController = new EnvByDevServerController(name);
+                await envByServerController.onStart();
+            } catch (error) {
+                console.log(error)
+            }
+        }
+
+    } else if (programOps.ServeByTest) {
+        //  检查更新
+        let flag = await checkUpdate();
+        if (flag) {
+            let envByServerController = new EnvByTestServerController(name);
             await envByServerController.onStart();
         }
 

package/config/package.json

@@ -50,7 +50,7 @@
     "vue-cropper": "^0.5.8",
     "vue-router": "3.0.2",
     "vuex": "^3.4.0",
-    "meixioacomponent": "^0.9.75",
+    "meixioacomponent": "^0.9.77",
     "meixisuperdrawer": "^0.0.4",
     "@vue/cli-plugin-babel": "~4.5.19",
     "@vue/cli-plugin-eslint": "~4.5.19",

package/config/urlConfig.js

@@ -1,10 +1,15 @@
 const urlConfig = {
     // 开发环境需要具体的ip地址与端口号
-    serve: {
+    serveByDev: {
         urlPrefixes: [],
         authUrl: 'auth.wubangtu.xyz/login',
         wsUrl: 'ws://gateway.wubangtu.xyz:9999/ws/websocket/mxapp'
     },
+    serveByTest: {
+        urlPrefixes: [],
+        authUrl: 'testauth.wubangtu.xyz/login',
+        wsUrl: 'ws://gateway.wubangtu.xyz:9999/ws/websocket/mxapp'
+    },
     beta: {
         urlPrefixes: ['wubangtu', 'xyz'],
         authUrl: 'auth.wubangtu.xyz/login',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meixifrontserve",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "description": "",
   "main": "index.js",
   "private": false,

package/scripts/envByDevServerController.js

@@ -0,0 +1,13 @@
+#! /usr/bin/env node
+const envByServerController = require('./envByServerController')
+
+class EnvByDevServerController extends envByServerController {
+    constructor(projectName) {
+        super(projectName);
+        this.proxy = "http://meixi.wubangtu.xyz/api";
+        this.configProps='serveByDev'
+    }
+}
+
+
+module.exports = EnvByDevServerController;

package/scripts/envByServerController.js

@@ -16,15 +16,19 @@ class EnvByServerController extends ServerController {
     constructor(projectName) {
         super(projectName);
         this.port = 8888;
-        this.verName = 'Dev';
+        this.verName = "Dev";
+        this.configProps = null;
+        this.proxy = null;
+
     }
 
     async onStart() {
-
-        if (await super.onStart()) {
+        let flag = await super.onStart()
+        if (flag) {
 
             this.writeVueConfigJs()
 
+
             this.onRunServe();
         }
 
@@ -33,12 +37,12 @@ class EnvByServerController extends ServerController {
 
 
     createEnvFiles = async () => {
-        let _urlConfig = urlConfig.serve;
+        let _urlConfig = urlConfig[`${this.configProps}`];
         let flag = await this.getServerPort();
         if (flag) {
             let envFileParams = {
                 envName: 'development',
-                proxy: 'http://meixi.wubangtu.xyz/api',
+                proxy: this.proxy,
                 systemId: this.projectParams.systemId,
                 systemName: this.projectParams.systemName,
                 apiUrl: '/proxy',
@@ -142,8 +146,8 @@ class EnvByServerController extends ServerController {
         exec('npm install --legacy-peer-deps', async (error, stdout, stderr) => {
             if (!error) {
                 shell.exec('npm run serve', (error, stdout, stderr) => {
-                    console.log(error);
                 })
+                this.openDefaultBrowser(`http://${this.getSystemUrl()}`);
             } else {
                 console.log(error)
                 console.error('依赖下载失败！')
@@ -156,6 +160,24 @@ class EnvByServerController extends ServerController {
     }
 
 
+
+     openDefaultBrowser  (url) {
+        var exec = require('child_process').exec;
+        console.log(process.platform)
+        switch (process.platform) {
+            case "darwin":
+                exec('open ' + url);
+                break;
+            case "win32":
+                exec('start ' + url);
+                break;
+            default:
+                exec('xdg-open', [url]);
+        }
+    }
+
+
+
 }
 
 

package/scripts/envByTestServerController.js

@@ -0,0 +1,15 @@
+#! /usr/bin/env node
+const envByServerController = require('./envByServerController')
+
+class EnvByTestServerController extends envByServerController {
+    constructor(projectName) {
+        super(projectName);
+        this.proxy = "http://gateway.wubangtu.xyz:9999";
+        this.configProps='serveByTest'
+    }
+
+
+}
+
+
+module.exports = EnvByTestServerController;

package/scripts/serveController.js

@@ -20,9 +20,10 @@ class ServeController {
     }
 
 
-    async onStart() {
+   async onStart() {
         let fileContent = await this.createEnvFiles();
 
+
         if (fileContent) {
 
             this.writeEnvFile(fileContent);
@@ -37,13 +38,13 @@ class ServeController {
         return false;
 
 
-
     }
 
     //  生成对应的环境模版文件
     createEnvFiles() {
 
 
+
     }