Merge remote-tracking branch 'origin/master'

zhangkaitao · zhangkaitao · commit b9e8b299cf89 · 2014-01-06T19:23:18.000+08:00
diff --git a/pom.xml b/pom.xml
@@ -45,11 +45,6 @@
             <name>apache Repository</name>
             <url>https://repository.apache.org/content/groups/public/</url>
         </repository>
-        <repository>
-            <id>travis-ci-repo</id>
-            <name>travis-ci Repository</name>
-            <url>http://maven.mirrors.travis-ci.org/nexus/content/repositories/central</url>
-        </repository>
         <repository>
             <id>java-repo</id>
             <name>java Repository</name>
@@ -58,12 +53,12 @@
         <repository>
             <id>springsource-repo</id>
             <name>SpringSource Repository</name>
-            <url>http://repo.springsource.org/release/</url>
+            <url>http://repo.spring.io/release/</url>
         </repository>
         <repository>
             <id>springsource-repo-snapshot</id>
             <name>SpringSource Repository</name>
-            <url>http://repo.springsource.org/snapshot/</url>
+            <url>http://repo.spring.io/snapshot/</url>
         </repository>
         <repository>
             <id>cloudhopper</id>
@@ -176,4 +171,4 @@
     </scm>
 
 
-</project>
+</project>
diff --git a/web/src/main/java/org/apache/shiro/web/session/mgt/OnlineWebSessionManager.java b/web/src/main/java/org/apache/shiro/web/session/mgt/OnlineWebSessionManager.java
@@ -100,9 +100,9 @@ public void validateSessions() {
         PageRequest pageRequest = new PageRequest(0, 100);
         Page<UserOnline> page = userOnlineService.findExpiredUserOnlineList(expiredDate, pageRequest);
 
-        List<String> needOfflineIdList = Lists.newArrayList();
         //改成批量过期删除
         while (page.hasContent()) {
+            List<String> needOfflineIdList = Lists.newArrayList();
             for (UserOnline userOnline : page.getContent()) {
                 try {
                     SessionKey key = new DefaultSessionKey(userOnline.getId());
@@ -123,16 +123,15 @@ public void validateSessions() {
                     needOfflineIdList.add(userOnline.getId());
                 }
 
-                if (needOfflineIdList.size() > 0) {
-                    try {
-                        userOnlineService.batchOffline(needOfflineIdList);
-                    } catch (Exception e) {
-                        log.error("batch delete db session error.", e);
-                    }
+            }
+            if (needOfflineIdList.size() > 0) {
+                try {
+                    userOnlineService.batchOffline(needOfflineIdList);
+                } catch (Exception e) {
+                    log.error("batch delete db session error.", e);
                 }
             }
-
-            pageRequest = new PageRequest((pageRequest.getPageNumber() + 1) * pageRequest.getPageSize(), pageRequest.getPageSize());
+            pageRequest = new PageRequest(0, pageRequest.getPageSize());
             page = userOnlineService.findExpiredUserOnlineList(expiredDate, pageRequest);
         }
 
diff --git a/web/src/main/sql/schema/init-personal-schema.sql b/web/src/main/sql/schema/init-personal-schema.sql
@@ -47,8 +47,8 @@ create table `personal_calendar`(
   `details`   varchar(1000),
   `start_date` date,
   `length` int,
-  `start_time` date,
-  `end_time` date,
+  `start_time` time,
+  `end_time` time,
   `background_color` varchar(100),
   `text_color` varchar(100),
   constraint `pk_office_calender` primary key(id),
