Commit d9d234fd authored by 邓晓峰's avatar 邓晓峰

fix: bug

parent 6921fe7f
This diff was suppressed by a .gitattributes entry.
module.exports = { module.exports = {
dev: { dev: {
'/CityInterface': { '/CityInterface': {
target: 'http://192.168.10.151:8055', // target: 'http://192.168.10.151:8055',
// target: 'https://panda-water.cn', // target: 'https://panda-water.cn',
// target: 'http://192.168.19.102:8055', // target: 'http://192.168.19.102:8055',
// target: 'https://panda-water.com', target: 'https://panda-water.com',
// target: 'http://192.168.10.150:8050', // target: 'http://192.168.10.150:8050',
// target: 'http://192.168.19.103:8112', // target: 'http://192.168.19.103:8112',
// target: 'http://192.168.12.8:8098', // target: 'http://192.168.12.8:8098',
...@@ -19,11 +19,11 @@ module.exports = { ...@@ -19,11 +19,11 @@ module.exports = {
}, },
}, },
'/cityinterface': { '/cityinterface': {
target: 'http://192.168.10.151:8055', // target: 'http://192.168.10.151:8055',
// target: 'http://192.168.10.150:8050', // target: 'http://192.168.10.150:8050',
// target: 'https://panda-water.cn', // target: 'https://panda-water.cn',
// target: 'http://192.168.19.102:8055', // target: 'http://192.168.19.102:8055',
// target: 'https://panda-water.com', target: 'https://panda-water.com',
// target: 'http://192.168.12.8:8098', // target: 'http://192.168.12.8:8098',
// target: 'http://192.168.10.20:8888', // target: 'http://192.168.10.20:8888',
changeOrigin: true, changeOrigin: true,
...@@ -37,10 +37,10 @@ module.exports = { ...@@ -37,10 +37,10 @@ module.exports = {
'/Publish': { '/Publish': {
// target: 'http://192.168.12.8:8098', // target: 'http://192.168.12.8:8098',
// target: 'http://192.168.10.20:8888', // target: 'http://192.168.10.20:8888',
target: 'http://192.168.10.151:8055', // target: 'http://192.168.10.151:8055',
// target: 'https://panda-water.cn', // target: 'https://panda-water.cn',
// target: 'http://192.168.19.102:8055', // target: 'http://192.168.19.102:8055',
// target: 'https://panda-water.com', target: 'https://panda-water.com',
// target: 'http://192.168.10.150:8050', // target: 'http://192.168.10.150:8050',
changeOrigin: true, changeOrigin: true,
headers: { headers: {
......
...@@ -45,13 +45,6 @@ class Notifier { ...@@ -45,13 +45,6 @@ class Notifier {
nginxStart: false nginxStart: false
}; };
// this._config = {
// mqtt_path: '/mqtt',
// nginxStart: 'false',
// mqtt_mess: {
// IsSSL: false,
// },
// };
this.MQTTCount = 0; this.MQTTCount = 0;
this.MQTTClient = null; this.MQTTClient = null;
this.MQTTOptions = {}; this.MQTTOptions = {};
...@@ -67,11 +60,8 @@ class Notifier { ...@@ -67,11 +60,8 @@ class Notifier {
this.loadMore = this.loadMore.bind(this); this.loadMore = this.loadMore.bind(this);
this.hasMore = this.hasMore.bind(this); this.hasMore = this.hasMore.bind(this);
this.renderVideo = renderVideo; this.renderVideo = renderVideo;
this.renderVideoElement = null;
this.renderPlatform = renderPlatform; this.renderPlatform = renderPlatform;
this.renderPlatformElement = null;
this.renderSysPlatform = renderSysPlatform; this.renderSysPlatform = renderSysPlatform;
this.renderSysElement = null;
this.props = props; this.props = props;
} }
...@@ -283,7 +273,6 @@ class Notifier { ...@@ -283,7 +273,6 @@ class Notifier {
const userInfo = this.getUserInfo(); const userInfo = this.getUserInfo();
const infoType = this.getMessageType(parseMessage.infoType); const infoType = this.getMessageType(parseMessage.infoType);
let state = null; let state = null;
debugger
if ( if (
_.isEmpty(parseMessage.tousers) || _.isEmpty(parseMessage.tousers) ||
userInfo.OID == parseMessage.tousers || userInfo.OID == parseMessage.tousers ||
...@@ -582,7 +571,7 @@ class Notifier { ...@@ -582,7 +571,7 @@ class Notifier {
} }
} else { } else {
logger.info('获取mqtt服务器参数失败'); Logger.info('获取mqtt服务器参数失败');
} }
}, },
); );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment