From 4ea2f64e7011732e01849de60479aac024fd8a37 Mon Sep 17 00:00:00 2001
From: Faruk Hammoud <farukhammoud@gmail.com>
Date: Sun, 5 Apr 2020 19:59:37 +0200
Subject: [PATCH] test commps
---
controllerApp/Net.pde | 5 +++--
controllerSite/controllerSite.py | 10 ++++------
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/controllerApp/Net.pde b/controllerApp/Net.pde
index 94214bc..f20e91a 100644
--- a/controllerApp/Net.pde
+++ b/controllerApp/Net.pde
@@ -80,14 +80,15 @@ class Net
@Override
public void run() {
try {
- URL url = new URL("http://controller.viarezo.fr/multicast?code="+code+"&id="+uuid);
+ URL url = new URL("http://controller.viarezo.fr/multicast/"+code);
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.setRequestMethod("POST");
conn.setRequestProperty("Content-Type", "application/json;charset=UTF-8");
conn.setRequestProperty("Accept", "application/json");
conn.setDoOutput(true);
conn.setDoInput(true);
-
+
+ jsonParam.put("id", uuid);
println("JSON", jsonParam.toString());
DataOutputStream os = new DataOutputStream(conn.getOutputStream());
//os.writeBytes(URLEncoder.encode(jsonParam.toString(), "UTF-8"));
diff --git a/controllerSite/controllerSite.py b/controllerSite/controllerSite.py
index 7f42173..6e3bdfd 100644
--- a/controllerSite/controllerSite.py
+++ b/controllerSite/controllerSite.py
@@ -26,15 +26,13 @@ def allowed_file(filename):
return '.' in filename and \
filename.rsplit('.', 1)[1].lower() in ALLOWED_EXTENSIONS
-@app.route('/multicast', methods=['GET', 'POST'])
-def multicast():
+@app.route('/multicast/<code>', methods=['GET', 'POST'])
+def multicast(code):
if request.method == 'POST':
- code = request.form['code']
- id = request.form['id']
content = request.json
- print(code,id,content)
+ print(code,content['id'])
socketio.emit('multicast', content, callback=confirmReception,namespace='/'+code)
- return jsonify({"code":code,"id":id})
+ return jsonify({"code":code,"id":content[id]})
return '''
<!doctype html>
<title>Use a HTTP POST Request</title>
--
GitLab