Merge branch 'master' of ssh://git.dever.cc:10022/python/demeter

demeter/mqtt.py

@@ -20,7 +20,7 @@ class Connect(object):
 			self.client.on_message = act.message
 		else:
 			self.client.on_connect = self.connect
-		self.client.connect(Demeter.config['mqtt']['host'], Demeter.config['mqtt']['port'], int(Demeter.config['mqtt']['timeout']))
+		self.client.connect(Demeter.config['mqtt']['host'], int(Demeter.config['mqtt']['port']), int(Demeter.config['mqtt']['timeout']))
 		if state:
 			self.client.loop_forever()
 

demeter/web.py

@@ -118,10 +118,11 @@ class Base(tornado.web.RequestHandler):
 		self.data['list'] = self.service('common').list(model, state=self.data['state'], search=self.data['search'], page=True, order=order)
 
 	def one(self, model, **kwd):
-		id = self.input('id')
 		self.data['info'] = {}
-		if id:
-			kwd['id'] = id
+		if 'id' not in kwd and self.input('id'):
+			id = self.input('id')
+			if id:
+				kwd['id'] = id
 		if kwd:
 			self.data['info'] = self.service('common').one(model, **kwd)