simon987/Much-Assembly-Required
1
0
Fork 0
mirror of https://github.com/simon987/Much-Assembly-Required.git synced 2025-12-16 08:09:07 +00:00
Code Issues Projects Releases Wiki Activity

Websocket auth up and running

Browse Source
This commit is contained in:
simon
2018-04-27 21:28:46 -04:00
parent dc034d1437
commit 113aa50d87
15 changed files with 157 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Server/src/main/resources/config.properties
View File

@@ -8,12 +8,11 @@ mysql_url=jdbc:mysql://localhost:3306/mar?useSSL=false
save_interval=5
log_limit=2000000
log_count=10
# Web server port
webSocket_port=8887
webSocket_host=0.0.0.0
use_secure_webSocket=0
use_ssl=0
cert_path=certificates
mar_port=4567
mar_address=localhost
server_name=Official MAR server
# ----------------------------------------------
# Length of a tick in ms
@@ -86,7 +85,6 @@ wg_minCopperCount=0
# Maximum copper tile count for the WorldGenerator
wg_maxCopperCount=2
# ----------------------------------------------
# Maximum execution time of user code in ms
user_timeout=100

2
Server/src/main/resources/static/js/mar.js
View File

@@ -695,7 +695,7 @@ var GameClient = (function () {
console.log("[MAR] Getting server info... ");
}
var xhr = new XMLHttpRequest();
xhr.open("GET", "./getServerInfo.php", true);
xhr.open("GET", "./server_info", true);
xhr.onreadystatechange = function () {
if (xhr.readyState === 4 && xhr.status === 200) {
if (DEBUG) {