update APIs

This commit is contained in:
Particle_G
2021-02-06 15:50:00 +08:00
committed by MrZ626
parent d86eb59963
commit 5b718e3f8c
7 changed files with 22 additions and 24 deletions

View File

@@ -144,16 +144,14 @@ PATH={--Network API paths
url="hdustea.3322.org", url="hdustea.3322.org",
port="10026", port="10026",
api="/tech/api/v1", http="/tech/api/v1",
appInfo="/app/info",
users="/users",
auth="/auth",
access="/auth/access",
rooms="/online/rooms",
socket="/tech/socket/v1", socket="/tech/socket/v1",
play_room="/play_room", appInfo="/app/info",
chat_room="/chat_room", user="/user",
auth="/auth/auth",
access="/auth/access",
onlineChat="/online/chat",
onlinePlay="/online/play",
} }
--Game tables --Game tables

View File

@@ -44,7 +44,7 @@ local function tick_httpREQ_autoLogin(task)
LOG.print(text.loginSuccessed) LOG.print(text.loginSuccessed)
httpRequest( httpRequest(
TICK_httpREQ_getUserInfo, TICK_httpREQ_getUserInfo,
PATH.api..PATH.users, PATH.http..PATH.user,
"GET", "GET",
{["Content-Type"]="application/json"}, {["Content-Type"]="application/json"},
json.encode{ json.encode{
@@ -199,11 +199,11 @@ function scene.update()
LOADED=true LOADED=true
SFX.play("welcome_sfx") SFX.play("welcome_sfx")
VOC.play("welcome_voc") 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 if USER.auth_token and USER.email then
httpRequest( httpRequest(
tick_httpREQ_autoLogin, tick_httpREQ_autoLogin,
PATH.api..PATH.auth, PATH.http..PATH.auth,
"GET", "GET",
{["Content-Type"]="application/json"}, {["Content-Type"]="application/json"},
json.encode{ json.encode{

View File

@@ -15,7 +15,7 @@ local function tick_httpREQ_newLogin(task)
httpRequest( httpRequest(
TICK_httpREQ_getUserInfo, TICK_httpREQ_getUserInfo,
PATH.api..PATH.users, PATH.http..PATH.user,
"GET", "GET",
{["Content-Type"]="application/json"}, {["Content-Type"]="application/json"},
json.encode{ json.encode{
@@ -26,7 +26,7 @@ local function tick_httpREQ_newLogin(task)
httpRequest( httpRequest(
TICK_httpREQ_getAccessToken, TICK_httpREQ_getAccessToken,
PATH.api..PATH.access, PATH.http..PATH.access,
"POST", "POST",
{["Content-Type"]="application/json"}, {["Content-Type"]="application/json"},
json.encode{ json.encode{
@@ -60,8 +60,8 @@ local function login()
end end
httpRequest( httpRequest(
tick_httpREQ_newLogin, tick_httpREQ_newLogin,
PATH.api..PATH.auth, PATH.http..PATH.auth,
"GET", "POST",
{["Content-Type"]="application/json"}, {["Content-Type"]="application/json"},
json.encode{ json.encode{
email=email, email=email,

View File

@@ -12,7 +12,7 @@ local function tick_httpREQ_manualAutoLogin(task)
elseif response.code==403 or response.code==401 then elseif response.code==403 or response.code==401 then
httpRequest( httpRequest(
TICK_httpREQ_getAccessToken, TICK_httpREQ_getAccessToken,
PATH.api..PATH.access, PATH.http..PATH.access,
"POST", "POST",
{["Content-Type"]="application/json"}, {["Content-Type"]="application/json"},
json.encode{ json.encode{
@@ -112,7 +112,7 @@ scene.widgetList={
if USER.access_token then if USER.access_token then
httpRequest( httpRequest(
tick_httpREQ_manualAutoLogin, tick_httpREQ_manualAutoLogin,
PATH.api..PATH.access, PATH.http..PATH.access,
"GET", "GET",
{["Content-Type"]="application/json"}, {["Content-Type"]="application/json"},
json.encode{ json.encode{
@@ -123,7 +123,7 @@ scene.widgetList={
else else
httpRequest( httpRequest(
TICK_httpREQ_getAccessToken, TICK_httpREQ_getAccessToken,
PATH.api..PATH.access, PATH.http..PATH.access,
"POST", "POST",
{["Content-Type"]="application/json"}, {["Content-Type"]="application/json"},
json.encode{ json.encode{

View File

@@ -32,7 +32,7 @@ scene.widgetList={
WIDGET.newButton{name="chat", x=640, y=540,w=350,h=120,font=40,code=function() WIDGET.newButton{name="chat", x=640, y=540,w=350,h=120,font=40,code=function()
wsConnect( wsConnect(
tick_goChatRoom, 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}, end},
WIDGET.newButton{name="back", x=1140, y=640,w=170,h=80,font=40,code=backScene}, WIDGET.newButton{name="back", x=1140, y=640,w=170,h=80,font=40,code=backScene},

View File

@@ -79,7 +79,7 @@ local function fresh()
rooms=nil rooms=nil
httpRequest( httpRequest(
task_fetchRooms, task_fetchRooms,
PATH.api..PATH.rooms, PATH.http..PATH.onlinePlay,
"GET", "GET",
{["Content-Type"]="application/json"}, {["Content-Type"]="application/json"},
json.encode{ json.encode{
@@ -109,7 +109,7 @@ function scene.keyDown(k)
elseif k=="n"then elseif k=="n"then
httpRequest( httpRequest(
task_createRooms, task_createRooms,
PATH.api..PATH.rooms.."/classic", PATH.http..PATH.onlinePlay.."/classic",
"POST", "POST",
{["Content-Type"]="application/json"}, {["Content-Type"]="application/json"},
json.encode{ json.encode{
@@ -143,7 +143,7 @@ function scene.keyDown(k)
end end
wsConnect( wsConnect(
task_enterRoom, task_enterRoom,
PATH.socket..PATH.play_room.. PATH.socket..PATH.onlinePlay..
"?email="..urlEncode(USER.email).. "?email="..urlEncode(USER.email)..
"&access_token="..urlEncode(USER.access_token).. "&access_token="..urlEncode(USER.access_token)..
"&id="..urlEncode(rooms[selected].id) "&id="..urlEncode(rooms[selected].id)

View File

@@ -48,7 +48,7 @@ function scene.keyDown(key)
end end
httpRequest( httpRequest(
tick_httpREQ_register, tick_httpREQ_register,
PATH.api..PATH.auth, PATH.http..PATH.auth,
"POST", "POST",
{["Content-Type"]="application/json"}, {["Content-Type"]="application/json"},
json.encode{ json.encode{