From 8df6b476f9b08bc192722af1079fb62a6902ec22 Mon Sep 17 00:00:00 2001
From: Bob <1397910458@qq.com>
Date: Thu, 20 Aug 2020 11:52:39 +0800
Subject: [PATCH] =?UTF-8?q?#=E6=96=B0=E5=AA=92=E4=BD=93=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml        | 80 ++++++++++++++++++++++----------------
 NewMediaMonitoring/wsgi.py |  2 +-
 2 files changed, 48 insertions(+), 34 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d08a0c7..7077cad 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,23 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="fe80fe9d-781d-41d9-b1e6-2f6100c4c4eb" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/fabfile.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/NewMediaMonitoring/local_settings.py" beforeDir="false" afterPath="$PROJECT_DIR$/NewMediaMonitoring/local_settings.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/NewMediaMonitoring/wsgi.py" beforeDir="false" afterPath="$PROJECT_DIR$/NewMediaMonitoring/wsgi.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/dashboard/migrations/0001_initial.py" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dashboard/migrations/0002_auto_20200803_1051.py" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dashboard/migrations/0003_auto_20200803_1104.py" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dashboard/migrations/0004_auto_20200803_1125.py" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dashboard/migrations/0005_organization_image.py" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dashboard/migrations/0006_auto_20200805_2325.py" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dashboard/migrations/0007_group_type.py" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dashboard/migrations/0008_auto_20200813_1538.py" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dashboard/migrations/0009_auto_20200813_1604.py" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dashboard/migrations/0010_group_user_group.py" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dashboard/migrations/0011_auto_20200817_1654.py" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dashboard/migrations/0012_auto_20200817_1717.py" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dashboard/migrations/0013_auto_20200818_0919.py" beforeDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -97,11 +82,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/polls/models.py">
-          <provider selected="true" editor-type-id="text-editor" />
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/polls/urls.py">
           <provider selected="true" editor-type-id="text-editor">
@@ -169,7 +149,16 @@
         <entry file="file://$PROJECT_DIR$/NewMediaMonitoring/wsgi.py">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="264">
-              <caret line="14" column="47" selection-start-line="14" selection-start-column="47" selection-end-line="14" selection-end-column="47" />
+              <caret line="15" column="3" selection-start-line="15" selection-start-column="3" selection-end-line="15" selection-end-column="3" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/requirements.txt">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="110">
+              <caret line="5" lean-forward="true" selection-start-line="5" selection-end-line="5" />
             </state>
           </provider>
         </entry>
@@ -226,7 +215,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/dashboard/templates/dashboard/base/base.html" />
         <option value="$PROJECT_DIR$/NewMediaMonitoring/settings.py" />
         <option value="$PROJECT_DIR$/management/templates/management/user-management-update.html" />
         <option value="$PROJECT_DIR$/dashboard/templates/dashboard/login.html" />
@@ -277,14 +265,15 @@
         <option value="$PROJECT_DIR$/NewMediaMonitoring/local_settings.py" />
         <option value="$PROJECT_DIR$/fabfile.py" />
         <option value="$PROJECT_DIR$/NewMediaMonitoring/wsgi.py" />
+        <option value="$PROJECT_DIR$/requirements.txt" />
       </list>
     </option>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="1912" />
-    <option name="y" value="26" />
-    <option name="width" value="1696" />
-    <option name="height" value="1026" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1936" />
+    <option name="height" value="1056" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
@@ -407,7 +396,7 @@
       <workItem from="1597801813210" duration="4762000" />
       <workItem from="1597840881537" duration="1976000" />
       <workItem from="1597885267085" duration="767000" />
-      <workItem from="1597886065062" duration="6447000" />
+      <workItem from="1597886065062" duration="7383000" />
     </task>
     <task id="LOCAL-00001" summary="#create">
       <created>1595559693168</created>
@@ -465,11 +454,32 @@
       <option name="project" value="LOCAL" />
       <updated>1597886088518</updated>
     </task>
-    <option name="localTasksCounter" value="9" />
+    <task id="LOCAL-00009" summary="#新媒体管理">
+      <created>1597894478295</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1597894478295</updated>
+    </task>
+    <task id="LOCAL-00010" summary="#新媒体管理">
+      <created>1597894499764</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1597894499764</updated>
+    </task>
+    <task id="LOCAL-00011" summary="#新媒体管理">
+      <created>1597894728260</created>
+      <option name="number" value="00011" />
+      <option name="presentableId" value="LOCAL-00011" />
+      <option name="project" value="LOCAL" />
+      <updated>1597894728260</updated>
+    </task>
+    <option name="localTasksCounter" value="12" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="175058000" />
+    <option name="totallyTimeSpent" value="175994000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -791,9 +801,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/requirements.txt">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
     <entry file="file://$PROJECT_DIR$/dashboard/migrations/__init__.py">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -879,10 +886,17 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/requirements.txt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" lean-forward="true" selection-start-line="5" selection-end-line="5" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/NewMediaMonitoring/wsgi.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="264">
-          <caret line="14" column="47" selection-start-line="14" selection-start-column="47" selection-end-line="14" selection-end-column="47" />
+          <caret line="15" column="3" selection-start-line="15" selection-start-column="3" selection-end-line="15" selection-end-column="3" />
         </state>
       </provider>
     </entry>
diff --git a/NewMediaMonitoring/wsgi.py b/NewMediaMonitoring/wsgi.py
index 0345c9c..aca45d0 100644
--- a/NewMediaMonitoring/wsgi.py
+++ b/NewMediaMonitoring/wsgi.py
@@ -13,5 +13,5 @@ import sys
 from django.core.wsgi import get_wsgi_application
 
 os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'NewMediaMonitoring.settings')
-sys.path.append("/var/www/p3/NewMediaMonitoring/current")
+sys.path.append("/var/www/p3/newmediamonitoring/current")
 application = get_wsgi_application()