xieshen
/
linbei
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

#修复同时点击bug

This commit is contained in:
Bob 2020-06-27 18:36:39 +08:00
parent 5d20a9491a
commit 2b6703b6fa
4 changed files with 75 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

132
.idea/workspace.xml
View File

@ -1,9 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="9cbc7ee8-e518-44ca-870c-9743cf0f1b98" name="Default Changelist" comment=""> <list default="true" id="9cbc7ee8-e518-44ca-870c-9743cf0f1b98" name="Default Changelist" comment="#修复同时点击bug">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/dashboard/static/dashboard/js/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/dashboard/static/dashboard/js/index.js" afterDir="false" /> <change beforePath="$PROJECT_DIR$/fabfile.py" beforeDir="false" afterPath="$PROJECT_DIR$/fabfile.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/linbei/settings.py" beforeDir="false" afterPath="$PROJECT_DIR$/linbei/settings.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/linbei/wsgi.py" beforeDir="false" afterPath="$PROJECT_DIR$/linbei/wsgi.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" />
@ -71,18 +73,10 @@
<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="true"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/index.js"> <entry file="file://$PROJECT_DIR$/linbei/wsgi.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="451"> <state relative-caret-position="286">
<caret line="6435" selection-start-line="6434" selection-end-line="6435" /> <caret line="16" column="35" selection-start-line="16" selection-start-column="35" selection-end-line="16" selection-end-column="35" />
<folding>
<element signature="e#464#688#0" />
<element signature="e#752#795#0" />
<element signature="e#803#844#0" />
<element signature="e#885#924#0" />
<element signature="e#1170#1193#0" />
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@ -99,8 +93,8 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/linbei/settings.py"> <entry file="file://$PROJECT_DIR$/linbei/settings.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1804"> <state relative-caret-position="-2439">
<caret line="85" selection-start-line="85" selection-end-line="95" /> <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
<folding> <folding>
<element signature="e#305#314#0" expanded="true" /> <element signature="e#305#314#0" expanded="true" />
</folding> </folding>
@ -108,6 +102,18 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/fabfile.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220">
<caret line="10" selection-start-line="10" selection-end-line="10" />
<folding>
<element signature="e#0#29#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://D:/2020/linbei/decode.py"> <entry file="file://D:/2020/linbei/decode.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
@ -217,7 +223,6 @@
<option value="$PROJECT_DIR$/graphic/urls.py" /> <option value="$PROJECT_DIR$/graphic/urls.py" />
<option value="$PROJECT_DIR$/graphic/views.py" /> <option value="$PROJECT_DIR$/graphic/views.py" />
<option value="$PROJECT_DIR$/graphic/templates/graphic/index.html" /> <option value="$PROJECT_DIR$/graphic/templates/graphic/index.html" />
<option value="$PROJECT_DIR$/linbei/wsgi.py" />
<option value="$PROJECT_DIR$/linbei/urls.py" /> <option value="$PROJECT_DIR$/linbei/urls.py" />
<option value="$PROJECT_DIR$/dashboard/templates/dashboard/index_2.html" /> <option value="$PROJECT_DIR$/dashboard/templates/dashboard/index_2.html" />
<option value="$PROJECT_DIR$/dashboard/static/dashboard/js/index_2.js" /> <option value="$PROJECT_DIR$/dashboard/static/dashboard/js/index_2.js" />
@ -240,14 +245,15 @@
<option value="$PROJECT_DIR$/dashboard/templates/dashboard/vector.html" /> <option value="$PROJECT_DIR$/dashboard/templates/dashboard/vector.html" />
<option value="$PROJECT_DIR$/dashboard/templates/dashboard/results_by_keywords.html" /> <option value="$PROJECT_DIR$/dashboard/templates/dashboard/results_by_keywords.html" />
<option value="$PROJECT_DIR$/../linbeitest/create_pyc.py" /> <option value="$PROJECT_DIR$/../linbeitest/create_pyc.py" />
<option value="$PROJECT_DIR$/fabfile.py" />
<option value="$PROJECT_DIR$/dashboard/static/dashboard/js/vector.js" /> <option value="$PROJECT_DIR$/dashboard/static/dashboard/js/vector.js" />
<option value="$PROJECT_DIR$/test.py" /> <option value="$PROJECT_DIR$/test.py" />
<option value="$PROJECT_DIR$/dashboard/templates/dashboard/index.html" /> <option value="$PROJECT_DIR$/dashboard/templates/dashboard/index.html" />
<option value="$PROJECT_DIR$/linbei/settings.py" />
<option value="$PROJECT_DIR$/dashboard/urls.py" /> <option value="$PROJECT_DIR$/dashboard/urls.py" />
<option value="$PROJECT_DIR$/dashboard/views.py" /> <option value="$PROJECT_DIR$/dashboard/views.py" />
<option value="$PROJECT_DIR$/dashboard/static/dashboard/js/index.js" /> <option value="$PROJECT_DIR$/dashboard/static/dashboard/js/index.js" />
<option value="$PROJECT_DIR$/linbei/settings.py" />
<option value="$PROJECT_DIR$/fabfile.py" />
<option value="$PROJECT_DIR$/linbei/wsgi.py" />
</list> </list>
</option> </option>
</component> </component>
@ -257,9 +263,9 @@
<other-services-enabled>true</other-services-enabled> <other-services-enabled>true</other-services-enabled>
<auto-save>true</auto-save> <auto-save>true</auto-save>
</component> </component>
<component name="ProjectFrameBounds" extendedState="6"> <component name="ProjectFrameBounds">
<option name="x" value="283" /> <option name="x" value="-15" />
<option name="y" value="78" /> <option name="y" value="43" />
<option name="width" value="1936" /> <option name="width" value="1936" />
<option name="height" value="1056" /> <option name="height" value="1056" />
</component> </component>
@ -540,14 +546,8 @@
<workItem from="1591289116263" duration="1056000" /> <workItem from="1591289116263" duration="1056000" />
<workItem from="1591318999695" duration="1227000" /> <workItem from="1591318999695" duration="1227000" />
<workItem from="1591587017803" duration="460000" /> <workItem from="1591587017803" duration="460000" />
<workItem from="1591602854501" duration="1399000" /> <workItem from="1591602854501" duration="2109000" />
</task> <workItem from="1593253917796" duration="225000" />
<task id="LOCAL-00016" summary="#index">
<created>1572435056993</created>
<option name="number" value="00016" />
<option name="presentableId" value="LOCAL-00016" />
<option name="project" value="LOCAL" />
<updated>1572435056993</updated>
</task> </task>
<task id="LOCAL-00017" summary="#index"> <task id="LOCAL-00017" summary="#index">
<created>1573027862539</created> <created>1573027862539</created>
@ -885,17 +885,24 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1591604018579</updated> <updated>1591604018579</updated>
</task> </task>
<option name="localTasksCounter" value="65" /> <task id="LOCAL-00065" summary="#修复同时点击bug">
<created>1591604304551</created>
<option name="number" value="00065" />
<option name="presentableId" value="LOCAL-00065" />
<option name="project" value="LOCAL" />
<updated>1591604304551</updated>
</task>
<option name="localTasksCounter" value="66" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="376891000" /> <option name="totallyTimeSpent" value="377826000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> <frame x="-15" y="43" width="1936" height="1056" extended-state="0" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.28434506" /> <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.28700745" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" /> <window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Message" order="0" />
@ -942,7 +949,6 @@
<SUITE FILE_PATH="coverage/linbei$import_points.coverage" NAME="import_points Coverage Results" MODIFIED="1573780425219" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" /> <SUITE FILE_PATH="coverage/linbei$import_points.coverage" NAME="import_points Coverage Results" MODIFIED="1573780425219" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/Leaflet-rotate-master/build/deps.js" />
<entry file="file://$PROJECT_DIR$/Leaflet-rotate-master/src/map/Map.js" /> <entry file="file://$PROJECT_DIR$/Leaflet-rotate-master/src/map/Map.js" />
<entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/leaflet-include.js" /> <entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/leaflet-include.js" />
<entry file="file://$PROJECT_DIR$/dashboard/templates/dashboard/index_1.html"> <entry file="file://$PROJECT_DIR$/dashboard/templates/dashboard/index_1.html">
@ -965,9 +971,6 @@
<entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/json/BaseStation_C_ALL.json"> <entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/json/BaseStation_C_ALL.json">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/requirements.txt">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/flow/bom.js"> <entry file="file://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/flow/bom.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="206"> <state relative-caret-position="206">
@ -1034,16 +1037,6 @@
<entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/json/Linyou_station_0.json"> <entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/json/Linyou_station_0.json">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/fabfile.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="10" selection-start-line="10" selection-end-line="10" />
<folding>
<element signature="e#0#29#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dashboard/templates/dashboard/vector.html"> <entry file="file://$PROJECT_DIR$/dashboard/templates/dashboard/vector.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2618"> <state relative-caret-position="2618">
@ -1140,15 +1133,14 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/index.js"> <entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/index.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="451"> <state relative-caret-position="385">
<caret line="6435" selection-start-line="6434" selection-end-line="6435" /> <caret line="6432" column="20" selection-start-line="6432" selection-start-column="20" selection-end-line="6432" selection-end-column="20" />
<folding> <folding>
<element signature="e#464#688#0" /> <element signature="e#464#688#0" />
<element signature="e#752#795#0" /> <element signature="e#752#795#0" />
<element signature="e#803#844#0" /> <element signature="e#803#844#0" />
<element signature="e#885#924#0" /> <element signature="e#885#924#0" />
<element signature="e#1170#1193#0" /> <element signature="e#1170#1193#0" />
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
@ -1160,16 +1152,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/linbei/settings.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1804">
<caret line="85" selection-start-line="85" selection-end-line="95" />
<folding>
<element signature="e#305#314#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://D:/2020/linbei/decode.py"> <entry file="file://D:/2020/linbei/decode.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state> <state>
@ -1211,5 +1193,35 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/requirements.txt">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/fabfile.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220">
<caret line="10" selection-start-line="10" selection-end-line="10" />
<folding>
<element signature="e#0#29#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/linbei/settings.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2439">
<caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
<folding>
<element signature="e#305#314#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/linbei/wsgi.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="286">
<caret line="16" column="35" selection-start-line="16" selection-start-column="35" selection-end-line="16" selection-end-column="35" />
</state>
</provider>
</entry>
</component> </component>
</project> </project>

2
fabfile.py vendored
View File

@ -1,7 +1,7 @@
from fabistrano import deploy from fabistrano import deploy
from fabric.api import env from fabric.api import env
env.hosts = ["g214@210.77.68.250"] # Replace with your host name or IP env.hosts = ["system@172.28.100.241"] # Replace with your host name or IP
env.base_dir = '/var/www/p3' # Set to your app's directory env.base_dir = '/var/www/p3' # Set to your app's directory
env.app_name = 'linbei' # This will deploy the app to /www/app_name.com/ env.app_name = 'linbei' # This will deploy the app to /www/app_name.com/
env.git_clone = 'http://210.77.77.77/xieshen/linbei.git' # Your git url env.git_clone = 'http://210.77.77.77/xieshen/linbei.git' # Your git url

2
linbei/settings.py
View File

@ -24,7 +24,7 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
SECRET_KEY = '&5vyclz4+^v404)ewhg_@xxo9$(nms66&r5@&avuyx5)5$v^@6' SECRET_KEY = '&5vyclz4+^v404)ewhg_@xxo9$(nms66&r5@&avuyx5)5$v^@6'
# 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 = False
ALLOWED_HOSTS = ['*'] ALLOWED_HOSTS = ['*']

2
linbei/wsgi.py
View File

@ -14,6 +14,6 @@ from django.core.wsgi import get_wsgi_application
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'linbei.settings') os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'linbei.settings')
sys.path.append("/var/www/p3/linbei/current") sys.path.append("/var/www/p3/linbei")
application = get_wsgi_application() application = get_wsgi_application()