Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wx-school-app-public
Project
Overview
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
姜雷
wx-school-app-public
Commits
5426891e
Commit
5426891e
authored
Mar 17, 2020
by
姜雷
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' into test
parents
bbaffcb4
28d4d3f4
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
index.js
src/constants/index.js
+1
-0
connect.tsx
src/pages/connect/connect.tsx
+2
-2
No files found.
src/constants/index.js
View file @
5426891e
...
@@ -4,3 +4,4 @@ export const NotRegisterCode = 1005;
...
@@ -4,3 +4,4 @@ export const NotRegisterCode = 1005;
export
const
BASE_SERVER_URL
=
'https://ex-test-dcxy-smapro-app.168cad.top'
;
export
const
BASE_SERVER_URL
=
'https://ex-test-dcxy-smapro-app.168cad.top'
;
export
const
SOCKET_URL
=
'wss://test-shower-wss1.168cad.top:9443/ws'
;
export
const
SOCKET_URL
=
'wss://test-shower-wss1.168cad.top:9443/ws'
;
export
const
DRY_SOCKET_URL
=
'wss://test-share-device-manager.168cad.top:9443'
;
src/pages/connect/connect.tsx
View file @
5426891e
...
@@ -17,7 +17,7 @@ import PaddingPkcs7 from 'crypto-js/pad-pkcs7';
...
@@ -17,7 +17,7 @@ import PaddingPkcs7 from 'crypto-js/pad-pkcs7';
// import { paySuccess } from '../../api/Order/paySuccess';
// import { paySuccess } from '../../api/Order/paySuccess';
import
'./connect.scss'
;
import
'./connect.scss'
;
import
{
str2ab
,
ab2str
}
from
'@/utils/arrayBuffer'
;
import
{
str2ab
,
ab2str
}
from
'@/utils/arrayBuffer'
;
import
{
SOCKET_URL
}
from
'@/constants'
;
import
{
DRY_
SOCKET_URL
}
from
'@/constants'
;
enum
ContorlCode
{
enum
ContorlCode
{
using
=
'1'
,
using
=
'1'
,
...
@@ -144,7 +144,7 @@ class Connect extends Component {
...
@@ -144,7 +144,7 @@ class Connect extends Component {
type
:
MessageType
.
info
,
type
:
MessageType
.
info
,
text
:
'服务器连接中...'
,
text
:
'服务器连接中...'
,
});
});
Taro
.
connectSocket
({
url
:
SOCKET_URL
}).
then
(
task
=>
{
Taro
.
connectSocket
({
url
:
DRY_
SOCKET_URL
}).
then
(
task
=>
{
socketTask
=
task
;
socketTask
=
task
;
task
.
onOpen
(()
=>
{
task
.
onOpen
(()
=>
{
this
.
addMessageItem
({
this
.
addMessageItem
({
...
...
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