#新媒体管理

This commit is contained in:
Bob 2020-08-20 15:20:26 +08:00
parent faa2882a73
commit d62223cdc0
2 changed files with 82 additions and 60 deletions

View File

@ -3,7 +3,7 @@
<component name="ChangeListManager"> <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 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$/NewMediaMonitoring/local_settings.py" beforeDir="false" afterPath="$PROJECT_DIR$/NewMediaMonitoring/local_settings.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/NewMediaMonitoring/settings.py" beforeDir="false" afterPath="$PROJECT_DIR$/NewMediaMonitoring/settings.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" />
@ -103,10 +103,12 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/NewMediaMonitoring/settings.py"> <entry file="file://$PROJECT_DIR$/NewMediaMonitoring/settings.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2599" /> <state relative-caret-position="158">
<caret line="139" column="44" selection-start-line="139" selection-start-column="44" selection-end-line="139" selection-end-column="44" />
</state>
</provider> </provider>
</entry> </entry>
</file> </file>
@ -119,20 +121,6 @@
</provider> </provider>
</entry> </entry>
</file> </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"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/fabfile.py"> <entry file="file://$PROJECT_DIR$/fabfile.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
@ -145,11 +133,14 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/NewMediaMonitoring/wsgi.py"> <entry file="file://$PROJECT_DIR$/NewMediaMonitoring/wsgi.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264"> <state relative-caret-position="466">
<caret line="15" column="3" selection-start-line="15" selection-start-column="3" selection-end-line="15" selection-end-column="3" /> <caret line="27" column="12" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
<folding>
<element signature="e#234#243#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@ -157,8 +148,20 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/requirements.txt"> <entry file="file://$PROJECT_DIR$/requirements.txt">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="110"> <state relative-caret-position="88">
<caret line="5" lean-forward="true" selection-start-line="5" selection-end-line="5" /> <caret line="4" column="21" lean-forward="true" selection-start-line="4" selection-start-column="2" selection-end-line="4" selection-end-column="21" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<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="154">
<caret line="7" column="3" lean-forward="true" selection-start-line="7" selection-start-column="3" selection-end-line="7" selection-end-column="3" />
</first_editor>
<second_editor />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -215,7 +218,6 @@
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/NewMediaMonitoring/settings.py" />
<option value="$PROJECT_DIR$/management/templates/management/user-management-update.html" /> <option value="$PROJECT_DIR$/management/templates/management/user-management-update.html" />
<option value="$PROJECT_DIR$/dashboard/templates/dashboard/login.html" /> <option value="$PROJECT_DIR$/dashboard/templates/dashboard/login.html" />
<option value="$PROJECT_DIR$/import_area.py" /> <option value="$PROJECT_DIR$/import_area.py" />
@ -264,8 +266,9 @@
<option value="$PROJECT_DIR$/dashboard/templates/dashboard/index.html" /> <option value="$PROJECT_DIR$/dashboard/templates/dashboard/index.html" />
<option value="$PROJECT_DIR$/NewMediaMonitoring/local_settings.py" /> <option value="$PROJECT_DIR$/NewMediaMonitoring/local_settings.py" />
<option value="$PROJECT_DIR$/fabfile.py" /> <option value="$PROJECT_DIR$/fabfile.py" />
<option value="$PROJECT_DIR$/NewMediaMonitoring/wsgi.py" />
<option value="$PROJECT_DIR$/requirements.txt" /> <option value="$PROJECT_DIR$/requirements.txt" />
<option value="$PROJECT_DIR$/NewMediaMonitoring/wsgi.py" />
<option value="$PROJECT_DIR$/NewMediaMonitoring/settings.py" />
</list> </list>
</option> </option>
</component> </component>
@ -306,18 +309,18 @@
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" /> <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" /> <property name="WebServerToolWindowFactoryState" value="false" />
<property name="database.console.LAST_STATE" value="false" /> <property name="database.console.LAST_STATE" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" /> <property name="last_opened_file_path" value="$PROJECT_DIR$/NewMediaMonitoring" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" /> <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="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="settings.editor.selected.configurable" value="vcs.Git" /> <property name="settings.editor.selected.configurable" value="vcs.Git" />
</component> </component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS"> <key name="CopyFile.RECENT_KEYS">
<recent name="D:\python\p3\NewMediaMonitoring\NewMediaMonitoring" />
<recent name="D:\python\p3\NewMediaMonitoring" /> <recent name="D:\python\p3\NewMediaMonitoring" />
<recent name="D:\python\p3\NewMediaMonitoring\media\upload" /> <recent name="D:\python\p3\NewMediaMonitoring\media\upload" />
<recent name="D:\python\p3\NewMediaMonitoring\management\templates\management" /> <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\dashboard\templates\dashboard\paginator" />
<recent name="D:\python\p3\NewMediaMonitoring\static\upload" />
</key> </key>
<key name="MoveFile.RECENT_KEYS"> <key name="MoveFile.RECENT_KEYS">
<recent name="D:\python\p3\NewMediaMonitoring\static\upload\cover" /> <recent name="D:\python\p3\NewMediaMonitoring\static\upload\cover" />
@ -396,7 +399,7 @@
<workItem from="1597801813210" duration="4762000" /> <workItem from="1597801813210" duration="4762000" />
<workItem from="1597840881537" duration="1976000" /> <workItem from="1597840881537" duration="1976000" />
<workItem from="1597885267085" duration="767000" /> <workItem from="1597885267085" duration="767000" />
<workItem from="1597886065062" duration="7383000" /> <workItem from="1597886065062" duration="8916000" />
</task> </task>
<task id="LOCAL-00001" summary="#create"> <task id="LOCAL-00001" summary="#create">
<created>1595559693168</created> <created>1595559693168</created>
@ -475,11 +478,25 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1597894728260</updated> <updated>1597894728260</updated>
</task> </task>
<option name="localTasksCounter" value="12" /> <task id="LOCAL-00012" summary="#新媒体管理">
<created>1597895559894</created>
<option name="number" value="00012" />
<option name="presentableId" value="LOCAL-00012" />
<option name="project" value="LOCAL" />
<updated>1597895559894</updated>
</task>
<task id="LOCAL-00013" summary="#新媒体管理">
<created>1597907613364</created>
<option name="number" value="00013" />
<option name="presentableId" value="LOCAL-00013" />
<option name="project" value="LOCAL" />
<updated>1597907613364</updated>
</task>
<option name="localTasksCounter" value="14" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="175994000" /> <option name="totallyTimeSpent" value="177527000" />
</component> </component>
<component name="TodoView"> <component name="TodoView">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
@ -491,10 +508,10 @@
</todo-panel> </todo-panel>
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="1912" y="26" width="1696" height="1026" extended-state="6" /> <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.32718328" /> <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.28510183" />
<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" />
@ -508,7 +525,7 @@
<window_info anchor="bottom" id="Version Control" order="8" weight="0.32924107" /> <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="Database Changes" order="9" show_stripe_button="false" weight="0.32924107" />
<window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.5010718" side_tool="true" weight="0.27901787" /> <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="Terminal" order="11" sideWeight="0.4989282" visible="true" weight="0.2622768" />
<window_info anchor="bottom" id="Python Console" order="12" weight="0.32924107" /> <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="Database Console" order="13" weight="0.32924107" />
<window_info anchor="bottom" id="Messages" order="14" /> <window_info anchor="bottom" id="Messages" order="14" />
@ -844,21 +861,6 @@
</state> </state>
</provider> </provider>
</entry> </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"> <entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/4821833c-3929-4c9b-9fff-45d56b6c72b5/console.sql">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
@ -869,13 +871,6 @@
</state> </state>
</provider> </provider>
</entry> </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"> <entry file="file://$PROJECT_DIR$/fabfile.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154"> <state relative-caret-position="154">
@ -886,17 +881,44 @@
</state> </state>
</provider> </provider>
</entry> </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="154">
<caret line="7" column="3" lean-forward="true" selection-start-line="7" selection-start-column="3" selection-end-line="7" selection-end-column="3" />
</first_editor>
<second_editor />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/requirements.txt"> <entry file="file://$PROJECT_DIR$/requirements.txt">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="110"> <state relative-caret-position="88">
<caret line="5" lean-forward="true" selection-start-line="5" selection-end-line="5" /> <caret line="4" column="21" lean-forward="true" selection-start-line="4" selection-start-column="2" selection-end-line="4" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/NewMediaMonitoring/local_settings.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="770">
<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> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/NewMediaMonitoring/wsgi.py"> <entry file="file://$PROJECT_DIR$/NewMediaMonitoring/wsgi.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264"> <state relative-caret-position="466">
<caret line="15" column="3" selection-start-line="15" selection-start-column="3" selection-end-line="15" selection-end-column="3" /> <caret line="27" column="12" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
<folding>
<element signature="e#234#243#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/NewMediaMonitoring/settings.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="158">
<caret line="139" column="44" selection-start-line="139" selection-start-column="44" selection-end-line="139" selection-end-column="44" />
</state> </state>
</provider> </provider>
</entry> </entry>

View File

@ -135,9 +135,9 @@ STATIC_URL = '/static/'
STATICFILES_DIRS = [ STATICFILES_DIRS = [
os.path.join(BASE_DIR, "static"), os.path.join(BASE_DIR, "static"),
] ]
STATIC_ROOT = '/var/www/p3/NewMediaMonitoring/static/' STATIC_ROOT = '/var/www/p3/newmediamonitoring/static/'
MEDIA_URL = '/media/' MEDIA_URL = '/media/'
MEDIA_ROOT = '/var/www/p3/NewMediaMonitoring/media/' MEDIA_ROOT = '/var/www/p3/newmediamonitoring/media/'
"""用户模块扩展部分""" """用户模块扩展部分"""
AUTH_PROFILE_MODULE = 'djangoadmin.myadmin.UserProfile' AUTH_PROFILE_MODULE = 'djangoadmin.myadmin.UserProfile'