Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
CivWeb
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ReactWeb5
CivWeb
Commits
d9d234fd
Commit
d9d234fd
authored
4 years ago
by
邓晓峰
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: bug
parent
6921fe7f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
18 deletions
+7
-18
civbase.zip
civbase.zip
+0
-0
proxy.js
config/proxy.js
+6
-6
index.js
src/components/Notifier/index.js
+1
-12
No files found.
civbase.zip
0 → 100644
View file @
d9d234fd
This diff was suppressed by a .gitattributes entry.
This diff is collapsed.
Click to expand it.
config/proxy.js
View file @
d9d234fd
module
.
exports
=
{
dev
:
{
'/CityInterface'
:
{
target
:
'http://192.168.10.151:8055'
,
//
target: 'http://192.168.10.151:8055',
// target: 'https://panda-water.cn',
// 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.19.103:8112',
// target: 'http://192.168.12.8:8098',
...
...
@@ -19,11 +19,11 @@ module.exports = {
},
},
'/cityinterface'
:
{
target
:
'http://192.168.10.151:8055'
,
//
target: 'http://192.168.10.151:8055',
// target: 'http://192.168.10.150:8050',
// target: 'https://panda-water.cn',
// 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.10.20:8888',
changeOrigin
:
true
,
...
...
@@ -37,10 +37,10 @@ module.exports = {
'/Publish'
:
{
// target: 'http://192.168.12.8:8098',
// 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: 'http://192.168.19.102:8055',
//
target: 'https://panda-water.com',
target
:
'https://panda-water.com'
,
// target: 'http://192.168.10.150:8050',
changeOrigin
:
true
,
headers
:
{
...
...
This diff is collapsed.
Click to expand it.
src/components/Notifier/index.js
View file @
d9d234fd
...
...
@@ -45,13 +45,6 @@ class Notifier {
nginxStart
:
false
};
// this._config = {
// mqtt_path: '/mqtt',
// nginxStart: 'false',
// mqtt_mess: {
// IsSSL: false,
// },
// };
this
.
MQTTCount
=
0
;
this
.
MQTTClient
=
null
;
this
.
MQTTOptions
=
{};
...
...
@@ -67,11 +60,8 @@ class Notifier {
this
.
loadMore
=
this
.
loadMore
.
bind
(
this
);
this
.
hasMore
=
this
.
hasMore
.
bind
(
this
);
this
.
renderVideo
=
renderVideo
;
this
.
renderVideoElement
=
null
;
this
.
renderPlatform
=
renderPlatform
;
this
.
renderPlatformElement
=
null
;
this
.
renderSysPlatform
=
renderSysPlatform
;
this
.
renderSysElement
=
null
;
this
.
props
=
props
;
}
...
...
@@ -283,7 +273,6 @@ class Notifier {
const
userInfo
=
this
.
getUserInfo
();
const
infoType
=
this
.
getMessageType
(
parseMessage
.
infoType
);
let
state
=
null
;
debugger
if
(
_
.
isEmpty
(
parseMessage
.
tousers
)
||
userInfo
.
OID
==
parseMessage
.
tousers
||
...
...
@@ -582,7 +571,7 @@ class Notifier {
}
}
else
{
l
ogger
.
info
(
'获取mqtt服务器参数失败'
);
L
ogger
.
info
(
'获取mqtt服务器参数失败'
);
}
},
);
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment