From 23a09f90796d6f99df612c0a76c3d0fb0ce0aafc Mon Sep 17 00:00:00 2001
From: Bob <1397910458@qq.com>
Date: Thu, 20 Aug 2020 11:34:37 +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                           | 356 +++++++++++-------
 NewMediaMonitoring/wsgi.py                    |   2 +-
 dashboard/migrations/0001_initial.py          | 268 -------------
 .../migrations/0002_auto_20200803_1051.py     | 115 ------
 .../migrations/0003_auto_20200803_1104.py     |  21 --
 .../migrations/0004_auto_20200803_1125.py     |  42 ---
 .../migrations/0005_organization_image.py     |  18 -
 .../migrations/0006_auto_20200805_2325.py     |  42 ---
 dashboard/migrations/0007_group_type.py       |  21 --
 .../migrations/0008_auto_20200813_1538.py     |  24 --
 .../migrations/0009_auto_20200813_1604.py     |  18 -
 dashboard/migrations/0010_group_user_group.py |  19 -
 .../migrations/0011_auto_20200817_1654.py     | 118 ------
 .../migrations/0012_auto_20200817_1717.py     |  33 --
 .../migrations/0013_auto_20200818_0919.py     |  18 -
 fabfile.py                                    |  10 +
 16 files changed, 228 insertions(+), 897 deletions(-)
 delete mode 100644 dashboard/migrations/0001_initial.py
 delete mode 100644 dashboard/migrations/0002_auto_20200803_1051.py
 delete mode 100644 dashboard/migrations/0003_auto_20200803_1104.py
 delete mode 100644 dashboard/migrations/0004_auto_20200803_1125.py
 delete mode 100644 dashboard/migrations/0005_organization_image.py
 delete mode 100644 dashboard/migrations/0006_auto_20200805_2325.py
 delete mode 100644 dashboard/migrations/0007_group_type.py
 delete mode 100644 dashboard/migrations/0008_auto_20200813_1538.py
 delete mode 100644 dashboard/migrations/0009_auto_20200813_1604.py
 delete mode 100644 dashboard/migrations/0010_group_user_group.py
 delete mode 100644 dashboard/migrations/0011_auto_20200817_1654.py
 delete mode 100644 dashboard/migrations/0012_auto_20200817_1717.py
 delete mode 100644 dashboard/migrations/0013_auto_20200818_0919.py
 create mode 100644 fabfile.py

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7501802..d08a0c7 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,7 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="fe80fe9d-781d-41d9-b1e6-2f6100c4c4eb" name="Default Changelist" comment="" />
+    <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" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -68,19 +86,10 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/dashboard/templates/dashboard/index.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="5170">
-              <caret line="235" column="53" selection-start-line="235" selection-start-column="53" selection-end-line="235" selection-end-column="53" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/dashboard/models.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="5808">
-              <caret line="264" selection-start-line="264" selection-end-line="264" />
+            <state relative-caret-position="185">
+              <caret line="51" column="47" selection-start-line="51" selection-start-column="47" selection-end-line="51" selection-end-column="47" />
               <folding>
                 <element signature="e#0#11#0" expanded="true" />
               </folding>
@@ -89,29 +98,82 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/dashboard/urls.py">
+        <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">
-            <state relative-caret-position="66">
-              <caret line="6" column="22" selection-start-line="6" selection-start-column="22" selection-end-line="6" selection-end-column="22" />
+            <state relative-caret-position="110">
+              <caret line="5" column="21" selection-start-line="5" selection-start-column="21" selection-end-line="5" selection-end-column="21" />
               <folding>
-                <element signature="e#0#32#0" expanded="true" />
+                <element signature="e#0#28#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/dashboard/views.py">
+        <entry file="file://$PROJECT_DIR$/polls/views.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="3674">
-              <caret line="179" column="7" selection-start-line="179" selection-start-column="7" selection-end-line="179" selection-end-column="7" />
+            <state relative-caret-position="183">
+              <caret line="33" column="24" selection-start-line="33" selection-start-column="24" selection-end-line="33" selection-end-column="24" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/NewMediaMonitoring/settings.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-2599" />
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/management/views.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="110">
+              <caret line="5" column="36" selection-start-line="5" selection-start-column="36" selection-end-line="5" selection-end-column="36" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/management/models.py">
+          <provider selected="true" editor-type-id="text-editor" />
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/NewMediaMonitoring/local_settings.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="374">
+              <caret line="35" column="13" lean-forward="true" selection-start-line="35" selection-start-column="13" selection-end-line="35" selection-end-column="13" />
+            </state>
+          </provider>
+        </entry>
+      </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="154">
+              <caret line="7" column="23" selection-start-line="7" selection-start-column="23" selection-end-line="7" selection-end-column="23" />
               <folding>
-                <element signature="e#0#45#0" expanded="true" />
+                <element signature="e#0#29#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
+      <file pinned="false" current-in-tab="true">
+        <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" />
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -151,6 +213,8 @@
       <find>image</find>
       <find>20181201110659913.PNG</find>
       <find>fd</find>
+      <find>ForeignKey</find>
+      <find>OneToOneField</find>
     </findStrings>
     <dirStrings>
       <dir>D:\python\p3\NewMediaMonitoring</dir>
@@ -162,8 +226,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/NewMediaMonitoring/urls.py" />
-        <option value="$PROJECT_DIR$/dashboard/templates/dashboard/base/header.html" />
         <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" />
@@ -173,7 +235,6 @@
         <option value="$PROJECT_DIR$/dashboard/templates/dashboard/paginator/user-management-paginate.html" />
         <option value="$PROJECT_DIR$/dashboard/urls.py" />
         <option value="$PROJECT_DIR$/dashboard/templates/dashboard/paginator/organization-management-paginate.html" />
