鉴权更改地址

diff --git a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/mgr.py b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/mgr.py
index 2caa8e6..0ccfb85 100644 (file)
--- a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/mgr.py
+++ b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/mgr.py
@@ -2974,11 +2974,11 @@ class getBootOffManager(Abstract):#开关机时间
 class testSmsSetIPManager(Abstract):#
     def __init__(self):
         self.timer = osTimer()
-        self.newip = "8.134.110.49"
+        self.newip = "test.iot.socket.thisiot.com"
         # "8.134.110.49"#默认大锤服务器 在大锤服务器更改要连接新的服务器地址
-        self.newcom = 30346
+        self.newcom = 9999
         # 31379
-       
+        
         self.new_key = "3JyCjsw4ryXKzjzudayY"
         self.new_pid = "qAELPTKmFanR4RHe"
         self.server_sate = 0
@@ -3028,6 +3028,7 @@ class testSmsSetIPManager(Abstract):#
 
     def set_new_key_cb(self, event, msg): 
         self.new_key = msg
+        print("set_new_key_cb",msg,self.new_key)
         EventMesh.publish("set_storage_config",["set_new_key",self.new_key])
 
     def get_new_key_cb(self, event, msg):
@@ -3035,6 +3036,7 @@ class testSmsSetIPManager(Abstract):#
     
     def set_new_pid_cb(self, event, msg): 
         self.new_pid = msg
+        print("set_new_pid_cb",msg,self.new_pid)
         EventMesh.publish("set_storage_config",["set_new_pid",self.new_pid])
 
     def get_new_pid_cb(self, event, msg):

diff --git a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/protocol.py b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/protocol.py
index 4ee7dc2..6b8c651 100644 (file)
--- a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/protocol.py
+++ b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/protocol.py
@@ -38,9 +38,9 @@ def server_init(server_type = None):
         # md5_key = "bZld0ALsZTt15tKEZhOlLPgbsO75BLTP"
         # PID = "SZKW"
     elif server_type == 2:
-        
-        d_server_addr = "8.134.110.49"
-        d_server_port = 30346
+        # test.iot.socket.thisiot.com:9999
+        d_server_addr = "test.iot.socket.thisiot.com"
+        d_server_port = 9999
         d_md5_key = "3JyCjsw4ryXKzjzudayY"
         d_PID = "qAELPTKmFanR4RHe"
     elif server_type == 3:
@@ -125,7 +125,7 @@ class SockManager(Abstract):
         self.reconnect_flag = 0
         self.connect_tmp = 0
         server_data = server_init()
-        print("SockManager:server_data:{}".format(server_data))
+        # print("SockManager:server_data:{}".format(server_data))
         self.server_addr = server_data[0]
         self.server_port = server_data[1]
         ip_infor = {}
@@ -206,7 +206,7 @@ class SockManager(Abstract):
                 print("sign_data:{} sonce_data:{}".format(md5_data,sign_data))
                 # sign_data = MD5_head
                 # http://8.134.110.49:31379/dev/device/check?imei=&bid=sonce=sign=
-                url = "http://8.134.110.49:31379/dev/device/check?imei={}&bid={}&sonce={}&sign={}".format(imei,pid_data,sonce_data,sign_data)
+                url = "http://test.app.api.thisiot.com/dev/device/check?imei={}&bid={}&sonce={}&sign={}".format(imei,pid_data,sonce_data,sign_data)
 
                 response = request.get(url)
                 data_tmp ={}
@@ -216,7 +216,7 @@ class SockManager(Abstract):
                 # d_PID = "3G"
                 # response.content = {'protocolType': '', 'host': 'device.miwitracker.com', 'secretKey': '', 'port': 8505, 'bid': '3G', 'extJsonStr': ''}
                 # response.status_code=200
-                # print("test-{}".format(response.status_code))
+                print("test-{}".format(response.status_code))
                 if response.status_code == 200:
                     content = response.content
                     c = next(content)
@@ -456,16 +456,22 @@ class ProtoCol(Abstract):
         EventMesh.subscribe(self.TYPE + "_SEND", self.handler)
         EventMesh.subscribe(self.TYPE + "_RECV", self.handler)
 
-    def handler(self, event, msg):
+    def change_key_pid(self):
         server_data = EventMesh.publish("get_new_key_pid")#获取pid和key
-        # print("handler",server_data)
+        print("handler",server_data,type(server_data[0]),type(server_data[1]))
         if server_data != None:
-            if self.md5_key != server_data[0]:
-                print("change md5key",self.md5_key,server_data[0])
+            if str(self.md5_key) != str(server_data[0]):
+                print("change md5key1",self.md5_key,server_data[0])
                 self.md5_key = server_data[0]
-            if self.PID != server_data[1]:
-                print("change md5PID",self.PID,server_data[1])
+                print("change md5key2",self.md5_key,server_data[0])
+            if str(self.PID) != str(server_data[1]):
+                print("change md5PID1",self.PID,server_data[1])
                 self.PID = server_data[1] 
+                print("change md5PID2",self.PID,server_data[1])
+        pass
+
+    def handler(self, event, msg):
+        self.change_key_pid()
 
         self.password = EventMesh.publish(constants.EVENT.GET_PASSWORD)
         self.imei = EventMesh.publish(constants.EVENT.GET_IMEI)#"867387060319166"#EventMesh.publish(constants.EVENT.GET_IMEI)#"867387060319166" #EventMesh.publish(constants.EVENT.GET_IMEI)#"867387060319166"#EventMesh.publish(constants.EVENT.GET_IMEI) #"867387060319166"#EventMesh.publish(constants.EVENT.GET_IMEI) #"867387060319166"#"867387060319188"#"867387060319177"#"867387060319166"#"860132060004322"#"867387060319166"#"860132060004322"#EventMesh.publish(constants.EVENT.GET_IMEI)