Skip to content
Snippets Groups Projects
Commit 7a536779 authored by Lihuan Zhang's avatar Lihuan Zhang
Browse files

test3

parent 3510d088
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
.idea/workspace.xml
+ 34
− 25
View file @ 7a536779
...@@ -2,11 +2,8 @@ ...@@ -2,11 +2,8 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="8e0a1b72-f07e-4c5d-8e03-75ac89ac3031" name="Default Changelist" comment=""> <list default="true" id="8e0a1b72-f07e-4c5d-8e03-75ac89ac3031" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/../generate/.idea/vcs.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../generate/generate.py" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../printing/.idea/vcs.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/../printing/.idea/vcs.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/PMPBackend/settings.py" beforeDir="false" afterPath="$PROJECT_DIR$/PMPBackend/settings.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/PMPBackend/settings.py" beforeDir="false" afterPath="$PROJECT_DIR$/PMPBackend/settings.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cargo/views.py" beforeDir="false" afterPath="$PROJECT_DIR$/cargo/views.py" afterDir="false" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
...@@ -33,13 +30,13 @@ ...@@ -33,13 +30,13 @@
<counts> <counts>
<entry key="html" value="181" /> <entry key="html" value="181" />
<entry key="py" value="6533" /> <entry key="py" value="6533" />
<entry key="txt" value="2" /> <entry key="txt" value="7" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.types.edit"> <usages-collector id="statistics.file.types.edit">
<counts> <counts>
<entry key="HTML" value="181" /> <entry key="HTML" value="181" />
<entry key="PLAIN_TEXT" value="2" /> <entry key="PLAIN_TEXT" value="7" />
<entry key="Python" value="6533" /> <entry key="Python" value="6533" />
</counts> </counts>
</usages-collector> </usages-collector>
...@@ -59,11 +56,11 @@ ...@@ -59,11 +56,11 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/PMPBackend/settings.py"> <entry file="file://$PROJECT_DIR$/PMPBackend/settings.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="828"> <state relative-caret-position="405">
<caret line="134" column="36" lean-forward="true" selection-start-line="134" selection-start-column="36" selection-end-line="134" selection-end-column="36" /> <caret line="27" column="32" selection-start-line="27" selection-start-column="32" selection-end-line="27" selection-end-column="32" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -89,15 +86,15 @@ ...@@ -89,15 +86,15 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/cargo/views.py"> <entry file="file://$PROJECT_DIR$/cargo/views.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300"> <state relative-caret-position="870">
<caret line="20" column="15" lean-forward="true" selection-start-line="20" selection-start-column="15" selection-end-line="20" selection-end-column="15" /> <caret line="58" column="40" selection-start-line="58" selection-start-column="40" selection-end-line="58" selection-end-column="40" />
<folding> <folding>
<element signature="e#2#47#0" expanded="true" /> <element signature="e#2#47#0" expanded="true" />
<marker date="1539229978487" expanded="true" signature="749:1445" ph="..." /> <marker date="1539230213513" expanded="true" signature="749:1415" ph="..." />
<marker date="1539229978487" expanded="true" signature="3983:5185" ph="..." /> <marker date="1539230213513" expanded="true" signature="3927:5129" ph="..." />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -191,8 +188,8 @@ ...@@ -191,8 +188,8 @@
<option value="$PROJECT_DIR$/PMPBackend/models.py" /> <option value="$PROJECT_DIR$/PMPBackend/models.py" />
<option value="$PROJECT_DIR$/cargo/models.py" /> <option value="$PROJECT_DIR$/cargo/models.py" />
<option value="$PROJECT_DIR$/PMPBackend/urls.py" /> <option value="$PROJECT_DIR$/PMPBackend/urls.py" />
<option value="$PROJECT_DIR$/PMPBackend/settings.py" />
<option value="$PROJECT_DIR$/cargo/views.py" /> <option value="$PROJECT_DIR$/cargo/views.py" />
<option value="$PROJECT_DIR$/PMPBackend/settings.py" />
</list> </list>
</option> </option>
</component> </component>
...@@ -311,6 +308,14 @@ ...@@ -311,6 +308,14 @@
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1538383319813</updated> <updated>1538383319813</updated>
</task> </task>
<task id="LOCAL-00001" summary="test1">
<created>1539229994834</created>
<option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
<updated>1539229994834</updated>
</task>
<option name="localTasksCounter" value="2" />
<servers /> <servers />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
...@@ -346,6 +351,10 @@ ...@@ -346,6 +351,10 @@
<component name="VcsContentAnnotationSettings"> <component name="VcsContentAnnotationSettings">
<option name="myLimit" value="2678400000" /> <option name="myLimit" value="2678400000" />
</component> </component>
<component name="VcsManagerConfiguration">
<MESSAGE value="test1" />
<option name="LAST_COMMIT_MESSAGE" value="test1" />
</component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/PMPBackend/templates/signIn.html"> <entry file="file://$PROJECT_DIR$/PMPBackend/templates/signIn.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
...@@ -465,24 +474,24 @@ ...@@ -465,24 +474,24 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/PMPBackend/settings.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="828">
<caret line="134" column="36" lean-forward="true" selection-start-line="134" selection-start-column="36" selection-end-line="134" selection-end-column="36" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/cargo/views.py"> <entry file="file://$PROJECT_DIR$/cargo/views.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300"> <state relative-caret-position="870">
<caret line="20" column="15" lean-forward="true" selection-start-line="20" selection-start-column="15" selection-end-line="20" selection-end-column="15" /> <caret line="58" column="40" selection-start-line="58" selection-start-column="40" selection-end-line="58" selection-end-column="40" />
<folding> <folding>
<element signature="e#2#47#0" expanded="true" /> <element signature="e#2#47#0" expanded="true" />
<marker date="1539229978487" expanded="true" signature="749:1445" ph="..." /> <marker date="1539230213513" expanded="true" signature="749:1415" ph="..." />
<marker date="1539229978487" expanded="true" signature="3983:5185" ph="..." /> <marker date="1539230213513" expanded="true" signature="3927:5129" ph="..." />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/PMPBackend/settings.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="405">
<caret line="27" column="32" selection-start-line="27" selection-start-column="32" selection-end-line="27" selection-end-column="32" />
</state>
</provider>
</entry>
</component> </component>
</project> </project>
\ No newline at end of file
PMPBackend/settings.py
+ 1
− 1
View file @ 7a536779
...@@ -25,7 +25,7 @@ SECRET_KEY = '84rci9)9prwn$cd!gv2g3^7s0)^a9_o30!k6iwy=wdav9+p7g#' ...@@ -25,7 +25,7 @@ SECRET_KEY = '84rci9)9prwn$cd!gv2g3^7s0)^a9_o30!k6iwy=wdav9+p7g#'
# SECURITY WARNING: don't run with debug turned on in production! # SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True DEBUG = True
ALLOWED_HOSTS = ['10.13.105.80'] ALLOWED_HOSTS = ['119.29.236.201']
# Application definition # Application definition
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment