From bffcca94553051b42b56a0e8dc45af1114ab550b Mon Sep 17 00:00:00 2001
From: lensferno <lensferno@outlook.com>
Date: Sun, 12 Feb 2023 20:39:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A8=A1=E5=9D=97=E5=90=8D?=
 =?UTF-8?q?=EF=BC=8C=E6=94=B9=E5=8C=85=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mywust-common/README.md                                      | 3 +++
 {mywust-model => mywust-common}/pom.xml                      | 2 +-
 .../java/cn/linghang/mywust/captcha/SolvedImageCaptcha.java  | 0
 .../cn/linghang/mywust/captcha/UnsolvedImageCaptcha.java     | 0
 .../main/java/cn/linghang/mywust/data}/global/Building.java  | 2 +-
 .../main/java/cn/linghang/mywust/data}/global/Campus.java    | 2 +-
 .../main/java/cn/linghang/mywust/data}/global/Classroom.java | 2 +-
 .../main/java/cn/linghang/mywust/data}/global/College.java   | 2 +-
 .../main/java/cn/linghang/mywust/data}/global/Course.java    | 2 +-
 .../src/main/java/cn/linghang/mywust/data}/global/Score.java | 2 +-
 .../java/cn/linghang/mywust/data}/global/StudentInfo.java    | 2 +-
 .../java/cn/linghang/mywust/data}/physics/PhysicsCourse.java | 4 ++--
 .../mywust/data}/undergrad/ExamDelayApplication.java         | 2 +-
 mywust-core/pom.xml                                          | 2 +-
 .../mywust/core/parser/HuangjiahuClassroomNameParser.java    | 2 +-
 .../core/parser/graduate/GraduateCourseTableParser.java      | 4 ++--
 .../mywust/core/parser/graduate/GraduateScoreParser.java     | 2 +-
 .../core/parser/graduate/GraduateStudentInfoPageParser.java  | 2 +-
 .../mywust/core/parser/physics/PhysicsCoursePageParser.java  | 4 ++--
 .../parser/undergraduate/UndergradCourseTableParser.java     | 4 ++--
 .../core/parser/undergraduate/UndergradExamDelayParser.java  | 2 +-
 .../core/parser/undergraduate/UndergradScoreParser.java      | 2 +-
 .../parser/undergraduate/UndergradStudentInfoPageParser.java | 2 +-
 .../parser/undergraduate/global/GlobalCourseTableParser.java | 4 ++--
 .../global/UndergradAllCourseScheduleParser.java             | 2 +-
 .../undergraduate/global/UndergradTeacherCourseParser.java   | 2 +-
 .../mywust/core/request/undergrade/BkjxRequestFactory.java   | 2 +-
 .../undergraduate/global/UndergradBuildingIdApiService.java  | 5 ++---
 mywust-model/README.md                                       | 3 ---
 pom.xml                                                      | 4 ++--
 30 files changed, 36 insertions(+), 37 deletions(-)
 create mode 100644 mywust-common/README.md
 rename {mywust-model => mywust-common}/pom.xml (92%)
 rename {mywust-model => mywust-common}/src/main/java/cn/linghang/mywust/captcha/SolvedImageCaptcha.java (100%)
 rename {mywust-model => mywust-common}/src/main/java/cn/linghang/mywust/captcha/UnsolvedImageCaptcha.java (100%)
 rename {mywust-model/src/main/java/cn/linghang/mywust/model => mywust-common/src/main/java/cn/linghang/mywust/data}/global/Building.java (95%)
 rename {mywust-model/src/main/java/cn/linghang/mywust/model => mywust-common/src/main/java/cn/linghang/mywust/data}/global/Campus.java (93%)
 rename {mywust-model/src/main/java/cn/linghang/mywust/model => mywust-common/src/main/java/cn/linghang/mywust/data}/global/Classroom.java (94%)
 rename {mywust-model/src/main/java/cn/linghang/mywust/model => mywust-common/src/main/java/cn/linghang/mywust/data}/global/College.java (93%)
 rename {mywust-model/src/main/java/cn/linghang/mywust/model => mywust-common/src/main/java/cn/linghang/mywust/data}/global/Course.java (98%)
 rename {mywust-model/src/main/java/cn/linghang/mywust/model => mywust-common/src/main/java/cn/linghang/mywust/data}/global/Score.java (97%)
 rename {mywust-model/src/main/java/cn/linghang/mywust/model => mywust-common/src/main/java/cn/linghang/mywust/data}/global/StudentInfo.java (92%)
 rename {mywust-model/src/main/java/cn/linghang/mywust/model => mywust-common/src/main/java/cn/linghang/mywust/data}/physics/PhysicsCourse.java (59%)
 rename {mywust-model/src/main/java/cn/linghang/mywust/model => mywust-common/src/main/java/cn/linghang/mywust/data}/undergrad/ExamDelayApplication.java (92%)
 delete mode 100644 mywust-model/README.md

diff --git a/mywust-common/README.md b/mywust-common/README.md
new file mode 100644
index 0000000..597eec0
--- /dev/null
+++ b/mywust-common/README.md
@@ -0,0 +1,3 @@
+# Mywust common
+
+存放各种数据实体类等公共依赖
\ No newline at end of file
diff --git a/mywust-model/pom.xml b/mywust-common/pom.xml
similarity index 92%
rename from mywust-model/pom.xml
rename to mywust-common/pom.xml
index da1208c..4a4fed2 100644
--- a/mywust-model/pom.xml
+++ b/mywust-common/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>mywust-model</artifactId>
+    <artifactId>mywust-common</artifactId>
 
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
diff --git a/mywust-model/src/main/java/cn/linghang/mywust/captcha/SolvedImageCaptcha.java b/mywust-common/src/main/java/cn/linghang/mywust/captcha/SolvedImageCaptcha.java
similarity index 100%
rename from mywust-model/src/main/java/cn/linghang/mywust/captcha/SolvedImageCaptcha.java
rename to mywust-common/src/main/java/cn/linghang/mywust/captcha/SolvedImageCaptcha.java
diff --git a/mywust-model/src/main/java/cn/linghang/mywust/captcha/UnsolvedImageCaptcha.java b/mywust-common/src/main/java/cn/linghang/mywust/captcha/UnsolvedImageCaptcha.java
similarity index 100%
rename from mywust-model/src/main/java/cn/linghang/mywust/captcha/UnsolvedImageCaptcha.java
rename to mywust-common/src/main/java/cn/linghang/mywust/captcha/UnsolvedImageCaptcha.java
diff --git a/mywust-model/src/main/java/cn/linghang/mywust/model/global/Building.java b/mywust-common/src/main/java/cn/linghang/mywust/data/global/Building.java
similarity index 95%
rename from mywust-model/src/main/java/cn/linghang/mywust/model/global/Building.java
rename to mywust-common/src/main/java/cn/linghang/mywust/data/global/Building.java
index d20dd1d..7889250 100644
--- a/mywust-model/src/main/java/cn/linghang/mywust/model/global/Building.java
+++ b/mywust-common/src/main/java/cn/linghang/mywust/data/global/Building.java
@@ -1,4 +1,4 @@
-package cn.linghang.mywust.model.global;
+package cn.linghang.mywust.data.global;
 
 import java.util.StringJoiner;
 
diff --git a/mywust-model/src/main/java/cn/linghang/mywust/model/global/Campus.java b/mywust-common/src/main/java/cn/linghang/mywust/data/global/Campus.java
similarity index 93%
rename from mywust-model/src/main/java/cn/linghang/mywust/model/global/Campus.java
rename to mywust-common/src/main/java/cn/linghang/mywust/data/global/Campus.java
index 1bfb696..3ee92db 100644
--- a/mywust-model/src/main/java/cn/linghang/mywust/model/global/Campus.java
+++ b/mywust-common/src/main/java/cn/linghang/mywust/data/global/Campus.java
@@ -1,4 +1,4 @@
-package cn.linghang.mywust.model.global;
+package cn.linghang.mywust.data.global;
 
 import java.util.StringJoiner;
 
diff --git a/mywust-model/src/main/java/cn/linghang/mywust/model/global/Classroom.java b/mywust-common/src/main/java/cn/linghang/mywust/data/global/Classroom.java
similarity index 94%
rename from mywust-model/src/main/java/cn/linghang/mywust/model/global/Classroom.java
rename to mywust-common/src/main/java/cn/linghang/mywust/data/global/Classroom.java
index 8c198bd..3eb5515 100644
--- a/mywust-model/src/main/java/cn/linghang/mywust/model/global/Classroom.java
+++ b/mywust-common/src/main/java/cn/linghang/mywust/data/global/Classroom.java
@@ -1,4 +1,4 @@
-package cn.linghang.mywust.model.global;
+package cn.linghang.mywust.data.global;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/mywust-model/src/main/java/cn/linghang/mywust/model/global/College.java b/mywust-common/src/main/java/cn/linghang/mywust/data/global/College.java
similarity index 93%
rename from mywust-model/src/main/java/cn/linghang/mywust/model/global/College.java
rename to mywust-common/src/main/java/cn/linghang/mywust/data/global/College.java
index a127f1e..df24010 100644
--- a/mywust-model/src/main/java/cn/linghang/mywust/model/global/College.java
+++ b/mywust-common/src/main/java/cn/linghang/mywust/data/global/College.java
@@ -1,4 +1,4 @@
-package cn.linghang.mywust.model.global;
+package cn.linghang.mywust.data.global;
 
 import java.util.StringJoiner;
 
diff --git a/mywust-model/src/main/java/cn/linghang/mywust/model/global/Course.java b/mywust-common/src/main/java/cn/linghang/mywust/data/global/Course.java
similarity index 98%
rename from mywust-model/src/main/java/cn/linghang/mywust/model/global/Course.java
rename to mywust-common/src/main/java/cn/linghang/mywust/data/global/Course.java
index 6332fe4..d52ca44 100644
--- a/mywust-model/src/main/java/cn/linghang/mywust/model/global/Course.java
+++ b/mywust-common/src/main/java/cn/linghang/mywust/data/global/Course.java
@@ -1,4 +1,4 @@
-package cn.linghang.mywust.model.global;
+package cn.linghang.mywust.data.global;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/mywust-model/src/main/java/cn/linghang/mywust/model/global/Score.java b/mywust-common/src/main/java/cn/linghang/mywust/data/global/Score.java
similarity index 97%
rename from mywust-model/src/main/java/cn/linghang/mywust/model/global/Score.java
rename to mywust-common/src/main/java/cn/linghang/mywust/data/global/Score.java
index 03a93a0..d371eda 100644
--- a/mywust-model/src/main/java/cn/linghang/mywust/model/global/Score.java
+++ b/mywust-common/src/main/java/cn/linghang/mywust/data/global/Score.java
@@ -1,4 +1,4 @@
-package cn.linghang.mywust.model.global;
+package cn.linghang.mywust.data.global;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/mywust-model/src/main/java/cn/linghang/mywust/model/global/StudentInfo.java b/mywust-common/src/main/java/cn/linghang/mywust/data/global/StudentInfo.java
similarity index 92%
rename from mywust-model/src/main/java/cn/linghang/mywust/model/global/StudentInfo.java
rename to mywust-common/src/main/java/cn/linghang/mywust/data/global/StudentInfo.java
index f340ae7..dba4ad5 100644
--- a/mywust-model/src/main/java/cn/linghang/mywust/model/global/StudentInfo.java
+++ b/mywust-common/src/main/java/cn/linghang/mywust/data/global/StudentInfo.java
@@ -1,4 +1,4 @@
-package cn.linghang.mywust.model.global;
+package cn.linghang.mywust.data.global;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/mywust-model/src/main/java/cn/linghang/mywust/model/physics/PhysicsCourse.java b/mywust-common/src/main/java/cn/linghang/mywust/data/physics/PhysicsCourse.java
similarity index 59%
rename from mywust-model/src/main/java/cn/linghang/mywust/model/physics/PhysicsCourse.java
rename to mywust-common/src/main/java/cn/linghang/mywust/data/physics/PhysicsCourse.java
index 50987e2..83934b0 100644
--- a/mywust-model/src/main/java/cn/linghang/mywust/model/physics/PhysicsCourse.java
+++ b/mywust-common/src/main/java/cn/linghang/mywust/data/physics/PhysicsCourse.java
@@ -1,6 +1,6 @@
-package cn.linghang.mywust.model.physics;
+package cn.linghang.mywust.data.physics;
 
