diff --git a/server/robot/accord/accord_conf.lua b/server/robot/accord/accord_conf.lua deleted file mode 100644 index 9717999d..00000000 --- a/server/robot/accord/accord_conf.lua +++ /dev/null @@ -1,5 +0,0 @@ ---luacheck: ignore 631 -return { - lua = {servers={[1]='127.0.0.1:20013'},cases={login={protocols={[1]={id=10009,name='NID_LOGIN_ROLE_CHOOSE_REQ',args={role_id=0,user_id=0}},[2]={id=10011,name='NID_LOGIN_ROLE_DELETE_REQ',args={role_id=0,user_id=0}}},name='login',openid='test001',password='123456',server='127.0.0.1:20013'}},accord={NID_LOGIN_ROLE_LOGOUT_REQ={msg_id=10015,name='NID_LOGIN_ROLE_LOGOUT_REQ',fields={role_id=0}},NID_LOGIN_ROLE_RELOAD_REQ={msg_id=10017,name='NID_LOGIN_ROLE_RELOAD_REQ',fields={role_id=0,token=0,lobby=0,user_id=0}},NID_HEARTBEAT_REQ={msg_id=1001,name='NID_HEARTBEAT_REQ',fields={time=0,serial=0}},NID_LOGIN_RANDOM_NAME_REQ={msg_id=10005,name='NID_LOGIN_RANDOM_NAME_REQ',fields={}},NID_LOGIN_ACCOUNT_RELOAD_REQ={msg_id=10003,name='NID_LOGIN_ACCOUNT_RELOAD_REQ',fields={openid='xxx',account_token=0}},NID_LOGIN_ROLE_CHOOSE_REQ={msg_id=10009,name='NID_LOGIN_ROLE_CHOOSE_REQ',fields={role_id=0,user_id=0}},NID_LOGIN_ROLE_CREATE_REQ={msg_id=10007,name='NID_LOGIN_ROLE_CREATE_REQ',fields={model=0,gender=0,name='xxx',user_id=0}},NID_LOGIN_ACCOUNT_LOGIN_REQ={msg_id=10001,name='NID_LOGIN_ACCOUNT_LOGIN_REQ',fields={platform=0,openid='xxx',session='xxx'}},NID_LOGIN_ROLE_LOGIN_REQ={msg_id=10013,name='NID_LOGIN_ROLE_LOGIN_REQ',fields={role_id=0,token=0,lobby=0,user_id=0}},NID_LOGIN_ROLE_DELETE_REQ={msg_id=10011,name='NID_LOGIN_ROLE_DELETE_REQ',fields={role_id=0,user_id=0}}}}, - json = [[{"servers":["127.0.0.1:20013"],"cases":{"login":{"protocols":[{"id":10009,"name":"NID_LOGIN_ROLE_CHOOSE_REQ","args":{"role_id":0,"user_id":0}},{"id":10011,"name":"NID_LOGIN_ROLE_DELETE_REQ","args":{"role_id":0,"user_id":0}}],"name":"login","openid":"test001","password":"123456","server":"127.0.0.1:20013"}},"accord":{"NID_LOGIN_ROLE_LOGOUT_REQ":{"msg_id":10015,"name":"NID_LOGIN_ROLE_LOGOUT_REQ","fields":{"role_id":0}},"NID_LOGIN_ROLE_RELOAD_REQ":{"msg_id":10017,"name":"NID_LOGIN_ROLE_RELOAD_REQ","fields":{"role_id":0,"token":0,"lobby":0,"user_id":0}},"NID_HEARTBEAT_REQ":{"msg_id":1001,"name":"NID_HEARTBEAT_REQ","fields":{"time":0,"serial":0}},"NID_LOGIN_RANDOM_NAME_REQ":{"msg_id":10005,"name":"NID_LOGIN_RANDOM_NAME_REQ","fields":{}},"NID_LOGIN_ACCOUNT_RELOAD_REQ":{"msg_id":10003,"name":"NID_LOGIN_ACCOUNT_RELOAD_REQ","fields":{"openid":"xxx","account_token":0}},"NID_LOGIN_ROLE_CHOOSE_REQ":{"msg_id":10009,"name":"NID_LOGIN_ROLE_CHOOSE_REQ","fields":{"role_id":0,"user_id":0}},"NID_LOGIN_ROLE_CREATE_REQ":{"msg_id":10007,"name":"NID_LOGIN_ROLE_CREATE_REQ","fields":{"model":0,"gender":0,"name":"xxx","user_id":0}},"NID_LOGIN_ACCOUNT_LOGIN_REQ":{"msg_id":10001,"name":"NID_LOGIN_ACCOUNT_LOGIN_REQ","fields":{"platform":0,"openid":"xxx","session":"xxx"}},"NID_LOGIN_ROLE_LOGIN_REQ":{"msg_id":10013,"name":"NID_LOGIN_ROLE_LOGIN_REQ","fields":{"role_id":0,"token":0,"lobby":0,"user_id":0}},"NID_LOGIN_ROLE_DELETE_REQ":{"msg_id":10011,"name":"NID_LOGIN_ROLE_DELETE_REQ","fields":{"role_id":0,"user_id":0}}}}]] -} diff --git a/server/robot/accord/src/bundle.lua b/server/robot/accord/index.lua similarity index 99% rename from server/robot/accord/src/bundle.lua rename to server/robot/accord/index.lua index f2892a2c..de192c91 100644 --- a/server/robot/accord/src/bundle.lua +++ b/server/robot/accord/index.lua @@ -1,3 +1,4 @@ +-- luacheck: ignore return [[ @@ -530,6 +531,7 @@ var DataUtils = { }); } } + var scope = null var http = null var app = angular.module('robot', []) @@ -1667,7 +1669,7 @@ var DataUtils = { ]] + +]] \ No newline at end of file diff --git a/server/robot/accord/src/data_utils.js b/server/robot/accord/page/data_utils.js similarity index 100% rename from server/robot/accord/src/data_utils.js rename to server/robot/accord/page/data_utils.js diff --git a/server/robot/accord/src/format_utils.js b/server/robot/accord/page/format_utils.js similarity index 100% rename from server/robot/accord/src/format_utils.js rename to server/robot/accord/page/format_utils.js diff --git a/server/robot/accord/src/index.html b/server/robot/accord/page/index.html similarity index 99% rename from server/robot/accord/src/index.html rename to server/robot/accord/page/index.html index 8c65e1cc..b328446a 100644 --- a/server/robot/accord/src/index.html +++ b/server/robot/accord/page/index.html @@ -1,3 +1,5 @@ +-- luacheck: ignore +return [[
@@ -364,9 +366,10 @@