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
e8ceb582
Commit
e8ceb582
authored
May 21, 2019
by
ibuler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Update] 允许资产ip填写为host地址
parent
84610f2a
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
1 deletion
+20
-1
0027_auto_20190521_1703.py
apps/assets/migrations/0027_auto_20190521_1703.py
+18
-0
asset.py
apps/assets/models/asset.py
+1
-1
requirements.txt
requirements/requirements.txt
+1
-0
No files found.
apps/assets/migrations/0027_auto_20190521_1703.py
0 → 100644
View file @
e8ceb582
# Generated by Django 2.1.7 on 2019-05-21 09:03
from
django.db
import
migrations
,
models
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
'assets'
,
'0026_auto_20190325_2035'
),
]
operations
=
[
migrations
.
AlterField
(
model_name
=
'asset'
,
name
=
'ip'
,
field
=
models
.
CharField
(
db_index
=
True
,
max_length
=
128
,
verbose_name
=
'IP'
),
),
]
apps/assets/models/asset.py
View file @
e8ceb582
...
...
@@ -71,7 +71,7 @@ class Asset(OrgModelMixin):
)
id
=
models
.
UUIDField
(
default
=
uuid
.
uuid4
,
primary_key
=
True
)
ip
=
models
.
GenericIPAddressField
(
max_length
=
32
,
verbose_name
=
_
(
'IP'
),
db_index
=
True
)
ip
=
models
.
CharField
(
max_length
=
128
,
verbose_name
=
_
(
'IP'
),
db_index
=
True
)
hostname
=
models
.
CharField
(
max_length
=
128
,
verbose_name
=
_
(
'Hostname'
))
protocol
=
models
.
CharField
(
max_length
=
128
,
default
=
PROTOCOL_SSH
,
choices
=
PROTOCOL_CHOICES
,
verbose_name
=
_
(
'Protocol'
))
port
=
models
.
IntegerField
(
default
=
22
,
verbose_name
=
_
(
'Port'
))
...
...
requirements/requirements.txt
View file @
e8ceb582
...
...
@@ -81,3 +81,4 @@ tencentcloud-sdk-python==3.0.40
django-radius==1.3.3
ipip-ipdb==1.2.1
django-redis-sessions==0.6.1
unicodecsv==0.14.1
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