Merge branch 'dev' of http://192.168.136.45:3000/SERVER/AnsjerServer into dev

Ansjer/file/apns_pem/zccloud-dev.pem

@@ -1,64 +1,65 @@
 Bag Attributes
-    friendlyName: Apple Development IOS Push Services: com.ansjer.zccloud
-    localKeyID: 53 D0 A7 6B CF E9 9C 46 ED 44 01 01 01 14 02 52 A6 45 AB C5 
-subject=/UID=com.ansjer.zccloud/CN=Apple Development IOS Push Services: com.ansjer.zccloud/OU=772N5HXAR2/C=US
+    friendlyName: iPhone Developer: bin zhou (WL7VT7TF2P)
+    localKeyID: 23 82 B2 0B 3D C6 B3 4A D4 D8 13 C3 4B B4 3F 45 A4 B9 C1 AE 
+subject=/UID=5M755H52RX/CN=iPhone Developer: bin zhou (WL7VT7TF2P)/OU=772N5HXAR2/O=ZOSI Technology Co. , Ltd/C=CN
 issuer=/C=US/O=Apple Inc./OU=Apple Worldwide Developer Relations/CN=Apple Worldwide Developer Relations Certification Authority
 -----BEGIN CERTIFICATE-----
-MIIFiTCCBHGgAwIBAgIIcl31JS0D4/cwDQYJKoZIhvcNAQEFBQAwgZYxCzAJBgNV
+MIIFoTCCBImgAwIBAgIIBSWRBGxJj18wDQYJKoZIhvcNAQELBQAwgZYxCzAJBgNV
 BAYTAlVTMRMwEQYDVQQKDApBcHBsZSBJbmMuMSwwKgYDVQQLDCNBcHBsZSBXb3Js
 ZHdpZGUgRGV2ZWxvcGVyIFJlbGF0aW9uczFEMEIGA1UEAww7QXBwbGUgV29ybGR3
 aWRlIERldmVsb3BlciBSZWxhdGlvbnMgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkw
-HhcNMTkxMTA4MDc0NjI4WhcNMjAxMTA3MDc0NjI4WjCBiDEiMCAGCgmSJomT8ixk
-AQEMEmNvbS5hbnNqZXIuemNjbG91ZDFAMD4GA1UEAww3QXBwbGUgRGV2ZWxvcG1l
-bnQgSU9TIFB1c2ggU2VydmljZXM6IGNvbS5hbnNqZXIuemNjbG91ZDETMBEGA1UE
-CwwKNzcyTjVIWEFSMjELMAkGA1UEBhMCVVMwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDTiNE32dceZMEsO/0na/qDcYD3icWauyoYm/SL0OWVtIahF4J5
-vXcg46QHNhQ4y/xczFLQr4iZsUKyElt3c3MLZCs2P/75UOfGYZTVRpugjo83iSpz
-9pHZl4qc7fZMDyurXzcYazRalFzB/PPbKBS+PVtAMpCv4a1Cg/vtHCMF3neJUQMV
-yTkXjyNuxK4UU/Pgeck4y52TmvuJMMEtkbLRoqCh046VSg2cGLmjNO9j+ECvn3rR
-b/XZdOPbDPtaCe2dLE+cL1ldJdkyxk5KJmvhkfiQlORhgJrS8r63KDZSi8PCRqkg
-bLWW6dXUBQOwQCLshLficY5M4LuLPthUTr51AgMBAAGjggHlMIIB4TAJBgNVHRME
-AjAAMB8GA1UdIwQYMBaAFIgnFwmpthhgi+zruvZHWcVSVKO3MIIBDwYDVR0gBIIB
-BjCCAQIwgf8GCSqGSIb3Y2QFATCB8TCBwwYIKwYBBQUHAgIwgbYMgbNSZWxpYW5j
-ZSBvbiB0aGlzIGNlcnRpZmljYXRlIGJ5IGFueSBwYXJ0eSBhc3N1bWVzIGFjY2Vw
-dGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJsZSBzdGFuZGFyZCB0ZXJtcyBhbmQg
-Y29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRlIHBvbGljeSBhbmQgY2VydGlm
-aWNhdGlvbiBwcmFjdGljZSBzdGF0ZW1lbnRzLjApBggrBgEFBQcCARYdaHR0cDov
-L3d3dy5hcHBsZS5jb20vYXBwbGVjYS8wEwYDVR0lBAwwCgYIKwYBBQUHAwIwTQYD
-VR0fBEYwRDBCoECgPoY8aHR0cDovL2RldmVsb3Blci5hcHBsZS5jb20vY2VydGlm
-aWNhdGlvbmF1dGhvcml0eS93d2RyY2EuY3JsMB0GA1UdDgQWBBRT0Kdrz+mcRu1E
-AQEBFAJSpkWrxTALBgNVHQ8EBAMCB4AwEAYKKoZIhvdjZAYDAQQCBQAwDQYJKoZI
-hvcNAQEFBQADggEBAG2u1x1eJUBKLVIMuIOeM8Zr6PfJ2Y9ulOh/gpuS+SDkZ4Gh
-NLlH2hjEj68q8IKuLQT+6mLdPZJgwiXEHIqCsZm3J4Oc1dDfOr3zXV7xeqhDm3h9
-wnqhYOWbanlDWZ9CvvBI3bdLU5tJ6W9C/Gkn3trRG0NvcqMtYGq5huRyv9thTq1j
-LTvHQgEQit1mWuhdZitTDkyjgLOR1NtBOvNxUtYpYx8+7Q/g2tuVnUbNke2VxeZ8
-MPjdcpOfcoZcZCgUf/7qWfFfPToVYrrvm7M9dZK5hY1losb6wxANUWHci3P/Ujpx
-zJSwCdfVZ7HyhTNPRCGrTgWH/VIz8KXTQoU7Gp4=
+HhcNMTkwOTAzMTExNjQyWhcNMjAwOTAyMTExNjQyWjCBlDEaMBgGCgmSJomT8ixk
+AQEMCjVNNzU1SDUyUlgxMDAuBgNVBAMMJ2lQaG9uZSBEZXZlbG9wZXI6IGJpbiB6
+aG91IChXTDdWVDdURjJQKTETMBEGA1UECwwKNzcyTjVIWEFSMjEiMCAGA1UECgwZ
+Wk9TSSBUZWNobm9sb2d5IENvLiAsIEx0ZDELMAkGA1UEBhMCQ04wggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDb7T9MxXW613lYJ7V7Ezc8NN3IKd5Gu9ru
+aYXldiN8ISNxMIC5ZMqRrhAW45Y2gOxtO4b6p5H6tDbmtFnaBBiAcPVslsi7mj1E
+ICnk8nZzGyVeUps+Ogx+Cq0saaNtXTYXeC8AASC9sDwKoug2t9odMe08wAy/NsuF
+CbahZLMA6xNzHd0cEHySCX2pMOvl/nItTmklEmmH78VGeMDcNsMlw0VrI7fyo2rf
+0YdMXZpMT+54nILHWP5kkvNRz3r1IIfqLvVjjrrRLSwcHH7eiqVGA/NL3tZfgvgB
+vdtEWH1Bqvz/+4UEFOIJq8jM2S0vJ439yJ5/BHt9fAaXqdf68/mHAgMBAAGjggHx
+MIIB7TAMBgNVHRMBAf8EAjAAMB8GA1UdIwQYMBaAFIgnFwmpthhgi+zruvZHWcVS
+VKO3MD8GCCsGAQUFBwEBBDMwMTAvBggrBgEFBQcwAYYjaHR0cDovL29jc3AuYXBw
+bGUuY29tL29jc3AwMy13d2RyMDEwggEdBgNVHSAEggEUMIIBEDCCAQwGCSqGSIb3
+Y2QFATCB/jCBwwYIKwYBBQUHAgIwgbYMgbNSZWxpYW5jZSBvbiB0aGlzIGNlcnRp
+ZmljYXRlIGJ5IGFueSBwYXJ0eSBhc3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRo
+ZW4gYXBwbGljYWJsZSBzdGFuZGFyZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1
+c2UsIGNlcnRpZmljYXRlIHBvbGljeSBhbmQgY2VydGlmaWNhdGlvbiBwcmFjdGlj
+ZSBzdGF0ZW1lbnRzLjA2BggrBgEFBQcCARYqaHR0cDovL3d3dy5hcHBsZS5jb20v
+Y2VydGlmaWNhdGVhdXRob3JpdHkvMBYGA1UdJQEB/wQMMAoGCCsGAQUFBwMDMB0G
+A1UdDgQWBBQjgrILPcazStTYE8NLtD9FpLnBrjAOBgNVHQ8BAf8EBAMCB4AwEwYK
+KoZIhvdjZAYBAgEB/wQCBQAwDQYJKoZIhvcNAQELBQADggEBAB0G3alPaDkIWsGH
+2WV6uFbt3wDFCRNr1oHHnB4KVqErhgUT0jhBnV5gZt2ZlvjpNjPoM5AAh49cisSm
+N4U1yVhb6VomsfExdmEwkdQq2fH9h6c1VZRfBECBy1R653xKwx4xeYVK8NQIgSFw
+nbqm0NXydzoU87t5mtHX7VWgy+cmixVtLwSUO1Qgtdcqcu+Th9SQTSVYWLLVKgsl
+E1M6+ViwQyGK5BVBQcIn2/wc2yl1JYCVJHYbQyiPX4xwPArL05EiKAc8yD54p3tp
+ZZoHAP5tQ2mnr3uCBM0mrbtvVeTA7Wp4/Pd2PB6ewJzKmIBWzWEyg6DEJp3LmW3j
+UhlGaF0=
 -----END CERTIFICATE-----
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----

Ansjer/urls.py

@@ -194,9 +194,13 @@ urlpatterns = [
     url(r'^v3/account/changePwd$', UserController.v3ChangePwdView.as_view()),
     url(r'^v3/account/resetPwdByCode$', UserController.v3resetPwdByCodeView.as_view()),
     url(r'^v3/account/register$', UserController.v3registerView.as_view()),
+    #测试------
+    url(r'^v11/account/changePwd$', UserController.v3ChangePwdView.as_view()),
+
     # app 设备消息模板
     # 路由加参数参考
     # url(r'^(?P<path>.*)/(?P<UID>.*)/lls$', Test.Test.as_view(), name=u'gg'),
+    #testing....................
     re_path('(?P<path>.*)', LogManager.errorPath),
 
 

Controller/EquipmentManagerV3.py

@@ -42,8 +42,6 @@ class EquipmentManagerV3(View):
                 return self.do_query(userID, request_dict, response)
             elif operation == 'modify':
                 return self.do_modify(userID, request_dict, response)
-            elif operation == 'query_reset':
-                return self.do_query_reset(userID, request_dict, response)
             else:
                 return response.json(414)
         else:
@@ -284,13 +282,6 @@ class EquipmentManagerV3(View):
         else:
             return response.json(tko.code)
 
-    # 新查询设备字段
-    def do_query_reset(self, userID, request_dict, response):
-        dvqs = Device_Info.objects.filter(userID_id=userID, isExist=2)
-        dvql = dvqs.values\
-            ('id', 'NickName', 'UID', 'ChannelIndex', 'Type', 'isShare')
-        res = CommonService.qs_to_list(dvql)
-        return response.json(0, res)
 
     # 加密
     def encrypt_pwd(self,userPwd):

Controller/UserController.py

@@ -50,6 +50,7 @@ class authCodeView(TemplateView):
 
     @method_decorator(csrf_exempt)
     def dispatch(self, *args, **kwargs):
+		# testtest11111111111111
         return super(authCodeView, self).dispatch(*args, **kwargs)
 
     @ratelimit(key='ip', rate='2/m')