p3mk6vbs7
/
Django
1
0
Fork 1
Code Issues Pull Requests 3 Packages Projects Releases Wiki Activity

解决合并冲突：处理doc/报告.docx文件

Browse Source
pull/6/head^2^2
xm 4 months ago
parent 53c15adc39 3d2f28dc80
commit e8f91c1633
8 changed files with 155 additions and 1 deletions
Show Stats Download Patch File Download Diff File

15
.idea/django.iml
Unescape View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<module version="4"> <!-- 模块声明，版本为4 -->
<component name="PyDocumentationSettings"> <!-- Python文档设置组件，用于配置Python文档相关的格式等设置 -->
<option name="format" value="PLAIN" /> <!-- 文档格式选项，设置为纯文本（PLAIN）格式 -->
<option name="myDocStringFormat" value="Plain" /> <!-- 自定义文档字符串格式选项，设置为纯文本（Plain）格式 -->
</component>
<component name="TemplatesService"> <!-- 模板服务组件，用于配置模板相关的服务设置 -->
<option name="TEMPLATE_CONFIGURATION" value="Jinja2" /> <!-- 模板配置选项，设置使用Jinja2模板引擎 -->
<option name="TEMPLATE_FOLDERS"> <!-- 模板文件夹选项，用于指定模板文件所在的文件夹列表 -->
<list>
<option value="$MODULE_DIR$/src/DjangoBlog-master/DjangoBlog-master/templates" /> <!-- 具体的模板文件夹路径，指向项目中DjangoBlog-master下的templates目录 -->
</list>
</option>
</component>
</module>

34
.idea/inspectionProfiles/Project_Default.xml
Unescape View File

@ -1,17 +1,29 @@
<<<<<<< HEAD
<component name="InspectionProjectProfileManager">
<profile version="1.0">
<option name="myName" value="Project Default" />
<inspection_tool class="PyPackageRequirementsInspection" enabled="true" level="WARNING" enabled_by_default="true">
<option name="ignoredPackages">
=======
<component name="InspectionProjectProfileManager"> <!-- 检查配置文件的根节点，管理项目级别的检查配置 -->
<profile version="1.0"> <!-- 检查配置文件的版本信息 -->
<option name="myName" value="Project Default" /> <!-- 配置文件的名称为“Project Default” -->
<inspection_tool class="PyPackageRequirementsInspection" enabled="true" level="WARNING" enabled_by_default="true"> <!-- PyPackageRequirementsInspection 检查工具的配置，用于检查Python包依赖 -->
<option name="ignoredPackages"> <!-- 配置忽略检查的Python包列表 -->
>>>>>>> origin/gjw_branch
<list>
<option value="bleach" />
<option value="borax" />
<option value="bottle" />
<<<<<<< HEAD
<option value="certifi" />
=======
>>>>>>> origin/gjw_branch
<option value="cffi" />
<option value="charset-normalizer" />
<option value="colorama" />
<option value="coverage" />
<<<<<<< HEAD
<option value="Django" />
<option value="django-appconf" />
<option value="django-compressor" />
@ -21,6 +33,14 @@
<option value="django-mdeditor" />
<option value="django-uuslug" />
<option value="elasticsearch" />
=======
<option value="django-appconf" />
<option value="django-compressor" />
<option value="django-echarts" />
<option value="django-ipware" />
<option value="django-mdeditor" />
<option value="django-uuslug" />
>>>>>>> origin/gjw_branch
<option value="elasticsearch-dsl" />
<option value="frozenlist" />
<option value="gevent" />
@ -30,13 +50,19 @@
<option value="jieba" />
<option value="Jinja2" />
<option value="jsonpickle" />
<<<<<<< HEAD
<option value="Markdown" />
=======
>>>>>>> origin/gjw_branch
<option value="MarkupSafe" />
<option value="multidict" />
<option value="mysqlclient" />
<option value="openai" />
<<<<<<< HEAD
<option value="packaging" />
<option value="pillow" />
=======
>>>>>>> origin/gjw_branch
<option value="prettytable" />
<option value="propcache" />
<option value="pycparser" />
@ -54,6 +80,7 @@
<option value="setuptools" />
<option value="simplejson" />
<option value="six" />
<<<<<<< HEAD
<option value="sqlparse" />
<option value="text-unidecode" />
<option value="tqdm" />
@ -62,6 +89,13 @@
<option value="ua-parser" />
<option value="ua-parser-builtins" />
<option value="urllib3" />
=======
<option value="text-unidecode" />
<option value="tqdm" />
<option value="typing_extensions" />
<option value="ua-parser" />
<option value="ua-parser-builtins" />
>>>>>>> origin/gjw_branch
<option value="user-agents" />
<option value="wcwidth" />
<option value="webencodings" />

