Merge branch 'master' of http://gitlab.ctune.cn/weijunh/DMapManager

@@ -62,7 +62,8 @@ class DataManager(BlueprintApi):
                 error = "密码不可为空"
                 error = "密码不可为空"
             else:
             else:
                 username = request.form.get("username")
                 username = request.form.get("username")
-                password = SM3.encode(request.form.get("password"))
+                # password = SM3.encode(request.form.get("password"))
+                password = request.form.get("password")
                 user = User.query.filter_by(
                 user = User.query.filter_by(
                     username=username, password=password).first()
                     username=username, password=password).first()
                 if not user:
                 if not user: