2.1.2

修改重连mqtt累加

@@ -4,5 +4,5 @@ SERVER:
  reconnect_interval: 3
  reconnect_interval: 3
 
 
 VERSION:
 VERSION:
- code: 101
- name: 2.1.1
+ code: 102
+ name: 2.1.2

@@ -262,7 +262,7 @@ class MqttClient(mqtt.Client):
  return self.status
  return self.status
 
 
  def _send_pingreq(self):
  def _send_pingreq(self):
- self._ping_counter = self._ping_counter + 1
+ self._ping_counter += 1
  if self._ping_counter * 10 == 3600 * 4:
  if self._ping_counter * 10 == 3600 * 4:
  print(threading.current_thread().name, '每隔4小时自动重连')
  print(threading.current_thread().name, '每隔4小时自动重连')
  self._ping_counter = 0
  self._ping_counter = 0

@@ -29,7 +29,7 @@ def post_terminal_info(name_f, source_ws_f, num_f, version_f, set_latest_f):
  _host = netutil.getip()
  _host = netutil.getip()
  data['ip'] = _host
  data['ip'] = _host
  try:
  try:
- r = requests.post(SERVER + '/post_terminal_info', json=data, timeout=2)
+ r = requests.post(SERVER + '/post_terminal_info', json=data, timeout=15)
  res= r.json().get('data', {})
  res= r.json().get('data', {})
  new_ws =res.get('ws', data['ws'])
  new_ws =res.get('ws', data['ws'])
  set_latest_f(res['ver'])
  set_latest_f(res['ver'])