312 lines
18 KiB
XML
312 lines
18 KiB
XML
<?xml version="1.0" encoding="UTF-8"?>
|
|
<project version="4">
|
|
<component name="BranchesTreeState">
|
|
<expand>
|
|
<path>
|
|
<item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
|
|
<item name="LOCAL_ROOT" type="e8cecc67:BranchNodeDescriptor" />
|
|
</path>
|
|
<path>
|
|
<item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
|
|
<item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
|
|
</path>
|
|
<path>
|
|
<item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
|
|
<item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
|
|
<item name="GROUP_NODE:origin" type="e8cecc67:BranchNodeDescriptor" />
|
|
</path>
|
|
</expand>
|
|
<select>
|
|
<path>
|
|
<item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
|
|
<item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
|
|
<item name="GROUP_NODE:origin" type="e8cecc67:BranchNodeDescriptor" />
|
|
<item name="BRANCH:origin/master" type="e8cecc67:BranchNodeDescriptor" />
|
|
</path>
|
|
</select>
|
|
</component>
|
|
<component name="ChangeListManager">
|
|
<list default="true" id="81247df9-f070-428a-8ff8-85c1a06086e7" name="Default Changelist" comment="第一次合并+上线 修改了history路由">
|
|
<change afterPath="$PROJECT_DIR$/Apps/work/serializers.py" afterDir="false" />
|
|
<change afterPath="$PROJECT_DIR$/Apps/work/urls.py" afterDir="false" />
|
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
<change beforePath="$PROJECT_DIR$/Apps/comments/serializers.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/comments/serializers.py" afterDir="false" />
|
|
<change beforePath="$PROJECT_DIR$/Apps/comments/views.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/comments/views.py" afterDir="false" />
|
|
<change beforePath="$PROJECT_DIR$/ITShowPlatform/settings.py" beforeDir="false" afterPath="$PROJECT_DIR$/ITShowPlatform/settings.py" afterDir="false" />
|
|
<change beforePath="$PROJECT_DIR$/ITShowPlatform/urls.py" beforeDir="false" afterPath="$PROJECT_DIR$/ITShowPlatform/urls.py" afterDir="false" />
|
|
<change beforePath="$PROJECT_DIR$/utils/get_error_msg.py" beforeDir="false" afterPath="$PROJECT_DIR$/utils/get_error_msg.py" afterDir="false" />
|
|
</list>
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
|
<option name="LAST_RESOLUTION" value="IGNORE" />
|
|
</component>
|
|
<component name="DjangoConsoleOptions" custom-start-script="import sys; print('Python %s on %s' % (sys.version, sys.platform)) import django; print('Django %s' % django.get_version()) sys.path.extend([WORKING_DIR_AND_PYTHON_PATHS]) if 'setup' in dir(django): django.setup() import django_manage_shell; django_manage_shell.run(PROJECT_ROOT)">
|
|
<option name="myCustomStartScript" value="import sys; print('Python %s on %s' % (sys.version, sys.platform)) import django; print('Django %s' % django.get_version()) sys.path.extend([WORKING_DIR_AND_PYTHON_PATHS]) if 'setup' in dir(django): django.setup() import django_manage_shell; django_manage_shell.run(PROJECT_ROOT)" />
|
|
</component>
|
|
<component name="FileTemplateManagerImpl">
|
|
<option name="RECENT_TEMPLATES">
|
|
<list>
|
|
<option value="Python Script" />
|
|
</list>
|
|
</option>
|
|
</component>
|
|
<component name="Git.Settings">
|
|
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
|
</component>
|
|
<component name="ProjectId" id="27v5hLzeA3tTKg74z1HrGlKm4g2" />
|
|
<component name="ProjectLevelVcsManager">
|
|
<OptionsSetting value="false" id="Update" />
|
|
</component>
|
|
<component name="ProjectViewState">
|
|
<option name="hideEmptyMiddlePackages" value="true" />
|
|
<option name="showExcludedFiles" value="false" />
|
|
<option name="showLibraryContents" value="true" />
|
|
<option name="showMembers" value="true" />
|
|
<option name="sortByType" value="true" />
|
|
</component>
|
|
<component name="PropertiesComponent">
|
|
<property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
|
|
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
|
|
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
|
|
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
|
|
<property name="TERMINAL_CUSTOM_COMMANDS_GOT_IT" value="true" />
|
|
<property name="WebServerToolWindowFactoryState" value="false" />
|
|
<property name="last_opened_file_path" value="$PROJECT_DIR$/../电商项目" />
|
|
<property name="nodejs_package_manager_path" value="npm" />
|
|
<property name="restartRequiresConfirmation" value="false" />
|
|
<property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
|
|
</component>
|
|
<component name="RecentsManager">
|
|
<key name="MoveFile.RECENT_KEYS">
|
|
<recent name="D:\IT_Studio\ITShowPlat\Apps" />
|
|
<recent name="C:\Users\PBDELL\Desktop\Django\ITShowPlatform\Apps" />
|
|
</key>
|
|
</component>
|
|
<component name="RunManager">
|
|
<configuration name="ITShowPlatform" type="Python.DjangoServer" factoryName="Django server">
|
|
<module name="ITShowPlatform" />
|
|
<option name="INTERPRETER_OPTIONS" value="" />
|
|
<option name="PARENT_ENVS" value="true" />
|
|
<envs>
|
|
<env name="PYTHONUNBUFFERED" value="1" />
|
|
<env name="DJANGO_SETTINGS_MODULE" value="ITShowPlatform.settings" />
|
|
</envs>
|
|
<option name="SDK_HOME" value="" />
|
|
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
|
<option name="IS_MODULE_SDK" value="true" />
|
|
<option name="ADD_CONTENT_ROOTS" value="true" />
|
|
<option name="ADD_SOURCE_ROOTS" value="true" />
|
|
<option name="launchJavascriptDebuger" value="false" />
|
|
<option name="port" value="8000" />
|
|
<option name="host" value="" />
|
|
<option name="additionalOptions" value="" />
|
|
<option name="browserUrl" value="" />
|
|
<option name="runTestServer" value="false" />
|
|
<option name="runNoReload" value="false" />
|
|
<option name="useCustomRunCommand" value="false" />
|
|
<option name="customRunCommand" value="" />
|
|
<method v="2" />
|
|
</configuration>
|
|
<configuration default="true" type="Python.DjangoServer" factoryName="Django server">
|
|
<module name="ITShowPlatform" />
|
|
<option name="INTERPRETER_OPTIONS" value="" />
|
|
<option name="PARENT_ENVS" value="true" />
|
|
<envs>
|
|
<env name="PYTHONUNBUFFERED" value="1" />
|
|
</envs>
|
|
<option name="SDK_HOME" value="C:\Users\PBDELL\Desktop\Django\ITShowPlatform\venv\Scripts\python.exe" />
|
|
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
|
<option name="IS_MODULE_SDK" value="false" />
|
|
<option name="ADD_CONTENT_ROOTS" value="true" />
|
|
<option name="ADD_SOURCE_ROOTS" value="true" />
|
|
<option name="launchJavascriptDebuger" value="false" />
|
|
<option name="port" value="8000" />
|
|
<option name="host" value="" />
|
|
<option name="additionalOptions" value="" />
|
|
<option name="browserUrl" value="" />
|
|
<option name="runTestServer" value="false" />
|
|
<option name="runNoReload" value="false" />
|
|
<option name="useCustomRunCommand" value="false" />
|
|
<option name="customRunCommand" value="" />
|
|
<method v="2" />
|
|
</configuration>
|
|
</component>
|
|
<component name="SvnConfiguration">
|
|
<configuration />
|
|
</component>
|
|
<component name="TaskManager">
|
|
<task active="true" id="Default" summary="Default task">
|
|
<changelist id="81247df9-f070-428a-8ff8-85c1a06086e7" name="Default Changelist" comment="" />
|
|
<created>1650187837343</created>
|
|
<option name="number" value="Default" />
|
|
<option name="presentableId" value="Default" />
|
|
<updated>1650187837343</updated>
|
|
<workItem from="1650187842307" duration="195000" />
|
|
<workItem from="1650644639049" duration="97000" />
|
|
<workItem from="1650644737751" duration="6000" />
|
|
<workItem from="1650644744696" duration="2432000" />
|
|
<workItem from="1650650513362" duration="57000" />
|
|
<workItem from="1650784711228" duration="1215000" />
|
|
<workItem from="1650790774256" duration="451000" />
|
|
<workItem from="1650903753930" duration="1368000" />
|
|
<workItem from="1651065854470" duration="1813000" />
|
|
<workItem from="1651738641048" duration="4689000" />
|
|
<workItem from="1651753611937" duration="5496000" />
|
|
</task>
|
|
<task id="LOCAL-00001" summary="fix">
|
|
<created>1650187914913</created>
|
|
<option name="number" value="00001" />
|
|
<option name="presentableId" value="LOCAL-00001" />
|
|
<option name="project" value="LOCAL" />
|
|
<updated>1650187914913</updated>
|
|
</task>
|
|
<task id="LOCAL-00002" summary="修改+合并前的提交">
|
|
<created>1650785005055</created>
|
|
<option name="number" value="00002" />
|
|
<option name="presentableId" value="LOCAL-00002" />
|
|
<option name="project" value="LOCAL" />
|
|
<updated>1650785005055</updated>
|
|
</task>
|
|
<option name="localTasksCounter" value="3" />
|
|
<servers />
|
|
</component>
|
|
<component name="TypeScriptGeneratedFilesManager">
|
|
<option name="version" value="2" />
|
|
</component>
|
|
<component name="Vcs.Log.Tabs.Properties">
|
|
<option name="TAB_STATES">
|
|
<map>
|
|
<entry key="MAIN">
|
|
<value>
|
|
<State>
|
|
<option name="FILTERS">
|
|
<map>
|
|
<entry key="branch">
|
|
<value>
|
|
<list>
|
|
<option value="origin/master" />
|
|
</list>
|
|
</value>
|
|
</entry>
|
|
</map>
|
|
</option>
|
|
</State>
|
|
</value>
|
|
</entry>
|
|
</map>
|
|
</option>
|
|
<option name="oldMeFiltersMigrated" value="true" />
|
|
</component>
|
|
<component name="VcsManagerConfiguration">
|
|
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
|
|
<MESSAGE value="fix" />
|
|
<MESSAGE value="修改+合并前的提交" />
|
|
<option name="LAST_COMMIT_MESSAGE" value="修改+合并前的提交" />
|
|
</component>
|
|
<component name="WindowStateProjectService">
|
|
<state x="460" y="12" key="#ITShowPlatform" timestamp="1651644593580">
|
|
<screen x="0" y="0" width="1536" height="864" />
|
|
</state>
|
|
<state x="460" y="12" key="#ITShowPlatform/0.0.1536.864@0.0.1536.864" timestamp="1651644593580" />
|
|
<state x="345" y="76" key="#SSH_Configurations" timestamp="1650645097799">
|
|
<screen x="0" y="0" width="1536" height="864" />
|
|
</state>
|
|
<state x="345" y="76" key="#SSH_Configurations/0.0.1536.864@0.0.1536.864" timestamp="1650645097799" />
|
|
<state x="223" y="87" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1651645077454">
|
|
<screen x="0" y="0" width="1536" height="864" />
|
|
</state>
|
|
<state x="223" y="87" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1536.864@0.0.1536.864" timestamp="1651645077454" />
|
|
<state x="93" y="93" width="1350" height="678" key="DiffContextDialog" timestamp="1650785927137">
|
|
<screen x="0" y="0" width="1536" height="864" />
|
|
</state>
|
|
<state x="93" y="93" width="1350" height="678" key="DiffContextDialog/0.0.1536.864@0.0.1536.864" timestamp="1650785927137" />
|
|
<state x="610" y="222" key="FileChooserDialogImpl" timestamp="1651755367804">
|
|
<screen x="0" y="0" width="1707" height="1027" />
|
|
</state>
|
|
<state x="549" y="187" key="FileChooserDialogImpl/0.0.1536.864@0.0.1536.864" timestamp="1651739204582" />
|
|
<state x="610" y="222" key="FileChooserDialogImpl/0.0.1707.1027@0.0.1707.1027" timestamp="1651755367804" />
|
|
<state x="615" y="398" key="Gitee.ShareDialog" timestamp="1650650539689">
|
|
<screen x="0" y="0" width="1536" height="864" />
|
|
</state>
|
|
<state x="615" y="398" key="Gitee.ShareDialog/0.0.1536.864@0.0.1536.864" timestamp="1650650539689" />
|
|
<state x="615" y="342" key="Github.Dialog.Accounts.Choose" timestamp="1650187937570">
|
|
<screen x="0" y="0" width="1536" height="864" />
|
|
</state>
|
|
<state x="615" y="342" key="Github.Dialog.Accounts.Choose/0.0.1536.864@0.0.1536.864" timestamp="1650187937570" />
|
|
<state width="1663" height="197" key="GridCell.Tab.0.bottom" timestamp="1651758555771">
|
|
<screen x="0" y="0" width="1707" height="1027" />
|
|
</state>
|
|
<state width="1493" height="216" key="GridCell.Tab.0.bottom/0.0.1536.864@0.0.1536.864" timestamp="1651746397546" />
|
|
<state width="1663" height="197" key="GridCell.Tab.0.bottom/0.0.1707.1027@0.0.1707.1027" timestamp="1651758555771" />
|
|
<state width="1663" height="197" key="GridCell.Tab.0.center" timestamp="1651758555771">
|
|
<screen x="0" y="0" width="1707" height="1027" />
|
|
</state>
|
|
<state width="1493" height="216" key="GridCell.Tab.0.center/0.0.1536.864@0.0.1536.864" timestamp="1651746397545" />
|
|
<state width="1663" height="197" key="GridCell.Tab.0.center/0.0.1707.1027@0.0.1707.1027" timestamp="1651758555771" />
|
|
<state width="1663" height="197" key="GridCell.Tab.0.left" timestamp="1651758555771">
|
|
<screen x="0" y="0" width="1707" height="1027" />
|
|
</state>
|
|
<state width="1493" height="216" key="GridCell.Tab.0.left/0.0.1536.864@0.0.1536.864" timestamp="1651746397545" />
|
|
<state width="1663" height="197" key="GridCell.Tab.0.left/0.0.1707.1027@0.0.1707.1027" timestamp="1651758555771" />
|
|
<state width="1663" height="197" key="GridCell.Tab.0.right" timestamp="1651758555771">
|
|
<screen x="0" y="0" width="1707" height="1027" />
|
|
</state>
|
|
<state width="1493" height="216" key="GridCell.Tab.0.right/0.0.1536.864@0.0.1536.864" timestamp="1651746397546" />
|
|
<state width="1663" height="197" key="GridCell.Tab.0.right/0.0.1707.1027@0.0.1707.1027" timestamp="1651758555771" />
|
|
<state width="1493" height="269" key="GridCell.Tab.1.bottom" timestamp="1651745777781">
|
|
<screen x="0" y="0" width="1536" height="864" />
|
|
</state>
|
|
<state width="1493" height="269" key="GridCell.Tab.1.bottom/0.0.1536.864@0.0.1536.864" timestamp="1651745777781" />
|
|
<state width="1493" height="269" key="GridCell.Tab.1.center" timestamp="1651745777781">
|
|
<screen x="0" y="0" width="1536" height="864" />
|
|
</state>
|
|
<state width="1493" height="269" key="GridCell.Tab.1.center/0.0.1536.864@0.0.1536.864" timestamp="1651745777781" />
|
|
<state width="1493" height="269" key="GridCell.Tab.1.left" timestamp="1651745777781">
|
|
<screen x="0" y="0" width="1536" height="864" />
|
|
</state>
|
|
<state width="1493" height="269" key="GridCell.Tab.1.left/0.0.1536.864@0.0.1536.864" timestamp="1651745777781" />
|
|
<state width="1493" height="269" key="GridCell.Tab.1.right" timestamp="1651745777781">
|
|
<screen x="0" y="0" width="1536" height="864" />
|
|
</state>
|
|
<state width="1493" height="269" key="GridCell.Tab.1.right/0.0.1536.864@0.0.1536.864" timestamp="1651745777781" />
|
|
<state x="147" y="69" key="MergeDialog" timestamp="1650785054273">
|
|
<screen x="0" y="0" width="1536" height="864" />
|
|
</state>
|
|
<state x="147" y="69" key="MergeDialog/0.0.1536.864@0.0.1536.864" timestamp="1650785054273" />
|
|
<state x="396" y="185" key="MultipleFileMergeDialog" timestamp="1650903868503">
|
|
<screen x="0" y="0" width="1536" height="864" />
|
|
</state>
|
|
<state x="396" y="185" key="MultipleFileMergeDialog/0.0.1536.864@0.0.1536.864" timestamp="1650903868503" />
|
|
<state x="300" y="90" key="SettingsEditor" timestamp="1651754341804">
|
|
<screen x="0" y="0" width="1707" height="1027" />
|
|
</state>
|
|
<state x="270" y="76" key="SettingsEditor/0.0.1536.864@0.0.1536.864" timestamp="1651645101984" />
|
|
<state x="300" y="90" key="SettingsEditor/0.0.1707.1027@0.0.1707.1027" timestamp="1651754341804" />
|
|
<state x="401" y="191" key="Vcs.Push.Dialog.v2" timestamp="1651754700403">
|
|
<screen x="0" y="0" width="1707" height="1027" />
|
|
</state>
|
|
<state x="361" y="161" key="Vcs.Push.Dialog.v2/0.0.1536.864@0.0.1536.864" timestamp="1650187932255" />
|
|
<state x="401" y="191" key="Vcs.Push.Dialog.v2/0.0.1707.1027@0.0.1707.1027" timestamp="1651754700403" />
|
|
<state x="93" y="93" width="1350" height="678" key="com.intellij.history.integration.ui.views.FileHistoryDialog" timestamp="1651645036813">
|
|
<screen x="0" y="0" width="1536" height="864" />
|
|
</state>
|
|
<state x="93" y="93" width="1350" height="678" key="com.intellij.history.integration.ui.views.FileHistoryDialog/0.0.1536.864@0.0.1536.864" timestamp="1651645036813" />
|
|
<state x="563" y="345" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1650784772214">
|
|
<screen x="0" y="0" width="1536" height="864" />
|
|
</state>
|
|
<state x="563" y="345" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1536.864@0.0.1536.864" timestamp="1650784772214" />
|
|
<state x="1000" y="164" key="ftp.server.browser" timestamp="1651644223975">
|
|
<screen x="0" y="0" width="1536" height="864" />
|
|
</state>
|
|
<state x="1000" y="164" key="ftp.server.browser/0.0.1536.864@0.0.1536.864" timestamp="1651644223975" />
|
|
<state x="520" y="210" key="git4idea.merge.GitMergeDialog" timestamp="1650785115917">
|
|
<screen x="0" y="0" width="1536" height="864" />
|
|
</state>
|
|
<state x="520" y="210" key="git4idea.merge.GitMergeDialog/0.0.1536.864@0.0.1536.864" timestamp="1650785115917" />
|
|
<state x="633" y="413" key="git4idea.remote.GitConfigureRemotesDialog" timestamp="1651754354143">
|
|
<screen x="0" y="0" width="1707" height="1027" />
|
|
</state>
|
|
<state x="633" y="413" key="git4idea.remote.GitConfigureRemotesDialog/0.0.1707.1027@0.0.1707.1027" timestamp="1651754354143" />
|
|
</component>
|
|
</project> |