Merge branch 'dev' of ssh://192.168.136.45:10022/SERVER/AnsjerServer into dev

# Conflicts:
#	Controller/UserController.py

Ansjer/urls.py

@@ -110,6 +110,7 @@ urlpatterns = [
 
     # h获取验证码    # v2接口
     url(r'^v2/account/authcode$', UserController.v2authCodeView.as_view()),
+
     url(r'^v2/account/register$', UserController.v2registerView.as_view()),
     url(r'^v2/account/forgetCode$', UserController.v2forgetPwdCodeView.as_view()),
     url(r'^v2/account/resetPwdByCode$', UserController.v2resetPwdByCodeView.as_view()),
@@ -156,6 +157,10 @@ urlpatterns = [
     url(r'^wechat/perfect', UserController.wxPerfectView.as_view()),
     # 分区分流
     path('Test', Test.Test.as_view()),
+    # 微信绑定的用户获取验证码
+    url(r'^oauth/authcode', UserController.OauthAuthCodeView.as_view()),
+    url(r'^oauth/perfect', UserController.OauthPerfectView.as_view()),
+
     # 路由加参数参考
     # url(r'^(?P<path>.*)/(?P<UID>.*)/lls$', Test.Test.as_view(), name=u'gg'),
     re_path('(?P<path>.*)', LogManager.errorPath),

Controller/UidSetController.py

@@ -19,7 +19,7 @@ from django.utils.decorators import method_decorator
 from django.views.decorators.csrf import csrf_exempt
 from django.views.generic.base import View
 
-from Model.models import UidSetModel, Device_User, Device_Info
+from Model.models import UidSetModel, Device_User, Device_Info,UidPushModel
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
 from Service.CommonService import CommonService
@@ -66,6 +66,8 @@ class UidSetView(View):
         userID = tko.userID
         if operation == 'queryAll':
             return self.do_queryAll(request_dict, userID, response)
+        elif operation == 'adminQueryAll':
+            return self.do_admin_queryAll(request_dict, userID, response)
         elif operation == 'adminDelete':
             return self.do_admin_delete(request_dict, userID, response)
         elif operation == 'adminQuery':
@@ -88,6 +90,28 @@ class UidSetView(View):
         else:
             return response.json(0)
 
+    def do_admin_queryAll(self, request_dict, userID, response):
+            uid_list = Device_Info.objects.filter(userID_id=userID).values_list('UID', flat=True)
+            print (uid_list)
+            id = request_dict.get('id', None)
+            uid_set_qs = UidPushModel.objects.filter(uid_set__id=id).values('addTime',
+                                                                            'appBundleId','app_type','lang','m_code','push_type','token_val','tz','uid_set',
+                                                                            'updTime','userID','userID__username'
+                                                                            , 'userID__userEmail', 'userID__NickName'
+                                                                            , 'userID__is_active', 'userID__phone'
+                                                                            , 'uid_set__channel', 'uid_set__uid'
+                                                                            , 'uid_set__detect_status'
+                                                                            ,'uid_set__detect_interval', 'uid_set__ucode'
+                                                                            , 'uid_set__version'
+                                                                            , 'uid_set__p2p_region'
+                                                                            ,'uid_set__cloud_vod', 'uid_set__tz'
+                                                                            , 'uid_set__video_code'
+                                                                            ,'uid_set__nickname'
+                                                                            ,'uid_set__ip'
+                                                                            )
+
+            return response.json(0, list(uid_set_qs))
+
         # 管理员删除
 
     def do_admin_delete(self, request_dict, userID, response):

Controller/UserController.py

@@ -1528,6 +1528,7 @@ class wxAuthSignView(TemplateView):
             print(user_qs)
             return self.do_login(user_qs, response)
 
+<<<<<<< HEAD
 
 # 获取验证码
 class wxPerfectView(TemplateView):
@@ -1546,7 +1547,6 @@ class wxPerfectView(TemplateView):
         response = ResponseObject(lang)
         request_dict = request.GET
         # return self.do_register('157113010663213800138000', '157113010663213800138000', response, 'xx')
-
         return self.ValidationError(request_dict, response)
 
     def ValidationError(self, request_dict, response):
@@ -1582,7 +1582,6 @@ class wxPerfectView(TemplateView):
                         user_extend_qs = UserExtendModel.objects. \
                             filter(userID_id=userID, authType=1, appBundleId=appBundleID)
                         if user_extend_qs.exists():
-                            # 如果用户绑定过则直接登录
                             user_extend_qs.update(authOpenID=openid)
                             return response.json(0)
                         else:

Service/TemplateService.py

@@ -60,14 +60,16 @@ class TemplateService:
             'deviceShare/confirm',
             'deviceShare/deleteUser',
             'equipment/delete',
-            'equipment/add',
             'equipment/query',
             'order/querylist',
             'detect/changeStatus',
             # 'notify/push',
             'equipment/flowUpdate',
             'wechat/authsign',
-            'user/initInfo'
+            'user/initInfo',
+            'wechat/perfect',
+            'oauth / perfect',
+            'oauth/authcode'
             # 'detect/queryInfo'
         ]
         return apiList