edit

admin/page/device.py

@@ -434,12 +434,11 @@ class notice_type_update_path(Load):
 	@Web.setting
 	def post(self):
 		self.update('notice_type')
-		Demeter.service('core', 'eros').rsync('notice_type')
+
 	@Web.auth
 	@Web.setting
 	def delete(self):
 		self.drop('notice_type')
-		Demeter.service('core', 'eros').rsync('notice_type')
 
 class log_path(Load):
 	@Web.auth

admin/page/hardware.py

@@ -98,12 +98,11 @@ class type_update_path(Load):
 	@Web.setting
 	def post(self):
 		self.update('hardware_type')
-		Demeter.service('core', 'eros').rsync('hardware_type')
+
 	@Web.auth
 	@Web.setting
 	def delete(self):
 		self.drop('hardware_type')
-		Demeter.service('core', 'eros').rsync('hardware_type')
 
 class restart_cron_path(Load):
 	@Web.auth

admin/page/msg.py

@@ -107,9 +107,9 @@ class type_update_path(Load):
 	@Web.setting
 	def post(self):
 		self.update('msg_type')
-		Demeter.service('core', 'eros').rsync('msg_type')
+
 	@Web.auth
 	@Web.setting
 	def delete(self):
 		self.drop('msg_type')
-		Demeter.service('core', 'eros').rsync('msg_type')
+		

admin/page/setting.py

@@ -80,13 +80,12 @@ class product_update_path(Load):
 	@Web.auth
 	@Web.setting
 	def post(self):
-		self.update('setting_product')
-		Demeter.service('core', 'eros').rsync('setting_product')
+		id = self.update('setting_product')
+
 	@Web.auth
 	@Web.setting
 	def delete(self):
 		self.drop('setting_product')
-		Demeter.service('core', 'eros').rsync('setting_product')
 
 class device_type_path(Load):
 	@Web.auth
@@ -122,13 +121,11 @@ class device_type_update_path(Load):
 	@Web.auth
 	@Web.setting
 	def post(self):
-		self.update('setting_device_type')
-		Demeter.service('core', 'eros').rsync('setting_device_type')
+		id = self.update('setting_device_type')
 	@Web.auth
 	@Web.setting
 	def delete(self):
 		self.drop('setting_device_type')
-		Demeter.service('core', 'eros').rsync('setting_device_type')
 
 class modbus_code_path(Load):
 	@Web.auth
@@ -171,10 +168,9 @@ class modbus_code_update_path(Load):
 	@Web.auth
 	@Web.setting
 	def post(self):
-		self.update('setting_modbus_code')
-		Demeter.service('core', 'eros').rsync('setting_modbus_code')
+		id = self.update('setting_modbus_code')
 	@Web.auth
 	@Web.setting
 	def delete(self):
 		self.drop('setting_modbus_code')
-		Demeter.service('core', 'eros').rsync('setting_modbus_code')
+		

conf/dev.conf

@@ -91,4 +91,11 @@ max_buffer_size     = 210763776
 process             = 0
 url                 = http://www.xinnongbaohe.com/
 farmurl             = http://farm.xinnongbaohe.com/?id=
-originurl           = http://s.xinnongbaohe.com/?id=
+originurl           = http://s.xinnongbaohe.com/?id=
+
+;同步配置
+[sync]
+;同步的表，多个用逗号隔开
+table               = notice_type,hardware_type,msg_type,setting_product,setting_device_type,setting_modbus_code
+;同步的方法，仅限service
+service              = core,eros

service/eros/core.py

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

sync.py

@@ -8,6 +8,8 @@ from demeter.core import *
 
 param = {}
 param['table'] = 't'
+param['id'] = 'i'
 Demeter.getopt(param)
 table = Demeter.option['table']
-Demeter.service('core', 'eros').sync(table)
+id = Demeter.option['id']
+Demeter.service('core', 'zeus').sync(table, {'id':id})