Merge branch 'develop' of github.com:chatopera/cosin into develop

cc-switch/.gitignore

@@ -10,5 +10,5 @@ sftp-config.json
 .vscode
 .idea/
 .composer.phar
-app/config/dev.env.js
+app/config/dev.env
 ax.js

cc-switch/app/config/dev.env.sample

@@ -0,0 +1,7 @@
+
+  PBX_CHANNEL_ID=bxzq
+  FREESWITCH_HOST=freeswitch
+  REDIS_HOST=redis
+  MINIO_END_POINT=mini
+  MINIO_ACCESS_KEY=key
+  MINIO_SECRET_KEY=secret

cc-switch/app/config/dev.env.sample.js

@@ -1,8 +0,0 @@
-module.exports = exports = {
-  PBX_CHANNEL_ID: 'bxzq',
-  FREESWITCH_HOST: 'freeswitch',
-  REDIS_HOST: 'redis',
-  MINIO_END_POINT: 'mini',
-  MINIO_ACCESS_KEY: 'key',
-  MINIO_SECRET_KEY: 'secret',
-};

cc-switch/app/config/index.js

@@ -1,4 +1,6 @@
-const _ = require('lodash');
+const fs = require('fs');
+const path = require('path');
+const dotenv = require('dotenv');
 
 const PBX_CHANNEL_ID = 'test';
 
@@ -6,14 +8,9 @@ const FREESWITCH_HOST = 'localhost';
 const FREESWITCH_PORT = 8021;
 const FREESWITCH_MAX_CHANNEL = 5;
 
-const ACTIVEMQ_HOST = 'localhost';
-const ACTIVEMQ_PORT = 61613;
-const ACTIVEMQ_USER = null;
-const ACTIVEMQ_PASS = null;
-
-const MINIO_END_POINT = '';
-const MINIO_ACCESS_KEY = '';
-const MINIO_SECRET_KEY = '';
+const MINIO_END_POINT = 'localhost';
+const MINIO_ACCESS_KEY = 'key';
+const MINIO_SECRET_KEY = 'secret';
 
 const REDIS_HOST = 'localhost';
 const REDIS_PORT = 6379;
@@ -23,10 +20,6 @@ const config = {
   FREESWITCH_HOST,
   FREESWITCH_PORT,
   FREESWITCH_MAX_CHANNEL,
-  ACTIVEMQ_HOST,
-  ACTIVEMQ_PORT,
-  ACTIVEMQ_USER,
-  ACTIVEMQ_PASS,
   REDIS_HOST,
   REDIS_PORT,
   MINIO_END_POINT,
@@ -34,16 +27,13 @@ const config = {
   MINIO_SECRET_KEY,
 };
 
-let env = {};
-
-try {
-  env = require('./dev.env.js');
-} catch (e) {}
-
-_.merge(env, process.env);
+let envFile = path.join(__dirname, 'dev.env');
+if (fs.existsSync(envFile)) {
+  dotenv.config({ path: envFile });
+}
 
 for (let key in config) {
-  let value = env[key];
+  let value = process.env[key];
   if (value) {
     config[key] = value;
   }

cc-switch/app/package.json

@@ -12,6 +12,7 @@
   "license": "ISC",
   "dependencies": {
     "debug": "^3.1.0",
+    "dotenv": "^6.0.0",
     "ioredis": "^4.0.0",
     "lodash": "^4.17.10",
     "minio": "^7.0.0",