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

cron.py

@@ -15,5 +15,8 @@ Demeter.echo(Demeter.option['method'])
 method = Demeter.option['method']
 
 cron = Demeter.service(method, 'cron')
-while(True):
-	cron.handle()
+if 'mqtt_' in method:
+	cron.run()
+else:
+	while(True):
+		cron.run()

front/page/__load__.py

@@ -98,7 +98,7 @@ class Device(object):
 				return (None, type)
 			self.data['device'] = Device.get(self, search=search)
 
-		if not self.data['device'] or not self.data['info']:
+		if not self.data['device'] and not self.data['info']:
 			self.view('404.html')
 			return (None, type)
 		self.data['input'] = {}

front/templates/mobile/device/index.html

@@ -38,7 +38,7 @@
         <ul>
             <li class="form-input">
                 <a href="/msg">
-                    <i class="ico ico-5"></i><span>消息通知提醒</span><p>{% if 'msgNum' in data['setting'] and data['setting']['msgNum'] > 0 %}<b>{{data['setting']['msgNum']}}</b>{% end %}<i>&gt;</i></p>
+                    <i class="ico ico-5"></i><span>消息通知提醒</span><p>{% if 'msgNum' in data['setting'] and data['setting']['msgNum']%}<b>{{data['setting']['msgNum']}}</b>{% end %}<i>&gt;</i></p>
                 </a>
             </li>
         </ul>

service/cron/mqtt_sub.py

@@ -4,10 +4,14 @@
     name:sub.py
     author:rabin
 """
+import time
+from demeter.core import *
 from demeter.mqtt import *
+timeSleep = 1000
 import random
 class Mqtt_sub(object):
-	Sub()
+	def run(self):
+		Sub()
 
 """
 data = {}

service/cron/savepic.py

@@ -8,7 +8,6 @@ import time
 from demeter.core import *
 import oss2
 from itertools import islice
-from datetime import *
 timeSleep = 1800
 
 key = 'xinnongbaohe'

service/cron/timing.py

@@ -6,7 +6,7 @@
 """
 import time
 from demeter.core import *
-timeSleep = 10
+timeSleep = 60
 
 # 设置过期时间
 class Timing(object):