From 56dc64927979d3af16a8ffa8696d149f32b4619f Mon Sep 17 00:00:00 2001
From: acgist <289547414@qq.com>
Date: Sat, 26 Nov 2022 12:38:11 +0800
Subject: [PATCH] =?UTF-8?q?[*]=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/static/javascript/taoyao.js     |  5 +++--
 taoyao-server/src/main/resources/static/meeting.html   | 10 +---------
 .../signal/protocol/client/ClientRegisterProtocol.java |  4 ++++
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/taoyao-server/src/main/resources/static/javascript/taoyao.js b/taoyao-server/src/main/resources/static/javascript/taoyao.js
index edf53c3..f5a22a4 100644
--- a/taoyao-server/src/main/resources/static/javascript/taoyao.js
+++ b/taoyao-server/src/main/resources/static/javascript/taoyao.js
@@ -57,7 +57,7 @@ const defaultRPCConfig = {
 /** 信令配置 */
 const signalConfig = {
 	/** 当前终端SN */
-	sn: 'taoyao',
+	sn: localStorage.getItem('taoyao.sn', 'taoyao'),
 	/** 当前版本 */
 	version: '1.0.0',
 	// 信令授权
@@ -484,7 +484,8 @@ function Taoyao(
 	/** WebRTC配置 */
 	this.webrtc = null;
 	/** WebSocket地址 */
-	this.webSocket = webSocket;
+	// "wss://192.168.1.100:8888/websocket.signal"
+	this.webSocket = webSocket || 'wss://' + location.host + '/websocket.signal';
 	/** 设备状态 */
 	this.audioEnabled = true;
 	this.videoEnabled = true;
diff --git a/taoyao-server/src/main/resources/static/meeting.html b/taoyao-server/src/main/resources/static/meeting.html
index d4eacc3..90eb4e9 100644
--- a/taoyao-server/src/main/resources/static/meeting.html
+++ b/taoyao-server/src/main/resources/static/meeting.html
@@ -50,16 +50,8 @@
 			meetingId: null
 		},
 		mounted() {
-			// 随机终端标识
-			if(signalConfig.sn === 'taoyao') {
-				let sn = localStorage.getItem('taoyao.sn');
-				if(sn) {
-					signalConfig.sn = sn;
-				}
-				console.debug('终端标识', sn);
-			}
 			let self = this;
-			this.taoyao = new Taoyao("wss://192.168.1.100:8888/websocket.signal");
+			this.taoyao = new Taoyao();
 			this.remoteClient = this.taoyao.remoteClient;
 			// 打开信令通道
 			this.taoyao
diff --git a/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/client/ClientRegisterProtocol.java b/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/client/ClientRegisterProtocol.java
index 9f6195e..5781f56 100644
--- a/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/client/ClientRegisterProtocol.java
+++ b/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/client/ClientRegisterProtocol.java
@@ -13,11 +13,14 @@ import com.acgist.taoyao.signal.client.ClientSession;
 import com.acgist.taoyao.signal.event.client.ClientRegisterEvent;
 import com.acgist.taoyao.signal.protocol.ProtocolMapAdapter;
 
+import lombok.extern.slf4j.Slf4j;
+
 /**
  * 终端注册信令
  * 
  * @author acgist
  */
+@Slf4j
 @Protocol
 public class ClientRegisterProtocol extends ProtocolMapAdapter {
 
@@ -40,6 +43,7 @@ public class ClientRegisterProtocol extends ProtocolMapAdapter {
 			StringUtils.equals(this.securityProperties.getUsername(), username) &&
 			StringUtils.equals(this.securityProperties.getPassword(), password)
 		) {
+			log.info("终端注册：{}", sn);
 			session.authorize(sn);
 			message.setCode(MessageCode.CODE_0000);
 		} else {