Compare commits

...

31 Commits

Author SHA1 Message Date
buaa20241040 55eadcca18 Merge pull request '将傅新峰新分支推送至远程仓库并向 dev 分支发起 Pull Request' (#3) from Feature-20241040 into dev
2 years ago
buaa20241018 bbe88796be Merge pull request '20241018' (#2) from Feature-20241018 into dev
2 years ago
buaa20241032 42ffe6d9e6 Merge pull request '将新分支推送至远程仓库并向 dev 分支发起 Pull Request' (#4) from Feature-20241032 into dev
2 years ago
buaa20241029 7fd28c6e8d 合并Feature-20241029至dev
2 years ago
buaa20241032 cfd8d9e031 在本地的 Feature-学号 分支上修改各自的 Function-学号.py 文件
2 years ago
熊昕然 9ae3c5917e 20241018
2 years ago
fuxinfeng ad056ebd55 20241040
2 years ago
徐天行 d08e77f02e 更改Function-20241029.py文件
2 years ago
熊昕然 4f2f11932f Merge branch 'dev' of https://bdgit.educoder.net/buaa20241029/BUAA-SE-2023-Lab01-Group9-remake into dev
2 years ago
buaa20241032 1b6559c931 Merge branch 'dev' of https://bdgit.educoder.net/buaa20241029/BUAA-SE-2023-Lab01-Group9-remake into dev
2 years ago
熊昕然 adf6527418 Conflict Solved
2 years ago
buaa20241032 49c6f920d8 Conflict Solved
2 years ago
吴鑫宇 4432f17902 Conflict Solved
2 years ago
熊昕然 a744b358f1 Merge branch 'Student-20241018' into dev
2 years ago
buaa20241032 557cd95e65 Merge branch 'Student-20241032' into dev
2 years ago
熊昕然 7130514059 在本地将 Student-学号 分支合并到 dev 分支
2 years ago
徐天行 a7549e5fae Merge branch 'Student-20241029' into dev
2 years ago
徐天行 cd91ef205a 添加项目文件
2 years ago
buaa20241032 b91f014303 组员在本地将 Student-学号 分支合并到 dev 分支
2 years ago
徐天行 a2a4e0f3f3 编写main.py
2 years ago
吴鑫宇 46708dc4fb Merge branch 'Student-20241027' into dev
2 years ago
吴鑫宇 283bba4469 change main.py
2 years ago
吴鑫宇 ad867e757a Merge remote-tracking branch 'origin/dev' into dev
2 years ago
熊昕然 6ef9a5213f Merge branch 'dev' of https://bdgit.educoder.net/buaa20241029/BUAA-SE-2023-Lab01-Group9-remake into dev
2 years ago
fuxinfeng e18403c92e Merge branch 'dev' of https://bdgit.educoder.net/buaa20241029/BUAA-SE-2023-Lab01-Group9-remake into dev
2 years ago
buaa20241032 e7403e394b Merge branch 'dev' of https://bdgit.educoder.net/buaa20241029/BUAA-SE-2023-Lab01-Group9-remake into dev
2 years ago
fuxinfeng 9d64c8d12b 20241040
2 years ago
buaa20241032 4dfb347803 在本地 Student-20241032 分支添加 Function-学号.py 文件
2 years ago
熊昕然 8a2dcc760d 在本地 Student-学号 分支添加 Function-学号.py 文件
2 years ago
吴鑫宇 55bb3ece0b change Function-20241027.py
2 years ago
吴鑫宇 effd91a64a add Function-20241027.py
2 years ago

8
.idea/.gitignore vendored

@ -0,0 +1,8 @@
# 默认忽略的文件
/shelf/
/workspace.xml
# 数据源本地存储已忽略文件
/dataSources/
/dataSources.local.xml
# 基于编辑器的 HTTP 客户端请求
/httpRequests/

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="PYTHON_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

@ -0,0 +1,24 @@
<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">
<value>
<list size="11">
<item index="0" class="java.lang.String" itemvalue="environs" />
<item index="1" class="java.lang.String" itemvalue="tornado" />
<item index="2" class="java.lang.String" itemvalue="meinheld" />
<item index="3" class="java.lang.String" itemvalue="aiohttp" />
<item index="4" class="java.lang.String" itemvalue="lxml" />
<item index="5" class="java.lang.String" itemvalue="gevent" />
<item index="6" class="java.lang.String" itemvalue="requests" />
<item index="7" class="java.lang.String" itemvalue="loguru" />
<item index="8" class="java.lang.String" itemvalue="supervisor" />
<item index="9" class="java.lang.String" itemvalue="Flask" />
<item index="10" class="java.lang.String" itemvalue="attrs" />
</list>
</value>
</option>
</inspection_tool>
</profile>
</component>

@ -0,0 +1,6 @@
<component name="InspectionProjectProfileManager">
<settings>
<option name="USE_PROJECT_PROFILE" value="false" />
<version value="1.0" />
</settings>
</component>

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.8 (study)" project-jdk-type="Python SDK" />
</project>

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/BUAA-SE-2023-Lab01-Group9-remake.iml" filepath="$PROJECT_DIR$/.idea/BUAA-SE-2023-Lab01-Group9-remake.iml" />
</modules>
</component>
</project>

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

@ -0,0 +1,2 @@
print('My Student_ID is 20241018')
print('My Name is 熊昕然')

@ -0,0 +1 @@
print('My Student_ID is 20241027')

@ -1 +1,2 @@
print('My Student_ID is 20241029')
print('My Student_ID is 20241029')
print('My Name is 徐天行')

@ -0,0 +1,2 @@
print('My Student_ID is 20241032')
print('My Name is 吴南李')

@ -0,0 +1,2 @@
print('My Student_ID is 20241040')
print('My Name is 傅新峰')

@ -0,0 +1,2 @@
import os
os.system('python Function-20241029.py')
Loading…
Cancel
Save