Merge branch 'release' of ssh://47.105.117.50:2224/wanli/evm-store into release

backend/backupData.json

-{"lastModifyDateTime": 1624346271}
\ No newline at end of file
+{"lastModifyDateTime": 1624969659}
\ No newline at end of file

backend/view/api.py

@@ -29,36 +29,47 @@ def stopApp():
         f.write(json.dumps(ret, indent=4))
     return ret
 
-<<<<<<< HEAD
+@api.route("/evm", methods=['GET','POST'])
+def hello_evm():
+    def check(p):
+        if hasattr(request, p):
+            return getattr(request, p)
+        else:
+            return None
+    
+    print(request.method)
+    print(request.headers)
+    print(request.data)
+    print(request.stream.read())
+    print(request.get_data())
+
+    if request.method == "GET":
+        result = { "args": request.args }
+    else:
+        result = {
+            'args': check('args'),
+            'json': check('json'),
+            'data': check('values'),
+            'form': check('form')
+        }
+    
+    return json.dumps(result)
+
 @api.route("/opqcp", methods=['POST'])
 def action_opqcp():
     params = request.json
-
-    print(params)
-
     result, message = signalManager.actionOpqcp.emit(params)
 
     return response_result(ResponseCode.OK, msg=message)
-=======
+
 @api.route("/monitor", methods=['GET', 'POST'])
 def action_monitor():
     print(request.json)
     print(request.data)
     print(request.form)
     print(type(request.json))
-
     
-
-    return response_result(ResponseCode.OK)
-
-@api.route("/opqcp", methods=['POST'])
-def action_opqcp():
-    params = request.json
-    print(params)
-    signalManager.actionOpqcp.emit(params)
-
     return response_result(ResponseCode.OK)
->>>>>>> master
 
 @api.route("/updatePassword", methods=['POST'])
 @validate_schema(UpdatePasswordSchema)