Merge pull request #592 from midoks/dev

细节优化

class/core/mw.py

@@ -1305,7 +1305,10 @@ def getClientIp():
 def checkDomainPanel():
     tmp = getHost()
     domain = readFile('data/bind_domain.pl')
-    port = readFile('data/port.pl').strip()
+
+    port = 7200
+    if os.path.exists('data/port.pl'):
+        port = readFile('data/port.pl').strip()
 
     scheme = 'http'
 

route/static/app/public.js

@@ -1351,58 +1351,57 @@ function execLog(){
  * @param {String} dateFormat 返回的日期格式，默认为'H:i:s'
  */
 function getSFM(seconds, dateFormat = 'H:i:s') {
-  var obj = {};
+
-  obj.H = Number.parseInt(seconds / 3600);
+	var obj = {};
-  obj.i = Number.parseInt((seconds - obj.H * 3600) / 60);
+ 	obj.H = Number.parseInt(seconds / 3600);
-  obj.s = Number.parseInt(seconds - obj.H * 3600 - obj.i * 60);
+ 	obj.i = Number.parseInt((seconds - obj.H * 3600) / 60);
-  if (obj.H < 10) {
+ 	obj.s = Number.parseInt(seconds - obj.H * 3600 - obj.i * 60);
-    obj.H = '0' + obj.H;
+ 	if (obj.H < 10) {
-  }
+    	obj.H = '0' + obj.H;
-  if (obj.i < 10) {
+  	}
-    obj.i = '0' + obj.i;
+  	if (obj.i < 10) {
-  }
+    	obj.i = '0' + obj.i;
-  if (obj.s < 10) {
+  	}
-    obj.s = '0' + obj.s;
+  	if (obj.s < 10) {
-  }
+    	obj.s = '0' + obj.s;
- 
+  	}
-  // 3.解析
+ 
-  var rs = dateFormat.replace('H', obj.H).replace('i', obj.i).replace('s', obj.s);
+  	// 3.解析
-  return rs;
+  	var rs = dateFormat.replace('H', obj.H).replace('i', obj.i).replace('s', obj.s);
+  	return rs;
 }
 
 function remind(a){
 	a = a == undefined ? 1 : a;
 	$.post("/task/list", "table=tasks&result=2,4,6,8&limit=10&p=" + a, function(g) {
-		// console.log(g);
+		var e = '';
-		var e = "";
 		var f = false;
 		var task_count = 0;
 		for(var d = 0; d < g.data.length; d++) {
-			if(g.data[d].status != '1'){
+			var status = g.data[d].status;
-				task_count++;
+			var status_text = '已经完成';
-				e += '<tr>\
+			var cos_text = '';
-						<td><input type="checkbox"></td>\
+			if (status == '1'){
-						<td>\
+				status_text = '完成';
-							<div class="titlename c3">\
+				cos_text = '耗时['+getSFM(g.data[d].end - g.data[d].start)+']'
-								<span>'+g.data[d].name+'</span>\
+			} else if (status == '0'){
-								<span class="rs-status">【'+lan.bt.task_the+'】<span>\
+				status_text = '正在处理';
-								<span class="rs-time">耗时['+ getSFM(g.data[d].end - g.data[d].start) +']</span>\
+				cos_text = '等待中..';
-							</div>\
+			} else if (status == '-1'){
-						</td>\
+				status_text = '安装中';
-						<td class="text-right c3">'+g.data[d].addtime+'</td>\
+				cos_text = '..';
-					</tr>';
-			} else{
-				e += '<tr>\
-						<td><input type="checkbox"></td>\
-						<td>\
-							<div class="titlename c3">'+g.data[d].name+'</span>\
-								<span class="rs-status">【'+lan.bt.task_ok+'】<span>\
-								<span class="rs-time">安装等待中...</span>\
-							</div>\
-						</td>\
-						<td class="text-right c3">'+g.data[d].addtime+'</td>\
-					</tr>';
 			}
+
+			e += '<tr>\
+				<td><input type="checkbox"></td>\
+				<td>\
+					<div class="titlename c3">'+g.data[d].name+'</span>\
+						<span class="rs-status">【'+status_text+'】<span>\
+						<span class="rs-time">'+cos_text+'</span>\
+					</div>\
+				</td>\
+				<td class="text-right c3">'+g.data[d].addtime+'</td>\
+			</tr>';
 		}
 		var con = '<div class="divtable"><table class="table table-hover">\
 					<thead>\
@@ -1412,15 +1411,16 @@ function remind(a){
 						</tr>\
 					</thead>\
 					<tbody id="remind">'+e+'</tbody>\
-					</table></div>\
+					</table>\
-					<div class="mtb15" style="height:32px">\
+				</div>\
-						<div class="pull-left buttongroup" style="display:none;">\
+				<div class="mtb15" style="height:32px">\
-							<button class="btn btn-default btn-sm mr5 rs-del" disabled="disabled">'+lan.public.del+'</button>\
+					<div class="pull-left buttongroup" style="display:none;">\
-							<button class="btn btn-default btn-sm mr5 rs-read" disabled="disabled">'+lan.bt.task_tip_read+'</button>\
+						<button class="btn btn-default btn-sm mr5 rs-del" disabled="disabled">'+lan.public.del+'</button>\
-							<button class="btn btn-default btn-sm">'+lan.bt.task_tip_all+'</button>\
+						<button class="btn btn-default btn-sm mr5 rs-read" disabled="disabled">'+lan.bt.task_tip_read+'</button>\
-						</div>\
+						<button class="btn btn-default btn-sm">'+lan.bt.task_tip_all+'</button>\
-						<div id="taskPage" class="page"></div>\
+					</div>\
-					</div>';
+					<div id="taskPage" class="page"></div>\
+				</div>';
 		
 		$(".task_count").text(task_count);
 		$(".msg_count").text(g.count);
@@ -1429,9 +1429,9 @@ function remind(a){
 
 		$("#Rs-checkAll").click(function(){
 			if($(this).prop("checked")){
-				$("#remind").find("input").prop("checked",true)
+				$("#remind").find("input").prop("checked",true);
 			} else {
-				$("#remind").find("input").prop("checked",false)
+				$("#remind").find("input").prop("checked",false);
 			}
 		});
 	},'json');

task.py

@@ -77,7 +77,7 @@ def openresty_cmd(method = 'reload'):
         return True
 
     sys_initd = '/etc/init.d/openresty'
-    if os.path.exists(install_initd):
+    if os.path.exists(sys_initd):
         os.system(sys_initd + ' ' + method)
         return True