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

Ansjer/urls.py

@@ -160,6 +160,8 @@ 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'^(?P<path>.*)/(?P<UID>.*)/lls$', Test.Test.as_view(), name=u'gg'),

Controller/UserController.py

@@ -1925,4 +1925,53 @@ class OauthPerfectView(TemplateView):
         user_qs.update(phone=phone,password=make_password(password))
         if not reds.del_data(str(phone) + '_OauthPerfect'):
             return response.json(10, '删除缓存失败')
+        return response.json(0)
+
+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'
+        request_dict = request.GET
+        lang = request_dict.get('lang')
+        if not lang:
+            lang = request_dict.get('language', None)
+        response = ResponseObject(lang)
+        was_limited = getattr(request, 'limited', False)
+        if was_limited is True:
+            return response.json(5)
+        return self.ValidationError(request_dict, response)
+
+    def post(self, request):
+        request.encoding = 'utf-8'
+        request_dict = request.POST
+        lang = request_dict.get('lang')
+        if not lang:
+            lang = request_dict.get('language', None)
+        response = ResponseObject(lang)
+        was_limited = getattr(request, 'limited', False)
+        if was_limited is True:
+            return response.json(5)
+        return self.ValidationError(request_dict, response)
+
+    def ValidationError(self, request_dict, response):
+        token = request_dict.get('token', None)
+        print (token)
+        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 ('都是空')
+        else:
+            return response.json(tko.code)
+
         return response.json(0)

Service/TemplateService.py

@@ -67,11 +67,11 @@ class TemplateService:
             'equipment/flowUpdate',
             'wechat/authsign',
             'user/initInfo',
+
             'wechat/perfect',
             'oauth / perfect',
-            'oauth/authcode'
-            # 'detect/queryInfo'
-        ]
+            'oauth/authcode',
+            'detect/queryInfo'        ]
         return apiList
 
     @staticmethod