对函数进行解耦，代码规范化 #17

Merged

hnu202306060209 merged 71 commits from develop into main

hnu202306060209 commented

Collaborator

There is no content yet.

hnu202306060209 added 71 commits

a58fa544a3 v0.0

5a4ec41169 Merge branch 'ybw_branch' of https://bdgit.educoder.net/ppy4sjqvf/pairedProject

5a4a9efede Merge pull request 'v0.0' (#1 ) from ybw_branch into develop

62c59450f5 v1.0 题目处理逻辑还没弄好，未与前端对接

08f3d8ff8f v0.0

0774642a33 Merge branch 'master' of https://bdgit.educoder.net/ppy4sjqvf/pairedProject

997acd73ec Merge branch 'ybw_branch' of https://bdgit.educoder.net/ppy4sjqvf/pairedProject

# Conflicts:
#	src/main/java/module-info.java

e2e0d99656 v1.0 大概的框架已经写好，未与后端对接

c7763f9ce9 v1.1 大概的框架已经写好，与后端能都对接，但功能未完善

f063724d4b v1.1 大概的框架已经写好，与后端能都对接，但功能未完善

42d1b8716a v1.1 登录、注册接口书写完成

deb026c631 v1.2 登录、注册接口书写完成

5558669058 v1.2

368c357ce4 Merge branch 'ybw_branch' of https://bdgit.educoder.net/ppy4sjqvf/pairedProject

# Conflicts:
#	src/main/java/com/ybw/mathapp/service/StartController.java

e48fe3fbb3 Merge branch 'wsf_branch' of https://bdgit.educoder.net/ppy4sjqvf/pairedProject

# Conflicts:
#	src/main/java/com/wsf/mathapp/view/RegisterView.java
#	src/main/java/com/ybw/mathapp/LoginAndRegister.java
#	src/main/java/com/ybw/mathapp/service/StartController.java

1c618fd01a v1.3

379a619104 v1.3 题目生成逻辑实现

1ec2d114e3 v1.3 题目生成逻辑实现

8d02f5a3f4 v1.3

297c3a9146 Merge branch 'ybw_branch' of https://bdgit.educoder.net/ppy4sjqvf/pairedProject

# Conflicts:
#	src/main/java/com/ybw/mathapp/service/Calculate.java
#	src/main/java/com/ybw/mathapp/service/ChoiceGenerator.java
#	src/main/java/com/ybw/mathapp/service/FileHandler.java
#	src/main/java/com/ybw/mathapp/service/PrimarySchoolGenerator.java
#	src/main/java/com/ybw/mathapp/service/QuestionDeduplicator.java
#	src/main/java/com/ybw/mathapp/service/SeniorHighGenerator.java
#	src/main/java/com/ybw/mathapp/service/StartController.java

58a80873a0 v1.4 基本功能已经实现，修改密码功能暂未实现

5c0611eac5 v1.5 重复登录功能有bug，已修复

6ecc72533a v1.4 基本完成

2e85231da8 Merge branch 'ybw_branch' of https://bdgit.educoder.net/ppy4sjqvf/pairedProject

# Conflicts:
#	src/main/java/com/ybw/mathapp/entity/User.java
#	src/main/java/com/ybw/mathapp/system/LogSystem.java

cf59537031 v1.5 完成

b85959fdfe Merge branch 'ybw_branch' of https://bdgit.educoder.net/ppy4sjqvf/pairedProject

f77a0f8cc9 v2.0 添加了用户名功能，并测试基本功能

1aef7d378b Merge branch 'wsf_branch' of https://bdgit.educoder.net/ppy4sjqvf/pairedProject

# Conflicts:
#	src/main/java/com/wsf/mathapp/view/RegisterView.java
#	src/main/java/com/ybw/mathapp/LoginAndRegister.java
#	src/main/java/com/ybw/mathapp/service/StartController.java

ab5345e732 v2.0 添加了用户名功能，并测试基本功能

6ecbb3d00f Merge pull request '最终版' (#2 ) from wsf_branch into develop

2f85a10320 v1.5 完成

8a477d5d69 v2.1 添加了用户名功能，并测试基本功能

a8bc234395 Merge branch 'ybw_branch' of https://bdgit.educoder.net/ppy4sjqvf/pairedProject

# Conflicts:
#	users.txt

3457e64dcc v1.6 小学题目排除除零问题

417928c39a Merge remote-tracking branch 'origin/ybw_branch'

7b4118d63e Merge remote-tracking branch 'origin/master'

4b62d84eca v2.2 添加了用户名功能，并测试基本功能

bc34de13ce v1.6 题目生成逻辑修改完毕

7d00dae5ef Merge branch 'ybw_branch' of https://bdgit.educoder.net/ppy4sjqvf/pairedProject

# Conflicts:
#	src/main/java/com/ybw/mathapp/Main.java

74de280d61 v3.0 所有功能已测试完毕，最终版

29eb228bc8 Merge pull request '测试版' (#4 ) from master into develop

611c7f5c9f v3.1 修改一些小bug，例如注册界面到登录界面再到注册界面时，上一次注册的数据还在

ae539ea7df v3.1 修改一些小bug，例如注册界面到登录界面再到注册界面时，上一次注册的数据还在

0e061b1418 v3.1 修改一些小bug，例如注册界面到登录界面再到注册界面时，上一次注册的数据还在

f3df764283 Merge pull request '修改一些小bug，例如注册界面到登录界面再到注册界面时，上一次注册的数据还在' (#5 ) from master into develop

641b44d8f6 v1.7 代码格式修改完成

9f91a754b0 v1.8 代码完成解耦

c3a4ba89a4 v1.9 user.txt提交

fcb049adf8 Merge remote-tracking branch 'origin/develop'

# Conflicts:
#	users.txt

8b7a841d0f v2.0 拉取develop中的user.txt后提交

16b893a096 Merge pull request '后端代码解耦且格式设置完毕' (#8 ) from ybw_branch into develop

7e1dec0ae4 v2.1 初中题目生成逻辑bug修复，users文档删除

e40969e573 Merge pull request '初中题目生成逻辑bug修复，users文档删除' (#9 ) from ybw_branch into develop

79bb5862fe Merge branch 'develop' of https://bdgit.educoder.net/ppy4sjqvf/pairedProject

91849ad261 v3.2 修改一些小bug

8328a98580 Merge branch 'develop' of https://bdgit.educoder.net/ppy4sjqvf/pairedProject

b08452bfcf Merge pull request '功能基本完善' (#10 ) from master into develop

974c74b7be v3.3 对前端长方法进行解耦，并使代码符合规范

84bb1008cb v3.3 对前端长方法进行解耦，并使代码符合规范

794fa5607d Merge pull request '前端代码格式修改完毕且解耦成功' (#11 ) from master into develop

773d83be67 Merge pull request '对前端长方法进行解耦，并使代码符合规范' (#12 ) from master into develop

bc0e65dbeb v2.2 后端代码checkstyle检查完毕

f223a5415d Merge pull request '后端代码checkstyle检查完毕' (#13 ) from ybw_branch into develop

c384fea901 v2.3 修复LevelSelectionView文件

d55ede49b2 Merge pull request '修复LevelSelectionView文件' (#14 ) from ybw_branch into develop

1c1d69d078 v2.4 JAR包更改pom文件

9aa5b173a7 Merge pull request 'JAR包更改pom文件' (#15 ) from ybw_branch into develop

e53d79d0ab v3.4 攥写说明文档

f2c0200f21 v3.4 攥写说明文档

1477a66dbd Merge remote-tracking branch 'origin/master'

18bd660033 Merge pull request '对函数进行解耦，代码规范化' (#16 ) from master into develop

hnu202306060209 merged commit 62e6d95ffd into main 4 months ago

hnu202306060209 referenced this issue from a commit

Merge pull request '对函数进行解耦，代码规范化' (#17) from develop into main

The pull request has been merged as 62e6d95ffd.

No reviewers

No Label

No Milestone

No project

No Assignees

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: ppy4sjqvf/pairedProject#17