代码，整理

mpusher · Mar 9, 2016 · 90cf62d · 90cf62d
1 parent 4eccafa
commit 90cf62d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/mpush-common/src/main/java/com/shinemo/mpush/common/manage/user/UserManager.java b/mpush-common/src/main/java/com/shinemo/mpush/common/manage/user/UserManager.java
@@ -11,40 +11,39 @@
 
 //查询使用
 public final class UserManager {
+    private static final Logger log = LoggerFactory.getLogger(UserManager.class);
     public static final UserManager INSTANCE = new UserManager();
-    private final String ONLINE_KEY = RedisKey.getUserOnlineKey(MPushUtil.getExtranetAddress());
 
-    private static final Logger log = LoggerFactory.getLogger(UserManager.class);
+    private final String ONLINE_KEY = RedisKey.getUserOnlineKey(MPushUtil.getExtranetAddress());
 
     public UserManager() {
-        //重置在线数
-//        RedisManage.set(RedisKey.getConnNum(MPushUtil.getExtranetAddress()), 0);
-        //删除已经存在的数据
+        clearUserOnlineData();
+    }
+
+    public void clearUserOnlineData() {
         RedisManage.del(ONLINE_KEY);
-        log.info("init redis key:{}" + ONLINE_KEY);
     }
 
-    public void userOnline(String userId) {
+    public void recordUserOnline(String userId) {
         RedisManage.zAdd(ONLINE_KEY, userId);
         log.info("user online {}", userId);
     }
 
-    public void userOffline(String userId) {
+    public void recordUserOffline(String userId) {
         RedisManage.zRem(ONLINE_KEY, userId);
         log.info("user offline {}", userId);
     }
 
     //在线用户
-    public long onlineUserNum() {
+    public long getOnlineUserNum() {
         return RedisManage.zCard(ONLINE_KEY);
     }
 
     //在线用户列表
-    public List<String> onlineUserList(int start, int size) {
+    public List<String> getOnlineUserList(int start, int size) {
         if (size < 10) {
             size = 10;
         }
         return RedisManage.zrange(ONLINE_KEY, start, size - 1, String.class);
     }
-
 }
diff --git a/mpush-core/src/main/java/com/shinemo/mpush/core/router/UserOnlineOfflineListener.java b/mpush-core/src/main/java/com/shinemo/mpush/core/router/UserOnlineOfflineListener.java
@@ -25,13 +25,13 @@ public UserOnlineOfflineListener() {
 
     @Subscribe
     void onUserOnline(UserOnlineEvent event) {
-        UserManager.INSTANCE.userOnline(event.getUserId());
+        UserManager.INSTANCE.recordUserOnline(event.getUserId());
         RedisManage.publish(ONLINE_CHANNEL, event.getUserId());
     }
 
     @Subscribe
     void onUserOffline(UserOfflineEvent event) {
-        UserManager.INSTANCE.userOffline(event.getUserId());
+        UserManager.INSTANCE.recordUserOffline(event.getUserId());
         RedisManage.publish(OFFLINE_CHANNEL, event.getUserId());
     }
 }