root 4 lat temu
rodzic
commit
58cca852d6
2 zmienionych plików z 44 dodań i 44 usunięć
  1. 36 36
      blockly.js
  2. 8 8
      cloud.js

+ 36 - 36
blockly.js

@@ -32,8 +32,8 @@ router.route('/history').post((req, res, next) => {
     postmysql(req, res, "blockly_history", _arr);
 }).get((req, res, next) => {
     console.log(req.body)
-    var _stime = req.body.starttime || "",
-        _etime = req.body.endtime || "";
+    var _stime = req.query.starttime || "",
+        _etime = req.query.endtime || "";
     getmysql(req, res, "blockly_history_get", req.query.username, "history", _stime, _etime);
 });
 
@@ -42,8 +42,8 @@ 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) => {
-    var _stime = req.body.starttime || "",
-        _etime = req.body.endtime || "";
+    var _stime = req.query.starttime || "",
+        _etime = req.query.endtime || "";
     getmysql(req, res, "blockly_duration_get", req.query.username, "duration", _stime, _etime);
 });
 
@@ -51,8 +51,8 @@ router.route('/duration').post((req, res, next) => {
 router.route('/labs').post((req, res, next) => {
     postmysql(req, res, "blockly_labs");
 }).get((req, res, next) => {
-    var _stime = req.body.starttime || "",
-        _etime = req.body.endtime || "";
+    var _stime = req.query.starttime || "",
+        _etime = req.query.endtime || "";
     getmysql(req, res, "blockly_labs_get", _stime, _etime);
 });
 
@@ -61,8 +61,8 @@ 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) => {
-    var _stime = req.body.starttime || "",
-        _etime = req.body.endtime || "";
+    var _stime = req.query.starttime || "",
+        _etime = req.query.endtime || "";
     getmysql(req, res, "blockly_examples_get", req.query.username, "example", _stime, _etime);
 });
 
@@ -71,8 +71,8 @@ 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) => {
-    var _stime = req.body.starttime || "",
-        _etime = req.body.endtime || "";
+    var _stime = req.query.starttime || "",
+        _etime = req.query.endtime || "";
     getmysql(req, res, "blockly_mode_switch_get", req.query.username, "modeswitch", _stime, _etime);
 });
 
@@ -82,8 +82,8 @@ router.route('/serial_monitor').post((req, res, next) => {
     postmysql(req, res, "blockly_serial_monitor", _arr);
 
 }).get((req, res, next) => {
-    var _stime = req.body.starttime || "",
-        _etime = req.body.endtime || "";
+    var _stime = req.query.starttime || "",
+        _etime = req.query.endtime || "";
     getmysql(req, res, "blockly_serial_monitor_get", req.query.username, "serialmonitor", _stime, _etime);
 });
 
@@ -93,8 +93,8 @@ router.route('/copy').post((req, res, next) => {
     postmysql(req, res, "blockly_copy", _arr);
 
 }).get((req, res, next) => {
-    var _stime = req.body.starttime || "",
-        _etime = req.body.endtime || "";
+    var _stime = req.query.starttime || "",
+        _etime = req.query.endtime || "";
     getmysql(req, res, "blockly_copy_get", req.query.username, "copy", _stime, _etime);
 });
 
@@ -103,8 +103,8 @@ 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) => {
-    var _stime = req.body.starttime || "",
-        _etime = req.body.endtime || "";
+    var _stime = req.query.starttime || "",
+        _etime = req.query.endtime || "";
     getmysql(req, res, "blockly_upload_area_run_get", req.query.username, "run", _stime, _etime);
 });
 
@@ -113,8 +113,8 @@ 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) => {
-    var _stime = req.body.starttime || "",
-        _etime = req.body.endtime || "";
+    var _stime = req.query.starttime || "",
+        _etime = req.query.endtime || "";
     getmysql(req, res, "blockly_upload_area_upload_get", req.query.username, "upload", _stime, _etime);
 });
 
@@ -124,8 +124,8 @@ 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) => {
-    var _stime = req.body.starttime || "",
-        _etime = req.body.endtime || "";
+    var _stime = req.query.starttime || "",
+        _etime = req.query.endtime || "";
     getmysql(req, res, "blockly_upload_area_errormsg_get", req.query.username, "errormsg", _stime, _etime);
 });
 
@@ -134,8 +134,8 @@ 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) => {
-    var _stime = req.body.starttime || "",
-        _etime = req.body.endtime || "";
+    var _stime = req.query.starttime || "",
+        _etime = req.query.endtime || "";
     getmysql(req, res, "blockly_blocks_to_workspace_get", req.query.username, "to_workspace", _stime, _etime);
 });
 
@@ -145,8 +145,8 @@ 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) => {
-    var _stime = req.body.starttime || "",
-        _etime = req.body.endtime || "";
+    var _stime = req.query.starttime || "",
+        _etime = req.query.endtime || "";
     getmysql(req, res, "blockly_blocks_out_workspace_get", req.query.username, "out_workspace", _stime, _etime);
 });
 
@@ -156,8 +156,8 @@ 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) => {
-    var _stime = req.body.starttime || "",
-        _etime = req.body.endtime || "";
+    var _stime = req.query.starttime || "",
+        _etime = req.query.endtime || "";
     getmysql(req, res, "blockly_files_local_export_get", req.query.username, "local_export", _stime, _etime);
 });
 
@@ -166,8 +166,8 @@ 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) => {
-    var _stime = req.body.starttime || "",
-        _etime = req.body.endtime || "";
+    var _stime = req.query.starttime || "",
+        _etime = req.query.endtime || "";
     getmysql(req, res, "blockly_files_local_import_get", req.query.username, "local_export", _stime, _etime);
 });
 
@@ -176,8 +176,8 @@ 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) => {
-    var _stime = req.body.starttime || "",
-        _etime = req.body.endtime || "";
+    var _stime = req.query.starttime || "",
+        _etime = req.query.endtime || "";
     getmysql(req, res, "blockly_files_cloud_create_get", req.query.username, "cloudcreate", _stime, _etime);
 });
 
@@ -187,8 +187,8 @@ router.route('/files/cloud_update').post((req, res, next) => {
     postmysql(req, res, "blockly_files_cloud_update", _arr);
 
 }).get((req, res, next) => {
-    var _stime = req.body.starttime || "",
-        _etime = req.body.endtime || "";
+    var _stime = req.query.starttime || "",
+        _etime = req.query.endtime || "";
     getmysql(req, res, "blockly_files_cloud_update_get", req.query.username, "cloudupdate", _stime, _etime);
 });
 
@@ -197,8 +197,8 @@ 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) => {
-    var _stime = req.body.starttime || "",
-        _etime = req.body.endtime || "";
+    var _stime = req.query.starttime || "",
+        _etime = req.query.endtime || "";
     getmysql(req, res, "blockly_files_cloud_open_get", req.query.username, "cloudopen", _stime, _etime);
 });
 
@@ -207,8 +207,8 @@ 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) => {
-    var _stime = req.body.starttime || "",
-        _etime = req.body.endtime || "";
+    var _stime = req.query.starttime || "",
+        _etime = req.query.endtime || "";
     getmysql(req, res, "blockly_files_cloud_delete_get", req.query.username, "clouddelete", _stime, _etime);
 });
 

+ 8 - 8
cloud.js

@@ -28,8 +28,8 @@ 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) => {
-    var _stime = req.body.starttime || "",
-        _etime = req.body.endtime || "";
+    var _stime = req.query.starttime || "",
+        _etime = req.query.endtime || "";
     getmysql(req, res, "cloud_event_create_get", req.query.username, "cloud_event_create", _stime, _etime);
 });
 
@@ -39,8 +39,8 @@ 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) => {
-    var _stime = req.body.starttime || "",
-        _etime = req.body.endtime || "";
+    var _stime = req.query.starttime || "",
+        _etime = req.query.endtime || "";
     getmysql(req, res, "cloud_event_del_get", req.query.username, "cloud_event_del", _stime, _etime);
 });
 
@@ -49,8 +49,8 @@ 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) => {
-    var _stime = req.body.starttime || "",
-        _etime = req.body.endtime || "";
+    var _stime = req.query.starttime || "",
+        _etime = req.query.endtime || "";
     getmysql(req, res, "cloud_panel_create_get", req.query.username, "cloud_panel_create", _stime, _etime);
 });
 
@@ -60,8 +60,8 @@ 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) => {
-    var _stime = req.body.starttime || "",
-        _etime = req.body.endtime || "";
+    var _stime = req.query.starttime || "",
+        _etime = req.query.endtime || "";
     getmysql(req, res, "cloud_panel_del_get", req.query.username, "cloud_panel_del", _stime, _etime);
 });