Merge branch 'yanglei'

myapps/sukang24h/api/wx_auth_portal.py

@@ -31,6 +31,7 @@ wx_auth_route = Blueprint('wx_auth', __name__)
 @wx_auth_route.route('/test', methods=['POST'])
 def my_test():
     a = {'error_code': '0', 'error_message': 'Success'}
+
     return jsonify(a)
 
 
@@ -59,16 +60,20 @@ def mini_login():
         return jsonify(WX_LOGIN_CODE_ERROR)
 
     try:
-        user_info = WeChatWxaCrypto(user_session["session_key"], iv, app_id).decrypt_message(encrypted_data)
+        user_info = WeChatWxaCrypto(
+            user_session["session_key"], iv, app_id).decrypt_message(encrypted_data)
     except:
         try:
-            session_key = redis_client.get(WX_SESSION_KEY + user_session["openid"])
-            user_info = WeChatWxaCrypto(session_key, iv, app_id).decrypt_message(encrypted_data)
+            session_key = redis_client.get(
+                WX_SESSION_KEY + user_session["openid"])
+            user_info = WeChatWxaCrypto(
+                session_key, iv, app_id).decrypt_message(encrypted_data)
         except:
             return BaseResponse(error_code=500, error_message='user info decrypt error')
 
     is_new_user = 0
-    wx_user_model = WxUser.query.filter_by(openid=user_session["openid"]).first()
+    wx_user_model = WxUser.query.filter_by(
+        openid=user_session["openid"]).first()
     if not wx_user_model:
         wx_user_model = WxUser()
         wx_user_model.status = 1
@@ -88,7 +93,8 @@ def mini_login():
     wx_user_model.platform = platform_appid_config_list.index(app_id)
     db.session.add(wx_user_model)
     db.session.commit()
-    token = generate_jwt(payload={"user_id": wx_user_model.id}, expiry=time.time() + 24 * 60 * 60)
+    token = generate_jwt(
+        payload={"user_id": wx_user_model.id}, expiry=time.time() + 24 * 60 * 60)
     return jsonify({
         'customer_id': wx_user_model.id,
         'token': token,