From 5b718e3f8c19120fee759439590f1118e3fae307 Mon Sep 17 00:00:00 2001
From: Particle_G <particle_g@outlook.com>
Date: Sat, 6 Feb 2021 15:50:00 +0800
Subject: [PATCH] update APIs

---
 parts/globalTables.lua     | 16 +++++++---------
 parts/scenes/load.lua      |  6 +++---
 parts/scenes/login.lua     |  8 ++++----
 parts/scenes/main.lua      |  6 +++---
 parts/scenes/net_menu.lua  |  2 +-
 parts/scenes/net_rooms.lua |  6 +++---
 parts/scenes/register.lua  |  2 +-
 7 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/parts/globalTables.lua b/parts/globalTables.lua
index 44f9d893..55b4e54e 100644
--- a/parts/globalTables.lua
+++ b/parts/globalTables.lua
@@ -144,16 +144,14 @@ PATH={--Network API paths
 	url="hdustea.3322.org",
 	port="10026",
 
-	api="/tech/api/v1",
-	appInfo="/app/info",
-	users="/users",
-	auth="/auth",
-	access="/auth/access",
-	rooms="/online/rooms",
-
+	http="/tech/api/v1",
 	socket="/tech/socket/v1",
-	play_room="/play_room",
-	chat_room="/chat_room",
+	appInfo="/app/info",
+	user="/user",
+	auth="/auth/auth",
+	access="/auth/access",
+	onlineChat="/online/chat",
+	onlinePlay="/online/play",	
 }
 
 --Game tables