7
.idea/inspectionProfiles/profiles_settings.xml
Unescape View File

@ -1,6 +1,13 @@
<<<<<<< HEAD
<component name="InspectionProjectProfileManager">
<settings>
<option name="USE_PROJECT_PROFILE" value="false" />
<version value="1.0" />
=======
<component name="InspectionProjectProfileManager"> <!-- 组件：检查项目配置文件管理器，用于管理项目级别的检查配置相关设置 -->
<settings> <!-- 配置检查相关的设置内容 -->
<option name="USE_PROJECT_PROFILE" value="false" /> <!-- 选项：是否使用项目级别的检查配置文件，值为false表示不使用 -->
<version value="1.0" /> <!-- 配置版本信息，版本值为1.0 -->
>>>>>>> origin/gjw_branch
</settings>
</component>

6
.idea/misc.xml
Unescape View File

@ -1,7 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Black">
<<<<<<< HEAD
<option name="sdkName" value="Python 3.13" />
</component>
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.13" project-jdk-type="Python SDK" />
=======
<option name="sdkName" value="Python 3.12" />
</component>
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.12" project-jdk-type="Python SDK" />
>>>>>>> origin/gjw_branch
</project>

4
.idea/vcs.xml
Unescape View File

@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<<<<<<< HEAD
<mapping directory="" vcs="Git" />
<mapping directory="$PROJECT_DIR$/src/DjangoBlog-master/DjangoBlog" vcs="Git" />
=======
<mapping directory="$PROJECT_DIR$" vcs="Git" />
>>>>>>> origin/gjw_branch
</component>
</project>

88
.idea/workspace.xml
Unescape View File

@ -0,0 +1,88 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="AutoImportSettings">
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="feebdecb-aab4-468a-89d2-02ab184d6524" name="更改" comment="" />
<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="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="ProjectColorInfo">{
&quot;customColor&quot;: &quot;&quot;,
&quot;associatedIndex&quot;: 1
}</component>
<component name="ProjectId" id="33xBFgI9uhuAj9lNSHkgcMEmGEr" />
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent"><![CDATA[{
"keyToString": {
"ModuleVcsDetector.initialDetectionPerformed": "true",
"RunOnceActivity.OpenDjangoStructureViewOnStart": "true",
"RunOnceActivity.ShowReadmeOnStart": "true",
"RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252": "true",
"git-widget-placeholder": "main",
"node.js.detected.package.eslint": "true",
"node.js.detected.package.tslint": "true",
"node.js.selected.package.eslint": "(autodetect)",
"node.js.selected.package.tslint": "(autodetect)",
"vue.rearranger.settings.migration": "true"
}
}]]></component>
<component name="RunManager">
<configuration name="django" type="Python.DjangoServer" factoryName="Django server">
<module name="django" />
<option name="ENV_FILES" value="" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<envs>
<env name="PYTHONUNBUFFERED" value="1" />
</envs>
<option name="SDK_HOME" value="" />
<option name="WORKING_DIRECTORY" value="" />
<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="SharedIndexes">
<attachedChunks>
<set>
<option value="bundled-js-predefined-d6986cc7102b-b598e85cdad2-JavaScript-PY-252.25557.178" />
<option value="bundled-python-sdk-ce6832f46686-7b97d883f26b-com.jetbrains.pycharm.pro.sharedIndexes.bundled-PY-252.25557.178" />
</set>
</attachedChunks>
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="默认任务">
<changelist id="feebdecb-aab4-468a-89d2-02ab184d6524" name="更改" comment="" />
<created>1760248745025</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1760248745025</updated>
<workItem from="1760248747064" duration="34000" />
<workItem from="1760248891758" duration="6962000" />
</task>
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="3" />
</component>
</project>

2
src/DjangoBlog-master_1/.idea/vcs.xml
Unescape View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<project version="4"> #11
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
<mapping directory="$PROJECT_DIR$/DjangoBlog" vcs="Git" />

0
src/test.py
Unescape View File

Write Preview
Loading…
Cancel
Save