Merge branch 'dev' into cmdb

2025-10-22 00:09:14 +00:00 · 2015-11-22 18:58:31 +08:00
parent d25e23623a a143797ac9
commit b8cb6f4246
33 changed files with 830 additions and 728 deletions
--- a/jasset/views.py
+++ b/jasset/views.py
@@ -145,7 +145,7 @@ def asset_add(request):
                asset_save = af_post.save(commit=False)
                if not use_default_auth:
                    password = request.POST.get('password', '')
-                    password_encode = CRYPTOR.encrypt(password)
+                    password_encode = password
                    asset_save.password = password_encode
                if not ip:
                    asset_save.ip = hostname