Browse Source

Merge branch 'dev' of http://39.106.8.246:3003/web/ibms into dev

 Conflicts:
	config/dev.env.js
shaun-sheep 5 years ago
parent
commit
e6b762cb9a
3 changed files with 12 additions and 12 deletions
  1. 8 8
      config/dev.env.js
  2. 2 2
      config/prod.env.js
  3. 2 2
      publish.js

+ 8 - 8
config/dev.env.js

@@ -3,12 +3,12 @@ const merge = require('webpack-merge')
 const prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
-  NODE_ENV: '"development"',
-  // BASE_URL: '"http://192.168.20.236"', //测试iframe地址
-  // // SSO_SERVER: '"http://192.168.20.102:8080"', //测试环境
-  // SSO_SERVER: '"http://192.168.20.236:8086"', //(新)测试环境
-  // MQTT_SERVICE: '"ws://192.168.20.225:61614/stomp/"' //MQ测试环境地址
-  SSO_SERVER: '"http://sso.sagacloud.cn"',  //正式环境
-  BASE_URL: '"http://mbi.sagacloud.cn"', //线上iframe地址
-  MQTT_SERVICE: '"ws://adm.sagacloud.cn/stomp/"' //MQ正式环境地址
+    NODE_ENV: '"development"',
+    // BASE_URL: '"http://192.168.20.236"', //测试iframe地址
+    // SSO_SERVER: '"http://192.168.20.235:8081"', //测试环境
+    // // SSO_SERVER: '"http://192.168.20.236:8086"', //(新)测试环境
+    // MQTT_SERVICE: '"ws://192.168.20.225:61614/stomp/"' //MQ测试环境地址
+    SSO_SERVER: '"http://sso.sagacloud.cn"',  //正式环境
+    BASE_URL: '"http://mbi.sagacloud.cn"', //线上iframe地址
+    MQTT_SERVICE: '"ws://adm.sagacloud.cn/stomp/"' //MQ正式环境地址
 })

+ 2 - 2
config/prod.env.js

@@ -2,8 +2,8 @@
 module.exports = {
     NODE_ENV: '"production"',
     BASE_URL: '"http://192.168.20.236"', //测试iframe地址
-    // SSO_SERVER: '"http://192.168.20.102:8080"', //测试环境
-    SSO_SERVER: '"http://192.168.20.236:8086"', //(新)测试环境
+    SSO_SERVER: '"http://192.168.20.235:8081"', //测试环境
+    // SSO_SERVER: '"http://192.168.20.236:8086"', //(新)测试环境
     MQTT_SERVICE: '"ws://192.168.20.225:61614/stomp/"' //MQ测试环境地址
     // BASE_URL: '"http://mbi.sagacloud.cn"', //线上iframe地址
     // SSO_SERVER: '"http://sso.sagacloud.cn"',  //正式环境

+ 2 - 2
publish.js

@@ -2,7 +2,7 @@
  * @Author: zhangyu
  * @Date: 2019-12-18 16:18:30
  * @Info: 自动化部署
- * @LastEditTime : 2020-01-18 10:47:19
+ * @LastEditTime : 2020-02-11 17:47:56
  */
 
 const Client = require("node-ssh");
@@ -11,7 +11,7 @@ const ssh = new Client();
 ssh.connect({
   host: process.env.npm_package_remote_host,
   port: "22",
-  privateKey: `${process.env.HOME}\\.ssh\\id_rsa_2048`,
+  // privateKey: `${process.env.HOME}\\.ssh\\id_rsa_2048`,
   username: process.env.npm_package_remote_user,
   password: process.env.npm_package_remote_password
 }).then(() => {