Merge remote-tracking branch 'remotes/origin/locky' into test

Controller/UserController.py

@@ -468,6 +468,9 @@ class v3ChangePwdView(TemplateView):
         else:
             if oldPwd is None or newPwd is None or len(newPwd) < 6:
                 return response.json(111)
+            data_valid = DataValid()
+            if not data_valid.password_validate(newPwd):
+                return response.json(109)
             tko = TokenObject(token)
             response.lang = tko.lang
             if tko.code != 0: