最终版 #2

Merged

ppy4sjqvf merged 26 commits from wsf_branch into develop

ppy4sjqvf commented

Owner

There is no content yet.

ppy4sjqvf added 26 commits

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 添加了用户名功能，并测试基本功能

ppy4sjqvf merged commit 6ecbb3d00f into develop 4 months ago

ppy4sjqvf referenced this issue from a commit

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

The pull request has been merged as 6ecbb3d00f.

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#2