Merge branch 'master' of ssh://git.dever.cc:10022/xinnongbaohe/zeus

admin/page/device.py

@@ -116,7 +116,8 @@ class info_path(Load):
 		if status:
 			self.data['search']['status'] = False
 
-		self.list('device_info', order='inorder asc, type_id asc,udate asc,hardware_id asc')
+		#inorder asc, type_id asc,
+		self.list('device_info', order='cdate desc, udate asc,hardware_id asc')
 		if self.data['list']:
 			for key, value in enumerate(self.data['list']):
 				farm = self.service('common').one('farm', id=value['farm_id'])

conf/env.conf

@@ -68,10 +68,10 @@ xsrf_cookies        = True
 ;前台配置
 [front]
 port				= 8088
-debug				= True
+debug				= False
 max_buffer_size		= 210763776
-process				= 0
-url					= http://192.168.33.10:8088/device
+process				= 50
+url					= http://www.xinnongbaohe.com:8088/device
 qrcode				= http://pan.baidu.com/share/qrcode?w=300&h=300&url=
 mobile				= True
 

front/page/__load__.py

@@ -28,7 +28,7 @@ class Load(Base):
 		if 'farm' in self.data['setting'] and self.data['setting']['farm']:
 			self.data['setting']['farmInfo'] = self.service('common').one('farm', id=self.data['setting']['farm'])
 			if 'eros_status' in self.data['setting']['farmInfo'] and self.data['setting']['farmInfo']['eros_status'] == 1 and self.data['setting']['farmInfo']['eros_server']:
-				self.data['url'] = 'http://' + self.data['setting']['farmInfo']['eros_server'] + ':8091'
+				self.data['url'] = 'http://' + self.data['setting']['farmInfo']['eros_server'] + ':8081'
 				
 			self.data['setting']['farmInfo']['gateways'] = ''
 			if self.data['setting']['farmInfo']['gateway']:
@@ -145,7 +145,8 @@ class Device(object):
 		if 'id--ins' in search and search['id--ins']:
 			search['id--ins'] = tuple(eval(search['id--ins']))
 			#order='inorder asc, type_id asc,udate asc,id asc'
-		return self.service('common').list('device_info', state=True, search=search, order='inorder asc, type_id asc,udate asc,hardware_id asc', limit='0,10000')
+			#inorder asc, type_id asc,udate asc,hardware_id asc
+		return self.service('common').list('device_info', state=True, search=search, order='cdate desc,udate asc,hardware_id asc', limit='0,10000')
 
 	@staticmethod
 	def getByGateway(self, search={}):