updated private cloud server and console

console/mini_poem/utils/date_utils.js

@@ -4,7 +4,7 @@
  */
 
 function formatDate(date, fmt) {
-    var o = {
+    let o = {
         "M+" : date.getMonth() + 1,
         "d+" : date.getDate(),
         "h+" : date.getHours(),
@@ -15,25 +15,25 @@ function formatDate(date, fmt) {
     };
     if(/(y+)/.test(fmt))
         fmt=fmt.replace(RegExp.$1, (date.getFullYear()+"").substr(4 - RegExp.$1.length));
-    for(var k in o)
+    for(let k in o)
         if(new RegExp("("+ k +")").test(fmt))
             fmt = fmt.replace(RegExp.$1, (RegExp.$1.length==1) ? (o[k]) : (("00"+ o[k]).substr((""+ o[k]).length)));
     return fmt;
 }
 
 function getNextDay(dateString) {
-    var nextDayStr;
-    var nextMonthStr;
-    var nextYearStr;
-    var currentDate = new Date(dateString);
-    var nextDate = new Date(currentDate.getTime() + 24 * 60 * 60 * 1000);
-    var nextDay = nextDate.getDate();
+    let nextDayStr;
+    let nextMonthStr;
+    let nextYearStr;
+    let currentDate = new Date(dateString);
+    let nextDate = new Date(currentDate.getTime() + 24 * 60 * 60 * 1000);
+    let nextDay = nextDate.getDate();
     if(nextDay < 10) {
         nextDayStr = "0" + nextDay;
     } else {
         nextDayStr = nextDay;
     }
-    var nextMonth = nextDate.getMonth() + 1;
+    let nextMonth = nextDate.getMonth() + 1;
     if(nextMonth < 10) {
         nextMonthStr = "0" + nextMonth;
     } else {
@@ -44,18 +44,18 @@ function getNextDay(dateString) {
 }
 
 function getPreviousDay(dateString) {
-    var lastDayStr;
-    var lastMonthStr;
-    var lastYearStr;
-    var currentDate = new Date(dateString);
-    var lastDate = new Date(currentDate.getTime() - 24 * 60 * 60 * 1000);
-    var lastDay = lastDate.getDate();
+    let lastDayStr;
+    let lastMonthStr;
+    let lastYearStr;
+    let currentDate = new Date(dateString);
+    let lastDate = new Date(currentDate.getTime() - 24 * 60 * 60 * 1000);
+    let lastDay = lastDate.getDate();
     if(lastDay < 10) {
         lastDayStr = "0" + lastDay;
     } else {
         lastDayStr = lastDay;
     }
-    var lastMonth = lastDate.getMonth() + 1;
+    let lastMonth = lastDate.getMonth() + 1;
     if(lastMonth < 10) {
         lastMonthStr = "0" + lastMonth;
     } else {
@@ -70,9 +70,9 @@ function getDateDiffer(startTime, endTime, diffType) {
     endTime = endTime.replace(/\-/g, "/");
 
     diffType = diffType.toLowerCase();
-    var sTime = new Date(startTime);
-    var eTime = new Date(endTime);
-    var divNum = 1;
+    let sTime = new Date(startTime);
+    let eTime = new Date(endTime);
+    let divNum = 1;
     switch (diffType) {
         case "second":
             divNum = 1000;
@@ -94,7 +94,7 @@ function getDateDiffer(startTime, endTime, diffType) {
 
 function dateDiff(sDate1, sDate2) {
 
-    var aDate, oDate1, oDate2, iDays;
+    let aDate, oDate1, oDate2, iDays;
     aDate = sDate1.split("-");
     oDate1 = new Date(aDate[1] + '-' + aDate[2] + '-' + aDate[0]);  //转换为yyyy-MM-dd格式
     aDate = sDate2.split("-");

console/mini_poem/utils/map.js

@@ -3,7 +3,7 @@
  * 2014-03-14
  */
 
-var Map = function() {
+let Map = function() {
     this.elements = [];
 };
 
@@ -27,7 +27,7 @@ Map.prototype.put = function(_key, _value) {
 };
 
 Map.prototype.remove = function(_key) {
-    var bln = false;
+    let bln = false;
     try {
         for (i = 0; i < this.elements.length; i++) {
             if (this.elements[i].key == _key) {
@@ -74,7 +74,7 @@ Map.prototype.element = function(_index) {
 };
 
 Map.prototype.containsKey = function(_key) {
-    var bln = false;
+    let bln = false;
     try {
         for (i = 0; i < this.elements.length; i++) {
             if (this.elements[i].key == _key) {
@@ -88,7 +88,7 @@ Map.prototype.containsKey = function(_key) {
 };
 
 Map.prototype.containsValue = function(_value) {
-    var bln = false;
+    let bln = false;
     try {
         for (i = 0; i < this.elements.length; i++) {
             if (this.elements[i].value == _value) {
@@ -102,7 +102,7 @@ Map.prototype.containsValue = function(_value) {
 };
 
 Map.prototype.values = function() {
-    var arr = [];
+    let arr = [];
     for (i = 0; i < this.elements.length; i++) {
         arr.push(this.elements[i].value);
     }
@@ -110,7 +110,7 @@ Map.prototype.values = function() {
 };
 
 Map.prototype.keys = function() {
-    var arr = [];
+    let arr = [];
     for (i = 0; i < this.elements.length; i++) {
         arr.push(this.elements[i].key);
     }

console/mini_poem/utils/object_reflection.js

@@ -4,13 +4,13 @@
  */
 
 function objectMemberCount(conditions) {
-    var memberCount = 0;
-    for(var f in conditions) {
+    let memberCount = 0;
+    for(let f in conditions) {
         memberCount++;
     }
-    var whereClause = "";
-           var index = 0;
-           for(var field in conditions) {
+    let whereClause = "";
+           let index = 0;
+           for(let field in conditions) {
                whereClause += field + " = '" + conditions[field] + "'";
                if(index < memberCount - 1) {
                    whereClause += " AND ";

console/mini_poem/utils/string_utils.js

@@ -1,29 +1,29 @@
 exports.randomChar = function(l) {
-    var x = "0123456789qwertyuioplkjhgfdsazxcvbnm";
-    var tmp = "";
-    for(var i = 0;i < l; i++)  {
+    let x = "0123456789qwertyuioplkjhgfdsazxcvbnm";
+    let tmp = "";
+    for(let i = 0;i < l; i++)  {
         tmp += x.charAt(Math.ceil(Math.random()*100000000)%x.length);
     }
     return  tmp;
 };
 
 exports.randomNumber = function(l) {
-    var x = "0123456789";
-    var tmp = "";
-    for(var i = 0;i < l; i++)  {
+    let x = "0123456789";
+    let tmp = "";
+    for(let i = 0;i < l; i++)  {
         tmp += x.charAt(Math.ceil(Math.random()*100000000)%x.length);
     }
     return  tmp;
 };
 
 exports.validateEmail = function (email) {
-    var re = /^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+    let re = /^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
     return re.test(email);
 };
 
 function rnd() {
-    var today = new Date();
-    var seed = today.getTime();
+    let today = new Date();
+    let seed = today.getTime();
     seed = (seed * 9301 + 49297) % 233280;
     return seed / (233280.0);
 }
@@ -33,6 +33,6 @@ function cr(number) {
 }
 
 function isNumber() {
-    var r = /^[0-9]*[1-9][0-9]*$/;
+    let r = /^[0-9]*[1-9][0-9]*$/;
     return r.test(str);
 }

console/mini_poem/utils/system_utils.js

@@ -3,9 +3,9 @@
  * 2016-12-02
  */
 
-var dateUtils = require('./date_utils');
-var platform = require('platform');
-var UAParser = require('ua-parser-js');
+let dateUtils = require('./date_utils');
+let platform = require('platform');
+let UAParser = require('ua-parser-js');
 
 function startup(expressApp, port, serverName) {
     if(expressApp && expressApp.listen && typeof(expressApp.listen) == "function") {
@@ -32,8 +32,8 @@ function getOS() {
 }
 
 function getUAInfo(ua) {
-    var parser = new UAParser();
-    var result = parser.setUA(ua).getResult();
+    let parser = new UAParser();
+    let result = parser.setUA(ua).getResult();
     return result;
 }