-        <option value="$PROJECT_DIR$/NewMediaMonitoring/local_settings.py" />
         <option value="$PROJECT_DIR$/management/templates/management/organization-management-update.html" />
         <option value="$PROJECT_DIR$/management/templates/management/organization-management.html" />
         <option value="$PROJECT_DIR$/management/templates/management/user-management.html" />
@@ -213,14 +274,17 @@
         <option value="$PROJECT_DIR$/management/templates/management/newmedia-management-edit-qita.html" />
         <option value="$PROJECT_DIR$/dashboard/views.py" />
         <option value="$PROJECT_DIR$/dashboard/templates/dashboard/index.html" />
+        <option value="$PROJECT_DIR$/NewMediaMonitoring/local_settings.py" />
+        <option value="$PROJECT_DIR$/fabfile.py" />
+        <option value="$PROJECT_DIR$/NewMediaMonitoring/wsgi.py" />
       </list>
     </option>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="-8" />
-    <option name="y" value="-8" />
-    <option name="width" value="1936" />
-    <option name="height" value="1056" />
+    <option name="x" value="1912" />
+    <option name="y" value="26" />
+    <option name="width" value="1696" />
+    <option name="height" value="1026" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
@@ -228,8 +292,23 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="ProjectPane">
+        <subPane>
+          <expand>
+            <path>
+              <item name="NewMediaMonitoring" type="b2602c69:ProjectViewProjectNode" />
+              <item name="NewMediaMonitoring" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="NewMediaMonitoring" type="b2602c69:ProjectViewProjectNode" />
+              <item name="NewMediaMonitoring" type="462c0819:PsiDirectoryNode" />
+              <item name="NewMediaMonitoring" type="462c0819:PsiDirectoryNode" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
       <pane id="Scope" />
-      <pane id="ProjectPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -241,19 +320,19 @@
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
-    <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
+    <property name="settings.editor.selected.configurable" value="vcs.Git" />
   </component>
   <component name="RecentsManager">
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="D:\python\p3\NewMediaMonitoring\static\upload\cover" />
-      <recent name="D:\python\p3\NewMediaMonitoring\static" />
-    </key>
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="D:\python\p3\NewMediaMonitoring" />
+      <recent name="D:\python\p3\NewMediaMonitoring\media\upload" />
       <recent name="D:\python\p3\NewMediaMonitoring\management\templates\management" />
       <recent name="D:\python\p3\NewMediaMonitoring\dashboard\templates\dashboard\paginator" />
       <recent name="D:\python\p3\NewMediaMonitoring\static\upload" />
-      <recent name="D:\python\p3\NewMediaMonitoring\static\upload\profile" />
+    </key>
+    <key name="MoveFile.RECENT_KEYS">
       <recent name="D:\python\p3\NewMediaMonitoring\static\upload\cover" />
+      <recent name="D:\python\p3\NewMediaMonitoring\static" />
     </key>
   </component>
   <component name="RunDashboard">
@@ -328,6 +407,7 @@
       <workItem from="1597801813210" duration="4762000" />
       <workItem from="1597840881537" duration="1976000" />
       <workItem from="1597885267085" duration="767000" />
+      <workItem from="1597886065062" duration="6447000" />
     </task>
     <task id="LOCAL-00001" summary="#create">
       <created>1595559693168</created>
@@ -378,11 +458,18 @@
       <option name="project" value="LOCAL" />
       <updated>1597885941104</updated>
     </task>
-    <option name="localTasksCounter" value="8" />
+    <task id="LOCAL-00008" summary="#新媒体管理">
+      <created>1597886088518</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1597886088518</updated>
+    </task>
+    <option name="localTasksCounter" value="9" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="168611000" />
+    <option name="totallyTimeSpent" value="175058000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -394,9 +481,10 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
+    <frame x="1912" y="26" width="1696" height="1026" extended-state="6" />
+    <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2829582" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.32718328" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Favorites" order="2" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
@@ -409,8 +497,8 @@
       <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
       <window_info anchor="bottom" id="Version Control" order="8" weight="0.32924107" />
       <window_info anchor="bottom" id="Database Changes" order="9" show_stripe_button="false" weight="0.32924107" />
-      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
-      <window_info anchor="bottom" id="Terminal" order="11" visible="true" weight="0.33333334" />
+      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.5010718" side_tool="true" weight="0.27901787" />
+      <window_info anchor="bottom" id="Terminal" order="11" sideWeight="0.4989282" visible="true" weight="0.27136257" />
       <window_info anchor="bottom" id="Python Console" order="12" weight="0.32924107" />
       <window_info anchor="bottom" id="Database Console" order="13" weight="0.32924107" />
       <window_info anchor="bottom" id="Messages" order="14" />
@@ -434,91 +522,6 @@
     <SUITE FILE_PATH="coverage/NewMediaMonitoring$import_area.coverage" NAME="import_area Coverage Results" MODIFIED="1596157104628" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/media/cover/2961407bea7605badb588de05f98437.jpg">
-      <provider selected="true" editor-type-id="images" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/dashboard/templates/dashboard/paginator/group-management-paginate.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="27" selection-start-line="11" selection-start-column="27" selection-end-line="11" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/management/templates/management/organization-management.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="206">
-          <caret line="51" column="45" lean-forward="true" selection-start-line="51" selection-start-column="45" selection-end-line="51" selection-end-column="45" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/0fffd6d4-73be-43bd-94b0-fcfe2a72c682/console.sql">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="49" selection-end-line="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="das://0fffd6d4-73be-43bd-94b0-fcfe2a72c682/database/newmediaDB1/schema/public/table/auth_user">
-      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
-        <state>
-          <filtering enabled="true">
-            <filter text="" />
-          </filtering>
-        </state>
-      </provider>
-    </entry>
-    <entry file="das://0fffd6d4-73be-43bd-94b0-fcfe2a72c682/database/newmediaDB1/schema/public/table/dashboard_group">
-      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
-        <state>
-          <filtering enabled="true">
-            <filter text="" />
-          </filtering>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/dashboard/tests.py">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/management/models.py">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="das://0fffd6d4-73be-43bd-94b0-fcfe2a72c682/database/newmediaDB1/schema/public/table/dashboard_group_admin">
-      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
-        <state>
-          <filtering enabled="true">
-            <filter text="" />
-          </filtering>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/management/templates/management/group-admin-create.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-339">
-          <caret line="37" column="61" selection-start-line="37" selection-start-column="61" selection-end-line="37" selection-end-column="61" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/static/css/style.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="223">
-          <caret line="5555" column="1" lean-forward="true" selection-start-line="5555" selection-start-column="1" selection-end-line="5555" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/management/templates/management/group-management.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="955">
-          <caret line="97" column="95" selection-start-line="97" selection-start-column="95" selection-end-line="97" selection-end-column="95" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/management/templates/management/group-user-create.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="22">
-          <caret line="43" column="75" selection-start-line="43" selection-start-column="58" selection-end-line="43" selection-end-column="75" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/management/templates/management/organization-management-create.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-506">
@@ -721,16 +724,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/management/views.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="402">
-          <caret line="860" column="74" selection-start-line="860" selection-start-column="74" selection-end-line="860" selection-end-column="74" />
-          <folding>
-            <element signature="e#0#11#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/management/templates/management/newmedia-management-edit-weibo.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="176">
@@ -780,7 +773,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/dashboard/urls.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="66">
+        <state relative-caret-position="132">
           <caret line="6" column="22" selection-start-line="6" selection-start-column="22" selection-end-line="6" selection-end-column="22" />
           <folding>
             <element signature="e#0#32#0" expanded="true" />
@@ -790,7 +783,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/dashboard/views.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3674">
+        <state relative-caret-position="3938">
           <caret line="179" column="7" selection-start-line="179" selection-start-column="7" selection-end-line="179" selection-end-column="7" />
           <folding>
             <element signature="e#0#45#0" expanded="true" />
@@ -798,15 +791,100 @@
         </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>
+    <entry file="file://$PROJECT_DIR$/polls/models.py">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/management/models.py">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
     <entry file="file://$PROJECT_DIR$/dashboard/models.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="5808">
-          <caret line="264" selection-start-line="264" selection-end-line="264" />
+        <state relative-caret-position="185">
+          <caret line="51" column="47" selection-start-line="51" selection-start-column="47" selection-end-line="51" selection-end-column="47" />
           <folding>
             <element signature="e#0#11#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://D:/install/Lib/site-packages/django_token/models.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="13" selection-start-line="13" selection-end-line="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/polls/urls.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="21" selection-start-line="5" selection-start-column="21" selection-end-line="5" selection-end-column="21" />
+          <folding>
+            <element signature="e#0#28#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/polls/views.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="183">
+          <caret line="33" column="24" selection-start-line="33" selection-start-column="24" selection-end-line="33" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/README.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="110">
+            <caret line="5" column="61" selection-start-line="5" selection-end-line="5" selection-end-column="61" />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/NewMediaMonitoring/settings.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-2599" />
+      </provider>
+    </entry>
+    <entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/4821833c-3929-4c9b-9fff-45d56b6c72b5/console.sql">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/management/views.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="36" selection-start-line="5" selection-start-column="36" selection-end-line="5" selection-end-column="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/NewMediaMonitoring/local_settings.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="35" column="13" lean-forward="true" selection-start-line="35" selection-start-column="13" selection-end-line="35" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/fabfile.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="7" column="23" selection-start-line="7" selection-start-column="23" selection-end-line="7" selection-end-column="23" />
+          <folding>
+            <element signature="e#0#29#0" expanded="true" />
+          </folding>
+        </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" />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/NewMediaMonitoring/wsgi.py b/NewMediaMonitoring/wsgi.py
index 2cc3a0d..1c3e3bd 100644
--- a/NewMediaMonitoring/wsgi.py
+++ b/NewMediaMonitoring/wsgi.py
@@ -12,5 +12,5 @@ import os
 from django.core.wsgi import get_wsgi_application
 
 os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'NewMediaMonitoring.settings')
-
+sys.path.append("/var/www/p3/NewMediaMonitoring/current")
 application = get_wsgi_application()
