From 3e88b0bfb11d47aa0852ddf9a1f302fe7158723f Mon Sep 17 00:00:00 2001 From: Brian Martin Date: Sun, 17 Feb 2019 13:49:05 -0500 Subject: [PATCH] add api error codes add api error codes --- bumper/__init__.py | 42 ++++++++++++++++++++++++++++- bumper/confserver.py | 64 +++++++++++++++++++++++++++++--------------- 2 files changed, 83 insertions(+), 23 deletions(-) diff --git a/bumper/__init__.py b/bumper/__init__.py index c986fb1..9b84d69 100644 --- a/bumper/__init__.py +++ b/bumper/__init__.py @@ -106,4 +106,44 @@ def check_authcode(uid, authcode): if uid == "fuid_{}".format(user.userid) and authcode in user.authcodes: return True - return False \ No newline at end of file + return False + +RETURN_API_SUCCESS = "0000" +ERR_ACTIVATE_TOKEN_TIMEOUT = "1006" +ERR_COMMON = "0001" +ERR_DEFAULT = "9000" +ERR_EMAIL_NON_EXIST = "1002" +ERR_EMAIL_SEND_TIME_LIMIT = "1011" +ERR_EMAIL_USED = "1001" +ERR_INTERFACE_AUTH = "0002" +ERR_PARAM_INVALID = "0003" +ERR_PWD_WRONG = "1005" +ERR_RESET_PWD_TOKEN_TIMEOUT = "1007" +ERR_TIMESTAMP_INVALID = "0005" +ERR_TOKEN_INVALID = "0004" +ERR_USER_DISABLE = "1004" +ERR_USER_NOT_ACTIVATED = "1003" +ERR_WRONG_COMFIRM_PWD = "10010" +ERR_WRONG_EMAIL_ADDRESS = "1008" +ERR_WRONG_PWD_FROMATE = "1009" + +API_ERRORS = { + RETURN_API_SUCCESS: "0000", + ERR_ACTIVATE_TOKEN_TIMEOUT: "1006", + ERR_COMMON: "0001", + ERR_DEFAULT: "9000", + ERR_EMAIL_NON_EXIST: "1002", + ERR_EMAIL_SEND_TIME_LIMIT: "1011", + ERR_EMAIL_USED: "1001", + ERR_INTERFACE_AUTH: "0002", + ERR_PARAM_INVALID: "0003", + ERR_PWD_WRONG: "1005", + ERR_RESET_PWD_TOKEN_TIMEOUT: "1007", + ERR_TIMESTAMP_INVALID: "0005", + ERR_TOKEN_INVALID: "0004", + ERR_USER_DISABLE: "1004", + ERR_USER_NOT_ACTIVATED: "1003", + ERR_WRONG_COMFIRM_PWD: "10010", + ERR_WRONG_EMAIL_ADDRESS: "1008", + ERR_WRONG_PWD_FROMATE: "1009", +} diff --git a/bumper/confserver.py b/bumper/confserver.py index 3ee906b..c0e9cb1 100644 --- a/bumper/confserver.py +++ b/bumper/confserver.py @@ -146,29 +146,49 @@ class ConfServer(): tmpaccesstoken = '' if 'checkLogin' in request.path: if request.query['accessToken'] in user.tokens and request.query['uid'] == "fuid_{}".format(user.userid): - tmpaccesstoken = request.query['accessToken'] + tmpaccesstoken = request.query['accessToken'] + body = { + "code": bumper.RETURN_API_SUCCESS, + "data": { + "accessToken": tmpaccesstoken, #Random chars 32 length + "country": countrycode, + "email": "null@null.com", + "uid": "fuid_{}".format(user.userid), + "username": "fusername_{}".format(user.userid), + }, + "msg": "操作成功", + "time": bumper.get_milli_time(time.time()) + } + else: + body = { + "code": bumper.ERR_TOKEN_INVALID, + "data": None, + "msg": "当前密码错误", + "time": bumper.get_milli_time(time.time()) + } else: if tmpaccesstoken == '': tmpaccesstoken = uuid.uuid4().hex user.add_token(tmpaccesstoken) - body = { - "code": "0000", - "data": { - "accessToken": tmpaccesstoken, #Random chars 32 length - "country": countrycode, - "email": "null@null.com", - "uid": "fuid_{}".format(user.userid), - "username": "fusername_{}".format(user.userid), - }, - "msg": "操作成功", - "time": bumper.get_milli_time(time.time()) - } - self.bumper_users.set(users) + body = { + "code": bumper.RETURN_API_SUCCESS, + "data": { + "accessToken": tmpaccesstoken, #Random chars 32 length + "country": countrycode, + "email": "null@null.com", + "uid": "fuid_{}".format(user.userid), + "username": "fusername_{}".format(user.userid), + }, + "msg": "操作成功", + "time": bumper.get_milli_time(time.time()) + } + self.bumper_users.set(users) + return web.json_response(body) body = { - "code": "1005", + "code": bumper.ERR_USER_NOT_ACTIVATED, "data": None, "msg": "当前密码错误", "time": bumper.get_milli_time(time.time()) @@ -192,7 +212,7 @@ class ConfServer(): user.revoke_token(request.query['accessToken']) self.bumper_users.set(users) - body = {"code": "0000","data": None,"msg": "操作成功", "time": bumper.get_milli_time(time.time())} + body = {"code": bumper.RETURN_API_SUCCESS,"data": None,"msg": "操作成功", "time": bumper.get_milli_time(time.time())} return web.json_response(body) @@ -212,7 +232,7 @@ class ConfServer(): user.add_authcode(tmpauthcode) body = { - "code": "0000", + "code": bumper.RETURN_API_SUCCESS, "data": { "authCode": tmpauthcode, "ecovacsUid": request.query['uid'] @@ -224,7 +244,7 @@ class ConfServer(): return web.json_response(body) body = { - "code": "1005", + "code": bumper.ERR_TOKEN_INVALID, "data": None, "msg": "当前密码错误", "time": bumper.get_milli_time(time.time()) @@ -238,7 +258,7 @@ class ConfServer(): async def handle_checkVersion(self, request): try: body = { - "code": "0000", + "code": bumper.RETURN_API_SUCCESS, "data": { "c": None, "img": None, @@ -260,7 +280,7 @@ class ConfServer(): async def handle_checkAgreement(self, request): try: body = { - "code": "0000", + "code": bumper.RETURN_API_SUCCESS, "data": [], "msg": "操作成功", "time": bumper.get_milli_time(time.time()) @@ -277,7 +297,7 @@ class ConfServer(): nextAlert = bumper.get_milli_time((datetime.now() + timedelta(hours=12)).timestamp()) body = { - "code": "0000", + "code": bumper.RETURN_API_SUCCESS, "data": { "clickSchemeUrl": None, "clickWebUrl": None, @@ -297,7 +317,7 @@ class ConfServer(): async def handle_getProductIotMap(self, request): try: - body = {"code":0,"data":[{"classid":"dl8fht","product":{"_id":"5acb0fa87c295c0001876ecf","name":"DEEBOT 600 Series","icon":"5acc32067c295c0001876eea","UILogicId":"dl8fht","ota":False,"iconUrl":"https://portal-ww.ecouser.net/api/pim/file/get/5acc32067c295c0001876eea"}},{"classid":"02uwxm","product":{"_id":"5ae1481e7ccd1a0001e1f69e","name":"DEEBOT OZMO Slim10 Series","icon":"5b1dddc48bc45700014035a1","UILogicId":"02uwxm","ota":False,"iconUrl":"https://portal-ww.ecouser.net/api/pim/file/get/5b1dddc48bc45700014035a1"}},{"classid":"y79a7u","product":{"_id":"5b04c0227ccd1a0001e1f6a8","name":"DEEBOT OZMO 900","icon":"5b04c0217ccd1a0001e1f6a7","UILogicId":"y79a7u","ota":True,"iconUrl":"https://portal-ww.ecouser.net/api/pim/file/get/5b04c0217ccd1a0001e1f6a7"}},{"classid":"jr3pqa","product":{"_id":"5b43077b8bc457000140363e","name":"DEEBOT 711","icon":"5b5ac4cc8d5a56000111e769","UILogicId":"jr3pqa","ota":True,"iconUrl":"https://portal-ww.ecouser.net/api/pim/file/get/5b5ac4cc8d5a56000111e769"}},{"classid":"uv242z","product":{"_id":"5b5149b4ac0b87000148c128","name":"DEEBOT 710","icon":"5b5ac4e45f21100001882bb9","UILogicId":"uv242z","ota":True,"iconUrl":"https://portal-ww.ecouser.net/api/pim/file/get/5b5ac4e45f21100001882bb9"}},{"classid":"ls1ok3","product":{"_id":"5b6561060506b100015c8868","name":"DEEBOT 900 Series","icon":"5ba4a2cb6c2f120001c32839","UILogicId":"ls1ok3","ota":True,"iconUrl":"https://portal-ww.ecouser.net/api/pim/file/get/5ba4a2cb6c2f120001c32839"}}]} + body = {"code":bumper.RETURN_API_SUCCESS,"data":[{"classid":"dl8fht","product":{"_id":"5acb0fa87c295c0001876ecf","name":"DEEBOT 600 Series","icon":"5acc32067c295c0001876eea","UILogicId":"dl8fht","ota":False,"iconUrl":"https://portal-ww.ecouser.net/api/pim/file/get/5acc32067c295c0001876eea"}},{"classid":"02uwxm","product":{"_id":"5ae1481e7ccd1a0001e1f69e","name":"DEEBOT OZMO Slim10 Series","icon":"5b1dddc48bc45700014035a1","UILogicId":"02uwxm","ota":False,"iconUrl":"https://portal-ww.ecouser.net/api/pim/file/get/5b1dddc48bc45700014035a1"}},{"classid":"y79a7u","product":{"_id":"5b04c0227ccd1a0001e1f6a8","name":"DEEBOT OZMO 900","icon":"5b04c0217ccd1a0001e1f6a7","UILogicId":"y79a7u","ota":True,"iconUrl":"https://portal-ww.ecouser.net/api/pim/file/get/5b04c0217ccd1a0001e1f6a7"}},{"classid":"jr3pqa","product":{"_id":"5b43077b8bc457000140363e","name":"DEEBOT 711","icon":"5b5ac4cc8d5a56000111e769","UILogicId":"jr3pqa","ota":True,"iconUrl":"https://portal-ww.ecouser.net/api/pim/file/get/5b5ac4cc8d5a56000111e769"}},{"classid":"uv242z","product":{"_id":"5b5149b4ac0b87000148c128","name":"DEEBOT 710","icon":"5b5ac4e45f21100001882bb9","UILogicId":"uv242z","ota":True,"iconUrl":"https://portal-ww.ecouser.net/api/pim/file/get/5b5ac4e45f21100001882bb9"}},{"classid":"ls1ok3","product":{"_id":"5b6561060506b100015c8868","name":"DEEBOT 900 Series","icon":"5ba4a2cb6c2f120001c32839","UILogicId":"ls1ok3","ota":True,"iconUrl":"https://portal-ww.ecouser.net/api/pim/file/get/5ba4a2cb6c2f120001c32839"}}]} return web.json_response(body) except Exception as e: