Commit 5426891e by 姜雷

Merge branch 'develop' into test

parents bbaffcb4 28d4d3f4
...@@ -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';
...@@ -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({
......
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