Skip to content

Commit

Permalink
Merge pull request #1 from UncleCatMySelf/master
Browse files Browse the repository at this point in the history
Merge remote project
  • Loading branch information
noseparte authored Jan 8, 2019
2 parents 3341366 + c993f31 commit cc4b9a0
Show file tree
Hide file tree
Showing 167 changed files with 4,753 additions and 7,207 deletions.
22 changes: 22 additions & 0 deletions .github/ISSUE_TEMPLATE/----.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---
name: 功能请求
about: 功能请求
title: 功能请求
labels: ''
assignees: UncleCatMySelf

---

**建议这个项目的想法**

**您的功能请求是否与问题有关?请描述一下。**
简明扼要地描述了问题所在。防爆。[...]我总是感到沮丧

**描述您想要的解决方案**
清晰简洁地描述您想要发生的事情。

**描述您考虑过**
的替代方案对您考虑过的任何替代解决方案或功能的简明扼要描述。

**其他上下文**
在此处添加有关功能请求的任何其他上下文或屏幕截图。
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,8 @@
/nbbuild/
/dist/
/nbdist/
/.nb-gradle/
/.nb-gradle/

### log ###

*.log
156 changes: 156 additions & 0 deletions Front-End-Testing/chat70.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,156 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title>WebSocket Chat</title>
</head>
<style>
form {
width: 406px;
height: 650px;
border: 4px solid #98bcde;
border-radius: 10px;
margin: 0 auto;
background-color: #eceff9;
display: flex;
flex-wrap: wrap;
justify-content: space-around;

}
h3 {
color: #92acdc;
text-align: center;
font-size: 26px;
}
textarea {
resize: none;
font-size: 20px;
width: 401px;
height: 511px;
}
.msg {
width: 324px;
height: 40px;
text-indent: 10px;
font-size: 20px;
outline: none;
}
.btn {
width: 140px;
height: 46px;
background-color: #d8f1f9;
border-radius: 6px;
border: 1px solid #98bcde;
font-size: 18px;
color: #92acdc;
font-weight: bold;
}

</style>
<body>
<script type="text/javascript">
var socket;
if (!window.WebSocket) {
window.WebSocket = window.MozWebSocket;
}
if (window.WebSocket) {
socket = new WebSocket("ws://192.168.1.121:8070/ws");
socket.onmessage = function(event) {
var ta = document.getElementById('responseText');
ta.value = ta.value + '\n' + event.data
};
socket.onopen = function(event) {
var ta = document.getElementById('responseText');
ta.value = "连接开启!";
};
socket.onclose = function(event) {
var ta = document.getElementById('responseText');
ta.value = ta.value + "连接被关闭";
};
} else {
alert("你的浏览器不支持 WebSocket!");
}

function send(value) {
if (!window.WebSocket) {
return;
}
if (socket.readyState == WebSocket.OPEN) {
var message = {
type: "login",
token: "2222"
}
socket.send(JSON.stringify(message));
} else {
alert("连接没有开启.");
}
}

function sendToMe(value) {
if (!window.WebSocket) {
return;
}
if (socket.readyState == WebSocket.OPEN) {
var message = {
type: "sendMe",
value: value,
token: "2222"
}
socket.send(JSON.stringify(message));
} else {
alert("连接没有开启.");
}
}

function sendToOne(value) {
if (!window.WebSocket) {
return;
}
if (socket.readyState == WebSocket.OPEN) {
var message = {
type : "sendTo",
token : "2222",
value: value,
one: "1111",
}
socket.send(JSON.stringify(message));
} else {
alert("连接没有开启.");
}
}

function sendGroup(value) {
if (!window.WebSocket) {
return;
}
if (socket.readyState == WebSocket.OPEN) {
var message = {
type: "sendGroup",
groupId: "2",
token: "2222",
value: value
}
socket.send(JSON.stringify(message));
} else {
alert("连接没有开启.");
}
}