-import cn.linghang.mywust.model.global.Course;
+import cn.linghang.mywust.data.global.Course;
 import lombok.Getter;
 import lombok.Setter;
 
diff --git a/mywust-model/src/main/java/cn/linghang/mywust/model/undergrad/ExamDelayApplication.java b/mywust-common/src/main/java/cn/linghang/mywust/data/undergrad/ExamDelayApplication.java
similarity index 92%
rename from mywust-model/src/main/java/cn/linghang/mywust/model/undergrad/ExamDelayApplication.java
rename to mywust-common/src/main/java/cn/linghang/mywust/data/undergrad/ExamDelayApplication.java
index c15b6a5..9037d6d 100644
--- a/mywust-model/src/main/java/cn/linghang/mywust/model/undergrad/ExamDelayApplication.java
+++ b/mywust-common/src/main/java/cn/linghang/mywust/data/undergrad/ExamDelayApplication.java
@@ -1,4 +1,4 @@
-package cn.linghang.mywust.model.undergrad;
+package cn.linghang.mywust.data.undergrad;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/mywust-core/pom.xml b/mywust-core/pom.xml
index 24fb9c8..0b4c3c3 100644
--- a/mywust-core/pom.xml
+++ b/mywust-core/pom.xml
@@ -38,7 +38,7 @@
 
         <dependency>
             <groupId>cn.linghang</groupId>
-            <artifactId>mywust-model</artifactId>
+            <artifactId>mywust-common</artifactId>
             <version>${project.parent.version}</version>
             <scope>compile</scope>
         </dependency>
diff --git a/mywust-core/src/main/java/cn/linghang/mywust/core/parser/HuangjiahuClassroomNameParser.java b/mywust-core/src/main/java/cn/linghang/mywust/core/parser/HuangjiahuClassroomNameParser.java
index 77a0357..45eec40 100644
--- a/mywust-core/src/main/java/cn/linghang/mywust/core/parser/HuangjiahuClassroomNameParser.java
+++ b/mywust-core/src/main/java/cn/linghang/mywust/core/parser/HuangjiahuClassroomNameParser.java
@@ -1,7 +1,7 @@
 package cn.linghang.mywust.core.parser;
 
 import cn.linghang.mywust.core.exception.ParseException;
-import cn.linghang.mywust.model.global.Classroom;
+import cn.linghang.mywust.data.global.Classroom;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/mywust-core/src/main/java/cn/linghang/mywust/core/parser/graduate/GraduateCourseTableParser.java b/mywust-core/src/main/java/cn/linghang/mywust/core/parser/graduate/GraduateCourseTableParser.java
index 5820115..ff74eca 100644
--- a/mywust-core/src/main/java/cn/linghang/mywust/core/parser/graduate/GraduateCourseTableParser.java
+++ b/mywust-core/src/main/java/cn/linghang/mywust/core/parser/graduate/GraduateCourseTableParser.java
@@ -2,8 +2,8 @@ package cn.linghang.mywust.core.parser.graduate;
 
 import cn.linghang.mywust.core.exception.ParseException;
 import cn.linghang.mywust.core.parser.Parser;
-import cn.linghang.mywust.model.global.Classroom;
-import cn.linghang.mywust.model.global.Course;
+import cn.linghang.mywust.data.global.Classroom;
+import cn.linghang.mywust.data.global.Course;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
diff --git a/mywust-core/src/main/java/cn/linghang/mywust/core/parser/graduate/GraduateScoreParser.java b/mywust-core/src/main/java/cn/linghang/mywust/core/parser/graduate/GraduateScoreParser.java
index 6e1ea32..eb04e99 100644
--- a/mywust-core/src/main/java/cn/linghang/mywust/core/parser/graduate/GraduateScoreParser.java
+++ b/mywust-core/src/main/java/cn/linghang/mywust/core/parser/graduate/GraduateScoreParser.java
@@ -2,7 +2,7 @@ package cn.linghang.mywust.core.parser.graduate;
 
 import cn.linghang.mywust.core.exception.ParseException;
 import cn.linghang.mywust.core.parser.Parser;
-import cn.linghang.mywust.model.global.Score;
+import cn.linghang.mywust.data.global.Score;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
diff --git a/mywust-core/src/main/java/cn/linghang/mywust/core/parser/graduate/GraduateStudentInfoPageParser.java b/mywust-core/src/main/java/cn/linghang/mywust/core/parser/graduate/GraduateStudentInfoPageParser.java
index 37b10cc..ae63de1 100644
--- a/mywust-core/src/main/java/cn/linghang/mywust/core/parser/graduate/GraduateStudentInfoPageParser.java
+++ b/mywust-core/src/main/java/cn/linghang/mywust/core/parser/graduate/GraduateStudentInfoPageParser.java
@@ -3,7 +3,7 @@ package cn.linghang.mywust.core.parser.graduate;
 import cn.linghang.mywust.core.exception.ParseException;
 import cn.linghang.mywust.core.parser.Parser;
 import cn.linghang.mywust.core.util.JsoupUtil;
-import cn.linghang.mywust.model.global.StudentInfo;
+import cn.linghang.mywust.data.global.StudentInfo;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Element;
 
diff --git a/mywust-core/src/main/java/cn/linghang/mywust/core/parser/physics/PhysicsCoursePageParser.java b/mywust-core/src/main/java/cn/linghang/mywust/core/parser/physics/PhysicsCoursePageParser.java
index b1669a9..f7210d9 100644
--- a/mywust-core/src/main/java/cn/linghang/mywust/core/parser/physics/PhysicsCoursePageParser.java
+++ b/mywust-core/src/main/java/cn/linghang/mywust/core/parser/physics/PhysicsCoursePageParser.java
@@ -3,8 +3,8 @@ package cn.linghang.mywust.core.parser.physics;
 import cn.linghang.mywust.core.exception.ParseException;
 import cn.linghang.mywust.core.parser.HuangjiahuClassroomNameParser;
 import cn.linghang.mywust.core.parser.Parser;
-import cn.linghang.mywust.model.global.Classroom;
-import cn.linghang.mywust.model.physics.PhysicsCourse;
+import cn.linghang.mywust.data.global.Classroom;
+import cn.linghang.mywust.data.physics.PhysicsCourse;
 import org.jsoup.Jsoup;
 import org.jsoup.select.Elements;
 
diff --git a/mywust-core/src/main/java/cn/linghang/mywust/core/parser/undergraduate/UndergradCourseTableParser.java b/mywust-core/src/main/java/cn/linghang/mywust/core/parser/undergraduate/UndergradCourseTableParser.java
index 343c403..af87383 100644
--- a/mywust-core/src/main/java/cn/linghang/mywust/core/parser/undergraduate/UndergradCourseTableParser.java
+++ b/mywust-core/src/main/java/cn/linghang/mywust/core/parser/undergraduate/UndergradCourseTableParser.java
@@ -3,8 +3,8 @@ package cn.linghang.mywust.core.parser.undergraduate;
 import cn.linghang.mywust.core.exception.ParseException;
 import cn.linghang.mywust.core.parser.Parser;
 import cn.linghang.mywust.core.util.JsoupUtil;
-import cn.linghang.mywust.model.global.Classroom;
-import cn.linghang.mywust.model.global.Course;
+import cn.linghang.mywust.data.global.Classroom;
+import cn.linghang.mywust.data.global.Course;
 import cn.linghang.mywust.util.StringUtil;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Element;
diff --git a/mywust-core/src/main/java/cn/linghang/mywust/core/parser/undergraduate/UndergradExamDelayParser.java b/mywust-core/src/main/java/cn/linghang/mywust/core/parser/undergraduate/UndergradExamDelayParser.java
index 37298c6..44fcd52 100644
--- a/mywust-core/src/main/java/cn/linghang/mywust/core/parser/undergraduate/UndergradExamDelayParser.java
+++ b/mywust-core/src/main/java/cn/linghang/mywust/core/parser/undergraduate/UndergradExamDelayParser.java
@@ -3,7 +3,7 @@ package cn.linghang.mywust.core.parser.undergraduate;
 import cn.linghang.mywust.core.exception.ParseException;
 import cn.linghang.mywust.core.parser.Parser;
 import cn.linghang.mywust.core.util.JsoupUtil;
