diff --git a/README.MD b/README.MD index ae7834f..9e1b376 100644 --- a/README.MD +++ b/README.MD @@ -1,6 +1,6 @@ #简单的课表查询网站 -针对广东岭南职业技术学院所使用的教务系统(青果网教务系统)的课表爬取与整理网站 +为针对广东岭南职业技术学院所使用的教务系统(青果网教务系统)的课表爬取与整理网站 ##公共API diff --git a/pom.xml b/pom.xml index 40b8147..d68a6c0 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ net.catten ssim war - 2.0 + 3.0 5.1.0.Final @@ -218,7 +218,7 @@ 5 web - / + /cs org.eclipse.jetty.util.URI.charset=UTF-8 diff --git a/src/main/java/net/catten/ssim/web/controller/IndexController.java b/src/main/java/net/catten/ssim/web/controller/IndexController.java index 0005e82..8d89f82 100644 --- a/src/main/java/net/catten/ssim/web/controller/IndexController.java +++ b/src/main/java/net/catten/ssim/web/controller/IndexController.java @@ -77,7 +77,7 @@ public String querySchedule( model.addAttribute("schedule",sortedLessons); model.addAttribute("week",week); - model.addAttribute("class",className); + model.addAttribute("className",className); return "schedule"; } diff --git a/src/main/resources/context-infrastructure.xml b/src/main/resources/context-infrastructure.xml index 948fdc7..7cf817d 100644 --- a/src/main/resources/context-infrastructure.xml +++ b/src/main/resources/context-infrastructure.xml @@ -14,6 +14,12 @@ + + + + + + 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 index c85722e..10dcac2 100644 --- a/src/test/java/net/catten/ssim/web/services/util/CaptureThreadTest.java +++ b/src/test/java/net/catten/ssim/web/services/util/CaptureThreadTest.java @@ -38,10 +38,10 @@ public void run() throws Exception { // captureThread.setDao(lessonDAO); // captureThread.run(); - for (String term : terms){ - captureThread.setTaskCode(term); - captureThread.run(); - } +// for (String term : terms){ +// captureThread.setTaskCode(term); +// captureThread.run(); +// } } } \ No newline at end of file diff --git a/src/test/resources/log4j.properties b/src/test/resources/log4j.properties index 8aab850..8de3174 100644 --- a/src/test/resources/log4j.properties +++ b/src/test/resources/log4j.properties @@ -11,7 +11,7 @@ log4j.appender.A1.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n log4j.logger.captureThread=debug, 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} +log4j.appender.time.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n # 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/web/WEB-INF/view/index.ftl b/web/WEB-INF/view/index.ftl index 942d85a..9f4a558 100644 --- a/web/WEB-INF/view/index.ftl +++ b/web/WEB-INF/view/index.ftl @@ -8,7 +8,7 @@
<#list terms as term> - ${term} + ${term}
diff --git a/web/WEB-INF/view/nodata.ftl b/web/WEB-INF/view/nodata.ftl index ce27fd2..5adbd97 100644 --- a/web/WEB-INF/view/nodata.ftl +++ b/web/WEB-INF/view/nodata.ftl @@ -7,7 +7,7 @@

抱歉,没有数据

diff --git a/web/WEB-INF/view/schedule.ftl b/web/WEB-INF/view/schedule.ftl index 348e8c4..5f9146b 100644 --- a/web/WEB-INF/view/schedule.ftl +++ b/web/WEB-INF/view/schedule.ftl @@ -1,14 +1,14 @@ <#import "temp/main.ftl" as temp> -<@temp.body title="${class} 在第 ${week} 周的课程 - ${term}"> +<@temp.body title="${className} 在第 ${week} 周的课程 - ${term}">

${term} -
${class}在第${week}周的课程 +
${className}在第${week}周的课程

diff --git a/web/WEB-INF/view/temp/main.ftl b/web/WEB-INF/view/temp/main.ftl index a6d8536..5202840 100644 --- a/web/WEB-INF/view/temp/main.ftl +++ b/web/WEB-INF/view/temp/main.ftl @@ -5,7 +5,7 @@ ${title} - + <@_import_css> @@ -34,8 +34,8 @@ <#macro _import_css> - - + + <#-- @@ -46,5 +46,5 @@ - + \ No newline at end of file diff --git a/web/WEB-INF/view/term.ftl b/web/WEB-INF/view/term.ftl index 26d011b..e4a0aba 100644 --- a/web/WEB-INF/view/term.ftl +++ b/web/WEB-INF/view/term.ftl @@ -6,13 +6,13 @@

查询 ${term} 的课程

-
+
@@ -34,7 +34,7 @@