实现 join 接口

jimvc/__init__.py

@@ -154,6 +154,7 @@ def is_not_need_to_auth(endpoint):
     not_auth_table = [
         'api_config.r_get',
         'api_config.r_create',
+        'api_misc.r_join',
         'v_config.create',
         'v_misc.login',
         'v_misc.recover_password',

jimvc/api/misc.py

@@ -49,7 +49,7 @@ def r_join(node_id, _token):
         ji.Check.previewing(args_rules, {'node_id': node_id, 'token': _token})
 
         token = Token()
-        token.token = token
+        token.token = _token
 
         # 检验 token 有效性
         if not token.valid():

jimvc/api_route_table.py

@@ -42,7 +42,7 @@ add_rule_api(config.blueprint, '', api_func='config.r_get', methods=['GET'])
 add_rule_api(about.blueprint, '', api_func='about.r_get', methods=['GET'])
 
 # 杂项操作
-add_rule_api(misc.blueprint, '/_join/<node_id>/<_token>', api_func='about.r_join', methods=['GET'])
+add_rule_api(misc.blueprint, '/_join/<node_id>/<_token>', api_func='misc.r_join', methods=['GET'])
 
 # IP 池操作
 add_rule_api(ip_pool.blueprint, '', api_func='ip_pool.r_create', methods=['POST'])

jimvc/models/token.py

@@ -38,7 +38,7 @@ class Token(object):
     def valid(self):
         score = db.r.zscore('Z:Token', self.token)
 
-        if score is not None and score <= ji.Common.ts():
+        if score is not None and score >= ji.Common.ts():
             return True
 
         return False

jimvc/models/utils.py

@@ -62,7 +62,7 @@ class Utils(object):
 
             if isinstance(ret, dict) and 'state' in ret:
                 response = make_response()
-                response.data = json.dumps(ret, ensure_ascii=False)
+                response.set_data(json.dumps(ret, ensure_ascii=False))
                 response.status_code = int(ret['state']['code'])
                 if 'redirect' in ret and request.args.get('auto_redirect', 'True') == 'True':
                     response.status_code = int(ret['redirect'].get('code', ret['state']['code']))