window.onbeforeunload = function(event) {
event.returnValue = "刷新提醒";
};
</script>
<form onsubmit="return false;">
<h3>InChat 聊天室-8070</h3>
<textarea id="responseText"></textarea>
<br>
<input class='msg' type="text" name="message" placeholder='发送消息' value="">
<input class='btn' type="button" value="登录" onclick="send(this.form.message.value)">
<input class='btn' type="button" value="发送给自己" onclick="sendToMe(this.form.message.value)">
<input class='btn' type="button" value="发送给某人" onclick="sendToOne(this.form.message.value)">
<input class='btn' type="button" value="发送到群组" onclick="sendGroup(this.form.message.value)">
</form>
<br>
<br>
</body>
</html>
156 changes: 156 additions & 0 deletions Front-End-Testing/chat90.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,156 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title>WebSocket Chat</title>
</head>
<style>
form {
width: 406px;
height: 650px;
border: 4px solid #98bcde;
border-radius: 10px;
margin: 0 auto;
background-color: #eceff9;
display: flex;
flex-wrap: wrap;
justify-content: space-around;

}
h3 {
color: #92acdc;
text-align: center;
font-size: 26px;
}
textarea {
resize: none;
font-size: 20px;
width: 401px;
height: 511px;
}
.msg {
width: 324px;
height: 40px;
text-indent: 10px;
font-size: 20px;
outline: none;
}
.btn {
width: 140px;
height: 46px;
background-color: #d8f1f9;
border-radius: 6px;
border: 1px solid #98bcde;
font-size: 18px;
color: #92acdc;
font-weight: bold;
}

</style>
<body>
<script type="text/javascript">
var socket;
if (!window.WebSocket) {
window.WebSocket = window.MozWebSocket;
}
if (window.WebSocket) {
socket = new WebSocket("ws://192.168.1.121:8090/ws");
socket.onmessage = function(event) {
var ta = document.getElementById('responseText');
ta.value = ta.value + '\n' + event.data
};
socket.onopen = function(event) {
var ta = document.getElementById('responseText');
ta.value = "连接开启!";
};
socket.onclose = function(event) {
var ta = document.getElementById('responseText');
ta.value = ta.value + "连接被关闭";
};
} else {
alert("你的浏览器不支持 WebSocket!");
}

function send(value) {
if (!window.WebSocket) {
return;
}
if (socket.readyState == WebSocket.OPEN) {
var message = {
type: "login",
token: "1111"
}
socket.send(JSON.stringify(message));
} else {
alert("连接没有开启.");
}
}

function sendToMe(value) {
if (!window.WebSocket) {
return;
}
if (socket.readyState == WebSocket.OPEN) {
var message = {
type: "sendMe",
value: value,
token: "1111"
}
socket.send(JSON.stringify(message));
} else {
alert("连接没有开启.");
}
}

function sendToOne(value) {
if (!window.WebSocket) {
return;
}
if (socket.readyState == WebSocket.OPEN) {
var message = {
type : "sendTo",
token : "1111",
value: value,
one: "2222",
}
socket.send(JSON.stringify(message));
} else {
alert("连接没有开启.");
}
}

function sendGroup(value) {
if (!window.WebSocket) {
return;
}
if (socket.readyState == WebSocket.OPEN) {
var message = {
type: "sendGroup",
groupId: "2",
token: "1111",
value: value
}
socket.send(JSON.stringify(message));
} else {
alert("连接没有开启.");
}
}

window.onbeforeunload = function(event) {
event.returnValue = "刷新提醒";
};
</script>
<form onsubmit="return false;">
<h3>InChat 聊天室-8090</h3>
<textarea id="responseText"></textarea>
<br>
<input class='msg' type="text" name="message" placeholder='发送消息' value="">
<input class='btn' type="button" value="登录" onclick="send(this.form.message.value)">
<input class='btn' type="button" value="发送给自己" onclick="sendToMe(this.form.message.value)">
<input class='btn' type="button" value="发送给某人" onclick="sendToOne(this.form.message.value)">
<input class='btn' type="button" value="发送到群组" onclick="sendGroup(this.form.message.value)">
</form>
<br>
<br>
</body>
</html>
Loading

0 comments on commit cc4b9a0

Please sign in to comment.