Merge remote-tracking branch 'remotes/origin/locky' into test

Ansjer/urls.py

@@ -288,6 +288,7 @@ urlpatterns = [
     re_path('adDepartment/(?P<operation>.*)$', AdDepartmentController.AdDepartmentView.as_view()),
     re_path('timeAlbum/(?P<operation>.*)$', TimeAlbumController.TimeAlbum.as_view()),
     re_path('shopify/(?P<operation>.*)$', ShopifyController.ShopifyView.as_view()),
+    re_path('^weChatMiniProgram/', include("Ansjer.server_urls.wechat_mini_program_url")),
     # 根据版本号获取设备配置信息
     re_path('open/device/configuration/(?P<operation>.*)', DeviceVersionInfoController.DeviceVersionInfoView.as_view()),
     # 获取APN配置信息

Controller/WeChatMiniProgram/UserController.py

@@ -16,7 +16,7 @@ from Object.RedisObject import RedisObject
 from Object.ResponseObject import ResponseObject
 
 
-class EquipmentFamilyView(View):
+class UserView(View):
 
     def get(self, request, *args, **kwargs):
         request.encoding = 'utf-8'
@@ -33,8 +33,8 @@ class EquipmentFamilyView(View):
         response = ResponseObject(lang)
         if operation == 'getPhoneNumber':
             return self.get_phone_number(request_dict, response)
-        elif operation == 'login':
-            return self.login(request_dict, response)
+        elif operation == 'userLogin':
+            return self.user_login(request_dict, response)
         else:
             valid = self.check_session_key(request)
             if not valid:
@@ -137,7 +137,7 @@ class EquipmentFamilyView(View):
             return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
 
     @classmethod
-    def login(cls, request_dict, response):
+    def user_login(cls, request_dict, response):
         """
         小程序登录
         https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/user-login/code2Session.html