ITStudio_OUC/ITShowPlatform
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	.idea/workspace.xml
This commit is contained in:
康家辉
2022-05-05 19:22:20 +08:00
parent 66ea27faee 7fa3281a5f
commit 776feb9fb6
2 changed files with 193 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/workspace.xml
Generated
+184 -26
View File
@@ -31,12 +31,50 @@
</select> </select>
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="81247df9-f070-428a-8ff8-85c1a06086e7" name="Default Changelist" comment="完善了一下serializers"> <list default="true" id="81247df9-f070-428a-8ff8-85c1a06086e7" name="Default Changelist" comment="第一次合并+上线&#10;修改了history路由">
<change afterPath="$PROJECT_DIR$/Apps/history/migrations/0001_initial.py" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Apps/history/migrations/__init__.py" afterDir="false" />
<change afterPath="$PROJECT_DIR$/media/lFUQpbHJ8k.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/ITShowPlatform.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/ITShowPlatform.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/deployment.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/deployment.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
<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$/history/migrations/0001_initial.py" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/ITShowPlatform/settings.py" beforeDir="false" afterPath="$PROJECT_DIR$/ITShowPlatform/settings.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/history/models.py" beforeDir="false" afterPath="$PROJECT_DIR$/history/models.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/ITShowPlatform/urls.py" beforeDir="false" afterPath="$PROJECT_DIR$/ITShowPlatform/urls.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/history/serializers.py" beforeDir="false" afterPath="$PROJECT_DIR$/history/serializers.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/comments/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/__init__.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/history/views.py" beforeDir="false" afterPath="$PROJECT_DIR$/history/views.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/comments/admin.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/comments/admin.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/comments/apps.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/comments/apps.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/comments/migrations/0001_initial.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/comments/migrations/0001_initial.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/comments/migrations/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/comments/__init__.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/comments/models.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/comments/models.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/comments/serializers.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/comments/serializers.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/comments/tests.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/comments/tests.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/comments/urls.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/comments/urls.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/comments/views.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/comments/views.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/enroll/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/comments/migrations/__init__.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/enroll/admin.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/enroll/admin.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/enroll/apps.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/enroll/apps.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/enroll/email.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/enroll/email.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/enroll/migrations/0001_initial.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/enroll/migrations/0001_initial.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/enroll/migrations/0002_alter_new_member_schedule_and_more.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/enroll/migrations/0002_alter_new_member_schedule_and_more.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/enroll/migrations/0003_alter_new_member_email_alter_new_member_phone_number.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/enroll/migrations/0003_alter_new_member_email_alter_new_member_phone_number.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/enroll/migrations/0004_alter_emailverifyrecord_send_time.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/enroll/migrations/0004_alter_emailverifyrecord_send_time.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/enroll/migrations/0005_alter_emailverifyrecord_code.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/enroll/migrations/0005_alter_emailverifyrecord_code.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/enroll/migrations/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/enroll/__init__.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/enroll/models.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/enroll/models.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/enroll/serializer.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/enroll/serializers.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/enroll/tests.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/enroll/tests.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/enroll/urls.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/enroll/urls.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/enroll/views.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/enroll/views.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/history/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/enroll/migrations/__init__.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/history/admin.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/history/admin.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/history/apps.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/history/apps.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/history/migrations/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/history/__init__.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/history/models.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/history/models.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/history/serializers.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/history/serializers.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/history/tests.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/history/tests.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/history/urls.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/history/urls.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/history/views.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/history/views.py" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -46,6 +84,13 @@
<component name="DjangoConsoleOptions" custom-start-script="import sys; print('Python %s on %s' % (sys.version, sys.platform))&#10;import django; print('Django %s' % django.get_version())&#10;sys.path.extend([WORKING_DIR_AND_PYTHON_PATHS])&#10;if 'setup' in dir(django): django.setup()&#10;import django_manage_shell; django_manage_shell.run(PROJECT_ROOT)"> <component name="DjangoConsoleOptions" custom-start-script="import sys; print('Python %s on %s' % (sys.version, sys.platform))&#10;import django; print('Django %s' % django.get_version())&#10;sys.path.extend([WORKING_DIR_AND_PYTHON_PATHS])&#10;if 'setup' in dir(django): django.setup()&#10;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))&#10;import django; print('Django %s' % django.get_version())&#10;sys.path.extend([WORKING_DIR_AND_PYTHON_PATHS])&#10;if 'setup' in dir(django): django.setup()&#10;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))&#10;import django; print('Django %s' % django.get_version())&#10;sys.path.extend([WORKING_DIR_AND_PYTHON_PATHS])&#10;if 'setup' in dir(django): django.setup()&#10;import django_manage_shell; django_manage_shell.run(PROJECT_ROOT)" />
</component> </component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
<option value="Python Script" />
</list>
</option>
</component>
<component name="Git.Settings"> <component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component> </component>
@@ -55,6 +100,7 @@
<component name="ProjectId" id="27v5hLzeA3tTKg74z1HrGlKm4g2" /> <component name="ProjectId" id="27v5hLzeA3tTKg74z1HrGlKm4g2" />
<component name="ProjectLevelVcsManager"> <component name="ProjectLevelVcsManager">
<OptionsSetting value="false" id="Update" /> <OptionsSetting value="false" id="Update" />
<ConfirmationsSetting value="2" id="Add" />
</component> </component>
<component name="ProjectViewState"> <component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" /> <option name="hideEmptyMiddlePackages" value="true" />
@@ -64,12 +110,21 @@
<option name="sortByType" value="true" /> <option name="sortByType" value="true" />
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
<property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" /> <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" /> <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
<property name="SHARE_PROJECT_CONFIGURATION_FILES" 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="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../Todo" /> <property name="last_opened_file_path" value="$PROJECT_DIR$/Apps" />
<property name="settings.editor.selected.configurable" value="web.server" /> <property name="nodejs_package_manager_path" value="npm" />
<property name="restartRequiresConfirmation" value="false" />
<property name="settings.editor.selected.configurable" value="com.jetbrains.django.DjangoModulesConfigurable" />
</component>
<component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS">
<recent name="C:\Users\PBDELL\Desktop\Django\ITShowPlatform\Apps" />
</key>
</component> </component>
<component name="RunManager"> <component name="RunManager">
<configuration name="ITShowPlatform" type="Python.DjangoServer" factoryName="Django server"> <configuration name="ITShowPlatform" type="Python.DjangoServer" factoryName="Django server">
@@ -80,8 +135,31 @@
<env name="PYTHONUNBUFFERED" value="1" /> <env name="PYTHONUNBUFFERED" value="1" />
<env name="DJANGO_SETTINGS_MODULE" value="ITShowPlatform.settings" /> <env name="DJANGO_SETTINGS_MODULE" value="ITShowPlatform.settings" />
</envs> </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="SDK_HOME" value="C:\Users\PBDELL\Desktop\Django\ITShowPlatform\venv\Scripts\python.exe" />
<option name="WORKING_DIRECTORY" value="" /> <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<option name="IS_MODULE_SDK" value="false" /> <option name="IS_MODULE_SDK" value="false" />
<option name="ADD_CONTENT_ROOTS" value="true" /> <option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" /> <option name="ADD_SOURCE_ROOTS" value="true" />
@@ -97,7 +175,6 @@
<method v="2" /> <method v="2" />
</configuration> </configuration>
</component> </component>
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
<component name="SvnConfiguration"> <component name="SvnConfiguration">
<configuration /> <configuration />
</component> </component>
@@ -117,10 +194,7 @@
<workItem from="1650790774256" duration="451000" /> <workItem from="1650790774256" duration="451000" />
<workItem from="1650903753930" duration="1368000" /> <workItem from="1650903753930" duration="1368000" />
<workItem from="1651065854470" duration="1813000" /> <workItem from="1651065854470" duration="1813000" />
<workItem from="1651235869595" duration="8446000" /> <workItem from="1651738641048" duration="4689000" />
<workItem from="1651248194966" duration="1722000" />
<workItem from="1651275393720" duration="5083000" />
<workItem from="1651322613788" duration="6665000" />
</task> </task>
<task id="LOCAL-00001" summary="fix"> <task id="LOCAL-00001" summary="fix">
<created>1650187914913</created> <created>1650187914913</created>
@@ -136,18 +210,11 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1650785005055</updated> <updated>1650785005055</updated>
</task> </task>
<task id="LOCAL-00003" summary="完善了一下serializers"> <option name="localTasksCounter" value="3" />
<created>1651233809599</created>
<option name="number" value="00003" />
<option name="presentableId" value="LOCAL-00003" />
<option name="project" value="LOCAL" />
<updated>1651233809599</updated>
</task>
<option name="localTasksCounter" value="4" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
<option name="version" value="3" /> <option name="version" value="2" />
</component> </component>
<component name="Vcs.Log.Tabs.Properties"> <component name="Vcs.Log.Tabs.Properties">
<option name="TAB_STATES"> <option name="TAB_STATES">
@@ -174,12 +241,103 @@
<option name="oldMeFiltersMigrated" value="true" /> <option name="oldMeFiltersMigrated" value="true" />
</component> </component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
<MESSAGE value="fix" /> <MESSAGE value="fix" />
<MESSAGE value="修改+合并前的提交" /> <MESSAGE value="修改+合并前的提交" />
<MESSAGE value="完善了一下serializers" /> <option name="LAST_COMMIT_MESSAGE" value="修改+合并前的提交" />
<option name="LAST_COMMIT_MESSAGE" value="完善了一下serializers" />
</component> </component>
<component name="com.intellij.coverage.CoverageDataManagerImpl"> <component name="WindowStateProjectService">
<SUITE FILE_PATH="coverage/ITShowPlatform$urls.coverage" NAME="urls Coverage Results" MODIFIED="1650768597611" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/history" /> <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="549" y="187" key="FileChooserDialogImpl" timestamp="1651739204582">
<screen x="0" y="0" width="1536" height="864" />
</state>
<state x="549" y="187" key="FileChooserDialogImpl/0.0.1536.864@0.0.1536.864" timestamp="1651739204582" />
<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="1493" height="216" key="GridCell.Tab.0.bottom" timestamp="1651746397547">
<screen x="0" y="0" width="1536" height="864" />
</state>
<state width="1493" height="216" key="GridCell.Tab.0.bottom/0.0.1536.864@0.0.1536.864" timestamp="1651746397546" />
<state width="1493" height="216" key="GridCell.Tab.0.center" timestamp="1651746397545">
<screen x="0" y="0" width="1536" height="864" />
</state>
<state width="1493" height="216" key="GridCell.Tab.0.center/0.0.1536.864@0.0.1536.864" timestamp="1651746397545" />
<state width="1493" height="216" key="GridCell.Tab.0.left" timestamp="1651746397545">
<screen x="0" y="0" width="1536" height="864" />
</state>
<state width="1493" height="216" key="GridCell.Tab.0.left/0.0.1536.864@0.0.1536.864" timestamp="1651746397545" />
<state width="1493" height="216" key="GridCell.Tab.0.right" timestamp="1651746397546">
<screen x="0" y="0" width="1536" height="864" />
</state>
<state width="1493" height="216" key="GridCell.Tab.0.right/0.0.1536.864@0.0.1536.864" timestamp="1651746397546" />
<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="270" y="76" key="SettingsEditor" timestamp="1651645101984">
<screen x="0" y="0" width="1536" height="864" />
</state>
<state x="270" y="76" key="SettingsEditor/0.0.1536.864@0.0.1536.864" timestamp="1651645101984" />
<state x="361" y="161" key="Vcs.Push.Dialog.v2" timestamp="1650187932255">
<screen x="0" y="0" width="1536" height="864" />
</state>
<state x="361" y="161" key="Vcs.Push.Dialog.v2/0.0.1536.864@0.0.1536.864" timestamp="1650187932255" />
<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" />
</component> </component>
</project> </project>
utils/get_error_msg.py
+9
View File
@@ -0,0 +1,9 @@
def get_error_msg(code="20000"):
error_set = {
"20000": "成功",
"50000": "意外错误",
"50403": "Forbidden",
"40000": "请求方法错误",
"40001": "JSON解析错误",
}
return error_set.get(str(code))