-import cn.linghang.mywust.model.undergrad.ExamDelayApplication;
+import cn.linghang.mywust.data.undergrad.ExamDelayApplication;
 import lombok.extern.slf4j.Slf4j;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Element;
diff --git a/mywust-core/src/main/java/cn/linghang/mywust/core/parser/undergraduate/UndergradScoreParser.java b/mywust-core/src/main/java/cn/linghang/mywust/core/parser/undergraduate/UndergradScoreParser.java
index 0132ee0..d44c7b5 100644
--- a/mywust-core/src/main/java/cn/linghang/mywust/core/parser/undergraduate/UndergradScoreParser.java
+++ b/mywust-core/src/main/java/cn/linghang/mywust/core/parser/undergraduate/UndergradScoreParser.java
@@ -3,7 +3,7 @@ package cn.linghang.mywust.core.parser.undergraduate;
 import cn.linghang.mywust.core.exception.ParseException;
 import cn.linghang.mywust.core.parser.Parser;
 import cn.linghang.mywust.core.util.JsoupUtil;
-import cn.linghang.mywust.model.global.Score;
+import cn.linghang.mywust.data.global.Score;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;
diff --git a/mywust-core/src/main/java/cn/linghang/mywust/core/parser/undergraduate/UndergradStudentInfoPageParser.java b/mywust-core/src/main/java/cn/linghang/mywust/core/parser/undergraduate/UndergradStudentInfoPageParser.java
index d3c1046..7ec2b19 100644
--- a/mywust-core/src/main/java/cn/linghang/mywust/core/parser/undergraduate/UndergradStudentInfoPageParser.java
+++ b/mywust-core/src/main/java/cn/linghang/mywust/core/parser/undergraduate/UndergradStudentInfoPageParser.java
@@ -3,7 +3,7 @@ package cn.linghang.mywust.core.parser.undergraduate;
 import cn.linghang.mywust.core.exception.ParseException;
 import cn.linghang.mywust.core.parser.Parser;
 import cn.linghang.mywust.core.util.JsoupUtil;
-import cn.linghang.mywust.model.global.StudentInfo;
+import cn.linghang.mywust.data.global.StudentInfo;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
diff --git a/mywust-core/src/main/java/cn/linghang/mywust/core/parser/undergraduate/global/GlobalCourseTableParser.java b/mywust-core/src/main/java/cn/linghang/mywust/core/parser/undergraduate/global/GlobalCourseTableParser.java
index 7d1e37c..397ad6a 100644
--- a/mywust-core/src/main/java/cn/linghang/mywust/core/parser/undergraduate/global/GlobalCourseTableParser.java
+++ b/mywust-core/src/main/java/cn/linghang/mywust/core/parser/undergraduate/global/GlobalCourseTableParser.java
@@ -1,8 +1,8 @@
 package cn.linghang.mywust.core.parser.undergraduate.global;
 
 import cn.linghang.mywust.core.exception.ParseException;
-import cn.linghang.mywust.model.global.Classroom;
-import cn.linghang.mywust.model.global.Course;
+import cn.linghang.mywust.data.global.Classroom;
+import cn.linghang.mywust.data.global.Course;
 import cn.linghang.mywust.util.StringUtil;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Element;
diff --git a/mywust-core/src/main/java/cn/linghang/mywust/core/parser/undergraduate/global/UndergradAllCourseScheduleParser.java b/mywust-core/src/main/java/cn/linghang/mywust/core/parser/undergraduate/global/UndergradAllCourseScheduleParser.java
index 60db013..fa0b0d3 100644
--- a/mywust-core/src/main/java/cn/linghang/mywust/core/parser/undergraduate/global/UndergradAllCourseScheduleParser.java
+++ b/mywust-core/src/main/java/cn/linghang/mywust/core/parser/undergraduate/global/UndergradAllCourseScheduleParser.java
@@ -2,7 +2,7 @@ package cn.linghang.mywust.core.parser.undergraduate.global;
 
 import cn.linghang.mywust.core.exception.ParseException;
 import cn.linghang.mywust.core.parser.Parser;
-import cn.linghang.mywust.model.global.Course;
+import cn.linghang.mywust.data.global.Course;
 
 import java.util.List;
 import java.util.regex.Pattern;
diff --git a/mywust-core/src/main/java/cn/linghang/mywust/core/parser/undergraduate/global/UndergradTeacherCourseParser.java b/mywust-core/src/main/java/cn/linghang/mywust/core/parser/undergraduate/global/UndergradTeacherCourseParser.java
index 4f67eaf..c1983b5 100644
--- a/mywust-core/src/main/java/cn/linghang/mywust/core/parser/undergraduate/global/UndergradTeacherCourseParser.java
+++ b/mywust-core/src/main/java/cn/linghang/mywust/core/parser/undergraduate/global/UndergradTeacherCourseParser.java
@@ -2,7 +2,7 @@ package cn.linghang.mywust.core.parser.undergraduate.global;
 
 import cn.linghang.mywust.core.exception.ParseException;
 import cn.linghang.mywust.core.parser.Parser;
-import cn.linghang.mywust.model.global.Course;
+import cn.linghang.mywust.data.global.Course;
 
 import java.util.List;
 import java.util.regex.Pattern;
diff --git a/mywust-core/src/main/java/cn/linghang/mywust/core/request/undergrade/BkjxRequestFactory.java b/mywust-core/src/main/java/cn/linghang/mywust/core/request/undergrade/BkjxRequestFactory.java
index 59d6858..7cb3c3d 100644
--- a/mywust-core/src/main/java/cn/linghang/mywust/core/request/undergrade/BkjxRequestFactory.java
+++ b/mywust-core/src/main/java/cn/linghang/mywust/core/request/undergrade/BkjxRequestFactory.java
@@ -2,7 +2,7 @@ package cn.linghang.mywust.core.request.undergrade;
 
 import cn.linghang.mywust.core.api.UndergradUrls;
 import cn.linghang.mywust.core.request.RequestFactory;
-import cn.linghang.mywust.model.global.Campus;
+import cn.linghang.mywust.data.global.Campus;
 import cn.linghang.mywust.network.entitys.FormBodyBuilder;
 import cn.linghang.mywust.network.entitys.HttpRequest;
 import cn.linghang.mywust.util.StringUtil;
diff --git a/mywust-core/src/main/java/cn/linghang/mywust/core/service/undergraduate/global/UndergradBuildingIdApiService.java b/mywust-core/src/main/java/cn/linghang/mywust/core/service/undergraduate/global/UndergradBuildingIdApiService.java
index 80fa359..58aefaf 100644
--- a/mywust-core/src/main/java/cn/linghang/mywust/core/service/undergraduate/global/UndergradBuildingIdApiService.java
+++ b/mywust-core/src/main/java/cn/linghang/mywust/core/service/undergraduate/global/UndergradBuildingIdApiService.java
@@ -1,12 +1,11 @@
 package cn.linghang.mywust.core.service.undergraduate.global;
 
 import cn.linghang.mywust.core.api.ConstantParams;
-import cn.linghang.mywust.core.api.UndergradUrls;
 import cn.linghang.mywust.core.exception.ApiException;
 import cn.linghang.mywust.core.request.undergrade.BkjxRequestFactory;
 import cn.linghang.mywust.core.service.undergraduate.UndergradApiServiceBase;
-import cn.linghang.mywust.model.global.Building;
-import cn.linghang.mywust.model.global.Campus;
+import cn.linghang.mywust.data.global.Building;
+import cn.linghang.mywust.data.global.Campus;
 import cn.linghang.mywust.network.RequestClientOption;
 import cn.linghang.mywust.network.Requester;
 import cn.linghang.mywust.network.entitys.HttpRequest;
diff --git a/mywust-model/README.md b/mywust-model/README.md
deleted file mode 100644
index 2f9d687..0000000
--- a/mywust-model/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Mywust model
-
-存放各种数据实体类
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 858f918..bbe9e9e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 
     <modules>
         <module>mywust-core</module>
-        <module>mywust-model</module>
+        <module>mywust-common</module>
         <module>mywust-network</module>
         <module>mywust-util</module>
         <module>mywust-test</module>
@@ -24,7 +24,7 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
             <version>${lombok.version}</version>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
     </dependencies>