edit

front/api/interface.py

@@ -34,13 +34,17 @@ class sync_path(Load):
 		data = json.loads(data)
 		table = self.input('table')
 
+		#print(data)
+
 		if data:
 			for v in data:
 				update = {}
-				info = self.service('common').one(table, id=v['id'], farm_id=v['farm_id'])
+				info = self.service('common').one(table, id=v['id'])
 				if info:
 					id = v['id']
 					del v['cdate']
+					if 'udate' in v:
+						del v['udate']
 					del v['id']
 					for i in v:
 						if v[i]:
@@ -48,6 +52,8 @@ class sync_path(Load):
 					self.service('common').update(table, id, update, cdate=False)
 				else:
 					del v['cdate']
+					if 'udate' in v:
+						del v['udate']
 					for i in v:
 						if v[i]:
 							update[i] = v[i]

front/page/__load__.py

@@ -27,6 +27,9 @@ 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['setting']['farmInfo']['gateways'] = ''
 			if self.data['setting']['farmInfo']['gateway']:
 				self.data['setting']['farmInfo']['gateways'] = tuple(eval(self.data['setting']['farmInfo']['gateway']))

front/page/main.py

@@ -33,6 +33,8 @@ class index_path(Load):
 	@Web.auth
 	@Web.setting
 	def get(self):
+		if 'url' in self.data:
+			self.redirect(self.data['url'])
 		mobile = Demeter.checkMobile(self.request)
 		if mobile:
 			self.redirect('/device')

service/eros/core.py

@@ -6,14 +6,19 @@ class Core(object):
 
 	# 实时同步
 	def rsync(self, table, id):
-		command = Demeter.path + 'sync.py -t ' + table + ' -i ' + id
+		command = Demeter.path + 'sync.py -t ' + str(table) + ' -i ' + str(id)
 		Shell.popen("python3 " + command, bg=True)
-		#self.sync(table)
+		#self.sync(table, {'id':id})
 
 	# 远程同步
 	def sync(self, table, search={}):
 		farm = Demeter.service('common').list('farm', search={'eros_status':1})
-		data = Demeter.service('common').list(table, search=search)
+		state = True
+		data = Demeter.service('common').list(table, state=state, search=search)
+		if not data:
+			state = False
+			data = Demeter.service('common').list(table, state=state, search=search)
+
 		param = {}
 		param['data'] = json.dumps(data)
 		param['table'] = table

sync.py

@@ -12,4 +12,4 @@ param['id'] = 'i'
 Demeter.getopt(param)
 table = Demeter.option['table']
 id = Demeter.option['id']
-Demeter.service('core', 'zeus').sync(table, {'id':id})
+Demeter.service('core', 'eros').sync(table, {'id':id})