update

blockly.js

@@ -12,7 +12,7 @@ router.use(async function (req, res, next) {
     //权限设置 - 登陆 验证码
     await asynnext(req, res, next);
     //// make sure we go to the next routes and don't stop here
-    //res.end("");
+    //res.end("", _stime, _etime);
 });
 
 /**
@@ -31,7 +31,9 @@ router.route('/history').post((req, res, next) => {
     var _arr = [req.body.userid, req.body.username, 0, "history"];
     postmysql(req, res, "blockly_history", _arr);
 }).get((req, res, next) => {
-    getmysql(req, res, "blockly_history_get", req.query.username, "history")
+    var _stime = req.body.starttime || "",
+        _etime = req.body.endtime || "";
+    getmysql(req, res, "blockly_history_get", req.query.username, "history", _stime, _etime, _stime, _etime);
 });
 
 //指定用户在 CocoBlockly 停留的总时间（离开的时候请求）
@@ -39,16 +41,18 @@ router.route('/duration').post((req, res, next) => {
     var _arr = [req.body.userid, req.body.username, req.body.time, "duration"];
     postmysql(req, res, "blockly_duration", _arr);
 }).get((req, res, next) => {
-    getmysql(req, res, "blockly_duration_get", req.query.username, "duration")
-
+    var _stime = req.body.starttime || "",
+        _etime = req.body.endtime || "";
+    getmysql(req, res, "blockly_duration_get", req.query.username, "duration", _stime, _etime, _stime, _etime);
 });
 
 //指定用户打开实验室的行为
 router.route('/labs').post((req, res, next) => {
     postmysql(req, res, "blockly_labs");
 }).get((req, res, next) => {
-    getmysql(req, res, "blockly_labs_get")
-
+    var _stime = req.body.starttime || "",
+        _etime = req.body.endtime || "";
+    getmysql(req, res, "blockly_labs_get", _stime, _etime, _stime, _etime);
 });
 
 //指定用户打开某个样例的行为
@@ -56,7 +60,9 @@ router.route('/examples').post((req, res, next) => {
     var _arr = [req.body.userid, req.body.username, "example", req.body.eventname, req.body.eventcontent];
     postmysql(req, res, "blockly_examples", _arr);
 }).get((req, res, next) => {
-    getmysql(req, res, "blockly_examples_get", req.query.username, "example");
+    var _stime = req.body.starttime || "",
+        _etime = req.body.endtime || "";
+    getmysql(req, res, "blockly_examples_get", req.query.username, "example", _stime, _etime);
 });
 
 //指定用户切换上传模式的行为
@@ -64,8 +70,9 @@ router.route('/mode_switch').post((req, res, next) => {
     var _arr = [req.body.userid, req.body.username, "modeswitch", req.body.eventname, req.body.eventcontent];
     postmysql(req, res, "blockly_mode_switch", _arr);
 }).get((req, res, next) => {
-    getmysql(req, res, "blockly_mode_switch_get", req.query.username, "modeswitch");
-
+    var _stime = req.body.starttime || "",
+        _etime = req.body.endtime || "";
+    getmysql(req, res, "blockly_mode_switch_get", req.query.username, "modeswitch", _stime, _etime);
 });
 
 //指定用户点击串口监视窗按钮的行为
@@ -74,8 +81,9 @@ router.route('/serial_monitor').post((req, res, next) => {
     postmysql(req, res, "blockly_serial_monitor", _arr);
 
 }).get((req, res, next) => {
-    getmysql(req, res, "blockly_serial_monitor_get", req.query.username, "serialmonitor");
-
+    var _stime = req.body.starttime || "",
+        _etime = req.body.endtime || "";
+    getmysql(req, res, "blockly_serial_monitor_get", req.query.username, "serialmonitor", _stime, _etime);
 });
 
 //指定用户点击复制源代码的行为
@@ -84,7 +92,9 @@ router.route('/copy').post((req, res, next) => {
     postmysql(req, res, "blockly_copy", _arr);
 
 }).get((req, res, next) => {
-    getmysql(req, res, "blockly_copy_get", req.query.username, "copy");
+    var _stime = req.body.starttime || "",
+        _etime = req.body.endtime || "";
+    getmysql(req, res, "blockly_copy_get", req.query.username, "copy", _stime, _etime);
 });
 
 //指定用户点击运行的行为
@@ -92,8 +102,9 @@ router.route('/upload_area/run').post((req, res, next) => {
     var _arr = [req.body.userid, req.body.username, "run", req.body.eventname, req.body.eventcontent];
     postmysql(req, res, "blockly_upload_area_run", _arr);
 }).get((req, res, next) => {
-    getmysql(req, res, "blockly_upload_area_run_get", req.query.username, "run");
-
+    var _stime = req.body.starttime || "",
+        _etime = req.body.endtime || "";
+    getmysql(req, res, "blockly_upload_area_run_get", req.query.username, "run", _stime, _etime);
 });
 
 //指定用户点击上传的行为
@@ -101,7 +112,9 @@ router.route('/upload_area/upload').post((req, res, next) => {
     var _arr = [req.body.userid, req.body.username, "upload", req.body.eventname, req.body.eventcontent];
     postmysql(req, res, "blockly_upload_area_upload", _arr);
 }).get((req, res, next) => {
-    getmysql(req, res, "blockly_upload_area_upload_get", req.query.username, "upload")
+    var _stime = req.body.starttime || "",
+        _etime = req.body.endtime || "";
+    getmysql(req, res, "blockly_upload_area_upload_get", req.query.username, "upload", _stime, _etime);
 });
 
 
@@ -110,7 +123,9 @@ router.route('/upload_area/errormsg').post((req, res, next) => {
     var _arr = [req.body.userid, req.body.username, "errormsg", req.body.eventname, req.body.eventcontent];
     postmysql(req, res, "blockly_upload_area_errormsg", _arr);
 }).get((req, res, next) => {
-    getmysql(req, res, "blockly_upload_area_errormsg_get", req.query.username, "errormsg")
+    var _stime = req.body.starttime || "",
+        _etime = req.body.endtime || "";
+    getmysql(req, res, "blockly_upload_area_errormsg_get", req.query.username, "errormsg", _stime, _etime);
 });
 
 //指定用户将积木拖入编程区域的行为
@@ -118,7 +133,9 @@ router.route('/blocks/to_workspace').post((req, res, next) => {
     var _arr = [req.body.userid, req.body.username, "to_workspace", req.body.eventname, req.body.eventcontent];
     postmysql(req, res, "blockly_blocks_to_workspace", _arr);
 }).get((req, res, next) => {
-    getmysql(req, res, "blockly_blocks_to_workspace_get", req.query.username, "to_workspace")
+    var _stime = req.body.starttime || "",
+        _etime = req.body.endtime || "";
+    getmysql(req, res, "blockly_blocks_to_workspace_get", req.query.username, "to_workspace", _stime, _etime);
 });
 
 
@@ -127,7 +144,9 @@ router.route('/blocks/out_workspace').post((req, res, next) => {
     var _arr = [req.body.userid, req.body.username, "out_workspace", req.body.eventname, req.body.eventcontent];
     postmysql(req, res, "blockly_blocks_out_workspace", _arr);
 }).get((req, res, next) => {
-    getmysql(req, res, "blockly_blocks_out_workspace_get", req.query.username, "out_workspace")
+    var _stime = req.body.starttime || "",
+        _etime = req.body.endtime || "";
+    getmysql(req, res, "blockly_blocks_out_workspace_get", req.query.username, "out_workspace", _stime, _etime);
 });
 
 
@@ -136,8 +155,9 @@ router.route('/files/local_export').post((req, res, next) => {
     var _arr = [req.body.userid, req.body.username, "local_export", req.body.eventname, req.body.eventcontent];
     postmysql(req, res, "blockly_files_local_export", _arr);
 }).get((req, res, next) => {
-    getmysql(req, res, "blockly_files_local_export_get", req.query.username, "local_export")
-
+    var _stime = req.body.starttime || "",
+        _etime = req.body.endtime || "";
+    getmysql(req, res, "blockly_files_local_export_get", req.query.username, "local_export", _stime, _etime, _stime, _etime);
 });
 
 //指定用户导入文件的行为
@@ -145,7 +165,9 @@ router.route('/files/local_import').post((req, res, next) => {
     var _arr = [req.body.userid, req.body.username, "local_import", req.body.eventname, req.body.eventcontent];
     postmysql(req, res, "blockly_files_local_import", _arr);
 }).get((req, res, next) => {
-    getmysql(req, res, "blockly_files_local_import_get", req.query.username, "local_export")
+    var _stime = req.body.starttime || "",
+        _etime = req.body.endtime || "";
+    getmysql(req, res, "blockly_files_local_import_get", req.query.username, "local_export", _stime, _etime);
 });
 
 //指定用户创建指定云端文件的行为
@@ -153,7 +175,9 @@ router.route('/files/cloud_create').post((req, res, next) => {
     var _arr = [req.body.userid, req.body.username, "cloud", req.body.eventname, req.body.eventcontent];
     postmysql(req, res, "blockly_files_cloud_create", _arr);
 }).get((req, res, next) => {
-    getmysql(req, res, "blockly_files_cloud_create_get", req.query.username, "cloudcreate");
+    var _stime = req.body.starttime || "",
+        _etime = req.body.endtime || "";
+    getmysql(req, res, "blockly_files_cloud_create_get", req.query.username, "cloudcreate", _stime, _etime);
 });
 
 //指定用户更新指定云端文件的行为
@@ -162,7 +186,9 @@ router.route('/files/cloud_update').post((req, res, next) => {
     postmysql(req, res, "blockly_files_cloud_update", _arr);
 
 }).get((req, res, next) => {
-    getmysql(req, res, "blockly_files_cloud_update_get", req.query.username, "cloudupdate");
+    var _stime = req.body.starttime || "",
+        _etime = req.body.endtime || "";
+    getmysql(req, res, "blockly_files_cloud_update_get", req.query.username, "cloudupdate", _stime, _etime);
 });
 
 //指定用户打开指定云端文件的行为
@@ -170,7 +196,9 @@ router.route('/files/cloud_open').post((req, res, next) => {
     var _arr = [req.body.userid, req.body.username, "cloud", req.body.eventname, req.body.eventcontent];
     postmysql(req, res, "blockly_files_cloud_open", _arr);
 }).get((req, res, next) => {
-    getmysql(req, res, "blockly_files_cloud_open_get", req.query.username, "cloudopen");
+    var _stime = req.body.starttime || "",
+        _etime = req.body.endtime || "";
+    getmysql(req, res, "blockly_files_cloud_open_get", req.query.username, "cloudopen", _stime, _etime);
 });
 
 //指定用户删除指定云端文件的行为
@@ -178,7 +206,9 @@ router.route('/files/cloud_delete').post((req, res, next) => {
     var _arr = [req.body.userid, req.body.username, "cloud", req.body.eventname, req.body.eventcontent];
     postmysql(req, res, "blockly_files_cloud_delete", _arr);
 }).get((req, res, next) => {
-    getmysql(req, res, "blockly_files_cloud_delete_get", req.query.username, "clouddelete");
+    var _stime = req.body.starttime || "",
+        _etime = req.body.endtime || "";
+    getmysql(req, res, "blockly_files_cloud_delete_get", req.query.username, "clouddelete", _stime, _etime);
 });
 
 queryString = function (url) {

cloud.js

@@ -9,7 +9,7 @@ const _mysqlLabor = ["127.0.0.1", "cuhkjc_query"]; //query數據庫信息
 
 //統壹處理區域
 router.use(async function (req, res, next) {
-    await asynnext(req, res, next);
+    await asynnext(req, res, next, _stime, _etime);
 });
 
 /**
@@ -28,8 +28,9 @@ router.route('/event_create').post((req, res, next) => {
     var _arr = [req.body.userid, req.body.username, "cloudevent", req.body.eventname, req.body.eventcontent];
     postmysql(req, res, "cloud_event_create", _arr);
 }).get((req, res, next) => {
-    getmysql(req, res, "cloud_event_create_get", req.query.username, "cloud_event_create");
-
+    var _stime = req.body.starttime || "",
+        _etime = req.body.endtime || "";
+    getmysql(req, res, "cloud_event_create_get", req.query.username, "cloud_event_create", _stime, _etime);
 });
 
 
@@ -38,8 +39,9 @@ router.route('/event_del').post((req, res, next) => {
     var _arr = [req.body.userid, req.body.username, "cloudevent", req.body.eventname, req.body.eventcontent];
     postmysql(req, res, "cloud_event_del", _arr);
 }).get((req, res, next) => {
-    getmysql(req, res, "cloud_event_del_get", req.query.username, "cloud_event_del")
-
+    var _stime = req.body.starttime || "",
+        _etime = req.body.endtime || "";
+    getmysql(req, res, "cloud_event_del_get", req.query.username, "cloud_event_del", _stime, _etime, _stime, _etime);
 });
 
 //指定用户创建云端可视化面板的行为
@@ -47,8 +49,9 @@ router.route('/panel_create').post((req, res, next) => {
     var _arr = [req.body.userid, req.body.username, "cloudevent", req.body.eventname, req.body.eventcontent];
     postmysql(req, res, "cloud_panel_create", _arr);
 }).get((req, res, next) => {
-    getmysql(req, res, "cloud_panel_create_get", req.query.username, "cloud_panel_create")
-
+    var _stime = req.body.starttime || "",
+        _etime = req.body.endtime || "";
+    getmysql(req, res, "cloud_panel_create_get", req.query.username, "cloud_panel_create", _stime, _etime, _stime, _etime);
 });
 
 
@@ -57,8 +60,9 @@ router.route('/panel_del').post((req, res, next) => {
     var _arr = [req.body.userid, req.body.username, "cloudevent", req.body.eventname, req.body.eventcontent];
     postmysql(req, res, "cloud_panel_del", _arr);
 }).get((req, res, next) => {
-    getmysql(req, res, "cloud_panel_del_get", req.query.username, "cloud_panel_del")
-
+    var _stime = req.body.starttime || "",
+        _etime = req.body.endtime || "";
+    getmysql(req, res, "cloud_panel_del_get", req.query.username, "cloud_panel_del", _stime, _etime, _stime, _etime);
 });
 
 queryString = function (url) {