Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
J
jumpserver
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ops
jumpserver
Commits
524cd1d9
Commit
524cd1d9
authored
9 years ago
by
ibuler
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #147 from jumpserver/bug_asset_upload_01
fix asset upload bug
parents
300e1061
231f9619
master
auditor_jym
audits
dev
dev_beta
dev_beta_db
gengmei
lagacy-0.4.0
node_service
password
rbac
restrict_access
test
v52
wph
1.5.2
1.5.1
1.5.0
1.4.10
1.4.9
1.4.8
1.4.7
1.4.6
1.4.5
1.4.4
1.4.3
1.4.2
1.4.1
1.4.0
1.3.3
1.3.2
1.3.1
1.3.0
1.2.1
1.2.0
1.1.1
1.1.0
1.0.0
0.3.3
0.3.2
0.3.2-rc2
0.3.1
v1.4.10
v1.4.7
v1.4.4
No related merge requests found
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
0 deletions
+2
-0
asset_api.py
jasset/asset_api.py
+2
-0
No files found.
jasset/asset_api.py
View file @
524cd1d9
...
@@ -290,6 +290,8 @@ def excel_to_db(excel_file):
...
@@ -290,6 +290,8 @@ def excel_to_db(excel_file):
ip
,
port
,
hostname
,
use_default_auth
,
username
,
password
,
group
=
row
ip
,
port
,
hostname
,
use_default_auth
,
username
,
password
,
group
=
row
if
get_object
(
Asset
,
hostname
=
hostname
):
if
get_object
(
Asset
,
hostname
=
hostname
):
continue
continue
if
isinstance
(
password
,
int
)
or
isinstance
(
password
,
float
):
password
=
unicode
(
int
(
password
))
use_default_auth
=
1
if
use_default_auth
==
u'默认'
else
0
use_default_auth
=
1
if
use_default_auth
==
u'默认'
else
0
password_encode
=
CRYPTOR
.
encrypt
(
password
)
if
password
else
''
password_encode
=
CRYPTOR
.
encrypt
(
password
)
if
password
else
''
if
hostname
:
if
hostname
:
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment