-
-
diff --git a/LICENSE.MD b/LICENSE.MD
new file mode 100644
index 0000000..af5153d
--- /dev/null
+++ b/LICENSE.MD
@@ -0,0 +1,361 @@
+### GNU GENERAL PUBLIC LICENSE
+
+Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+### Preamble
+
+The licenses for most software are designed to take away your freedom
+to share and change it. By contrast, the GNU General Public License is
+intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if
+you distribute copies of the software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on,
+we want its recipients to know that what they have is not the
+original, so that any problems introduced by others will not reflect
+on the original authors' reputations.
+
+Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at
+all.
+
+The precise terms and conditions for copying, distribution and
+modification follow.
+
+### TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+**0.** This License applies to any program or other work which
+contains a notice placed by the copyright holder saying it may be
+distributed under the terms of this General Public License. The
+"Program", below, refers to any such program or work, and a "work
+based on the Program" means either the Program or any derivative work
+under copyright law: that is to say, a work containing the Program or
+a portion of it, either verbatim or with modifications and/or
+translated into another language. (Hereinafter, translation is
+included without limitation in the term "modification".) Each licensee
+is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the Program
+(independent of having been made by running the Program). Whether that
+is true depends on what the Program does.
+
+**1.** You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a
+fee.
+
+**2.** You may modify your copy or copies of the Program or any
+portion of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+
+**a)** You must cause the modified files to carry prominent notices
+stating that you changed the files and the date of any change.
+
+
+**b)** You must cause any work that you distribute or publish, that in
+whole or in part contains or is derived from the Program or any part
+thereof, to be licensed as a whole at no charge to all third parties
+under the terms of this License.
+
+
+**c)** If the modified program normally reads commands interactively
+when run, you must cause it, when started running for such interactive
+use in the most ordinary way, to print or display an announcement
+including an appropriate copyright notice and a notice that there is
+no warranty (or else, saying that you provide a warranty) and that
+users may redistribute the program under these conditions, and telling
+the user how to view a copy of this License. (Exception: if the
+Program itself is interactive but does not normally print such an
+announcement, your work based on the Program is not required to print
+an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+**3.** You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+
+**a)** Accompany it with the complete corresponding machine-readable
+source code, which must be distributed under the terms of Sections 1
+and 2 above on a medium customarily used for software interchange; or,
+
+
+**b)** Accompany it with a written offer, valid for at least three
+years, to give any third party, for a charge no more than your cost of
+physically performing source distribution, a complete machine-readable
+copy of the corresponding source code, to be distributed under the
+terms of Sections 1 and 2 above on a medium customarily used for
+software interchange; or,
+
+
+**c)** Accompany it with the information you received as to the offer
+to distribute corresponding source code. (This alternative is allowed
+only for noncommercial distribution and only if you received the
+program in object code or executable form with such an offer, in
+accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+**4.** You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt otherwise
+to copy, modify, sublicense or distribute the Program is void, and
+will automatically terminate your rights under this License. However,
+parties who have received copies, or rights, from you under this
+License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+**5.** You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+**6.** Each time you redistribute the Program (or any work based on
+the Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+**7.** If, as a consequence of a court judgment or allegation of
+patent infringement or for any other reason (not limited to patent
+issues), conditions are imposed on you (whether by court order,
+agreement or otherwise) that contradict the conditions of this
+License, they do not excuse you from the conditions of this License.
+If you cannot distribute so as to satisfy simultaneously your
+obligations under this License and any other pertinent obligations,
+then as a consequence you may not distribute the Program at all. For
+example, if a patent license would not permit royalty-free
+redistribution of the Program by all those who receive copies directly
+or indirectly through you, then the only way you could satisfy both it
+and this License would be to refrain entirely from distribution of the
+Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+**8.** If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+**9.** The Free Software Foundation may publish revised and/or new
+versions of the General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation. If the Program does not specify a
+version number of this License, you may choose any version ever
+published by the Free Software Foundation.
+
+**10.** If you wish to incorporate parts of the Program into other
+free programs whose distribution conditions are different, write to
+the author to ask for permission. For software which is copyrighted by
+the Free Software Foundation, write to the Free Software Foundation;
+we sometimes make exceptions for this. Our decision will be guided by
+the two goals of preserving the free status of all derivatives of our
+free software and of promoting the sharing and reuse of software
+generally.
+
+**NO WARRANTY**
+
+**11.** BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+**12.** IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+### END OF TERMS AND CONDITIONS
+
+### How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these
+terms.
+
+To do so, attach the following notices to the program. It is safest to
+attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ one line to give the program's name and an idea of what it does.
+ Copyright (C) yyyy name of author
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+Also add information on how to contact you by electronic and paper
+mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details
+ type `show w'. This is free software, and you are welcome
+ to redistribute it under certain conditions; type `show c'
+ for details.
+
+The hypothetical commands \`show w' and \`show c' should show the
+appropriate parts of the General Public License. Of course, the
+commands you use may be called something other than \`show w' and
+\`show c'; they could even be mouse-clicks or menu items--whatever
+suits your program.
+
+You should also get your employer (if you work as a programmer) or
+your school, if any, to sign a "copyright disclaimer" for the program,
+if necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright
+ interest in the program `Gnomovision'
+ (which makes passes at compilers) written
+ by James Hacker.
+
+ signature of Ty Coon, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library,
+you may consider it more useful to permit linking proprietary
+applications with the library. If this is what you want to do, use the
+[GNU Lesser General Public
+License](http://www.gnu.org/licenses/lgpl.html) instead of this
+License.
\ No newline at end of file
diff --git a/LNCKingoJWCaterpillar/pom.xml b/LNCKingoJWCaterpillar/pom.xml
deleted file mode 100644
index b9f13d5..0000000
--- a/LNCKingoJWCaterpillar/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
- ssim
- net.catten
- 2.0
-
- 4.0.0
-
- lnc-kingojw-caterpillar
-
-
-
-
- org.jsoup
- jsoup
-
-
-
- commons-io
- commons-io
-
-
-
- org.apache.httpcomponents
- httpclient
-
-
-
- junit
- junit
-
-
-
-
-
- net.catten
- ssim-common
- ${project.version}
-
-
-
\ No newline at end of file
diff --git a/LNCKingoJWCaterpillar/src/main/resources/login.properties.sample b/LNCKingoJWCaterpillar/src/main/resources/login.properties.sample
deleted file mode 100644
index 3e7ab05..0000000
--- a/LNCKingoJWCaterpillar/src/main/resources/login.properties.sample
+++ /dev/null
@@ -1,7 +0,0 @@
-username=
-password=
-role=STU
-charset=GB2312
-tableFormat=2
-delay=500
-userAgent=Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/54.0.2840.90 Safari/537.36undefined5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/54.0.2840.90 Safari/537.36 SN:NULL
\ No newline at end of file
diff --git a/README.MD b/README.MD
index 081d571..9e1b376 100644
--- a/README.MD
+++ b/README.MD
@@ -1,98 +1,112 @@
-#青果网教务系统课表数据抓取工具
-
-此工具专门用于批量抓取青果网教务系统的“课程课表”页面数据，并整理成原始课程数据导入到数据库
-
-##构建
-
-**需要先安装 maven 然后再构建此工程**
-
-在工程目录里执行
-
- mvn clean package
-
-构建完之后文件在 SubjectImporter 的 target 里，ssim-main-2.0.jar 为可执行 jar 包，lib 文件夹为所依赖的组件。
-
-##执行命令
-
-总共有三种启动方式
-
- java -jar ssim-main-2.0.jar 学期代号
- java -jar ssim-main-2.0.jar 学期代号 缓存文件夹
- java -jar ssim-main-2.0.jar 学期代号 缓存文件夹 --continue
-
-其中学期代号格式是年份+学期，例如20140，2014是年份，0为第一学期（1就是第二学期）。缓存文件夹是制定爬虫把网页缓存在哪里。
---continue 选项是直接跳过抓取，仅丛缓存文件夹导入。
-
-爬虫启动之后，将会先检查有没有数据库里面有没有存储数据用的表，没有将自动创建。表将以 学期代号 + 下划线 + 表名 的形在没有指定缓存文件夹的情况下，爬虫会把网页存储到内存中然后再导入到数据库。在指定了缓存文件夹的情况下，爬虫会把网页缓存到指定文件夹。
-导入数据库前爬虫会把所有网页预先格式化成对象全部存储到内存里。800个结果约占用200MB内存。
-
-##配置文件
-
-配置文件有两个： login.properties 和 connection.properties
-
-### login.properties 说明
-
-此配置文件是关于爬虫的配置文件。
-
-模板如下：
-
- username=
- password=
- role=
- charset=GB2312
- tableFormat=2
- delay=600
- userAgent=Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/54.0.2840.90 Safari/537.36undefined5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/54.0.2840.90 Safari/537.36 SN:NULL
-
-username 填登录帐号。 password 填登录密码。 role 指登录的类型，学生的类型是 STU ，其他类型请自行查看青果网教务登录框的其他值。charset 是页面编码，默认 GB2312 不要改，除非青果网更改页面编码。 tableFormat 是爬取的课表格式，不用改。 delay 是抓取下一个页面前的等待时间，单位毫秒，建议不要低于400，容易卡住。 userAgent 是要伪装成什么浏览器，如果你有特殊偏好的话可以改成其他浏览器，这里默认是 Linux 下的 Chrome。
-
-### connection.properties 说明
-
-此配置文件是关于数据库的配置文件。
-
-模板如下：
-
- hostname=localhost:3306
- username=
- password=
- database=
-
- hostname 填 mysql 服务器的地址，必须带上端口号。 username 和 password 是数据库用户和对应的密码。 database 指目标数据库。
-
-##数据库表
-
-爬虫使用两张表存储所有的课表数据，一张是 subject 一张是 lessons。字段含义分别如下：
-
-### subjects 表
-
-
-id : 课程的唯一 ID
-term : 课程学期
-name : 课程名称
-code : 课程代号
-unit : 所属学院
-timeSpend : 学时
-point : 学分
-
-#### lessons 表
-
-id : 自增 id
-subject : 对应 subjects 表内的课程 id
-teacher : 任课老师姓名
-classNumber : 对应青果网表格的上课班号
-attendAmount : 上课人数
-classAttend : 上课班级
-classType : 课程类别
-assessmentType : 考核方式
-week : 周次
-timePoint : 节次
-address : 地点
-
-##使用注意
-
-- 只能使用 MySQL/MariaDB 数据库
-- 缓存文件夹要先创建，如果不存在将会报错
-- 每一次抓取前，都要事先清除掉缓存目录和目的数据库表
-- 目标数据库必须预先存在
-- 每次导入请先删除指定数据库中 Lessons 和 Subjects 两张表
-- 爬虫抓取页面的时间间隔建议不要低于400
+#简单的课表查询网站
+
+为针对广东岭南职业技术学院所使用的教务系统（青果网教务系统）的课表爬取与整理网站
+
+##公共API
+
+通过此类 API 与服务器通讯均使用 UTF-8 编码格式
+
+####课表查询 API
+
+#####/api/terms
+
+查询所有可用学期
+
+- 方法 ： GET
+- 无传参
+- 返回：学期字符串数组
+
+```
+{
+ "data":["2016-2017学年第二学期"]
+}
+```
+
+####/api/weeks
+
+查询学期最大周数
+
+- 方法 ： GET
+- 参数
+ - termName ： 学期全称
+- 返回 ： 最大周数（从 1 开始算起）
+
+```
+{
+ "data":19
+}
+```
+
+####/api/classes
+
+查询学期内上课的班级
+
+- 方法 ： GET
+- 参数
+ - termName ： 学期全称
+- 返回 ： 学期内所有上课班级
+
+```
+{
+ "data":["班级名称 1"，"班级名称 2", "班级名称 3", ....]
+}
+```
+
+####/api/types
+
+查询所有课程类型
+
+- 方法 ： GET
+- 无传参
+- 返回 ： 所有课程类型
+
+```
+{
+ "data":[
+ "专业基础课/必修课",
+ "专业课/必修课",
+ "专业课/限选课",
+ "公共课/任选课",
+ "公共课/必修课"，
+ .... ]
+}
+```
+
+####/api/lessons
+
+- 方法 ： GET
+- 参数 ：
+ - termName ： 学期全称
+ - week ： 周数（从 1 开始算起），可选，不填则返回整个学期课表
+ - className ： 上课班级全称
+ - ignoreType ： 忽略的课程类型，数组，可选，不填则返回全部类型的课程（包括因为教务录入问题而产生的重复课程）
+- 返回 ： 指定条件的课表
+
+```
+{
+ "data":[
+ {
+ "id":158758,
+ "term":"2016-2017学年第二学期", // 学期
+ "unit":"外语外贸学院", // 学院
+ "name":"公共外语（二）", // 课程名称
+ "period":63.0, // 课时
+ "credit":3.5, // 学分
+ "teacher":"XXX", // 上课教师
+ "category":"公共课/必修课", // 课程类型
+ "attendClass":"xx通信技术x班", //上课班级
+ "week":1, // 周数
+ "weekday":5, // 星期几
+ "turn":5, // 第几节课
+ "address":"C栋B609" // 地点
+ }, .....]
+}
+```
+
+***
+##参考
+
+- [Hibernate EHCache – Hibernate Second Level Cache](http://www.journaldev.com/2980/hibernate-ehcache-hibernate-second-level-cache)
+- [解决spring3 mvc中乱码的问题。](http://blog.csdn.net/zhengzhb/article/details/6967975)
+- [How to configure log4j.properties for SpringJUnit4ClassRunner?](http://stackoverflow.com/questions/4570072/how-to-configure-log4j-properties-for-springjunit4classrunner)
+- [H2数据库攻略](http://www.cnblogs.com/gao241/p/3480472.html)
diff --git a/SubjectImportCommonUtils/pom.xml b/SubjectImportCommonUtils/pom.xml
deleted file mode 100644
index 2b1de19..0000000
--- a/SubjectImportCommonUtils/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
- ssim
- net.catten
- 2.0
-
- 4.0.0
-
- ssim-common
-
-
-
\ No newline at end of file
diff --git a/SubjectImportCommonUtils/src/main/resources/connection.property.sample b/SubjectImportCommonUtils/src/main/resources/connection.property.sample
deleted file mode 100644
index 6a7f5d2..0000000
--- a/SubjectImportCommonUtils/src/main/resources/connection.property.sample
+++ /dev/null
@@ -1,4 +0,0 @@
-hostname=localhost:3306
-username=example
-password=123456
-database=ClassSheet
\ No newline at end of file
diff --git a/SubjectImporter/pom.xml b/SubjectImporter/pom.xml
deleted file mode 100644
index baee548..0000000
--- a/SubjectImporter/pom.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-
-
-
- ssim
- net.catten
- 2.0
-
- 4.0.0
-
- ssim-main
- jar
-
-
-
- net.catten
- class-schedule-adapter
- 2.0
-
-
-
- net.catten
- lnc-kingojw-caterpillar
- 2.0
-
-
-
- mysql
- mysql-connector-java
-
-
-
- junit
- junit
- 4.12
- test
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-jar-plugin
-
-
-
- false
-
-
-
- true
-
- lib/
-
- net.catten.ssim.Main
-
-
-
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-dependency-plugin
- 2.10
-
-
- copy-dependencies
- package
-
- copy-dependencies
-
-
- ${project.build.directory}/lib
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/SubjectImporter/src/main/java/net/catten/ssim/Main.java b/SubjectImporter/src/main/java/net/catten/ssim/Main.java
deleted file mode 100644
index fc4210c..0000000
--- a/SubjectImporter/src/main/java/net/catten/ssim/Main.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package net.catten.ssim;
-
-import net.catten.lnc.kingo.jw.caterpillar.KingoJWCaterpillar;
-import net.catten.ssim.events.ProgressPrinter;
-import net.catten.ssim.helper.TableChecker;
-import net.catten.ssim.helper.TableMaker;
-import net.catten.ssim.services.DataImporter;
-import net.catten.ssim.helper.DatabaseConnector;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.*;
-import java.util.logging.Logger;
-
-/**
- * Created by catten on 11/13/16.
- */
-public class Main {
- public static void main(String[] args) throws ClassNotFoundException, SQLException, IOException, InterruptedException {
- Logger logger = Logger.getLogger(Main.class.getClass().toString());
- ProgressPrinter progressPrinter = new ProgressPrinter(40);
-
- //Property preparing
- Properties dbProperties = new Properties();
- dbProperties.load(new FileInputStream(new File("connection.properties")));
- logger.info("Database connection properties loaded.");
-
- Properties tableProperty = new Properties();
- tableProperty.load(Main.class.getResourceAsStream("/tables.properties"));
- logger.info("Table properties loaded.");
-
- //Handling Database connection
- DatabaseConnector databaseConnector = new DatabaseConnector(dbProperties);
- Connection connection = databaseConnector.getConnection();
- logger.info("Database connected.");
-
- //Start capturing pages
- Properties loginProperties = new Properties();
- loginProperties.load(new FileInputStream(new File("login.properties")));
- KingoJWCaterpillar caterpillar = new KingoJWCaterpillar(loginProperties);
- caterpillar.setTickReceiver(progressPrinter);
-
- DataImporter dataImporter;
-
- String schoolTerm = args[0];
- String tablePrefix = schoolTerm + "_";
-
- //Check tables and create not existed table
- TableMaker tableMaker = new TableMaker(connection, tableProperty, tablePrefix);
- TableChecker tableChecker = new TableChecker(connection, new ArrayList<>(tableProperty.stringPropertyNames()), tablePrefix);
- List notExistTables = tableChecker.checkNotExist();
- logger.info("Check tables successful");
- tableMaker.make(notExistTables);
-
- if (args.length == 1) {
- Map resultMap = caterpillar.getTermSubjectToMemory(Integer.parseInt(schoolTerm));
-
- dataImporter = new DataImporter(connection, resultMap, loginProperties.getProperty("UTF-8"), tablePrefix);
- } else {
- File targetDir = new File(args[1]);
-
- if (args.length <= 2 || !args[2].equals("--continue"))
- caterpillar.getTermSubjectToFiles(Integer.parseInt(schoolTerm), targetDir);
-
- dataImporter = new DataImporter(connection, targetDir, loginProperties.getProperty("charset"), ".html", tablePrefix);
- }
-
- //Import to database
- dataImporter.setTickReceiver(progressPrinter);
- dataImporter.startJobs();
-
- connection.close();
- }
-}
diff --git a/SubjectImporter/src/main/java/net/catten/ssim/dto/LessonDTO.java b/SubjectImporter/src/main/java/net/catten/ssim/dto/LessonDTO.java
deleted file mode 100644
index 0c011e5..0000000
--- a/SubjectImporter/src/main/java/net/catten/ssim/dto/LessonDTO.java
+++ /dev/null
@@ -1,165 +0,0 @@
-package net.catten.ssim.dto;
-
-import net.catten.ssim.schedule.model.Lesson;
-
-import java.io.*;
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * Created by catten on 11/14/16.
- */
-public class LessonDTO implements Cloneable,Serializable {
- private int id;
- private int subject;
- private String teacher;
- private String classNumber;
- private Integer attendAmount;
- private String classAttend;
- private String classType;
- private String assessmentType;
- private int weekday;
- private String timePoint;
- private String address;
-
- public static List splitLesson(Lesson lesson, Integer subjectId) {
- String classList[] = lesson.getClassAttend();
- List weekdays = lesson.getWeeks();
-
- List lessons = new LinkedList<>();
-
- LessonDTO template = new LessonDTO();
- template.setSubject(subjectId);
- template.setTeacher(lesson.getTeacher());
- template.setAssessmentType(lesson.getAssessmentType());
- template.setClassNumber(lesson.getClassNumber());
- template.setAttendAmount(lesson.getAttendAmount());
- template.setClassType(lesson.getClassType());
- template.setTimePoint(lesson.getTimePoint().toString());
- template.setAddress(lesson.getPosition());
-
- for (String className : classList) {
- for (Integer weekday : weekdays) {
- LessonDTO clone = (LessonDTO) template.clone();
- clone.setClassAttend(className);
- clone.setWeekday(weekday);
- lessons.add(clone);
- }
- }
-
- return lessons;
- }
-
- public int getId() {
- return id;
- }
-
- public void setId(int id) {
- this.id = id;
- }
-
- public int getSubject() {
- return subject;
- }
-
- public void setSubject(int subject) {
- this.subject = subject;
- }
-
- public String getTeacher() {
- return teacher;
- }
-
- public void setTeacher(String teacher) {
- this.teacher = teacher;
- }
-
- public String getClassNumber() {
- return classNumber;
- }
-
- public void setClassNumber(String classNumber) {
- this.classNumber = classNumber;
- }
-
- public Integer getAttendAmount() {
- return attendAmount;
- }
-
- public void setAttendAmount(Integer attendAmount) {
- this.attendAmount = attendAmount;
- }
-
- public String getClassAttend() {
- return classAttend;
- }
-
- public void setClassAttend(String classAttend) {
- this.classAttend = classAttend;
- }
-
- public String getClassType() {
- return classType;
- }
-
- public void setClassType(String classType) {
- this.classType = classType;
- }
-
- public String getAssessmentType() {
- return assessmentType;
- }
-
- public void setAssessmentType(String assessmentType) {
- this.assessmentType = assessmentType;
- }
-
- public int getWeek() {
- return weekday;
- }
-
- public void setWeekday(int weekday) {
- this.weekday = weekday;
- }
-
- public String getTimePoint() {
- return timePoint;
- }
-
- public void setTimePoint(String timePoint) {
- this.timePoint = timePoint;
- }
-
- public String getAddress() {
- return address;
- }
-
- public void setAddress(String address) {
- this.address = address;
- }
-
- @Override
- public Object clone() {
- try {
- return super.clone();
- } catch (CloneNotSupportedException ignored) {}
- return null;
- }
-
- @Override
- public String toString() {
- return "LessonDTO{" +
- "id=" + id +
- ", subject=" + subject +
- ", teacher='" + teacher + '\'' +
- ", classNumber='" + classNumber + '\'' +
- ", attendAmount=" + attendAmount +
- ", classAttend='" + classAttend + '\'' +
- ", classType='" + classType + '\'' +
- ", assessmentType='" + assessmentType + '\'' +
- ", weekday=" + weekday +
- ", timePoint='" + timePoint + '\'' +
- ", address='" + address + '\'' +
- '}';
- }
-}
diff --git a/SubjectImporter/src/main/java/net/catten/ssim/helper/DatabaseConnector.java b/SubjectImporter/src/main/java/net/catten/ssim/helper/DatabaseConnector.java
deleted file mode 100644
index 25bde1d..0000000
--- a/SubjectImporter/src/main/java/net/catten/ssim/helper/DatabaseConnector.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package net.catten.ssim.helper;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-import java.util.Properties;
-
-/**
- * Created by catten on 11/14/16.
- */
-public class DatabaseConnector {
- private Properties properties;
- private Connection connection;
-
- /**
- * Simple database manager, use database property to connect database
- *
- * @param properties a property object contained :
- * hostname for target database server with port number
- * username for login to database
- * password for the database user
- * database for target database(schema)
- */
- public DatabaseConnector(Properties properties) throws ClassNotFoundException {
- this.properties = properties;
- Class.forName("com.mysql.jdbc.Driver");
- }
-
- /**
- * Get a database connection
- *
- * If connection doesn't exist, try to create a connection
- *
- * @return
- * @throws SQLException
- * @throws ClassNotFoundException
- */
- public Connection getConnection() throws SQLException, ClassNotFoundException {
- if(connection == null || connection.isClosed()){
- createConnection();
- }
- return connection;
- }
-
- /**
- * Close the connection
- *
- * @throws SQLException
- */
- public void closeConnection() throws SQLException {
- connection.close();
- }
-
- private void createConnection() throws SQLException {
- String connectString = String.format("jdbc:mysql://%s/%s?user=%s&password=%s&useUnicode=true&characterEncoding=utf8",
- properties.get("hostname"),
- properties.get("database"),
- properties.get("username"),
- properties.get("password"));
- connection = DriverManager.getConnection(connectString);
- }
-}
diff --git a/SubjectImporter/src/main/java/net/catten/ssim/helper/TableChecker.java b/SubjectImporter/src/main/java/net/catten/ssim/helper/TableChecker.java
deleted file mode 100644
index e9b32c9..0000000
--- a/SubjectImporter/src/main/java/net/catten/ssim/helper/TableChecker.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package net.catten.ssim.helper;
-
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * Created by catten on 11/13/16.
- */
-public class TableChecker {
- private Connection connection;
- private ArrayList tables;
- private String prefix;
-
- public TableChecker(Connection connection, ArrayList tables, String prefix) {
- this.connection = connection;
- this.tables = tables;
- this.prefix = prefix;
- }
-
- public List checkNotExist() throws SQLException {
- List results = new LinkedList<>();
- for (String s : tables) {
- ResultSet resultSet = connection.getMetaData().getTables(null, connection.getSchema(), prefix + s, new String[]{"TABLE"});
- if (!resultSet.next()) results.add(s);
- }
- return results;
- }
-
- public Connection getConnection() {
- return connection;
- }
-
- public void setConnection(Connection connection) {
- this.connection = connection;
- }
-
- public ArrayList getTables() {
- return tables;
- }
-
- public void setTables(ArrayList tables) {
- this.tables = tables;
- }
-}
diff --git a/SubjectImporter/src/main/java/net/catten/ssim/helper/TableMaker.java b/SubjectImporter/src/main/java/net/catten/ssim/helper/TableMaker.java
deleted file mode 100644
index 8e51b92..0000000
--- a/SubjectImporter/src/main/java/net/catten/ssim/helper/TableMaker.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package net.catten.ssim.helper;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.List;
-import java.util.Properties;
-import java.util.logging.Logger;
-
-/**
- * Created by catten on 11/14/16.
- */
-public class TableMaker {
-
- private Properties tableProperty;
- private Connection connection;
- private Logger logger;
- private String prefix;
-
- public TableMaker(Connection connection, Properties tableProperty, String prefix) {
- this.connection = connection;
- this.tableProperty = tableProperty;
- this.prefix = prefix;
- logger = Logger.getLogger(this.getClass().toString());
- }
-
- public void make(List makeList) throws SQLException {
- Statement statement = connection.createStatement();
- for (String s : makeList) {
- int result = statement.executeUpdate(String.format("CREATE TABLE %s (%s)", prefix + s,tableProperty.get(s)));
- logger.info(String.format("Created table %s, result = %d", prefix + s, result));
- }
- }
-
- public Properties getTableProperty() {
- return tableProperty;
- }
-
- public void setTableProperty(Properties tableProperty) {
- this.tableProperty = tableProperty;
- }
-
- public Connection getConnection() {
- return connection;
- }
-
- public void setConnection(Connection connection) {
- this.connection = connection;
- }
-
- public Logger getLogger() {
- return logger;
- }
-
- public void setLogger(Logger logger) {
- this.logger = logger;
- }
-}
diff --git a/SubjectImporter/src/main/java/net/catten/ssim/helper/Validator.java b/SubjectImporter/src/main/java/net/catten/ssim/helper/Validator.java
deleted file mode 100644
index 8916dd2..0000000
--- a/SubjectImporter/src/main/java/net/catten/ssim/helper/Validator.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package net.catten.ssim.helper;
-
-import java.io.File;
-
-/**
- * Created by catten on 11/14/16.
- */
-public class Validator {
- public static void isDirectory(File file){
- if (!file.isDirectory()) throw new IllegalArgumentException("Source of data must be a directory!");
- }
-}
\ No newline at end of file
diff --git a/SubjectImporter/src/main/java/net/catten/ssim/repository/BaseRepository.java b/SubjectImporter/src/main/java/net/catten/ssim/repository/BaseRepository.java
deleted file mode 100644
index ef73dfe..0000000
--- a/SubjectImporter/src/main/java/net/catten/ssim/repository/BaseRepository.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package net.catten.ssim.repository;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-
-/**
- * Created by catten on 11/14/16.
- */
-public abstract class BaseRepository {
- protected Connection connection;
- protected String table;
-
- public BaseRepository(Connection connection, String table) {
- this.connection = connection;
- this.table = table;
- }
-
- public abstract void save(T entity) throws SQLException;
-}
diff --git a/SubjectImporter/src/main/java/net/catten/ssim/repository/LessonRepository.java b/SubjectImporter/src/main/java/net/catten/ssim/repository/LessonRepository.java
deleted file mode 100644
index 404cc3a..0000000
--- a/SubjectImporter/src/main/java/net/catten/ssim/repository/LessonRepository.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package net.catten.ssim.repository;
-
-import net.catten.ssim.dto.LessonDTO;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-
-/**
- * Created by catten on 11/14/16.
- */
-public class LessonRepository extends BaseRepository {
-
- public LessonRepository(Connection connection, String table) {
- super(connection, table);
- }
-
- @Override
- public void save(LessonDTO entity) throws SQLException {
- PreparedStatement preparedStatement = connection.prepareStatement(
- "INSERT INTO " + table + "lessons (subject,teacher,classNumber,attendAmount,classAttend,classType,assessmentType,week,timePoint,address) VALUE (?,?,?,?,?,?,?,?,?,?)");
- preparedStatement.setInt(1, entity.getSubject());
- preparedStatement.setString(2, entity.getTeacher());
- preparedStatement.setString(3, entity.getClassNumber());
- preparedStatement.setInt(4, entity.getAttendAmount());
- preparedStatement.setString(5, entity.getClassAttend());
- preparedStatement.setString(6, entity.getClassType());
- preparedStatement.setString(7, entity.getAssessmentType());
- preparedStatement.setInt(8, entity.getWeek());
- preparedStatement.setString(9, entity.getTimePoint());
- preparedStatement.setString(10, entity.getAddress());
- preparedStatement.execute();
- preparedStatement.close();
- }
-}
diff --git a/SubjectImporter/src/main/java/net/catten/ssim/repository/SubjectRepository.java b/SubjectImporter/src/main/java/net/catten/ssim/repository/SubjectRepository.java
deleted file mode 100644
index 516616c..0000000
--- a/SubjectImporter/src/main/java/net/catten/ssim/repository/SubjectRepository.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package net.catten.ssim.repository;
-
-import net.catten.ssim.schedule.model.Subject;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-
-/**
- * Created by catten on 11/14/16.
- */
-public class SubjectRepository extends BaseRepository {
-
- public SubjectRepository(Connection connection, String table) {
- super(connection, table);
- }
-
- @Override
- public void save(Subject entity) throws SQLException {
- PreparedStatement preparedStatement = connection
- .prepareStatement("INSERT INTO " + table + "subjects (id,term,name,code,unit,timeSpend,point) VALUES (?,?,?,?,?,?,?)");
- preparedStatement.setInt(1, entity.getId());
- preparedStatement.setString(2, entity.getTerm());
- preparedStatement.setString(3, entity.getName());
- preparedStatement.setString(4, entity.getCode());
- preparedStatement.setString(5, entity.getUnit());
- preparedStatement.setDouble(6, entity.getTimeSpend());
- preparedStatement.setDouble(7, entity.getPoint());
- preparedStatement.executeUpdate();
- preparedStatement.close();
- }
-
-}
diff --git a/SubjectImporter/src/main/java/net/catten/ssim/services/DataImporter.java b/SubjectImporter/src/main/java/net/catten/ssim/services/DataImporter.java
deleted file mode 100644
index c7a7b63..0000000
--- a/SubjectImporter/src/main/java/net/catten/ssim/services/DataImporter.java
+++ /dev/null
@@ -1,137 +0,0 @@
-package net.catten.ssim.services;
-
-import net.catten.ssim.common.events.TickEventProvider;
-import net.catten.ssim.common.events.TickEventReceiver;
-import net.catten.ssim.dto.LessonDTO;
-import net.catten.ssim.helper.Validator;
-import net.catten.ssim.repository.LessonRepository;
-import net.catten.ssim.repository.SubjectRepository;
-import net.catten.ssim.schedule.factory.SubjectFactory;
-import net.catten.ssim.schedule.model.Lesson;
-import net.catten.ssim.schedule.model.Subject;
-import org.apache.commons.io.IOUtils;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Logger;
-
-/**
- * Created by catten on 11/14/16.
- */
-public class DataImporter implements TickEventProvider {
- private File targetDir;
- private String fileSuffix;
- private String tablePrefix;
-
- private SubjectFactory subjectFactory;
- private Logger logger;
-
- private Map bufferMap;
-
- private LessonRepository lessonRepository;
- private SubjectRepository subjectRepository;
-
- private TickEventReceiver tickEventReceiver = message -> {
- //do nothing...
- };
-
- public DataImporter(Connection connection,File targetDir, String charset, String fileSuffix, String tablePrefix) {
-
- //Validate if target file is a directory
- this.targetDir = targetDir;
- Validator.isDirectory(targetDir);
-
- //Set file suffix
- this.fileSuffix = fileSuffix;
-
- //Set table prefix
- this.tablePrefix = tablePrefix;
-
- initialize(connection,charset);
- logger.info("DataImporter initialized for import from file.");
- }
-
- public DataImporter(Connection connection, Map bufferedData, String charset, String tablePrefix){
- this.bufferMap = bufferedData;
- this.tablePrefix = tablePrefix;
-
- initialize(connection,charset);
-
- logger.info("DataImporter initialized for import from buffer.");
- }
-
- private void initialize(Connection connection, String charset) {
- //Set connection
-
- //Create subject factory with charset
- this.subjectFactory = new SubjectFactory(charset);
-
- //Get logger for logging
- this.logger = Logger.getLogger(this.getClass().toString());
-
- lessonRepository = new LessonRepository(connection,tablePrefix);
- subjectRepository = new SubjectRepository(connection,tablePrefix);
- }
-
- public void startJobs() throws IOException, SQLException {
- bufferItems();
- int currentItem = 0;
- for (Integer item : bufferMap.keySet()) {
- currentItem++;
-
- Subject subject = subjectFactory.parse(bufferMap.get(item),item);
- subjectRepository.save(subject);
- for (Lesson lesson : subject.getLessons()){
-
- tickEventReceiver.tick(bufferMap.size(),currentItem, item);
- List lessonDTOList = LessonDTO.splitLesson(lesson,subject.getId());
- for (LessonDTO lessonDTO : lessonDTOList){
- lessonRepository.save(lessonDTO);
- }
- }
- }
- System.out.println();
- logger.info("Work finished.");
- }
-
- private void bufferItems() throws IOException {
- if (targetDir != null) {
- logger.info("Fetching files : " + targetDir.getAbsolutePath());
- File[] files = targetDir.listFiles((file, s) -> s.endsWith(fileSuffix));
- bufferMap = new HashMap<>();
- if(files != null){
- logger.info(String.valueOf(files.length) + " Files match, added to file list.");
-
- int currentFile = 0;
- for (File file : files){
- currentFile++;
- int suffixPos = file.getName().indexOf(fileSuffix.charAt(0));
- bufferMap.put(Integer.parseInt(file.getName().substring(0,suffixPos)), IOUtils.toString(new FileInputStream(file)));
- tickEventReceiver.tick(files.length,currentFile,file.getName());
- }
- System.out.println();
- logger.info("Buffering finished.");
- }
- }
- }
-
- public String getCharset() {
- return subjectFactory.getCharset();
- }
-
- public void setCharset(String charset) {
- subjectFactory.setCharset(charset);
- }
-
-
- @Override
- public void setTickReceiver(TickEventReceiver receiver) {
- this.tickEventReceiver = receiver;
- }
-}
diff --git a/SubjectImporter/src/main/resources/tables.properties b/SubjectImporter/src/main/resources/tables.properties
deleted file mode 100644
index 5fabebf..0000000
--- a/SubjectImporter/src/main/resources/tables.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-subjects=id INT PRIMARY KEY NOT NULL AUTO_INCREMENT,term VARCHAR(30) NOT NULL ,name TEXT NOT NULL,code CHAR(20) NOT NULL ,unit VARCHAR(50) NOT NULL ,timeSpend DOUBLE NOT NULL ,point DOUBLE NOT NULL
-lessons=id INT PRIMARY KEY NOT NULL AUTO_INCREMENT,subject INT NOT NULL ,teacher VARCHAR(50) NOT NULL ,classNumber CHAR(10) NOT NULL ,attendAmount INT NOT NULL ,classAttend TEXT,classType VARCHAR(20),assessmentType CHAR(10),week INT,timePoint CHAR(16),address TEXT
\ No newline at end of file
diff --git a/SubjectImporter/src/test/java/net/catten/ssim/dto/LessonDTOTest.java b/SubjectImporter/src/test/java/net/catten/ssim/dto/LessonDTOTest.java
deleted file mode 100644
index b3feedf..0000000
--- a/SubjectImporter/src/test/java/net/catten/ssim/dto/LessonDTOTest.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package net.catten.ssim.dto;
-
-import net.catten.ssim.Main;
-import net.catten.ssim.dto.LessonDTO;
-import net.catten.ssim.schedule.factory.SubjectFactory;
-import net.catten.ssim.schedule.model.Lesson;
-import net.catten.ssim.schedule.model.Subject;
-import org.junit.Test;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by catten on 11/14/16.
- */
-public class LessonDTOTest {
- @Test
- public void splitLesson() throws Exception {
- SubjectFactory subjectFactory = new SubjectFactory("GB2312");
- Subject subject = subjectFactory.parse(Main.class.getResourceAsStream("/012213.html"), 12213);
- List lessonList = new LinkedList<>();
- for (Lesson lesson : subject.getLessons()) {
- lessonList.addAll(LessonDTO.splitLesson(lesson, subject.getId()));
- }
- System.out.println(lessonList);
- }
-
-}
\ No newline at end of file
diff --git a/SubjectImporter/src/test/resources/012213.html b/SubjectImporter/src/test/resources/012213.html
deleted file mode 100644
index 4ba6b16..0000000
--- a/SubjectImporter/src/test/resources/012213.html
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
- LessonSel_rpt
-
-
-
-
-
-
-
-
-
-
ѧԺγ̿α
2016-2017ѧһѧ
еλϢѧԺ γ̣[011922]רҵĿ ѧʱ36.0 ѧ֣2.0
ονʦ
Ͽ
Ͽ
γ
ʽ
Ͽΰ༶
ܴ
ڴ
ص
»
008
0
רҵ/
15()1
17
[1-2]
зʵѵ(B403)
17
[3-4]
зʵѵ(B403)
17-18
һ[1-2]
зʵѵ(B403)
17-18
һ[3-4]
зʵѵ(B403)
17-18
[5-6]
зʵѵ(B403)
17-18
[7-8]
зʵѵ(B403)
17-18
[1-2]
зʵѵ(B403)
17-18
[3-4]
зʵѵ(B403)
17-18
[5-6]
зʵѵ(B403)
17-18
[7-8]
зʵѵ(B403)
»
009
0
רҵ/
15()2
17-18
һ[5-6]
зʵѵ(B403)
17-18
һ[7-8]
зʵѵ(B403)
17-18
[1-2]
зʵѵ(B403)
17-18
[3-4]
зʵѵ(B403)
17-18
[5-6]
зʵѵ(B403)
17-18
[7-8]
зʵѵ(B403)
17-18
[1-2]
зʵѵ(B403)
17-18
[3-4]
зʵѵ(B403)
18
[1-2]
зʵѵ(B403)
18
[3-4]
зʵѵ(B403)
001
0
רҵ/
15()3
17-18
һ[5-6]
Ӧüһ(¥B307)
17-18
һ[7-8]
Ӧüһ(¥B307)
17-18
[1-2]
Ӧüһ(¥B307)
17-18
[3-4]
Ӧüһ(¥B307)
17-18
[9-10]
Ӧüһ(¥B307)
17-18
[11-12]
Ӧüһ(¥B307)
17-18
[1-2]
Ӧüһ(¥B307)
17-18
[3-4]
Ӧüһ(¥B307)
18
[5-6]
Ӧüһ(¥B307)
18
[7-8]
Ӧüһ(¥B307)
ı
003
0
רҵ/
15()1
17
[9-10]
ʵ(¥B408)
17
[11-12]
ʵ(¥B408)
17-18
һ[5-6]
ʵ(¥B408)
17-18
һ[7-8]
ʵ(¥B408)
17-18
[1-2]
ʵ(¥B408)
17-18
[3-4]
ʵ(¥B408)
17-18
[5-6]
ʵ(¥B408)
17-18
[7-8]
ʵ(¥B408)
17-18
[5-6]
ʵ(¥B408)
17-18
[7-8]
ʵ(¥B408)
004
0
/
15ɽ1
17
[1-2]
3G-ۺʵѵ(305)
17
[3-4]
3G-ۺʵѵ(305)
17-18
һ[1-2]
3G-ۺʵѵ(305)
17-18
һ[3-4]
3G-ۺʵѵ(305)
17-18
[5-6]
3G-ۺʵѵ(305)
17-18
[7-8]
3G-ۺʵѵ(305)
17-18
[1-2]
3G-ۺʵѵ(305)
17-18
[3-4]
3G-ۺʵѵ(305)
17-18
[5-6]
3G-ۺʵѵ(305)
17-18
[7-8]
3G-ۺʵѵ(305)
005
0
/
15ɽ2
17-18
һ[5-6]
3G-ۺʵѵ(305)
17-18
һ[7-8]
3G-ۺʵѵ(305)
17-18
[1-2]
3G-ۺʵѵ(305)
17-18
[3-4]
3G-ۺʵѵ(305)
17-18
[5-6]
3G-ۺʵѵ(305)
17-18
[7-8]
3G-ۺʵѵ(305)
17-18
[1-2]
3G-ۺʵѵ(305)
17-18
[3-4]
3G-ۺʵѵ(305)
18
[1-2]
3G-ۺʵѵ(305)
18
[3-4]
3G-ۺʵѵ(305)
ʤ
002
0
/
15(IT)
17-18
[1-2]
ʵѵң¶303
17-18
[3-4]
ʵѵң¶303
17-18
[5-6]
ʵѵң¶303
17-18
[7-8]
ʵѵң¶303
17-18
[9-10]
ʵѵң¶303
17-18
[11-12]
ʵѵң¶303
17-18
[5-6]
ʵѵң¶303
17-18
[7-8]
ʵѵң¶303
18
[1-2]
ʵѵң¶303
18
[3-4]
ʵѵң¶303
С
007
0
רҵ/
15()4
17-18
һ[1-2]
ʵ(¥B408)
17-18
һ[3-4]
ʵ(¥B408)
17-18
[1-2]
ʵ(¥B408)
17-18
[3-4]
ʵ(¥B408)
17-18
[5-6]
ʵ(¥B408)
17-18
[7-8]
ʵ(¥B408)
17-18
[1-2]
ʵ(¥B408)
17-18
[3-4]
ʵ(¥B408)
18
[9-10]
ʵ(¥B408)
18
[11-12]
ʵ(¥B408)
˹㻪
006
0
רҵ/
15()2
17
[1-2]
ʵѵң¶303
17
[3-4]
ʵѵң¶303
17-18
һ[5-6]
ʵѵң¶303
17-18
һ[7-8]
ʵѵң¶303
17-18
[5-6]
ʵѵң¶303
17-18
[7-8]
ʵѵң¶303
17-18
[9-10]
ʵѵң¶303
17-18
[11-12]
ʵѵң¶303
17-18
[1-2]
ʵѵң¶303
17-18
[3-4]
ʵѵң¶303
-
-
-
diff --git a/connection.properties b/connection.properties
deleted file mode 100644
index ffc65a5..0000000
--- a/connection.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-hostname=localhost:3306
-username=
-password=
-database=
diff --git a/login.properties b/login.properties
deleted file mode 100644
index 8443baf..0000000
--- a/login.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-username=
-password=
-role=STU
-charset=GB2312
-tableFormat=2
-delay=500
-userAgent=Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/54.0.2840.90 Safari/537.36undefined5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/54.0.2840.90 Safari/537.36 SN:NULL
diff --git a/pom.xml b/pom.xml
index 65c2186..d68a6c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,53 +6,179 @@
net.cattenssim
- pom
- 2.0
-
- ClassScheduleAdapter
- LNCKingoJWCaterpillar
- SubjectImportCommonUtils
- SubjectImporter
-
-
-
-
-
-
- mysql
- mysql-connector-java
- 5.1.38
-
-
-
-
- org.jsoup
- jsoup
- 1.8.3
-
-
-
-
- commons-io
- commons-io
- 2.4
-
-
-
-
- org.apache.httpcomponents
- httpclient
- 4.5.2
-
-
-
- junit
- junit
- 4.12
- test
-
-
-
+ war
+ 3.0
+
+
+ 5.1.0.Final
+ 4.2.5.RELEASE
+ 2.7.0
+
+
+
+
+
+
+
+
+
+
+ mysql
+ mysql-connector-java
+ 5.1.38
+
+
+
+
+ org.jsoup
+ jsoup
+ 1.8.3
+
+
+
+
+ commons-io
+ commons-io
+ 2.4
+
+
+
+
+ org.apache.httpcomponents
+ httpclient
+ 4.5.2
+
+
+
+ javax.servlet
+ servlet-api
+ 2.5
+
+
+
+ org.hibernate
+ hibernate-core
+ ${hibernate.version}
+
+
+
+ org.hibernate
+ hibernate-entitymanager
+ ${hibernate.version}
+
+
+
+ org.hibernate
+ hibernate-ehcache
+ ${hibernate.version}
+
+
+
+
+ org.springframework
+ spring-core
+ ${spring.version}
+
+
+ org.springframework
+ spring-orm
+ ${spring.version}
+
+
+ org.springframework
+ spring-context
+ ${spring.version}
+
+
+
+
+
+ org.springframework
+ spring-webmvc
+ ${spring.version}
+
+
+
+ org.freemarker
+ freemarker
+ 2.3.23
+
+
+
+ org.springframework
+ spring-context-support
+ ${spring.version}
+
+
+
+
+
+ com.fasterxml.jackson.core
+ jackson-core
+ LATEST
+
+
+
+ com.fasterxml.jackson.core
+ jackson-databind
+ LATEST
+
+
+
+ com.fasterxml.jackson.core
+ jackson-annotations
+ LATEST
+
+
+
+
+ com.alibaba
+ druid
+ 1.0.15
+
+
+
+
+ org.springframework.data
+ spring-data-jpa
+ 1.9.4.RELEASE
+
+
+
+
+
+ org.slf4j
+ slf4j-log4j12
+ 1.7.10
+
+
+
+ org.slf4j
+ jcl-over-slf4j
+ 1.7.10
+
+
+
+ org.springframework
+ spring-test
+ ${spring.version}
+ test
+
+
+
+ org.mockito
+ mockito-core
+ 2.7.2
+ test
+
+
+
+ junit
+ junit
+ 4.12
+ test
+
+
@@ -64,6 +190,64 @@
1.8
+
+
+
+ org.apache.maven.plugins
+ maven-war-plugin
+ 2.6
+
+ true
+ true
+ web
+
+
+ web
+ true
+
+
+
+
+
+
+
+ org.eclipse.jetty
+ jetty-maven-plugin
+ 9.2.10.v20150310
+
+ 5
+ web
+
+ /cs
+
+
+ org.eclipse.jetty.util.URI.charset=UTF-8
+
+ stop
+ 8089
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/SubjectImportCommonUtils/src/main/java/net/catten/ssim/common/events/TickEventProvider.java b/src/main/java/net/catten/ssim/common/events/TickEventProvider.java
similarity index 100%
rename from SubjectImportCommonUtils/src/main/java/net/catten/ssim/common/events/TickEventProvider.java
rename to src/main/java/net/catten/ssim/common/events/TickEventProvider.java
diff --git a/SubjectImportCommonUtils/src/main/java/net/catten/ssim/common/events/TickEventReceiver.java b/src/main/java/net/catten/ssim/common/events/TickEventReceiver.java
similarity index 100%
rename from SubjectImportCommonUtils/src/main/java/net/catten/ssim/common/events/TickEventReceiver.java
rename to src/main/java/net/catten/ssim/common/events/TickEventReceiver.java
diff --git a/src/main/java/net/catten/ssim/common/http/HttpSessionHolder.java b/src/main/java/net/catten/ssim/common/http/HttpSessionHolder.java
new file mode 100644
index 0000000..8477158
--- /dev/null
+++ b/src/main/java/net/catten/ssim/common/http/HttpSessionHolder.java
@@ -0,0 +1,22 @@
+package net.catten.ssim.common.http;
+
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.jsoup.nodes.Document;
+
+import java.io.IOException;
+
+/**
+ * Created by catten on 2/23/17.
+ */
+public interface HttpSessionHolder {
+
+ Document post(String target, String refer, UrlEncodedFormEntity formEntity) throws IOException;
+ Document get(String target, String refer) throws IOException;
+
+ void setUserAgent(String userAgent);
+ String getUserAgent();
+
+ void setCharset(String charset);
+ String getCharset();
+
+}
diff --git a/src/main/java/net/catten/ssim/common/http/impl/HttpSessionHolderImpl.java b/src/main/java/net/catten/ssim/common/http/impl/HttpSessionHolderImpl.java
new file mode 100644
index 0000000..8dabca7
--- /dev/null
+++ b/src/main/java/net/catten/ssim/common/http/impl/HttpSessionHolderImpl.java
@@ -0,0 +1,100 @@
+package net.catten.ssim.common.http.impl;
+
+import net.catten.ssim.common.http.HttpSessionHolder;
+import org.apache.http.NoHttpResponseException;
+import org.apache.http.client.CookieStore;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.protocol.HttpClientContext;
+import org.apache.http.impl.client.BasicCookieStore;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.protocol.BasicHttpContext;
+import org.apache.http.protocol.HttpContext;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+
+/**
+ * Created by catten on 2/23/17.
+ */
+public class HttpSessionHolderImpl implements HttpSessionHolder {
+
+ private Logger logger = LoggerFactory.getLogger(this.getClass());
+
+ private String userAgent = "HttpSessionHolder/Apache HttpClient/JRE";
+ private String charset = "UTF-8";
+
+ private HttpClient httpClient;
+
+ private HttpContext websiteContext;
+ private CookieStore cookieStore;
+
+ public HttpSessionHolderImpl(){
+ cookieStore = new BasicCookieStore();
+ websiteContext = new BasicHttpContext();
+ websiteContext.setAttribute(HttpClientContext.COOKIE_STORE, cookieStore);
+
+ logger.info("Using userAgent : " + userAgent);
+ logger.info("Using charset : " + charset);
+
+ httpClient = HttpClients
+ .custom()
+ .setRetryHandler((e, i, httpContext) -> i <= 5 && e instanceof NoHttpResponseException)
+ .build();
+ }
+
+ @Override
+ public Document post(String target, String refer, UrlEncodedFormEntity formEntity) throws IOException {
+ HttpPost request = new HttpPost(target);
+ request.setHeader("Referer", refer);
+ request.setHeader("User-Agent", userAgent);
+ request.setEntity(formEntity);
+ CloseableHttpResponse response = (CloseableHttpResponse) httpClient.execute(request, websiteContext);
+ Document document = Jsoup.parse(response.getEntity().getContent(),charset,target);
+ response.close();
+ return document;
+ }
+
+ @Override
+ public Document get(String target, String refer) throws IOException {
+ HttpGet request = new HttpGet(target);
+ request.setHeader("Referer", refer);
+ request.setHeader("User-Agent", userAgent);
+ CloseableHttpResponse response = (CloseableHttpResponse)httpClient.execute(request, websiteContext);
+ Document document = Jsoup.parse(response.getEntity().getContent(),charset,target);
+ response.close();
+ return document;
+ }
+
+ public String getUserAgent() {
+ return userAgent;
+ }
+
+ public void setUserAgent(String userAgent) {
+ this.userAgent = userAgent;
+ logger.info("Set userAgent to " + userAgent);
+ }
+
+ public String getCharset() {
+ return charset;
+ }
+
+ public void setCharset(String charset) {
+ this.charset = charset;
+ logger.info("Set charset to " + charset);
+ }
+
+ public CookieStore getCookieStore() {
+ return cookieStore;
+ }
+
+ public void setCookieStore(CookieStore cookieStore) {
+ this.cookieStore = cookieStore;
+ }
+}
diff --git a/SubjectImporter/src/main/java/net/catten/ssim/events/ProgressPrinter.java b/src/main/java/net/catten/ssim/events/ProgressPrinter.java
similarity index 100%
rename from SubjectImporter/src/main/java/net/catten/ssim/events/ProgressPrinter.java
rename to src/main/java/net/catten/ssim/events/ProgressPrinter.java
diff --git a/src/main/java/net/catten/ssim/schedule/factory/CourseFactory.java b/src/main/java/net/catten/ssim/schedule/factory/CourseFactory.java
new file mode 100644
index 0000000..3354669
--- /dev/null
+++ b/src/main/java/net/catten/ssim/schedule/factory/CourseFactory.java
@@ -0,0 +1,17 @@
+package net.catten.ssim.schedule.factory;
+
+import net.catten.ssim.schedule.model.KingoRawCourse;
+
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * Created by catten on 3/10/17.
+ */
+public interface CourseFactory {
+ T parse(File file) throws IOException;
+
+ String getCharset();
+
+ void setCharset(String charset);
+}
diff --git a/src/main/java/net/catten/ssim/schedule/factory/LessonExpander.java b/src/main/java/net/catten/ssim/schedule/factory/LessonExpander.java
new file mode 100644
index 0000000..4c5bcee
--- /dev/null
+++ b/src/main/java/net/catten/ssim/schedule/factory/LessonExpander.java
@@ -0,0 +1,13 @@
+package net.catten.ssim.schedule.factory;
+
+import net.catten.ssim.schedule.model.KingoRawCourse;
+import net.catten.ssim.web.model.Lesson;
+
+import java.util.List;
+
+/**
+ * Created by catten on 3/10/17.
+ */
+public interface LessonExpander {
+ List expand(R rawCourse);
+}
diff --git a/ClassScheduleAdapter/src/main/java/net/catten/ssim/schedule/factory/SubjectFactory.java b/src/main/java/net/catten/ssim/schedule/factory/impl/CourseFactoryImpl.java
similarity index 75%
rename from ClassScheduleAdapter/src/main/java/net/catten/ssim/schedule/factory/SubjectFactory.java
rename to src/main/java/net/catten/ssim/schedule/factory/impl/CourseFactoryImpl.java
index d7b75ce..42eb9c5 100644
--- a/ClassScheduleAdapter/src/main/java/net/catten/ssim/schedule/factory/SubjectFactory.java
+++ b/src/main/java/net/catten/ssim/schedule/factory/impl/CourseFactoryImpl.java
@@ -1,7 +1,9 @@
-package net.catten.ssim.schedule.factory;
+package net.catten.ssim.schedule.factory.impl;
-import net.catten.ssim.schedule.model.Lesson;
-import net.catten.ssim.schedule.model.Subject;
+import net.catten.ssim.schedule.factory.CourseFactory;
+import net.catten.ssim.schedule.model.KingoRawCourse;
+import net.catten.ssim.schedule.model.KingoRawLesson;
+import net.catten.ssim.schedule.model.KingoRawTimePoint;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
@@ -13,7 +15,7 @@
/**
* Created by catten on 11/12/16.
*/
-public class SubjectFactory {
+public class CourseFactoryImpl implements CourseFactory {
private String baseUrl = "";
private String charset = "UTF-8";
@@ -21,7 +23,7 @@ public class SubjectFactory {
/**
* Default constructor
*/
- public SubjectFactory(){
+ public CourseFactoryImpl(){
}
/**
@@ -29,22 +31,10 @@ public SubjectFactory(){
*
* @param charset
*/
- public SubjectFactory(String charset){
+ public CourseFactoryImpl(String charset){
this.charset = charset;
}
- /**
- * Parse HTML strings
- *
- * @param s HTML
- * @param id id of this string
- * @return
- * @throws IOException
- */
- public Subject parse(String s, Integer id) throws IOException {
- return parse(Jsoup.parse(s),id);
- }
-
/**
* Parse HTML file using file object
*
@@ -52,7 +42,8 @@ public Subject parse(String s, Integer id) throws IOException {
* @return
* @throws IOException
*/
- public Subject parse(File file) throws IOException {
+ @Override
+ public KingoRawCourse parse(File file) throws IOException {
if(file.isFile() && file.canRead() && file.exists()){
String name = file.getName().substring(0,file.getName().indexOf("."));
int id = 0;
@@ -66,22 +57,22 @@ public Subject parse(File file) throws IOException {
* Parse HTML file using stream
*
* @param inputStream stream
- * @param id Give a ID to this Subject, can be null
+ * @param id Give a ID to this KingoRawCourse, can be null
* @return
* @throws IOException
*/
- public Subject parse(InputStream inputStream,Integer id) throws IOException {
+ public KingoRawCourse parse(InputStream inputStream, Integer id) throws IOException {
Document document = Jsoup.parse(inputStream,charset, baseUrl);
return parse(document,id);
}
- public Subject parse(Document document,Integer id){
+ public KingoRawCourse parse(Document document, Integer id){
Element root = document.select("table").first();
Elements tables = root.select("table");
tables.remove(0);
- Subject subject = new Subject();
+ KingoRawCourse subject = new KingoRawCourse();
subject.setId(id);
subject = processSubjectTerm(subject,tables.get(0));
@@ -98,10 +89,12 @@ public void setBaseUrl(String baseUrl) {
this.baseUrl = baseUrl;
}
+ @Override
public String getCharset() {
return charset;
}
+ @Override
public void setCharset(String charset) {
this.charset = charset;
}
@@ -113,13 +106,13 @@ public void setCharset(String charset) {
*
* */
- private Subject processSubjectTerm(Subject subject,Element tableElement){
+ private KingoRawCourse processSubjectTerm(KingoRawCourse subject, Element tableElement){
Elements elements = tableElement.select("tr");
subject.setTerm(elements.get(1).children().text());
return subject;
}
- private Subject processSubjectTitle(Subject subject,Element tableElement){
+ private KingoRawCourse processSubjectTitle(KingoRawCourse subject, Element tableElement){
Elements fields = tableElement.select("td");
String text = fields.first().text();
String[] split = text.split(new String(new char[]{160}));
@@ -145,16 +138,18 @@ private Subject processSubjectTitle(Subject subject,Element tableElement){
return subject;
}
- private List processLessonList(Element tableElement){
- LinkedList lessons = new LinkedList<>();
- Lesson lessonLatest = null;
+ private List processLessonList(Element tableElement){
+ LinkedList lessons = new LinkedList<>();
+ KingoRawLesson lessonLatest = null;
Elements tableItems = tableElement.select("tr");
tableItems.removeIf(element -> !element.child(0).attr("width").equals(""));
for (Element items : tableItems){
- Lesson lesson = new Lesson();
- for (int i = 0; i < items.childNodes().size();i++){
+ KingoRawLesson lesson = new KingoRawLesson();
+ KingoRawTimePoint timePoint = new KingoRawTimePoint();
+ Elements elements = items.getElementsByTag("td");
+ for (int i = 0; i < elements.size(); i++){
Element contentChild = items.child(i);
String c = contentChild.text().trim();
boolean fillLatest = "".equals(c) && lessonLatest != null;
@@ -178,10 +173,10 @@ private List processLessonList(Element tableElement){
lesson.setClassAttend(fillLatest ? lessonLatest.getClassAttend() : c.split(" "));
break;
case 6:
- lesson.setWeek(c);
+ timePoint.setWeekRange(c);
break;
case 7:
- lesson.setTimePoint(c);
+ timePoint.setTimePoints(c);
break;
case 8:
lesson.setPosition(c);
@@ -190,6 +185,7 @@ private List processLessonList(Element tableElement){
break;
}
}
+ lesson.setTimePoint(timePoint);
lessons.add(lesson);
lessonLatest = lessons.getLast();
}
diff --git a/src/main/java/net/catten/ssim/schedule/factory/impl/LessonExpanderImpl.java b/src/main/java/net/catten/ssim/schedule/factory/impl/LessonExpanderImpl.java
new file mode 100644
index 0000000..149733e
--- /dev/null
+++ b/src/main/java/net/catten/ssim/schedule/factory/impl/LessonExpanderImpl.java
@@ -0,0 +1,43 @@
+package net.catten.ssim.schedule.factory.impl;
+
+import net.catten.ssim.schedule.factory.LessonExpander;
+import net.catten.ssim.web.model.Lesson;
+import net.catten.ssim.schedule.model.KingoRawCourse;
+import net.catten.ssim.schedule.model.KingoRawLesson;
+import net.catten.ssim.schedule.model.Timepoint;
+
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * Created by catten on 2/24/17.
+ */
+public class LessonExpanderImpl implements LessonExpander {
+ @Override
+ public List expand(KingoRawCourse rawCourse){
+ List lessons = new LinkedList<>();
+
+ for (KingoRawLesson rawLesson : rawCourse.getLessons()){
+ for (Timepoint timepoint : rawLesson.getTimePoint().expand()){
+ for (String c : rawLesson.getClassAttend()){
+ Lesson lesson = new Lesson();
+ lesson.setTerm(rawCourse.getTerm());
+ lesson.setUnit(rawCourse.getUnit());
+ lesson.setPeriod(rawCourse.getTimeSpend());
+ lesson.setCredit(rawCourse.getPoint());
+ lesson.setName(rawCourse.getName());
+ lesson.setTeacher(rawLesson.getTeacher());
+ lesson.setCategory(rawLesson.getClassType());
+ lesson.setAttendClass(c);
+ lesson.setWeek(timepoint.getWeek());
+ lesson.setWeekday(timepoint.getWeekday());
+ lesson.setTurn(timepoint.getTurn());
+ lesson.setAddress(rawLesson.getPosition());
+ lessons.add(lesson);
+ }
+ }
+ }
+
+ return lessons;
+ }
+}
diff --git a/src/main/java/net/catten/ssim/schedule/kingo/jw/caterpillar/CourseScheduleCaterpillar.java b/src/main/java/net/catten/ssim/schedule/kingo/jw/caterpillar/CourseScheduleCaterpillar.java
new file mode 100644
index 0000000..9e0c729
--- /dev/null
+++ b/src/main/java/net/catten/ssim/schedule/kingo/jw/caterpillar/CourseScheduleCaterpillar.java
@@ -0,0 +1,33 @@
+package net.catten.ssim.schedule.kingo.jw.caterpillar;
+
+import net.catten.ssim.common.events.TickEventProvider;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Map;
+import java.util.Properties;
+
+/**
+ * Created by catten on 2/24/17.
+ */
+public interface CourseScheduleCaterpillar extends TickEventProvider {
+ Map getTermsFromRemote() throws IOException;
+
+ Map getCoursesFromRemote(String termCode) throws IOException;
+
+ int getTermSubjectToFiles(String termCode, File outputFolder) throws IOException, InterruptedException;
+
+ boolean isLoginExpire() throws IOException;
+
+ String getUserAgent();
+
+ void setUserAgent(String userAgent);
+
+ String getCharset();
+
+ void setCharset(String charset);
+
+ Properties getLoginProperties();
+
+ void setLoginProperties(Properties loginProperties) throws IOException;
+}
diff --git a/LNCKingoJWCaterpillar/src/main/java/net/catten/lnc/kingo/jw/caterpillar/KingoJWCaterpillar.java b/src/main/java/net/catten/ssim/schedule/kingo/jw/caterpillar/impl/KingoJWCaterpillar.java
similarity index 55%
rename from LNCKingoJWCaterpillar/src/main/java/net/catten/lnc/kingo/jw/caterpillar/KingoJWCaterpillar.java
rename to src/main/java/net/catten/ssim/schedule/kingo/jw/caterpillar/impl/KingoJWCaterpillar.java
index 2af519d..ad84f05 100644
--- a/LNCKingoJWCaterpillar/src/main/java/net/catten/lnc/kingo/jw/caterpillar/KingoJWCaterpillar.java
+++ b/src/main/java/net/catten/ssim/schedule/kingo/jw/caterpillar/impl/KingoJWCaterpillar.java
@@ -1,80 +1,70 @@
-package net.catten.lnc.kingo.jw.caterpillar;
+package net.catten.ssim.schedule.kingo.jw.caterpillar.impl;
-import net.catten.ssim.common.events.TickEventProvider;
+import net.catten.ssim.common.http.HttpSessionHolder;
+import net.catten.ssim.common.http.impl.HttpSessionHolderImpl;
+import net.catten.ssim.schedule.kingo.jw.caterpillar.CourseScheduleCaterpillar;
import net.catten.ssim.common.events.TickEventReceiver;
-import org.apache.commons.io.IOUtils;
import org.apache.commons.io.output.FileWriterWithEncoding;
import org.apache.http.NameValuePair;
-import org.apache.http.client.CookieStore;
-import org.apache.http.client.HttpClient;
import org.apache.http.client.entity.UrlEncodedFormEntity;
import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.methods.HttpRequestBase;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.impl.client.BasicCookieStore;
-import org.apache.http.impl.client.HttpClients;
import org.apache.http.message.BasicNameValuePair;
-import org.apache.http.protocol.BasicHttpContext;
-import org.apache.http.protocol.HttpContext;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
import org.jsoup.nodes.FormElement;
import org.jsoup.select.Elements;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
-import java.io.*;
+import java.io.File;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
import java.math.BigInteger;
import java.nio.file.Files;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.*;
-import java.util.logging.Logger;
import java.util.stream.Collectors;
/**
* Created by catten on 11/17/16.
*/
-public class KingoJWCaterpillar implements TickEventProvider {
+public class KingoJWCaterpillar implements CourseScheduleCaterpillar {
private Properties loginProperties;
private Properties stringProperties;
- private String userAgent;
- private String charset;
private int delayMS;
- private Logger logger = Logger.getLogger(KingoJWCaterpillar.class.toString());
+ private Logger logger = LoggerFactory.getLogger(KingoJWCaterpillar.class);
- private HttpContext websiteContext;
- private CookieStore cookieStore;
-
- private HttpClient httpClient;
+ private HttpSessionHolder httpSessionHolder = new HttpSessionHolderImpl();
private TickEventReceiver tickEventReceiver = message -> {
- //do nothing...
+ logger.info("Working : " + message[0] + "/" + message[1] + " - " + message[2]);
};
public KingoJWCaterpillar(Properties loginProperties) throws IOException {
- this.loginProperties = new Properties();
+ init(loginProperties);
+ }
+
+ public KingoJWCaterpillar(){
+ logger.info("Using default tick receiver : logger ");
+ }
+
+ private void init(Properties loginProperties) throws IOException {
this.stringProperties = new Properties();
this.loginProperties = loginProperties;
- stringProperties.load(KingoJWCaterpillar.class.getResourceAsStream("/strings.properties"));
+
+ stringProperties.load(KingoJWCaterpillar.class.getResourceAsStream("/net/catten/ssim/schedule/kingo/jw/strings.properties"));
logger.info("Properties Loaded.");
- cookieStore = new BasicCookieStore();
- websiteContext = new BasicHttpContext();
- websiteContext.setAttribute(HttpClientContext.COOKIE_STORE, cookieStore);
- logger.info("Website context initialized.");
+ setUserAgent(loginProperties.getProperty("userAgent"));
+ logger.info("Using User-Agent : " + getUserAgent());
+ setCharset(loginProperties.getProperty("charset"));
+ logger.info("Using encoding : " + getCharset());
- userAgent = loginProperties.getProperty("userAgent");
- logger.info("Using User-Agent : " + userAgent);
- charset = loginProperties.getProperty("charset");
- logger.info("Using encoding : " + charset);
delayMS = Integer.parseInt(loginProperties.getProperty("delay"));
logger.info("Page capture delay : " + String.valueOf(delayMS) + " ms.");
-
- httpClient = HttpClients.createDefault();
- logger.info("HTTP Client started.");
}
static String getEncryptedPassword(String username, String password) {
@@ -110,25 +100,20 @@ public boolean initializeSession() throws IOException {
CloseableHttpResponse response;
//Try to get indexPage
- logger.info("Requesting address : " + loginPageAddress);
- response = getResponse(loginPageAddress, loginPageAddress);
- resultPage = Jsoup.parse(response.getEntity().getContent(), charset, "");
- response.close();
+ resultPage = httpSessionHolder.get(loginPageAddress, loginPageAddress);
FormElement theForm = (FormElement) resultPage.getElementsByTag("form").first();
- if (theForm.elements().size() < 1) {
- logger.warning("Login form not found, maybe the website was close or under construction.");
+ if (!Validate.isForm(theForm) && theForm.elements().size() <= 0) {
+ logger.warn("Login form not found, maybe the website was close or under construction.");
return false;
}
//Try to login
- response = postResponse(loginPageAddress, loginPageAddress, prepareLoginData(theForm));
- resultPage = Jsoup.parse(response.getEntity().getContent(), charset, "");
- response.close();
+ resultPage = httpSessionHolder.post(loginPageAddress, loginPageAddress, prepareLoginData(theForm));
Element element = resultPage.getElementById("divLogNote").child(0);
if (!element.text().equals(stringProperties.getProperty("loginSuccessTip"))) {
- logger.warning("Login result : " + element.text());
+ logger.warn("Login result : " + element.text());
return false;
}
return true;
@@ -140,14 +125,13 @@ public boolean initializeSession() throws IOException {
* @return
* @throws IOException
*/
- public Map getTerms() throws IOException {
+ @Override
+ public Map getTermsFromRemote() throws IOException {
String queryPage = stringProperties.getProperty("classInfoQueryPage");
+
//Get page
- CloseableHttpResponse response = getResponse(queryPage, queryPage);
- Document resultPage = Jsoup.parse(response.getEntity().getContent(), charset, "");
- response.close();
- logger.info("request finished.");
+ Document resultPage = httpSessionHolder.get(queryPage, queryPage);
//Analyze page
FormElement theForm = (FormElement) resultPage.getElementById("form1");
@@ -166,15 +150,14 @@ public Map getTerms() throws IOException {
* @return
* @throws IOException
*/
- public Map getSubjects(Integer termCode) throws IOException {
+ @Override
+ public Map getCoursesFromRemote(String termCode) throws IOException {
- String queryPage = stringProperties.getProperty("subjectListQueryPage") + String.valueOf(termCode);
+ String queryPage = stringProperties.getProperty("subjectListQueryPage") + termCode;
String referPage = stringProperties.getProperty("classInfoQueryPage");
+
//Get page
- CloseableHttpResponse response = getResponse(queryPage, referPage);
- Document resultPage = Jsoup.parse(response.getEntity().getContent(), charset, "");
- response.close();
- logger.info("request finished.");
+ Document resultPage = httpSessionHolder.get(queryPage, referPage);
//Analyze page
Element scriptElement = resultPage.getElementsByTag("script").first();
@@ -192,49 +175,6 @@ public Map getSubjects(Integer termCode) throws IOException {
return null;
}
- /**
- * Get all subjects in a term and save them to an array.
- *
- * @param termCode
- * @return
- * @throws IOException
- * @throws InterruptedException
- */
- public Map getTermSubjectToMemory(Integer termCode) throws IOException, InterruptedException {
-
- if (isLoginExpire()) initializeSession();
- logger.info("checking login status finished");
-
- String referPage = stringProperties.getProperty("classInfoQueryPage");
- String targetPage = stringProperties.getProperty("subjectQueryPage");
-
-
- LinkedList nameValuePairs = new LinkedList<>();
- nameValuePairs.add(new BasicNameValuePair("Sel_XNXQ", String.valueOf(termCode)));
- nameValuePairs.add(new BasicNameValuePair("gs", loginProperties.getProperty("tableFormat")));
- nameValuePairs.add(new BasicNameValuePair("txt_yzm", ""));
- nameValuePairs.addLast(new BasicNameValuePair("Sel_KC", ""));
-
- Map results = new HashMap<>();
-
- logger.info("Capturing subject data...");
- Map lessonListOfTheTerm = getSubjects(termCode);
- int total = lessonListOfTheTerm.size();
- int current = 0;
- logger.info("total item count - " + lessonListOfTheTerm.keySet().size());
- for (String key : lessonListOfTheTerm.keySet()) {
- current++;
- nameValuePairs.removeLast();
- nameValuePairs.addLast(new BasicNameValuePair("Sel_KC", key));
- results.put(Integer.parseInt(key), getSingleSubjectPage(referPage, targetPage, new UrlEncodedFormEntity(nameValuePairs)));
- tickEventReceiver.tick(total, current, key);
- Thread.sleep(delayMS);
- }
- System.out.println();
- logger.info("Capture finished.");
- return results;
- }
-
/**
* Get all subjects in a term and save them to file.
*
@@ -244,13 +184,23 @@ public Map getTermSubjectToMemory(Integer termCode) throws IOEx
* @throws IOException
* @throws InterruptedException
*/
- public int getTermSubjectToFiles(Integer termCode, File outputFolder) throws IOException, InterruptedException {
+ @Override
+ public int getTermSubjectToFiles(String termCode, File outputFolder) throws IOException, InterruptedException {
if (!outputFolder.isDirectory()) {
- logger.warning("specified path is not a directory : " + outputFolder.getAbsolutePath());
+ logger.warn("specified path is not a directory : " + outputFolder.getAbsolutePath());
return -1;
}
+ File[] files = outputFolder.listFiles();
+ if(files != null && files.length > 0){
+ logger.info("Cleaning old files...");
+ for (File file : files){
+ Files.delete(file.toPath());
+ }
+ logger.info("Cleaning finished.");
+ }
+
if (isLoginExpire()) initializeSession();
logger.info("checking login status finished");
@@ -259,13 +209,13 @@ public int getTermSubjectToFiles(Integer termCode, File outputFolder) throws IOE
LinkedList nameValuePairs = new LinkedList<>();
- nameValuePairs.add(new BasicNameValuePair("Sel_XNXQ", String.valueOf(termCode)));
+ nameValuePairs.add(new BasicNameValuePair("Sel_XNXQ", termCode));
nameValuePairs.add(new BasicNameValuePair("gs", loginProperties.getProperty("tableFormat")));
nameValuePairs.add(new BasicNameValuePair("txt_yzm", ""));
nameValuePairs.addLast(new BasicNameValuePair("Sel_KC", ""));
logger.info("Capturing subject data...");
- Map lessonListOfTheTerm = getSubjects(termCode);
+ Map lessonListOfTheTerm = getCoursesFromRemote(termCode);
int total = lessonListOfTheTerm.size();
int current = 0;
logger.info("total item count - " + lessonListOfTheTerm.keySet().size());
@@ -276,7 +226,7 @@ public int getTermSubjectToFiles(Integer termCode, File outputFolder) throws IOE
File file = new File(outputFolder, key + ".html");
FileWriterWithEncoding fileWriter = new FileWriterWithEncoding(file, "UTF-8");
- fileWriter.write(getSingleSubjectPage(referPage, targetPage, new UrlEncodedFormEntity(nameValuePairs)));
+ fileWriter.write(httpSessionHolder.post(targetPage, referPage, new UrlEncodedFormEntity(nameValuePairs)).toString());
fileWriter.flush();
fileWriter.close();
@@ -288,27 +238,18 @@ public int getTermSubjectToFiles(Integer termCode, File outputFolder) throws IOE
return current;
}
- private String getSingleSubjectPage(String refer, String targetPage, UrlEncodedFormEntity formEntity) throws IOException {
- CloseableHttpResponse response = postResponse(targetPage, refer, formEntity);
- String result = IOUtils.toString(response.getEntity().getContent(), charset);
- response.close();
- return result;
- }
-
/**
* Get a page , if the validate field in the from is require, return true.
*
* @return
* @throws IOException
*/
+ @Override
public boolean isLoginExpire() throws IOException {
String queryPage = stringProperties.getProperty("classInfoQueryPage");
- CloseableHttpResponse response = getResponse(queryPage, queryPage);
- Document resultPage = Jsoup.parse(response.getEntity().getContent(), charset, "");
- response.close();
- logger.info("request finished.");
+ Document resultPage = httpSessionHolder.get(queryPage, queryPage);
Element element = resultPage.getElementById("txt_yzm");
boolean result = !element.parent().attr("style").equals("display:none");
@@ -330,7 +271,7 @@ private UrlEncodedFormEntity prepareLoginData(FormElement formElement) throws Un
String attrName = element.attr("name");
switch (attrName) {
case "pcInfo":
- nameValuePairs.add(new BasicNameValuePair(attrName, userAgent));
+ nameValuePairs.add(new BasicNameValuePair(attrName, getUserAgent()));
break;
case "dsdsdsdsdxcxdfgfg":
nameValuePairs.add(new BasicNameValuePair(attrName, getEncryptedPassword(loginProperties.getProperty("username"), loginProperties.getProperty("password"))));
@@ -355,60 +296,43 @@ private UrlEncodedFormEntity prepareLoginData(FormElement formElement) throws Un
}
}
}
- return new UrlEncodedFormEntity(nameValuePairs, charset);
+ return new UrlEncodedFormEntity(nameValuePairs, getCharset());
}
- /**
- * Set user-agent as Chrome(Linux) and set refer
- *
- * @param request
- * @param refer
- */
- private void prepareBaseHeader(HttpRequestBase request, String refer) {
- request.setHeader("Referer", refer);
- request.setHeader("User-Agent", userAgent);
+ @Override
+ public String getUserAgent() {
+ return httpSessionHolder.getUserAgent();
}
- /**
- * Factory method for GET request
- *
- * @param targetPage
- * @param refer
- * @return
- * @throws IOException
- */
- private CloseableHttpResponse getResponse(String targetPage, String refer) throws IOException {
- HttpGet httpGet = new HttpGet(targetPage);
- prepareBaseHeader(httpGet, refer);
- return (CloseableHttpResponse) httpClient.execute(httpGet, websiteContext);
+ @Override
+ public void setUserAgent(String userAgent) {
+ httpSessionHolder.setUserAgent(userAgent);
}
- /**
- * Factory method for POST request
- *
- * @param targetPage
- * @param refer
- * @param formEntity
- * @return
- * @throws IOException
- */
- private CloseableHttpResponse postResponse(String targetPage, String refer, UrlEncodedFormEntity formEntity) throws IOException {
- HttpPost httpPost = new HttpPost(targetPage);
- prepareBaseHeader(httpPost, refer);
- httpPost.setEntity(formEntity);
- return (CloseableHttpResponse) httpClient.execute(httpPost, websiteContext);
+ @Override
+ public void setTickReceiver(TickEventReceiver tickEventReceiver) {
+ this.tickEventReceiver = tickEventReceiver;
+ logger.info("Using tick receiver : " + tickEventReceiver.getClass());
}
- public String getUserAgent() {
- return userAgent;
+ @Override
+ public String getCharset() {
+ return httpSessionHolder.getCharset();
}
- public void setUserAgent(String userAgent) {
- this.userAgent = userAgent;
+ @Override
+ public void setCharset(String charset) {
+ httpSessionHolder.setCharset(charset);
}
@Override
- public void setTickReceiver(TickEventReceiver tickEventReceiver) {
- this.tickEventReceiver = tickEventReceiver;
+ public Properties getLoginProperties() {
+ return loginProperties;
+ }
+
+ @Override
+ public void setLoginProperties(Properties loginProperties) throws IOException {
+ init(loginProperties);
+ this.loginProperties = loginProperties;
}
}
diff --git a/src/main/java/net/catten/ssim/schedule/kingo/jw/caterpillar/impl/Validate.java b/src/main/java/net/catten/ssim/schedule/kingo/jw/caterpillar/impl/Validate.java
new file mode 100644
index 0000000..6203a35
--- /dev/null
+++ b/src/main/java/net/catten/ssim/schedule/kingo/jw/caterpillar/impl/Validate.java
@@ -0,0 +1,13 @@
+package net.catten.ssim.schedule.kingo.jw.caterpillar.impl;
+
+import org.jsoup.nodes.Element;
+import org.jsoup.nodes.FormElement;
+
+/**
+ * Created by catten on 2/23/17.
+ */
+public class Validate {
+ public static boolean isForm(Element element){
+ return element.tag().getName().equals("form");
+ }
+}
diff --git a/ClassScheduleAdapter/src/main/java/net/catten/ssim/schedule/model/Subject.java b/src/main/java/net/catten/ssim/schedule/model/KingoRawCourse.java
similarity index 90%
rename from ClassScheduleAdapter/src/main/java/net/catten/ssim/schedule/model/Subject.java
rename to src/main/java/net/catten/ssim/schedule/model/KingoRawCourse.java
index ed73905..a4259d0 100644
--- a/ClassScheduleAdapter/src/main/java/net/catten/ssim/schedule/model/Subject.java
+++ b/src/main/java/net/catten/ssim/schedule/model/KingoRawCourse.java
@@ -5,7 +5,7 @@
/**
* Created by catten on 11/12/16.
*/
-public class Subject {
+public class KingoRawCourse {
private Integer id; //服务器上的ID
private String term;//学期
private String name;//课程名称
@@ -13,7 +13,7 @@ public class Subject {
private String unit;//承担单位
private double timeSpend;//学时
private Double point;//学分
- private List lessons;//课堂
+ private List lessons;//课堂
public Integer getId() {
return id;
@@ -75,17 +75,17 @@ public void setPoint(Double point) {
this.point = point;
}
- public List getLessons() {
+ public List getLessons() {
return lessons;
}
- public void setLessons(List lessons) {
+ public void setLessons(List lessons) {
this.lessons = lessons;
}
@Override
public String toString() {
- return "Subject{" +
+ return "KingoRawCourse{" +
"id=" + id +
", term='" + term + '\'' +
", name='" + name + '\'' +
diff --git a/ClassScheduleAdapter/src/main/java/net/catten/ssim/schedule/model/Lesson.java b/src/main/java/net/catten/ssim/schedule/model/KingoRawLesson.java
similarity index 67%
rename from ClassScheduleAdapter/src/main/java/net/catten/ssim/schedule/model/Lesson.java
rename to src/main/java/net/catten/ssim/schedule/model/KingoRawLesson.java
index 4418f3d..72bd2b2 100644
--- a/ClassScheduleAdapter/src/main/java/net/catten/ssim/schedule/model/Lesson.java
+++ b/src/main/java/net/catten/ssim/schedule/model/KingoRawLesson.java
@@ -1,21 +1,18 @@
package net.catten.ssim.schedule.model;
import java.util.Arrays;
-import java.util.LinkedList;
-import java.util.List;
/**
* Created by catten on 11/12/16.
*/
-public class Lesson {
+public class KingoRawLesson {
private String teacher;//任课老师
private String classNumber;//上课班号
private Integer attendAmount;//上课人数
private String[] classAttend;//上课班级构成
private String classType;//课程类别
private String assessmentType;//考核方式
- private List weeks;//周次
- private String timePoint;//节次
+ private KingoRawTimePoint timePoint;
private String position;//地点
public String getTeacher() {
@@ -58,40 +55,6 @@ public void setAssessmentType(String assessmentType) {
this.assessmentType = assessmentType;
}
- public List getWeeks() {
- return weeks;
- }
-
- public void setWeek(String parse){
- String[] list = parse.split(",");
- List _weeks = new LinkedList<>();
- for (String s : list){
- String[] range = s.split("-");
- if(range.length == 1) {
- _weeks.add(Integer.parseInt(range[0]));
- }else {
- int _startWeek = Integer.parseInt(range[0]);
- int _endWeek = Integer.parseInt(range[range.length - 1]);
- for (int i = _startWeek; i <= _endWeek; i++){
- _weeks.add(i);
- }
- }
- }
- this.weeks = _weeks;
- }
-
- public void setWeeks(List weeks) {
- this.weeks = weeks;
- }
-
- public String getTimePoint() {
- return timePoint;
- }
-
- public void setTimePoint(String timePoint) {
- this.timePoint = timePoint;
- }
-
public String getPosition() {
return position;
}
@@ -110,16 +73,24 @@ public void setClassAttend(String[] classAttend) {
@Override
public String toString() {
- return "Lesson{" +
+ return "KingoRawLesson{" +
"teacher='" + teacher + '\'' +
", classNumber='" + classNumber + '\'' +
", attendAmount=" + attendAmount +
", classAttend=" + Arrays.toString(classAttend) +
", classType='" + classType + '\'' +
", assessmentType='" + assessmentType + '\'' +
- ", weeks=" + weeks +
+ ", weeks=" + timePoint +
", timePoint=" + timePoint +
", position='" + position + '\'' +
'}';
}
+
+ public KingoRawTimePoint getTimePoint() {
+ return timePoint;
+ }
+
+ public void setTimePoint(KingoRawTimePoint timePoint) {
+ this.timePoint = timePoint;
+ }
}
diff --git a/src/main/java/net/catten/ssim/schedule/model/KingoRawTimePoint.java b/src/main/java/net/catten/ssim/schedule/model/KingoRawTimePoint.java
new file mode 100644
index 0000000..c69262e
--- /dev/null
+++ b/src/main/java/net/catten/ssim/schedule/model/KingoRawTimePoint.java
@@ -0,0 +1,108 @@
+package net.catten.ssim.schedule.model;
+
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by catten on 2/24/17.
+ */
+public class KingoRawTimePoint {
+ private static Map weekMap = new HashMap() {
+ {
+ put("日", 0);
+ put("一", 1);
+ put("二", 2);
+ put("三", 3);
+ put("四", 4);
+ put("五", 5);
+ put("六", 6);
+ }
+ };
+
+ private String weekRange;
+ private String timePoints;
+
+ public KingoRawTimePoint() {
+
+ }
+
+ public KingoRawTimePoint(String weekRange, String timePoints) {
+ this.weekRange = weekRange;
+ this.timePoints = timePoints;
+ }
+
+ public String getWeekRange() {
+ return weekRange;
+ }
+
+ public void setWeekRange(String weekRange) {
+ this.weekRange = weekRange;
+ }
+
+ public String getTimePoints() {
+ return timePoints;
+ }
+
+ public void setTimePoints(String timePoints) {
+ timePoints = timePoints.replace("节","");
+ this.timePoints = timePoints;
+ }
+
+ private List parseWeeks(String parse) {
+ String[] list = parse.split(",");
+ List _weeks = new LinkedList<>();
+ for (String s : list) {
+ String[] range = s.split("-");
+ if (range.length == 1) {
+ _weeks.add(Integer.parseInt(range[0]));
+ } else {
+ int _startWeek = Integer.parseInt(range[0]);
+ int _endWeek = Integer.parseInt(range[range.length - 1]);
+ for (int i = _startWeek; i <= _endWeek; i++) {
+ _weeks.add(i);
+ }
+ }
+ }
+ return _weeks;
+ }
+
+ public List expand() {
+ List timepoints = new LinkedList<>();
+
+ List weeks = parseWeeks(weekRange);
+ for (Integer week : weeks) {
+ String[] strings = timePoints.split("\\[|]");
+ if (strings.length >= 3) {
+ switch (strings[2]) {
+ case "双":
+ if (week % 2 != 0) continue;
+ case "单":
+ if (week % 2 == 0) continue;
+ default:
+ break;
+ }
+ }
+
+ String[] r = strings[1].split("-");
+ if(r.length > 1){
+ for (int i = Integer.parseInt(r[0]); i <= Integer.parseInt(r[1]); i++){
+ timepoints.add(new Timepoint(week,weekMap.get(strings[0]),i));
+ }
+ }else {
+ timepoints.add(new Timepoint(week,weekMap.get(strings[0]),Integer.parseInt(r[0])));
+ }
+ }
+
+ return timepoints;
+ }
+
+ @Override
+ public String toString() {
+ return "KingoRawTimePoint{" +
+ "weekRange='" + weekRange + '\'' +
+ ", timePoints='" + timePoints + '\'' +
+ '}';
+ }
+}
diff --git a/src/main/java/net/catten/ssim/schedule/model/Timepoint.java b/src/main/java/net/catten/ssim/schedule/model/Timepoint.java
new file mode 100644
index 0000000..89757c1
--- /dev/null
+++ b/src/main/java/net/catten/ssim/schedule/model/Timepoint.java
@@ -0,0 +1,49 @@
+package net.catten.ssim.schedule.model;
+
+/**
+ * Created by catten on 2/24/17.
+ */
+public class Timepoint {
+ private int week;
+ private int weekday;
+ private int turn;
+
+ public Timepoint(int week, int weekday, int turn) {
+ this.week = week;
+ this.weekday = weekday;
+ this.turn = turn;
+ }
+
+ public int getWeek() {
+ return week;
+ }
+
+ public void setWeek(int week) {
+ this.week = week;
+ }
+
+ public int getWeekday() {
+ return weekday;
+ }
+
+ public void setWeekday(int weekday) {
+ this.weekday = weekday;
+ }
+
+ public int getTurn() {
+ return turn;
+ }
+
+ public void setTurn(int turn) {
+ this.turn = turn;
+ }
+
+ @Override
+ public String toString() {
+ return "Timepoint{" +
+ "week=" + week +
+ ", weekday=" + weekday +
+ ", turn=" + turn +
+ '}';
+ }
+}
diff --git a/src/main/java/net/catten/ssim/web/controller/ClassScheduleController.java b/src/main/java/net/catten/ssim/web/controller/ClassScheduleController.java
new file mode 100644
index 0000000..d7c2bed
--- /dev/null
+++ b/src/main/java/net/catten/ssim/web/controller/ClassScheduleController.java
@@ -0,0 +1,64 @@
+package net.catten.ssim.web.controller;
+
+import net.catten.ssim.web.model.Lesson;
+import net.catten.ssim.web.services.LessonServices;
+import org.apache.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+/**
+ * Created by catten on 3/7/17.
+ */
+@Controller
+@RequestMapping("/api")
+public class ClassScheduleController {
+
+ private LessonServices lessonServices;
+
+ @Autowired
+ public void setLessonServices(LessonServices lessonServices) {
+ this.lessonServices = lessonServices;
+ }
+
+ @RequestMapping("/terms")
+ public Model terms(Model model) {
+ model.addAttribute("data", lessonServices.querySchoolTerms());
+ return model;
+ }
+
+ @RequestMapping("/weeks")
+ public Model termWeekCount(@RequestParam("termName") String termName, Model model) {
+ model.addAttribute("data", lessonServices.queryWeeks(termName));
+ return model;
+ }
+
+ @RequestMapping("/classes")
+ public Model termClasses(@RequestParam("termName") String termName, Model model) {
+ model.addAttribute("data", lessonServices.listClassesInTerm(termName));
+ return model;
+ }
+
+ @RequestMapping("/lessons")
+ public Model lessons(
+ @RequestParam("termName") String termName,
+ @RequestParam(value = "week", required = false) Integer week,
+ @RequestParam("className") String className,
+ @RequestParam(value = "ignoreType", required = false) List ignoreTypes,
+ Model model) {
+
+ model.addAttribute("data", lessonServices.querySchedule(termName, className, week, ignoreTypes));
+
+ return model;
+ }
+
+ @RequestMapping("/types")
+ public Model lessonTypes(Model model) {
+ model.addAttribute("data",lessonServices.listClassTypes());
+ return model;
+ }
+}
diff --git a/src/main/java/net/catten/ssim/web/controller/IndexController.java b/src/main/java/net/catten/ssim/web/controller/IndexController.java
new file mode 100644
index 0000000..8d89f82
--- /dev/null
+++ b/src/main/java/net/catten/ssim/web/controller/IndexController.java
@@ -0,0 +1,84 @@
+package net.catten.ssim.web.controller;
+
+import net.catten.ssim.web.model.Lesson;
+import net.catten.ssim.web.services.LessonServices;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * Created by cattenlinger on 2017/3/10.
+ */
+@Controller
+@RequestMapping("")
+public class IndexController {
+
+ private LessonServices lessonServices;
+
+ @Autowired
+ public void setLessonServices(LessonServices lessonServices) {
+ this.lessonServices = lessonServices;
+ }
+
+ @RequestMapping(method = RequestMethod.GET)
+ public String index(Model model){
+ model.addAttribute("terms",lessonServices.querySchoolTerms());
+ return "index";
+ }
+
+ @RequestMapping(value = "/terms/{termName}",method = RequestMethod.GET)
+ public String termInfo(@PathVariable("termName") String termName, Model model){
+
+ model.addAttribute("term",termName);
+ Integer weekCount = lessonServices.queryWeeks(termName);
+ if(weekCount == null) return "nodata";
+ model.addAttribute("weeks",weekCount);
+
+ model.addAttribute("classes",lessonServices.listClassesInTerm(termName));
+ model.addAttribute("categories",lessonServices.listClassTypes());
+ return "term";
+ }
+
+ @RequestMapping(value = "/schedule")
+ public String querySchedule(
+ @RequestParam("termName") String termName,
+ @RequestParam("week") Integer week,
+ @RequestParam("class") String className,
+ @RequestParam(value = "ignoreType",required = false) List ignoreTypes,
+ Model model){
+
+ model.addAttribute("term",termName);
+
+ List lessons = lessonServices.querySchedule(termName, className, week, ignoreTypes);
+ if(lessons == null || lessons.size() == 0) return "nodata";
+
+ Queue sortedLessons = new LinkedList<>(lessons.parallelStream().sorted(
+ Comparator.comparing(Lesson::getWeekday)
+ .thenComparing(Comparator.comparing(Lesson::getTurn)))
+ .collect(Collectors.toList()));
+
+// List[][] lessonMap = new List[7][8];
+// for(Lesson lesson : lessons){
+// List turnLessons = lessonMap[lesson.getWeekday()][lesson.getTurn()];
+// if(turnLessons == null) {
+// lessonMap[lesson.getWeekday()][lesson.getTurn()] = new LinkedList<>();
+// turnLessons = lessonMap[lesson.getWeekday()][lesson.getTurn()];
+// }
+//
+// turnLessons.add(lesson);
+// }
+
+ model.addAttribute("schedule",sortedLessons);
+ model.addAttribute("week",week);
+ model.addAttribute("className",className);
+
+ return "schedule";
+ }
+}
diff --git a/src/main/java/net/catten/ssim/web/controller/ManageController.java b/src/main/java/net/catten/ssim/web/controller/ManageController.java
new file mode 100644
index 0000000..93bc18a
--- /dev/null
+++ b/src/main/java/net/catten/ssim/web/controller/ManageController.java
@@ -0,0 +1,57 @@
+package net.catten.ssim.web.controller;
+
+import net.catten.ssim.web.services.CoursesUpdateServices;
+import net.catten.ssim.web.services.SimpleUserServices;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * Created by cattenlinger on 2017/3/9.
+ */
+@Controller
+@RequestMapping("/api/manage")
+public class ManageController {
+
+ private CoursesUpdateServices coursesUpdateServices;
+ @Autowired
+ public void setCoursesUpdateServices(CoursesUpdateServices coursesUpdateServices) {
+ this.coursesUpdateServices = coursesUpdateServices;
+ }
+
+ @RequestMapping("/task")
+ public Model getTaskStatus(Model model){
+ model.addAttribute("status",coursesUpdateServices.getStatus());
+ model.addAttribute("task",coursesUpdateServices.getTaskStatus());
+ return model;
+ }
+
+ @RequestMapping("/task/fire")
+ public Model startTask(@RequestParam("code") String taskCode, Model model){
+ coursesUpdateServices.setTaskCode(taskCode);
+ coursesUpdateServices.fireCaptureThread(false);
+
+ model.addAttribute("status",coursesUpdateServices.getStatus());
+ model.addAttribute("task",coursesUpdateServices.getTaskStatus());
+ return model;
+ }
+
+ @RequestMapping("/task/import")
+ public Model startImport(Model model){
+ coursesUpdateServices.fireCaptureThread(true);
+ model.addAttribute("status",coursesUpdateServices.getStatus());
+ model.addAttribute("task",coursesUpdateServices.getTaskStatus());
+ return model;
+ }
+
+ @RequestMapping("/task/terminate")
+ public Model stopTask(Model model){
+ coursesUpdateServices.terminateCaptureThread();
+ model.addAttribute("status",coursesUpdateServices.getStatus());
+ model.addAttribute("task",coursesUpdateServices.getTaskStatus());
+ return model;
+ }
+}
diff --git a/src/main/java/net/catten/ssim/web/controller/TokenController.java b/src/main/java/net/catten/ssim/web/controller/TokenController.java
new file mode 100644
index 0000000..17ee279
--- /dev/null
+++ b/src/main/java/net/catten/ssim/web/controller/TokenController.java
@@ -0,0 +1,33 @@
+package net.catten.ssim.web.controller;
+
+import net.catten.ssim.web.services.SimpleUserServices;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * Created by cattenlinger on 2017/3/9.
+ */
+@Controller
+@RequestMapping("/secure/token")
+public class TokenController {
+
+ private SimpleUserServices userServices;
+
+ @Autowired
+ public void setUserServices(SimpleUserServices userServices) {
+ this.userServices = userServices;
+ }
+
+ @RequestMapping(method = RequestMethod.POST)
+ public Model getToken(@RequestParam("username") String username, @RequestParam("password") String password, Model model){
+ String token = userServices.generateToken(username,password);
+ model.addAttribute("token",token);
+ model.addAttribute("expireDate",userServices.tokenExpireDate(token));
+ return model;
+ }
+
+}
diff --git a/src/main/java/net/catten/ssim/web/interceptors/PermissionInterceptor.java b/src/main/java/net/catten/ssim/web/interceptors/PermissionInterceptor.java
new file mode 100644
index 0000000..ee37e7e
--- /dev/null
+++ b/src/main/java/net/catten/ssim/web/interceptors/PermissionInterceptor.java
@@ -0,0 +1,42 @@
+package net.catten.ssim.web.interceptors;
+
+import net.catten.ssim.web.services.SimpleUserServices;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.servlet.HandlerInterceptor;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * Created by cattenlinger on 2017/3/9.
+ */
+public class PermissionInterceptor implements HandlerInterceptor {
+
+ private SimpleUserServices userServices;
+
+ @Autowired
+ public void setUserServices(SimpleUserServices userServices) {
+ this.userServices = userServices;
+ }
+
+ @Override
+ public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+
+ String token = request.getHeader("SSIM-AUTH-TOKEN");
+ if(token == null || token.equals("") || userServices.isTokenExpired(token)) {
+ response.sendError(HttpServletResponse.SC_FORBIDDEN);
+ return false;
+ }else return true;
+ }
+
+ @Override
+ public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception {
+
+ }
+
+ @Override
+ public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
+
+ }
+}
diff --git a/src/main/java/net/catten/ssim/web/model/Lesson.java b/src/main/java/net/catten/ssim/web/model/Lesson.java
new file mode 100644
index 0000000..cf31ca3
--- /dev/null
+++ b/src/main/java/net/catten/ssim/web/model/Lesson.java
@@ -0,0 +1,154 @@
+package net.catten.ssim.web.model;
+
+import javax.persistence.*;
+
+/**
+ * Created by catten on 2/24/17.
+ */
+@Entity
+@Cacheable
+@Table(name = "lesson",indexes = {
+ @Index(name = "index_term",columnList = "term"),
+ @Index(name = "index_attend_class", columnList = "attendClass"),
+ @Index(name = "index_category", columnList = "category")
+})
+public class Lesson {
+ private Long id;
+ private String term;
+ private String unit;
+ private String name;
+ private Double period;
+ private Double credit;
+ private String teacher;
+ private String category;
+ private String attendClass;
+ private Integer week;
+ private Integer weekday;
+ private Integer turn;
+ private String address;
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getTerm() {
+ return term;
+ }
+
+ public void setTerm(String term) {
+ this.term = term;
+ }
+
+ public Double getPeriod() {
+ return period;
+ }
+
+ public void setPeriod(Double period) {
+ this.period = period;
+ }
+
+ public Double getCredit() {
+ return credit;
+ }
+
+ public void setCredit(Double credit) {
+ this.credit = credit;
+ }
+
+ public String getTeacher() {
+ return teacher;
+ }
+
+ public void setTeacher(String teacher) {
+ this.teacher = teacher;
+ }
+
+ public String getCategory() {
+ return category;
+ }
+
+ public void setCategory(String category) {
+ this.category = category;
+ }
+
+ public String getAttendClass() {
+ return attendClass;
+ }
+
+ public void setAttendClass(String attendClass) {
+ this.attendClass = attendClass;
+ }
+
+ public Integer getWeek() {
+ return week;
+ }
+
+ public void setWeek(Integer week) {
+ this.week = week;
+ }
+
+ public Integer getWeekday() {
+ return weekday;
+ }
+
+ public void setWeekday(Integer weekday) {
+ this.weekday = weekday;
+ }
+
+ public Integer getTurn() {
+ return turn;
+ }
+
+ public void setTurn(Integer turn) {
+ this.turn = turn;
+ }
+
+ public String getAddress() {
+ return address;
+ }
+
+ public void setAddress(String address) {
+ this.address = address;
+ }
+
+ public String getUnit() {
+ return unit;
+ }
+
+ public void setUnit(String unit) {
+ this.unit = unit;
+ }
+
+ @Override
+ public String toString() {
+ return "Lesson{" +
+ "id=" + id +
+ ", term='" + term + '\'' +
+ ", unit='" + unit + '\'' +
+ ", name='" + name + '\'' +
+ ", period=" + period +
+ ", credit=" + credit +
+ ", teacher='" + teacher + '\'' +
+ ", category='" + category + '\'' +
+ ", attendClass='" + attendClass + '\'' +
+ ", week=" + week +
+ ", weekday=" + weekday +
+ ", turn=" + turn +
+ ", address='" + address + '\'' +
+ '}';
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+}
diff --git a/src/main/java/net/catten/ssim/web/model/UpdateRequest.java b/src/main/java/net/catten/ssim/web/model/UpdateRequest.java
new file mode 100644
index 0000000..97b80fb
--- /dev/null
+++ b/src/main/java/net/catten/ssim/web/model/UpdateRequest.java
@@ -0,0 +1,52 @@
+package net.catten.ssim.web.model;
+
+import javax.persistence.*;
+
+/**
+ * Created by cattenlinger on 2017/3/9.
+ */
+@Entity
+@Table(name = "update_request", indexes = {
+ @Index(name = "index_ur_senderId",columnList = "senderId"),
+ @Index(name = "index_ur_request",columnList = "requestFor")
+})
+public class UpdateRequest {
+ private Long id;
+ private String senderId;
+ private String senderName;
+ private String requestFor;
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getSenderId() {
+ return senderId;
+ }
+
+ public void setSenderId(String senderId) {
+ this.senderId = senderId;
+ }
+
+ public String getSenderName() {
+ return senderName;
+ }
+
+ public void setSenderName(String senderName) {
+ this.senderName = senderName;
+ }
+
+ public String getRequestFor() {
+ return requestFor;
+ }
+
+ public void setRequestFor(String requestFor) {
+ this.requestFor = requestFor;
+ }
+}
diff --git a/src/main/java/net/catten/ssim/web/repositories/LessonDAO.java b/src/main/java/net/catten/ssim/web/repositories/LessonDAO.java
new file mode 100644
index 0000000..d181810
--- /dev/null
+++ b/src/main/java/net/catten/ssim/web/repositories/LessonDAO.java
@@ -0,0 +1,28 @@
+package net.catten.ssim.web.repositories;
+
+import net.catten.ssim.web.model.Lesson;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * Created by catten on 2/24/17.
+ */
+@Repository
+public interface LessonDAO extends JpaRepository, JpaSpecificationExecutor{
+
+ @Query("select distinct l.term from Lesson l order by l.term desc ")
+ List getTerms();
+
+ @Query("select max(l.week) from Lesson l where l.term = ?1")
+ Integer getLatestWeek(String term);
+
+ @Query("select distinct l.attendClass from Lesson l where l.term = ?1 order by l.attendClass desc")
+ List getAttendClassesInTerm(String term);
+
+ @Query("select distinct l.category from Lesson l")
+ List getTypes();
+}
diff --git a/src/main/java/net/catten/ssim/web/services/CoursesUpdateServices.java b/src/main/java/net/catten/ssim/web/services/CoursesUpdateServices.java
new file mode 100644
index 0000000..03556b5
--- /dev/null
+++ b/src/main/java/net/catten/ssim/web/services/CoursesUpdateServices.java
@@ -0,0 +1,54 @@
+package net.catten.ssim.web.services;
+
+import net.catten.ssim.schedule.kingo.jw.caterpillar.CourseScheduleCaterpillar;
+import net.catten.ssim.web.repositories.LessonDAO;
+import net.catten.ssim.web.services.util.CaptureThread;
+import net.catten.ssim.web.services.util.TickModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * Created by catten on 2/24/17.
+ */
+@Service
+public class CoursesUpdateServices {
+
+ private CaptureThread captureThread;
+ private Thread captureThreadHolder;
+
+ private TickModel tickModel;
+
+ @Autowired
+ public void setCaptureThread(CaptureThread captureThread) {
+ this.captureThread = captureThread;
+ }
+
+ @Autowired
+ public void setTickModel(TickModel tickModel) {
+ this.tickModel = tickModel;
+ }
+
+ public TickModel getTaskStatus(){
+ return tickModel;
+ }
+
+ public void setTaskCode(String taskCode){
+ captureThread.setTaskCode(taskCode);
+ }
+
+ public String getStatus(){
+ return captureThread.getStatus();
+ }
+
+ public void fireCaptureThread(boolean skipCapture){
+ captureThreadHolder = new Thread(captureThread);
+ captureThread.setSkipCapture(skipCapture);
+ captureThreadHolder.start();
+ }
+
+ public void terminateCaptureThread(){
+ captureThreadHolder.interrupt();
+ }
+}
diff --git a/src/main/java/net/catten/ssim/web/services/LessonServices.java b/src/main/java/net/catten/ssim/web/services/LessonServices.java
new file mode 100644
index 0000000..e65086a
--- /dev/null
+++ b/src/main/java/net/catten/ssim/web/services/LessonServices.java
@@ -0,0 +1,79 @@
+package net.catten.ssim.web.services;
+
+import net.catten.ssim.web.model.Lesson;
+import net.catten.ssim.web.repositories.LessonDAO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import java.util.List;
+
+/**
+ * Created by catten on 2/24/17.
+ */
+@Service
+public class LessonServices {
+
+ private LessonDAO lessonDAO;
+
+ @Autowired
+ public void setLessonDAO(LessonDAO lessonDAO) {
+ this.lessonDAO = lessonDAO;
+ }
+
+ public List querySchoolTerms(){
+ return lessonDAO.getTerms();
+ }
+
+ public List querySchedule(String termName, String attendClass){
+ return lessonDAO.findAll((root, cq, cb) -> cb.and(
+ cb.equal(root.get("term"),termName),
+ cb.equal(root.get("attendClass"),attendClass))
+ );
+ }
+
+ public List querySchedule(String termName,String attendClass, Integer week, List ignoreType){
+ return lessonDAO.findAll((root, cq, cb) -> {
+ Predicate predicate = cb.and(
+ cb.equal(root.get("term"),termName),
+ cb.equal(root.get("attendClass"),attendClass)
+ );
+
+ if(week != null) predicate = cb.and(
+ predicate,
+ cb.equal(root.get("week"),week)
+ );
+
+ if(ignoreType != null && ignoreType.size() > 0) predicate = cb.and(
+ predicate,
+ cb.not(root.get("category").in(ignoreType))
+ );
+
+ return predicate;
+ });
+ }
+
+ public List querySchedule(String termName, String attendClass, Integer week){
+ return lessonDAO.findAll((root, criteriaQuery, cb) -> cb.and(
+ cb.equal(root.get("term"),termName),
+ cb.equal(root.get("attendClass"),attendClass),
+ cb.equal(root.get("week"),week)
+ ));
+ }
+
+ public Integer queryWeeks(String termName){
+ return lessonDAO.getLatestWeek(termName);
+ }
+
+ public List listClassesInTerm(String termName){
+ return lessonDAO.getAttendClassesInTerm(termName);
+ }
+
+ public List listClassTypes(){
+ return lessonDAO.getTypes();
+ }
+}
diff --git a/src/main/java/net/catten/ssim/web/services/SimpleUserServices.java b/src/main/java/net/catten/ssim/web/services/SimpleUserServices.java
new file mode 100644
index 0000000..ebed5fa
--- /dev/null
+++ b/src/main/java/net/catten/ssim/web/services/SimpleUserServices.java
@@ -0,0 +1,48 @@
+package net.catten.ssim.web.services;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+
+/**
+ * Created by cattenlinger on 2017/3/9.
+ */
+@Service
+public class SimpleUserServices {
+
+ private Properties userProperties;
+ private Map tokenPool;
+
+ public SimpleUserServices() {
+ tokenPool = new HashMap<>();
+ }
+
+ @Autowired
+ public void setUserProperties(Properties userProperties) {
+ this.userProperties = userProperties;
+ }
+
+ public String generateToken(String username, String password) {
+ String passwd = userProperties.getProperty(username);
+
+ if (passwd == null || !password.equals(passwd)) {
+ return null;
+ }
+
+ String token = UUID.randomUUID().toString();
+ tokenPool.put(token,System.currentTimeMillis() + 36000000);
+ return token;
+ }
+
+ public Date tokenExpireDate(String token){
+ Long ms = tokenPool.get(token);
+ if(ms == null) return null;
+ return new Date(ms);
+ }
+
+ public boolean isTokenExpired(String token){
+ Long tokenPeriod = tokenPool.get(token);
+ return tokenPeriod == null || tokenPeriod < System.currentTimeMillis();
+ }
+}
diff --git a/src/main/java/net/catten/ssim/web/services/util/CaptureThread.java b/src/main/java/net/catten/ssim/web/services/util/CaptureThread.java
new file mode 100644
index 0000000..7ec2a29
--- /dev/null
+++ b/src/main/java/net/catten/ssim/web/services/util/CaptureThread.java
@@ -0,0 +1,168 @@
+package net.catten.ssim.web.services.util;
+
+import net.catten.ssim.common.events.TickEventReceiver;
+import net.catten.ssim.schedule.factory.CourseFactory;
+import net.catten.ssim.schedule.factory.LessonExpander;
+import net.catten.ssim.web.repositories.LessonDAO;
+import net.catten.ssim.schedule.kingo.jw.caterpillar.CourseScheduleCaterpillar;
+//import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * Created by catten on 3/4/17.
+ */
+public class CaptureThread implements Runnable {
+
+ public final static String STATUS_ERROR = "error";
+ public final static String STATUS_READY = "ready";
+ public final static String STATUS_CAPTURING = "capturing";
+ public final static String STATUS_IMPORTING = "importing";
+ public final static String STATUS_STOPPED = "stopped";
+
+ private Logger logger = LoggerFactory.getLogger(this.getClass());
+
+ private TickEventReceiver receiver;
+ private CourseScheduleCaterpillar caterpillar;
+ private CourseFactory factory;
+ private LessonExpander expander;
+
+ private String bufferPath;
+
+ private String taskCode;
+ private String status = STATUS_READY;
+ private boolean skipCapture = false;
+
+ private LessonDAO dao;
+
+ @Override
+ public void run() {
+ //Provide a default ticker, output status to log.
+ if(this.receiver == null){
+ logger.warn("No tick receiver, using default receiver!");
+ this.receiver = message -> logger.info("Work status : " + message[1] + "/" + message[0] + " - " + message[2]);
+ }
+
+ File file = new File(bufferPath);
+ if (file.exists() && file.isDirectory()) {
+ logger.info("Directory : " + file.getAbsolutePath());
+
+ try {
+ if ((taskCode != null && !taskCode.equals("")) || skipCapture) {
+ status = STATUS_CAPTURING;
+ if(!skipCapture) {
+ logger.info("Start capturing from website.");
+ caterpillar.getTermSubjectToFiles(taskCode, file);
+ logger.info("Capture finished");
+ }
+ status = STATUS_IMPORTING;
+ File[] files = file.listFiles();
+ if (files != null) {
+ logger.info("Start importing task.");
+ int count = 0;
+ for (File f : files){
+ dao.save(expander.expand(factory.parse(f)));
+ count++;
+ receiver.tick(count,files.length,f.getName());
+ }
+ logger.info("Importing finished.");
+ }
+ status = STATUS_READY;
+ } else {
+ logger.error("Task not available.");
+ status = STATUS_ERROR;
+ }
+ } catch (IOException e) {
+ logger.error("An error occur, task interrupted.",e);
+ status = STATUS_ERROR;
+ } catch (InterruptedException e) {
+ logger.error("Task interrupted.", e);
+ status = STATUS_STOPPED;
+ }
+ } else {
+ logger.error("Capture could not start, please check if buffer path exist and is a directory!");
+ status = STATUS_ERROR;
+ }
+ }
+
+ /*
+ *
+ *
+ * Getter setter
+ *
+ *
+ * */
+
+ public CourseScheduleCaterpillar getCaterpillar() {
+ return caterpillar;
+ }
+
+ public void setCaterpillar(CourseScheduleCaterpillar caterpillar) {
+ this.caterpillar = caterpillar;
+ }
+
+ public TickEventReceiver getReceiver() {
+ return receiver;
+ }
+
+ public void setReceiver(TickEventReceiver receiver) {
+ this.receiver = receiver;
+ }
+
+ public LessonDAO getDao() {
+ return dao;
+ }
+
+ @Autowired
+ public void setDao(LessonDAO dao) {
+ this.dao = dao;
+ }
+
+ public String getBufferPath() {
+ return bufferPath;
+ }
+
+ public void setBufferPath(String bufferPath) {
+ this.bufferPath = bufferPath;
+ }
+
+ public String getStatus() {
+ return status;
+ }
+
+ public void setStatus(String status) {
+ this.status = status;
+ }
+
+ public void setTaskCode(String taskCode) {
+ this.taskCode = taskCode;
+ }
+
+ public CourseFactory getFactory() {
+ return factory;
+ }
+
+ public void setFactory(CourseFactory factory) {
+ this.factory = factory;
+ }
+
+ public LessonExpander getExpander() {
+ return expander;
+ }
+
+ public void setExpander(LessonExpander expander) {
+ this.expander = expander;
+ }
+
+ public boolean isSkipCapture() {
+ return skipCapture;
+ }
+
+ public void setSkipCapture(boolean skipCapture) {
+ this.skipCapture = skipCapture;
+ }
+}
diff --git a/src/main/java/net/catten/ssim/web/services/util/TickModel.java b/src/main/java/net/catten/ssim/web/services/util/TickModel.java
new file mode 100644
index 0000000..c3decef
--- /dev/null
+++ b/src/main/java/net/catten/ssim/web/services/util/TickModel.java
@@ -0,0 +1,53 @@
+package net.catten.ssim.web.services.util;
+
+import net.catten.ssim.common.events.TickEventReceiver;
+
+/**
+ * Created by catten on 3/4/17.
+ */
+public class TickModel implements TickEventReceiver {
+ private Integer taskTotal = 0;
+ private Integer taskCurrent = 0;
+ private String taskStatus;
+
+ @Override
+ public void tick(Object... message) {
+
+ Integer _total = (Integer) message[0];
+ Integer _current = (Integer) message[1];
+
+ if (!taskTotal.equals(_total)) taskTotal = _total;
+ setTaskCurrent(_current);
+ setTaskStatus((String) message[2]);
+ }
+
+ /*
+ *
+ * Getter setter
+ *
+ * */
+
+ public synchronized Integer getTaskTotal() {
+ return taskTotal;
+ }
+
+ public synchronized void setTaskTotal(Integer taskTotal) {
+ this.taskTotal = taskTotal;
+ }
+
+ public synchronized void setTaskCurrent(Integer taskCurrent) {
+ this.taskCurrent = taskCurrent;
+ }
+
+ public synchronized String getTaskStatus() {
+ return taskStatus;
+ }
+
+ public synchronized void setTaskStatus(String taskStatus) {
+ this.taskStatus = taskStatus;
+ }
+
+ public Integer getTaskCurrent() {
+ return taskCurrent;
+ }
+}
diff --git a/src/main/resources/context-application.xml b/src/main/resources/context-application.xml
new file mode 100644
index 0000000..5e69278
--- /dev/null
+++ b/src/main/resources/context-application.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/context-caterpillar.xml b/src/main/resources/context-caterpillar.xml
new file mode 100644
index 0000000..72b7442
--- /dev/null
+++ b/src/main/resources/context-caterpillar.xml
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/context-infrastructure.xml b/src/main/resources/context-infrastructure.xml
new file mode 100644
index 0000000..7cf817d
--- /dev/null
+++ b/src/main/resources/context-infrastructure.xml
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/context-webmvc.xml b/src/main/resources/context-webmvc.xml
new file mode 100644
index 0000000..fc5b96f
--- /dev/null
+++ b/src/main/resources/context-webmvc.xml
@@ -0,0 +1,46 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/hibernate.properties b/src/main/resources/hibernate.properties
new file mode 100644
index 0000000..f0be561
--- /dev/null
+++ b/src/main/resources/hibernate.properties
@@ -0,0 +1,7 @@
+hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
+hibernate.hbm2ddl.auto=update
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.use_query_cache=true
+cache.provider_class=org.hibernate.cache.EhCacheProvider
+hibernate.cache.region.factory_class=org.hibernate.cache.ehcache.EhCacheRegionFactory
+#hibernate.show_sql=true
diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties
new file mode 100644
index 0000000..46fefe1
--- /dev/null
+++ b/src/main/resources/log4j.properties
@@ -0,0 +1,23 @@
+# Set root logger level to DEBUG and its only appender to A1.
+log4j.rootLogger=INFO, stdout, file
+
+# Stdout is set to be a ConsoleAppender.
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+# Stdout uses PatternLayout.
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
+
+# File output
+log4j.appender.file=org.apache.log4j.FileAppender
+# File output setting
+log4j.appender.file.File=log/log-info.log
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=[%-5p] %d{yyyy-MM-dd HH:mm:ss}
+
+#log4j.logger.captureThread=info, net.catten.ssim.services.util.CaptureThread
+#log4j.appender.time=org.apache.log4j.ConsoleAppender
+#log4j.appender.time.layout=org.apache.log4j.PatternLayout
+#log4j.appender.time.layout.ConversionPattern=[%-5p] %d{yyyy-MM-dd HH:mm:ss}
+
+# An alternative logging format:
+# log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1} - %m%n
\ No newline at end of file
diff --git a/LNCKingoJWCaterpillar/src/main/resources/strings.properties b/src/main/resources/net/catten/ssim/schedule/kingo/jw/strings.properties
similarity index 100%
rename from LNCKingoJWCaterpillar/src/main/resources/strings.properties
rename to src/main/resources/net/catten/ssim/schedule/kingo/jw/strings.properties
diff --git a/src/test/java/configuration/TestConfiguration.java b/src/test/java/configuration/TestConfiguration.java
new file mode 100644
index 0000000..16b1f5b
--- /dev/null
+++ b/src/test/java/configuration/TestConfiguration.java
@@ -0,0 +1,17 @@
+package configuration;
+
+import net.catten.ssim.web.repositories.LessonDAO;
+import org.mockito.Mockito;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * Created by catten on 3/4/17
+ */
+@Configuration
+public class TestConfiguration {
+ @Bean
+ public LessonDAO lessonDAO(){
+ return Mockito.mock(LessonDAO.class);
+ }
+}
diff --git a/src/test/java/net/catten/ssim/helper/LessonExpanderImplTest.java b/src/test/java/net/catten/ssim/helper/LessonExpanderImplTest.java
new file mode 100644
index 0000000..eea7a88
--- /dev/null
+++ b/src/test/java/net/catten/ssim/helper/LessonExpanderImplTest.java
@@ -0,0 +1,37 @@
+package net.catten.ssim.helper;
+
+import net.catten.ssim.schedule.factory.LessonExpander;
+import net.catten.ssim.schedule.factory.impl.LessonExpanderImpl;
+import net.catten.ssim.web.model.Lesson;
+import net.catten.ssim.schedule.factory.impl.CourseFactoryImpl;
+import net.catten.ssim.schedule.model.KingoRawCourse;
+import org.junit.Test;
+
+import java.io.InputStream;
+import java.util.List;
+
+/**
+ * Created by catten on 2/24/17.
+ */
+public class LessonExpanderImplTest {
+ private String testCaseFiles[] = new String[]{
+ "000586",
+ "012244"
+ };
+
+ @Test
+ public void expand() throws Exception {
+ for (String testCast : testCaseFiles){
+ InputStream inputStream = this.getClass().getResourceAsStream("/kingo/" + testCast + ".html");
+ CourseFactoryImpl reader = new CourseFactoryImpl();
+ reader.setCharset("GBK");
+ KingoRawCourse rawTable = reader.parse(inputStream,Integer.parseInt(testCast));
+ LessonExpander expander = new LessonExpanderImpl();
+ List lessons = expander.expand(rawTable);
+ for (Lesson lesson : lessons){
+ System.out.println(lesson);
+ }
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/src/test/java/net/catten/ssim/schedule/kingo/KingoCourseTableReaderTest.java b/src/test/java/net/catten/ssim/schedule/kingo/KingoCourseTableReaderTest.java
new file mode 100644
index 0000000..3f97985
--- /dev/null
+++ b/src/test/java/net/catten/ssim/schedule/kingo/KingoCourseTableReaderTest.java
@@ -0,0 +1,36 @@
+package net.catten.ssim.schedule.kingo;
+
+import net.catten.ssim.schedule.factory.impl.CourseFactoryImpl;
+import net.catten.ssim.schedule.model.KingoRawCourse;
+import net.catten.ssim.schedule.model.KingoRawLesson;
+import net.catten.ssim.schedule.model.Timepoint;
+import org.junit.Test;
+
+import java.io.InputStream;
+
+/**
+ * Created by catten on 2/23/17.
+ */
+public class KingoCourseTableReaderTest {
+
+ private String testCaseFiles[] = new String[]{
+ "000586",
+ "012244"
+ };
+
+ @Test
+ public void parse() throws Exception {
+ for (String testCast : testCaseFiles){
+ InputStream inputStream = this.getClass().getResourceAsStream("/kingo/" + testCast + ".html");
+ CourseFactoryImpl reader = new CourseFactoryImpl();
+ reader.setCharset("GBK");
+ KingoRawCourse rawTable = reader.parse(inputStream,Integer.parseInt(testCast));
+ for (KingoRawLesson lesson : rawTable.getLessons()){
+ for (Timepoint timepoint : lesson.getTimePoint().expand()){
+ System.out.println(lesson + " - " + timepoint);
+ }
+ }
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/LNCKingoJWCaterpillar/src/test/java/net/catten/lnc/kingo/jw/caterpillar/KingoJWCaterpillarTest.java b/src/test/java/net/catten/ssim/schedule/kingo/jw/caterpillar/impl/KingoJWCaterpillarTest.java
similarity index 76%
rename from LNCKingoJWCaterpillar/src/test/java/net/catten/lnc/kingo/jw/caterpillar/KingoJWCaterpillarTest.java
rename to src/test/java/net/catten/ssim/schedule/kingo/jw/caterpillar/impl/KingoJWCaterpillarTest.java
index 98cd25a..61561ae 100644
--- a/LNCKingoJWCaterpillar/src/test/java/net/catten/lnc/kingo/jw/caterpillar/KingoJWCaterpillarTest.java
+++ b/src/test/java/net/catten/ssim/schedule/kingo/jw/caterpillar/impl/KingoJWCaterpillarTest.java
@@ -1,13 +1,13 @@
-package net.catten.lnc.kingo.jw.caterpillar;
+package net.catten.ssim.schedule.kingo.jw.caterpillar.impl;
+import net.catten.ssim.schedule.kingo.jw.caterpillar.impl.KingoJWCaterpillar;
+import org.junit.Assert;
import org.junit.Test;
import java.math.BigInteger;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
-import static org.junit.Assert.*;
-
/**
* Created by catten on 11/18/16.
*/
@@ -28,7 +28,7 @@ public void md5Test() throws NoSuchAlgorithmException {
@Test
public void encryptPasswordTest(){
- assertTrue(KingoJWCaterpillar.getEncryptedPassword("14601120234","14601120234").equals("B82AA43F8653B8E4420CA239DC1BA0"));
+ Assert.assertTrue(KingoJWCaterpillar.getEncryptedPassword("14601120234","14601120234").equals("B82AA43F8653B8E4420CA239DC1BA0"));
}
}
\ No newline at end of file
diff --git a/src/test/java/net/catten/ssim/schedule/model/KingoRawTimePointTest.java b/src/test/java/net/catten/ssim/schedule/model/KingoRawTimePointTest.java
new file mode 100644
index 0000000..dee52ac
--- /dev/null
+++ b/src/test/java/net/catten/ssim/schedule/model/KingoRawTimePointTest.java
@@ -0,0 +1,17 @@
+package net.catten.ssim.schedule.model;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Created by catten on 3/5/17.
+ */
+public class KingoRawTimePointTest {
+ @Test
+ public void expand() throws Exception {
+ KingoRawTimePoint timePoint = new KingoRawTimePoint("1-2","一[1-4]节");
+ System.out.println(timePoint.expand());
+ }
+
+}
\ No newline at end of file
diff --git a/src/test/java/net/catten/ssim/web/services/util/CaptureThreadTest.java b/src/test/java/net/catten/ssim/web/services/util/CaptureThreadTest.java
new file mode 100644
index 0000000..10dcac2
--- /dev/null
+++ b/src/test/java/net/catten/ssim/web/services/util/CaptureThreadTest.java
@@ -0,0 +1,47 @@
+package net.catten.ssim.web.services.util;
+
+import net.catten.ssim.web.repositories.LessonDAO;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.ContextHierarchy;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import java.io.File;
+
+/**
+ * Created by catten on 3/4/17.
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextHierarchy({
+ //@ContextConfiguration(classes = TestConfiguration.class),
+ @ContextConfiguration("classpath:cat-test.xml")
+})
+
+public class CaptureThreadTest {
+
+ @Autowired
+ private CaptureThread captureThread;
+
+ @Autowired
+ private LessonDAO lessonDAO;
+
+ @Test
+ public void run() throws Exception {
+ String[] terms = new String[]{"20140","20141","20150","20151","20160","20161"};
+ System.out.println("Current path : " + new File("").getAbsolutePath());
+ captureThread.setDao(lessonDAO);
+
+// captureThread.setTaskCode("20161");
+// //captureThread.setSkipCapture(true);
+// captureThread.setDao(lessonDAO);
+// captureThread.run();
+
+// for (String term : terms){
+// captureThread.setTaskCode(term);
+// captureThread.run();
+// }
+ }
+
+}
\ No newline at end of file
diff --git a/src/test/resources/cat-test.xml b/src/test/resources/cat-test.xml
new file mode 100644
index 0000000..251f330
--- /dev/null
+++ b/src/test/resources/cat-test.xml
@@ -0,0 +1,66 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ org.hibernate.dialect.MySQL5InnoDBDialect
+ update
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/test/resources/db.properties b/src/test/resources/db.properties
new file mode 100644
index 0000000..130d8bc
--- /dev/null
+++ b/src/test/resources/db.properties
@@ -0,0 +1,6 @@
+#jdbc.url=jdbc:h2:file:~/.h2/classSchedule;AUTO_SERVER=TRUE
+#jdbc.driver=org.h2.Driver
+jdbc.driver=com.mysql.jdbc.Driver
+jdbc.url=jdbc:mysql:///lnc_databases
+jdbc.username=devel_lncdb
+jdbc.password=123456
\ No newline at end of file
diff --git a/src/test/resources/kingo/000586.html b/src/test/resources/kingo/000586.html
new file mode 100644
index 0000000..17b35d3
--- /dev/null
+++ b/src/test/resources/kingo/000586.html
@@ -0,0 +1,71 @@
+
+
+
+ LessonSel_rpt
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/web/WEB-INF/view/nodata.ftl b/web/WEB-INF/view/nodata.ftl
new file mode 100644
index 0000000..5adbd97
--- /dev/null
+++ b/web/WEB-INF/view/nodata.ftl
@@ -0,0 +1,15 @@
+<#import "temp/main.ftl" as temp>
+<@temp.body title="${term}">
+