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

# Conflicts:
#	Controller/UserController.py

Ansjer/urls.py

@@ -160,7 +160,7 @@ urlpatterns = [
     # 微信绑定的用户获取验证码
     url(r'^oauth/authcode', UserController.OauthAuthCodeView.as_view()),
     url(r'^oauth/perfect', UserController.OauthPerfectView.as_view()),
-    url(r'^oauth/unbunding', UserController.Un_bundingWXView.as_view()),
+    url(r'^oauth/unbunding', UserController.UnbundingWXView.as_view()),
 
 
     # 路由加参数参考

Controller/UidSetController.py

@@ -139,14 +139,31 @@ class UidSetView(View):
             line = request_dict.get('line', None)
             page = int(page)
             line = int(line)
-            omqs = UidSetModel.objects.all().order_by('-id')
-            if not omqs.exists():
-                return response.json(0, [])
-            count = omqs.count()
-            order_ql = omqs[(page - 1) * line:page * line]
-            uidset_json = CommonService.qs_to_dict(order_ql)
-            uidset_json['count'] = count
-            return response.json(0, uidset_json)
+            deviceContent = request_dict.get('content', None)
+            if deviceContent:
+                try:
+                    searchCondition = json.loads(deviceContent)
+                except Exception as e:
+                    return response.json(10, repr(e))
+                else:
+                    kwargs = CommonService.get_kwargs(data=searchCondition)
+                    omqs = UidSetModel.objects.filter(**kwargs)
+                    if not omqs.exists():
+                        return response.json(0, [])
+                    count = omqs.count()
+                    order_ql = omqs[(page - 1) * line:page * line]
+                    uidset_json = CommonService.qs_to_dict(order_ql)
+                    uidset_json['count'] = count
+                    return response.json(0, uidset_json)
+            else:
+                omqs = UidSetModel.objects.all().order_by('-id')
+                if not omqs.exists():
+                    return response.json(0, [])
+                count = omqs.count()
+                order_ql = omqs[(page - 1) * line:page * line]
+                uidset_json = CommonService.qs_to_dict(order_ql)
+                uidset_json['count'] = count
+                return response.json(0, uidset_json)
         else:
             return response.json(404)
 

Controller/UserController.py

@@ -1932,9 +1932,6 @@ class OauthPerfectView(TemplateView):
 
 
 class Un_bundingWXView(TemplateView):
-    @method_decorator(csrf_exempt)
-    def dispatch(self, *args, **kwargs):
-        return super(Un_bundingWXView, self).dispatch(*args, **kwargs)
 
     def get(self, request, *args, **kwargs):
         request.encoding = 'utf-8'
@@ -1948,7 +1945,7 @@ class Un_bundingWXView(TemplateView):
             return response.json(5)
         return self.ValidationError(request_dict, response)
 
-    def post(self, request):
+    def post(self, request, *args, **kwargs):
         request.encoding = 'utf-8'
         request_dict = request.POST
         lang = request_dict.get('lang')
@@ -1966,16 +1963,21 @@ class Un_bundingWXView(TemplateView):
         token = request_dict.get('token')
         tko = TokenObject(token)
         if tko.code == 0:
-            user_qs = Device_User.objects.filter(userID=tko.userID).values('phone', 'userEmail')
-            UserExtend = UserExtendModel.objects.filter(userID=tko.userID)
-            if (user_qs[0]['phone'] != '' or user_qs[0]['userEmail'] != ''):
-                print(user_qs[0]['phone'] != '')
-                print(user_qs[0]['userEmail'] != '')
-                if UserExtend.exists():
-                    UserExtend.update(authOpenID='', authType=0)
-            else:
-                print('都是空')
+            try:
+                user_qs = Device_User.objects.filter(userID=tko.userID).values('phone', 'userEmail')
+                UserExtend = UserExtendModel.objects.filter(userID=tko.userID)
+                if (user_qs[0]['phone'] != '' or user_qs[0]['userEmail'] != ''):
+                    print(user_qs[0]['phone'] != '')
+                    print(user_qs[0]['userEmail'] != '')
+                    if UserExtend.exists():
+                        UserExtend.update(authOpenID='', authType=0)
+                    else:
+                        return response.json(173)
+                else:
+                    print('都是空')
+                    return response.json(48)
+                return response.json(0)
+            except Exception as e:
+                return response.json(309)
         else:
             return response.json(tko.code)
-
-        return response.json(0)