diff --git a/dashboard/migrations/0001_initial.py b/dashboard/migrations/0001_initial.py
deleted file mode 100644
index d5e2e0a..0000000
--- a/dashboard/migrations/0001_initial.py
+++ /dev/null
@@ -1,268 +0,0 @@
-# Generated by Django 2.1.8 on 2020-08-03 10:46
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-import uuid
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Area_code_2020',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('code', models.CharField(blank=True, max_length=256, null=True, verbose_name='区划代码')),
-                ('name', models.CharField(blank=True, max_length=256, null=True, verbose_name='名称')),
-                ('level', models.CharField(blank=True, max_length=256, null=True, verbose_name='级别1-5,省市县镇村')),
-                ('pcode', models.CharField(blank=True, max_length=256, null=True, verbose_name='父级区划代码')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Group',
-            fields=[
-                ('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False, verbose_name='id')),
-                ('name', models.CharField(blank=True, max_length=256, null=True, verbose_name='群组名称')),
-                ('presentation', models.TextField(blank=True, null=True, verbose_name='群组描述')),
-                ('image', models.FileField(blank=True, null=True, upload_to='groupimage')),
-                ('type', models.CharField(blank=True, max_length=256, null=True, verbose_name='群组类型')),
-                ('stauts', models.CharField(blank=True, max_length=256, null=True, verbose_name='状态')),
-                ('administrativedivision', models.CharField(blank=True, max_length=256, null=True, verbose_name='行政区划')),
-                ('created', models.DateTimeField(auto_now_add=True, verbose_name='创建时间')),
-                ('updated', models.DateTimeField(auto_now=True, verbose_name='更新时间')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Group_admin',
-            fields=[
-                ('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False, verbose_name='id')),
-                ('created', models.DateTimeField(auto_now_add=True, verbose_name='创建时间')),
-                ('updated', models.DateTimeField(auto_now=True, verbose_name='更新时间')),
-                ('group', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='dashboard.Group')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Group_user',
-            fields=[
-                ('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False, verbose_name='id')),
-                ('created', models.DateTimeField(auto_now_add=True, verbose_name='创建时间')),
-                ('updated', models.DateTimeField(auto_now=True, verbose_name='更新时间')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Level',
-            fields=[
-                ('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False, verbose_name='id')),
-                ('name', models.CharField(blank=True, max_length=256, null=True, verbose_name='等级名')),
-                ('level', models.IntegerField(blank=True, default=0, null=True, verbose_name='级别')),
-                ('created', models.DateTimeField(auto_now_add=True, verbose_name='创建时间')),
-                ('updated', models.DateTimeField(auto_now=True, verbose_name='更新时间')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Organization',
-            fields=[
-                ('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False, verbose_name='id')),
-                ('name', models.CharField(blank=True, max_length=256, null=True, verbose_name='单位名')),
-                ('administrativedivision', models.CharField(blank=True, max_length=256, null=True, verbose_name='行政区划')),
-                ('created', models.DateTimeField(auto_now_add=True, verbose_name='创建时间')),
-                ('updated', models.DateTimeField(auto_now=True, verbose_name='更新时间')),
-                ('group', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='dashboard.Group')),
-                ('level', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='dashboard.Level')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Qita',
-            fields=[
-                ('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False, verbose_name='id')),
-                ('type', models.CharField(blank=True, max_length=256, null=True, verbose_name='新媒体类型')),
-                ('name', models.CharField(blank=True, max_length=256, null=True, verbose_name='新媒体名称')),
-                ('count', models.CharField(blank=True, max_length=256, null=True, verbose_name='总发文量')),
-                ('count_jc', models.CharField(blank=True, max_length=256, null=True, verbose_name='监测时间内发文量')),
-                ('comment', models.CharField(blank=True, max_length=256, null=True, verbose_name='评论数')),
-                ('reply', models.CharField(blank=True, max_length=256, null=True, verbose_name='作者回复数')),
-                ('date', models.CharField(blank=True, max_length=256, null=True, verbose_name='最近发文日期')),
-                ('created', models.DateTimeField(auto_now_add=True, verbose_name='创建时间')),
-                ('updated', models.DateTimeField(auto_now=True, verbose_name='更新时间')),
-                ('organization', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='dashboard.Organization')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Toutiao',
-            fields=[
-                ('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False, verbose_name='id')),
-                ('code', models.CharField(blank=True, max_length=256, null=True, verbose_name='头条号')),
-                ('image', models.FileField(blank=True, null=True, upload_to='cover')),
-                ('created', models.DateTimeField(auto_now_add=True, verbose_name='创建时间')),
-                ('updated', models.DateTimeField(auto_now=True, verbose_name='更新时间')),
-                ('organization', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='dashboard.Organization')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Toutiao_comment',
-            fields=[
-                ('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False, verbose_name='id')),
-                ('comment', models.TextField(blank=True, null=True, verbose_name='评论')),
-                ('user', models.CharField(blank=True, max_length=256, null=True, verbose_name='用户')),
-                ('reply', models.TextField(blank=True, null=True, verbose_name='回复')),
-                ('created', models.DateTimeField(auto_now_add=True, verbose_name='创建时间')),
-                ('updated', models.DateTimeField(auto_now=True, verbose_name='更新时间')),
-                ('toutiao', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='dashboard.Toutiao')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Toutiao_data',
-            fields=[
-                ('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False, verbose_name='id')),
-                ('title', models.CharField(blank=True, max_length=256, null=True, verbose_name='标题')),
-                ('url', models.CharField(blank=True, max_length=256, null=True, verbose_name='链接')),
-                ('img', models.CharField(blank=True, max_length=256, null=True, verbose_name='缩略图')),
-                ('count', models.CharField(blank=True, max_length=256, null=True, verbose_name='阅读数')),
-                ('commentcount', models.CharField(blank=True, max_length=256, null=True, verbose_name='评论数')),
-                ('reply', models.CharField(blank=True, max_length=256, null=True, verbose_name='作者回复数')),
-                ('date', models.CharField(blank=True, max_length=256, null=True, verbose_name='时间')),
-                ('content', models.TextField(blank=True, null=True, verbose_name='正文')),
-                ('comment', models.TextField(blank=True, null=True, verbose_name='评论')),
-                ('created', models.DateTimeField(auto_now_add=True, verbose_name='创建时间')),
-                ('updated', models.DateTimeField(auto_now=True, verbose_name='更新时间')),
-                ('toutiao', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='dashboard.Toutiao')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Toutiao_Wrong',
-            fields=[
-                ('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False, verbose_name='id')),
-                ('wrong', models.CharField(blank=True, max_length=256, null=True, verbose_name='错别字')),
-                ('idea', models.CharField(blank=True, max_length=256, null=True, verbose_name='建议')),
-                ('site', models.CharField(blank=True, max_length=256, null=True, verbose_name='位置')),
-                ('change', models.BooleanField(blank=True, null=True, verbose_name='是否已修改')),
-                ('created', models.DateTimeField(auto_now_add=True, verbose_name='创建时间')),
-                ('updated', models.DateTimeField(auto_now=True, verbose_name='更新时间')),
-                ('toutiao', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='dashboard.Toutiao')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Userprofile',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(blank=True, max_length=256, null=True, verbose_name='姓名')),
-                ('sex', models.CharField(blank=True, max_length=256, null=True, verbose_name='性别')),
-                ('image', models.FileField(blank=True, null=True, upload_to='profile')),
-                ('organization', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='dashboard.Organization')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Weibi_data',
-            fields=[
-                ('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False, verbose_name='id')),
-                ('weiboid', models.CharField(blank=True, max_length=256, null=True, verbose_name='微博ID')),
-                ('content', models.TextField(blank=True, null=True, verbose_name='正文')),
-                ('url', models.CharField(blank=True, max_length=256, null=True, verbose_name='文章url')),
-                ('originalimageurl', models.CharField(blank=True, max_length=256, null=True, verbose_name='原始图片url')),
-                ('transpondimageurl', models.CharField(blank=True, max_length=256, null=True, verbose_name='转发图片url')),
-                ('original', models.BooleanField(blank=True, null=True, verbose_name='是否原创')),
-                ('site', models.CharField(blank=True, max_length=256, null=True, verbose_name='发布位置')),
-                ('date', models.CharField(blank=True, max_length=256, null=True, verbose_name='发布时间')),
-                ('tool', models.CharField(blank=True, max_length=256, null=True, verbose_name='发布工具')),
-                ('like', models.CharField(blank=True, max_length=256, null=True, verbose_name='点赞数')),
-                ('transpond', models.CharField(blank=True, max_length=256, null=True, verbose_name='转发数')),
-                ('comment', models.CharField(blank=True, max_length=256, null=True, verbose_name='评论数')),
-                ('title', models.CharField(blank=True, max_length=256, null=True, verbose_name='文章标题')),
-                ('created', models.DateTimeField(auto_now_add=True, verbose_name='创建时间')),
-                ('updated', models.DateTimeField(auto_now=True, verbose_name='更新时间')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Weibo',
-            fields=[
-                ('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False, verbose_name='id')),
-                ('code', models.CharField(blank=True, max_length=256, null=True, verbose_name='微博号')),
-                ('image', models.FileField(blank=True, null=True, upload_to='cover')),
-                ('created', models.DateTimeField(auto_now_add=True, verbose_name='创建时间')),
-                ('updated', models.DateTimeField(auto_now=True, verbose_name='更新时间')),
-                ('organization', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='dashboard.Organization')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Weibo_Wrong',
-            fields=[
-                ('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False, verbose_name='id')),
-                ('wrong', models.CharField(blank=True, max_length=256, null=True, verbose_name='错别字')),
-                ('idea', models.CharField(blank=True, max_length=256, null=True, verbose_name='建议')),
-                ('site', models.CharField(blank=True, max_length=256, null=True, verbose_name='位置')),
-                ('change', models.BooleanField(blank=True, null=True, verbose_name='是否已修改')),
-                ('created', models.DateTimeField(auto_now_add=True, verbose_name='创建时间')),
-                ('updated', models.DateTimeField(auto_now=True, verbose_name='更新时间')),
-                ('weibo', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='dashboard.Weibo')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Weixin',
-            fields=[
-                ('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False, verbose_name='id')),
-                ('code', models.CharField(blank=True, max_length=256, null=True, verbose_name='微信公众号')),
-                ('image', models.FileField(blank=True, null=True, upload_to='cover')),
-                ('created', models.DateTimeField(auto_now_add=True, verbose_name='创建时间')),
-                ('updated', models.DateTimeField(auto_now=True, verbose_name='更新时间')),
-                ('organization', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='dashboard.Organization')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Weixin_comment',
-            fields=[
-                ('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False, verbose_name='id')),
-                ('comment', models.TextField(blank=True, null=True, verbose_name='评论')),
-                ('user', models.CharField(blank=True, max_length=256, null=True, verbose_name='用户')),
-                ('reply', models.TextField(blank=True, null=True, verbose_name='回复')),
-                ('created', models.DateTimeField(auto_now_add=True, verbose_name='创建时间')),
-                ('updated', models.DateTimeField(auto_now=True, verbose_name='更新时间')),
-                ('weixin', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='dashboard.Weixin')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Weixin_data',
-            fields=[
-                ('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False, verbose_name='id')),
-                ('title', models.CharField(blank=True, max_length=256, null=True, verbose_name='文章标题')),
-                ('site', models.CharField(blank=True, max_length=256, null=True, verbose_name='位置')),
-                ('date', models.CharField(blank=True, max_length=256, null=True, verbose_name='发文时间')),
-                ('original', models.BooleanField(blank=True, null=True, verbose_name='是否原创')),
-                ('url', models.CharField(blank=True, max_length=256, null=True, verbose_name='文章链接')),
-                ('author', models.CharField(blank=True, max_length=256, null=True, verbose_name='作者')),
-                ('comment', models.CharField(blank=True, max_length=256, null=True, verbose_name='评论数')),
-                ('reply', models.CharField(blank=True, max_length=256, null=True, verbose_name='作者回复数')),
-                ('content', models.TextField(blank=True, null=True, verbose_name='正文')),
-                ('created', models.DateTimeField(auto_now_add=True, verbose_name='创建时间')),
-                ('updated', models.DateTimeField(auto_now=True, verbose_name='更新时间')),
-                ('weixin', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='dashboard.Weixin')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Weixin_Wrong',
-            fields=[
-                ('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False, verbose_name='id')),
-                ('wrong', models.CharField(blank=True, max_length=256, null=True, verbose_name='错别字')),
-                ('idea', models.CharField(blank=True, max_length=256, null=True, verbose_name='建议')),
-                ('site', models.CharField(blank=True, max_length=256, null=True, verbose_name='位置')),
-                ('change', models.BooleanField(blank=True, null=True, verbose_name='是否已修改')),
-                ('created', models.DateTimeField(auto_now_add=True, verbose_name='创建时间')),
-                ('updated', models.DateTimeField(auto_now=True, verbose_name='更新时间')),
-                ('weixin', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='dashboard.Weixin')),
-            ],
-        ),
-        migrations.AddField(
-            model_name='weibi_data',
-            name='weibo',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='dashboard.Weibo'),
-        ),
-    ]
diff --git a/dashboard/migrations/0002_auto_20200803_1051.py b/dashboard/migrations/0002_auto_20200803_1051.py
deleted file mode 100644
index 89dccf3..0000000
--- a/dashboard/migrations/0002_auto_20200803_1051.py
+++ /dev/null
@@ -1,115 +0,0 @@
-# Generated by Django 2.1.8 on 2020-08-03 10:51
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-import uuid
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('dashboard', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Organizationtype',
-            fields=[
-                ('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False, verbose_name='id')),
-                ('organizationtype', models.CharField(blank=True, max_length=256, null=True, verbose_name='单位类型')),
-                ('created', models.DateTimeField(auto_now_add=True, verbose_name='创建时间')),
-                ('updated', models.DateTimeField(auto_now=True, verbose_name='更新时间')),
-            ],
-        ),
-        migrations.AlterField(
-            model_name='group_admin',
-            name='group',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='dashboard.Group'),
-        ),
-        migrations.AlterField(
-            model_name='group_admin',
-            name='user',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
-        ),
-        migrations.AlterField(
-            model_name='group_user',
-            name='user',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
-        ),
-        migrations.AlterField(
-            model_name='organization',
-            name='group',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='dashboard.Group'),
-        ),
-        migrations.AlterField(
-            model_name='qita',
-            name='organization',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='dashboard.Organization'),
-        ),
-        migrations.AlterField(
-            model_name='toutiao',
-            name='organization',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='dashboard.Organization'),
-        ),
-        migrations.AlterField(
-            model_name='toutiao_comment',
-            name='toutiao',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='dashboard.Toutiao'),
-        ),
-        migrations.AlterField(
-            model_name='toutiao_data',
-            name='toutiao',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='dashboard.Toutiao'),
-        ),
-        migrations.AlterField(
-            model_name='toutiao_wrong',
-            name='toutiao',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='dashboard.Toutiao'),
-        ),
-        migrations.AlterField(
-            model_name='userprofile',
-            name='organization',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='dashboard.Organization'),
-        ),
-        migrations.AlterField(
-            model_name='weibi_data',
-            name='weibo',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='dashboard.Weibo'),
-        ),
-        migrations.AlterField(
-            model_name='weibo',
-            name='organization',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='dashboard.Organization'),
-        ),
-        migrations.AlterField(
-            model_name='weibo_wrong',
-            name='weibo',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='dashboard.Weibo'),
-        ),
-        migrations.AlterField(
-            model_name='weixin',
-            name='organization',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='dashboard.Organization'),
-        ),
-        migrations.AlterField(
-            model_name='weixin_comment',
-            name='weixin',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='dashboard.Weixin'),
-        ),
-        migrations.AlterField(
-            model_name='weixin_data',
-            name='weixin',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='dashboard.Weixin'),
-        ),
-        migrations.AlterField(
-            model_name='weixin_wrong',
-            name='weixin',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='dashboard.Weixin'),
-        ),
-        migrations.AddField(
-            model_name='organization',
-            name='organizationtype',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='dashboard.Organizationtype'),
-        ),
-    ]
diff --git a/dashboard/migrations/0003_auto_20200803_1104.py b/dashboard/migrations/0003_auto_20200803_1104.py
deleted file mode 100644
index 41e1691..0000000
--- a/dashboard/migrations/0003_auto_20200803_1104.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Generated by Django 2.1.8 on 2020-08-03 11:04
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('dashboard', '0002_auto_20200803_1051'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='organization',
-            name='group',
-        ),
-        migrations.RemoveField(
-            model_name='organization',
-            name='level',
-        ),
-    ]
diff --git a/dashboard/migrations/0004_auto_20200803_1125.py b/dashboard/migrations/0004_auto_20200803_1125.py
deleted file mode 100644
index 862c64e..0000000
--- a/dashboard/migrations/0004_auto_20200803_1125.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# Generated by Django 2.1.8 on 2020-08-03 11:25
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('dashboard', '0003_auto_20200803_1104'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='organization',
-            name='administrativedivision',
-        ),
-        migrations.AddField(
-            model_name='organization',
-            name='cities',
-            field=models.CharField(blank=True, max_length=256, null=True, verbose_name='市'),
-        ),
-        migrations.AddField(
-            model_name='organization',
-            name='district',
-            field=models.CharField(blank=True, max_length=256, null=True, verbose_name='县'),
-        ),
-        migrations.AddField(
-            model_name='organization',
-            name='province',
-            field=models.CharField(blank=True, max_length=256, null=True, verbose_name='省'),
-        ),
-        migrations.AddField(
-            model_name='organization',
-            name='town',
-            field=models.CharField(blank=True, max_length=256, null=True, verbose_name='乡'),
-        ),
-        migrations.AddField(
-            model_name='organization',
-            name='village',
-            field=models.CharField(blank=True, max_length=256, null=True, verbose_name='村'),
-        ),
-    ]
diff --git a/dashboard/migrations/0005_organization_image.py b/dashboard/migrations/0005_organization_image.py
deleted file mode 100644
index e7c0489..0000000
--- a/dashboard/migrations/0005_organization_image.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 2.1.8 on 2020-08-03 15:35
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('dashboard', '0004_auto_20200803_1125'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='organization',
-            name='image',
-            field=models.FileField(blank=True, null=True, upload_to='cover'),
-        ),
-    ]
diff --git a/dashboard/migrations/0006_auto_20200805_2325.py b/dashboard/migrations/0006_auto_20200805_2325.py
deleted file mode 100644
index f09e765..0000000
--- a/dashboard/migrations/0006_auto_20200805_2325.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# Generated by Django 2.1.8 on 2020-08-05 23:25
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('dashboard', '0005_organization_image'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='group',
-            name='administrativedivision',
-        ),
-        migrations.AddField(
-            model_name='group',
-            name='cities',
-            field=models.CharField(blank=True, max_length=256, null=True, verbose_name='市'),
-        ),
-        migrations.AddField(
-            model_name='group',
-            name='district',
-            field=models.CharField(blank=True, max_length=256, null=True, verbose_name='县'),
-        ),
-        migrations.AddField(
-            model_name='group',
-            name='province',
-            field=models.CharField(blank=True, max_length=256, null=True, verbose_name='省'),
-        ),
-        migrations.AddField(
-            model_name='group',
-            name='town',
-            field=models.CharField(blank=True, max_length=256, null=True, verbose_name='乡'),
-        ),
-        migrations.AddField(
-            model_name='group',
-            name='village',
-            field=models.CharField(blank=True, max_length=256, null=True, verbose_name='村'),
-        ),
-    ]
diff --git a/dashboard/migrations/0007_group_type.py b/dashboard/migrations/0007_group_type.py
deleted file mode 100644
index ee1ff5d..0000000
--- a/dashboard/migrations/0007_group_type.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Generated by Django 2.1.8 on 2020-08-13 15:23
-
-from django.db import migrations, models
-import uuid
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('dashboard', '0006_auto_20200805_2325'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Group_type',
-            fields=[
-                ('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False, verbose_name='id')),
-                ('type', models.CharField(blank=True, max_length=256, null=True, verbose_name='群组类型')),
-            ],
-        ),
-    ]
diff --git a/dashboard/migrations/0008_auto_20200813_1538.py b/dashboard/migrations/0008_auto_20200813_1538.py
deleted file mode 100644
index ab84583..0000000
--- a/dashboard/migrations/0008_auto_20200813_1538.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# Generated by Django 2.1.8 on 2020-08-13 15:38
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('dashboard', '0007_group_type'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='group',
-            name='stauts',
-            field=models.CharField(blank=True, choices=[('0', '关闭'), ('1', '开启')], max_length=256, null=True, verbose_name='状态'),
-        ),
-        migrations.AlterField(
-            model_name='group',
-            name='type',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='dashboard.Group_type'),
-        ),
-    ]
diff --git a/dashboard/migrations/0009_auto_20200813_1604.py b/dashboard/migrations/0009_auto_20200813_1604.py
deleted file mode 100644
index 25e2828..0000000
--- a/dashboard/migrations/0009_auto_20200813_1604.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 2.1.8 on 2020-08-13 16:04
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('dashboard', '0008_auto_20200813_1538'),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name='group',
-            old_name='stauts',
-            new_name='status',
-        ),
-    ]
diff --git a/dashboard/migrations/0010_group_user_group.py b/dashboard/migrations/0010_group_user_group.py
deleted file mode 100644
index 3514998..0000000
--- a/dashboard/migrations/0010_group_user_group.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Generated by Django 2.1.8 on 2020-08-13 16:23
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('dashboard', '0009_auto_20200813_1604'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='group_user',
-            name='group',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='dashboard.Group'),
-        ),
-    ]
diff --git a/dashboard/migrations/0011_auto_20200817_1654.py b/dashboard/migrations/0011_auto_20200817_1654.py
deleted file mode 100644
index 7646013..0000000
--- a/dashboard/migrations/0011_auto_20200817_1654.py
+++ /dev/null
@@ -1,118 +0,0 @@
-# Generated by Django 2.1.8 on 2020-08-17 16:54
-
-from django.db import migrations, models
-import django.db.models.deletion
-import uuid
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('dashboard', '0010_group_user_group'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Qita_jc',
-            fields=[
-                ('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False, verbose_name='id')),
-                ('count', models.CharField(blank=True, max_length=256, null=True, verbose_name='总发文量')),
-                ('count_jc', models.CharField(blank=True, max_length=256, null=True, verbose_name='监测时间内发文量')),
-                ('comment', models.CharField(blank=True, max_length=256, null=True, verbose_name='评论数')),
-                ('reply', models.CharField(blank=True, max_length=256, null=True, verbose_name='作者回复数')),
-                ('date', models.CharField(blank=True, max_length=256, null=True, verbose_name='最近发文日期')),
-                ('created', models.DateTimeField(auto_now_add=True, verbose_name='创建时间')),
-                ('updated', models.DateTimeField(auto_now=True, verbose_name='更新时间')),
-            ],
-        ),
-        migrations.RemoveField(
-            model_name='qita',
-            name='comment',
-        ),
-        migrations.RemoveField(
-            model_name='qita',
-            name='count',
-        ),
-        migrations.RemoveField(
-            model_name='qita',
-            name='count_jc',
-        ),
-        migrations.RemoveField(
-            model_name='qita',
-            name='date',
-        ),
-        migrations.RemoveField(
-            model_name='qita',
-            name='reply',
-        ),
-        migrations.AddField(
-            model_name='qita',
-            name='alias',
-            field=models.CharField(blank=True, max_length=256, null=True, verbose_name='别名'),
-        ),
-        migrations.AddField(
-            model_name='qita',
-            name='image',
-            field=models.FileField(blank=True, null=True, upload_to='cover'),
-        ),
-        migrations.AddField(
-            model_name='qita',
-            name='status',
-            field=models.CharField(blank=True, choices=[('0', '关闭'), ('1', '开启')], max_length=256, null=True, verbose_name='状态'),
-        ),
-        migrations.AddField(
-            model_name='qita',
-            name='toutiaoid',
-            field=models.CharField(blank=True, max_length=256, null=True, verbose_name='新媒体ID'),
-        ),
-        migrations.AddField(
-            model_name='toutiao',
-            name='alias',
-            field=models.CharField(blank=True, max_length=256, null=True, verbose_name='别名'),
-        ),
-        migrations.AddField(
-            model_name='toutiao',
-            name='status',
-            field=models.CharField(blank=True, choices=[('0', '关闭'), ('1', '开启')], max_length=256, null=True, verbose_name='状态'),
-        ),
-        migrations.AddField(
-            model_name='toutiao',
-            name='toutiaoid',
-            field=models.CharField(blank=True, max_length=256, null=True, verbose_name='头条ID'),
-        ),
-        migrations.AddField(
-            model_name='weibo',
-            name='alias',
-            field=models.CharField(blank=True, max_length=256, null=True, verbose_name='别名'),
-        ),
-        migrations.AddField(
-            model_name='weibo',
-            name='status',
-            field=models.CharField(blank=True, choices=[('0', '关闭'), ('1', '开启')], max_length=256, null=True, verbose_name='状态'),
-        ),
-        migrations.AddField(
-            model_name='weibo',
-            name='weiboid',
-            field=models.CharField(blank=True, max_length=256, null=True, verbose_name='微博ID'),
-        ),
-        migrations.AddField(
-            model_name='weixin',
-            name='alias',
-            field=models.CharField(blank=True, max_length=256, null=True, verbose_name='别名'),
-        ),
-        migrations.AddField(
-            model_name='weixin',
-            name='status',
-            field=models.CharField(blank=True, choices=[('0', '关闭'), ('1', '开启')], max_length=256, null=True, verbose_name='状态'),
-        ),
-        migrations.AddField(
-            model_name='weixin',
-            name='weixinid',
-            field=models.CharField(blank=True, max_length=256, null=True, verbose_name='微信ID'),
-        ),
-        migrations.AddField(
-            model_name='qita_jc',
-            name='mewnedia',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='dashboard.Qita'),
-        ),
-    ]
diff --git a/dashboard/migrations/0012_auto_20200817_1717.py b/dashboard/migrations/0012_auto_20200817_1717.py
deleted file mode 100644
index ec9c59f..0000000
--- a/dashboard/migrations/0012_auto_20200817_1717.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# Generated by Django 2.1.8 on 2020-08-17 17:17
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('dashboard', '0011_auto_20200817_1654'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='qita',
-            name='status',
-            field=models.CharField(blank=True, choices=[('1', '开启'), ('0', '关闭')], max_length=256, null=True, verbose_name='状态'),
-        ),
-        migrations.AlterField(
-            model_name='toutiao',
-            name='status',
-            field=models.CharField(blank=True, choices=[('1', '开启'), ('0', '关闭')], max_length=256, null=True, verbose_name='状态'),
-        ),
-        migrations.AlterField(
-            model_name='weibo',
-            name='status',
-            field=models.CharField(blank=True, choices=[('1', '开启'), ('0', '关闭')], max_length=256, null=True, verbose_name='状态'),
-        ),
-        migrations.AlterField(
-            model_name='weixin',
-            name='status',
-            field=models.CharField(blank=True, choices=[('1', '开启'), ('0', '关闭')], max_length=256, null=True, verbose_name='状态'),
-        ),
-    ]
diff --git a/dashboard/migrations/0013_auto_20200818_0919.py b/dashboard/migrations/0013_auto_20200818_0919.py
deleted file mode 100644
index 9b300c7..0000000
--- a/dashboard/migrations/0013_auto_20200818_0919.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 2.1.8 on 2020-08-18 09:19
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('dashboard', '0012_auto_20200817_1717'),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name='qita',
-            old_name='toutiaoid',
-            new_name='qitaid',
-        ),
-    ]
diff --git a/fabfile.py b/fabfile.py
new file mode 100644
index 0000000..d9aded5
--- /dev/null
+++ b/fabfile.py
@@ -0,0 +1,10 @@
+from fabistrano import deploy
+from fabric.api import env
+
+env.hosts = ["nut@210.72.82.249"]  # Replace with your host name or IP
+env.base_dir = '/var/www/p3'  # Set to your app's directory
+env.app_name = 'newmediamonitoring'  # This will deploy the app to /www/app_name.com/
+env.git_clone = 'http://210.77.77.77/xieshen/newmediamonitoring.git'  # Your git url
+env.remote_owner = 'nut'
+env.remote_group = 'www-data'
+env.restart_cmd = 'sudo service apache2 restart'