diff --git a/parts/scenes/load.lua b/parts/scenes/load.lua
index 47259f6b..3e4d5233 100644
--- a/parts/scenes/load.lua
+++ b/parts/scenes/load.lua
@@ -44,7 +44,7 @@ local function tick_httpREQ_autoLogin(task)
 				LOG.print(text.loginSuccessed)
 				httpRequest(
 					TICK_httpREQ_getUserInfo,
-					PATH.api..PATH.users,
+					PATH.http..PATH.user,
 					"GET",
 					{["Content-Type"]="application/json"},
 					json.encode{
@@ -199,11 +199,11 @@ function scene.update()
 			LOADED=true
 			SFX.play("welcome_sfx")
 			VOC.play("welcome_voc")
-			httpRequest(tick_httpREQ_launch,PATH.api..PATH.appInfo)
+			httpRequest(tick_httpREQ_launch,PATH.http..PATH.appInfo)
 			if USER.auth_token and USER.email then
 				httpRequest(
 					tick_httpREQ_autoLogin,
-					PATH.api..PATH.auth,
+					PATH.http..PATH.auth,
 					"GET",
 					{["Content-Type"]="application/json"},
 					json.encode{
diff --git a/parts/scenes/login.lua b/parts/scenes/login.lua
index 0bfe4573..4c940631 100644
--- a/parts/scenes/login.lua
+++ b/parts/scenes/login.lua
@@ -15,7 +15,7 @@ local function tick_httpREQ_newLogin(task)
 
 				httpRequest(
 					TICK_httpREQ_getUserInfo,
-					PATH.api..PATH.users,
+					PATH.http..PATH.user,
 					"GET",
 					{["Content-Type"]="application/json"},
 					json.encode{
@@ -26,7 +26,7 @@ local function tick_httpREQ_newLogin(task)
 
 				httpRequest(
 					TICK_httpREQ_getAccessToken,
-					PATH.api..PATH.access,
+					PATH.http..PATH.access,
 					"POST",
 					{["Content-Type"]="application/json"},
 					json.encode{
@@ -60,8 +60,8 @@ local function login()
 	end
 	httpRequest(
 		tick_httpREQ_newLogin,
-		PATH.api..PATH.auth,
-		"GET",
+		PATH.http..PATH.auth,
+		"POST",
 		{["Content-Type"]="application/json"},
 		json.encode{
 			email=email,
diff --git a/parts/scenes/main.lua b/parts/scenes/main.lua
index 3ce67201..e5d8a2af 100644
--- a/parts/scenes/main.lua
+++ b/parts/scenes/main.lua
@@ -12,7 +12,7 @@ local function tick_httpREQ_manualAutoLogin(task)
 			elseif response.code==403 or response.code==401 then
 				httpRequest(
 					TICK_httpREQ_getAccessToken,
-					PATH.api..PATH.access,
+					PATH.http..PATH.access,
 					"POST",
 					{["Content-Type"]="application/json"},
 					json.encode{
@@ -112,7 +112,7 @@ scene.widgetList={
 			if USER.access_token then
 				httpRequest(
 					tick_httpREQ_manualAutoLogin,
-					PATH.api..PATH.access,
+					PATH.http..PATH.access,
 					"GET",
 					{["Content-Type"]="application/json"},
 					json.encode{
@@ -123,7 +123,7 @@ scene.widgetList={
 			else
 				httpRequest(
 					TICK_httpREQ_getAccessToken,
-					PATH.api..PATH.access,
+					PATH.http..PATH.access,
 					"POST",
 					{["Content-Type"]="application/json"},
 					json.encode{
diff --git a/parts/scenes/net_menu.lua b/parts/scenes/net_menu.lua
index 2534a485..463cbc40 100644
--- a/parts/scenes/net_menu.lua
+++ b/parts/scenes/net_menu.lua
@@ -32,7 +32,7 @@ scene.widgetList={
 	WIDGET.newButton{name="chat",	x=640,	y=540,w=350,h=120,font=40,code=function()
 		wsConnect(
 			tick_goChatRoom,
-			PATH.socket..PATH.chat_room.."?email="..urlEncode(USER.email).."&access_token="..urlEncode(USER.access_token)
+			PATH.socket..PATH.onlineChat.."?email="..urlEncode(USER.email).."&access_token="..urlEncode(USER.access_token)
 		)
 	end},
 	WIDGET.newButton{name="back",	x=1140,	y=640,w=170,h=80,font=40,code=backScene},
diff --git a/parts/scenes/net_rooms.lua b/parts/scenes/net_rooms.lua
index efeff148..d9fdd4f3 100644
--- a/parts/scenes/net_rooms.lua
+++ b/parts/scenes/net_rooms.lua
@@ -79,7 +79,7 @@ local function fresh()
 	rooms=nil
 	httpRequest(
 		task_fetchRooms,
-		PATH.api..PATH.rooms,
+		PATH.http..PATH.onlinePlay,
 		"GET",
 		{["Content-Type"]="application/json"},
 		json.encode{
@@ -109,7 +109,7 @@ function scene.keyDown(k)
 	elseif k=="n"then
 		httpRequest(
 			task_createRooms,
-			PATH.api..PATH.rooms.."/classic",
+			PATH.http..PATH.onlinePlay.."/classic",
 			"POST",
 			{["Content-Type"]="application/json"},
 			json.encode{
@@ -143,7 +143,7 @@ function scene.keyDown(k)
 			end
 			wsConnect(
 				task_enterRoom,
-				PATH.socket..PATH.play_room..
+				PATH.socket..PATH.onlinePlay..
 				"?email="..urlEncode(USER.email)..
 				"&access_token="..urlEncode(USER.access_token)..
 				"&id="..urlEncode(rooms[selected].id)
diff --git a/parts/scenes/register.lua b/parts/scenes/register.lua
index 42da0920..3bb9bd7d 100644
--- a/parts/scenes/register.lua
+++ b/parts/scenes/register.lua
@@ -48,7 +48,7 @@ function scene.keyDown(key)
 		end
 		httpRequest(
 			tick_httpREQ_register,
-			PATH.api..PATH.auth,
+			PATH.http..PATH.auth,
 			"POST",
 			{["Content-Type"]="application/json"},
 			json.encode{