From 061ffefd68dcc3e6a277d7b3b1ffcfe3ce70c75f Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 2 Nov 2020 19:46:13 +0800 Subject: [PATCH] 1 --- .gitmodules | 6 ++++++ server/loginserver_be/loginserver_be.py | 4 ++-- third_party/f7 | 1 + third_party/q7 | 1 + 4 files changed, 10 insertions(+), 2 deletions(-) create mode 160000 third_party/f7 create mode 160000 third_party/q7 diff --git a/.gitmodules b/.gitmodules index 585c590..404c4dc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,9 @@ [submodule "third_party/q5"] path = third_party/q5 url = git@git.kingsome.cn:server_common/q5.git +[submodule "third_party/f7"] + path = third_party/f7 + url = git@git.kingsome.cn:server_common/f7.git +[submodule "third_party/q7"] + path = third_party/q7 + url = git@git.kingsome.cn:server_common/q7.git diff --git a/server/loginserver_be/loginserver_be.py b/server/loginserver_be/loginserver_be.py index 9e3256d..860557a 100644 --- a/server/loginserver_be/loginserver_be.py +++ b/server/loginserver_be/loginserver_be.py @@ -14,7 +14,7 @@ CONFIG_DIR = '../config' if f7.isOnlineEnv() else '/var/data/conf_test/loginserv def __loginGoogleAuth(request): try: - client_id = request.get_argument('client', '') + client_id = request.get_argument('client_id', '') token = request.get_argument('token', '') idinfo = id_token.verify_oauth2_token(token, requests.Request(), client_id) return json.dumps({ @@ -43,7 +43,7 @@ if __name__ == "__main__": f7.app.init('/data/logs/loginserver_be/logs') f7.udplog.info('loginserver_be start pid:' + str(os.getpid())) - conf = json.loads(open(CONFIG_DIR + '/loginserver_be.json', 'r').read()) + conf = json.loads(open(CONFIG_DIR + '/loginserver_be.cluster.json', 'r').read()) f7.app.registerHandler('Login', 'auth', __loginAuth) f7.app.listen(conf['listen_port']) diff --git a/third_party/f7 b/third_party/f7 new file mode 160000 index 0000000..d84f116 --- /dev/null +++ b/third_party/f7 @@ -0,0 +1 @@ +Subproject commit d84f1162556e1703d71a203cc2985d61bafea32e diff --git a/third_party/q7 b/third_party/q7 new file mode 160000 index 0000000..4af43d5 --- /dev/null +++ b/third_party/q7 @@ -0,0 +1 @@ +Subproject commit 4af43d56490d566c38021d9687975dae17d9e7ad