commit：1.6版本发布

orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/LoginController.java

@@ -9,8 +9,7 @@ import lombok.extern.slf4j.Slf4j;
 import com.orange.demo.common.core.annotation.MyRequestBody;
 import com.orange.demo.common.core.constant.ErrorCodeEnum;
 import com.orange.demo.common.core.constant.ApplicationConstant;
-import com.orange.demo.common.core.object.ResponseResult;
-import com.orange.demo.common.core.object.TokenData;
+import com.orange.demo.common.core.object.*;
 import com.orange.demo.common.core.util.*;
 import com.orange.demo.common.redis.cache.SessionCacheHelper;
 import com.orange.demo.upmsapi.constant.SysUserStatus;
@@ -134,6 +133,7 @@ public class LoginController {
         jsonData.put("permCodeList", permCodeList);
         return ResponseResult.success(jsonData);
     }
+
     /**
      * 用户修改自己的密码。
      *
@@ -167,11 +167,14 @@ public class LoginController {
     private JSONObject buildLoginData(SysUser user) {
         boolean isAdmin = user.getUserType() == SysUserType.TYPE_ADMIN;
         TokenData tokenData = new TokenData();
-        String sessionId = MyCommonUtil.generateUuid();
+        String sessionId = user.getLoginName() + "_" + MyCommonUtil.generateUuid();
         tokenData.setUserId(user.getUserId());
         tokenData.setIsAdmin(isAdmin);
+        tokenData.setLoginName(user.getLoginName());
         tokenData.setShowName(user.getShowName());
         tokenData.setSessionId(sessionId);
+        tokenData.setLoginIp(IpUtil.getRemoteIpAddress(ContextUtil.getHttpRequest()));
+        tokenData.setLoginTime(new Date());
         // 这里手动将TokenData存入request，便于OperationLogAspect统一处理操作日志。
         TokenData.addToRequest(tokenData);
         JSONObject jsonData = new JSONObject();

orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/LoginUserController.java

@@ -0,0 +1,86 @@
+package com.orange.demo.upmsservice.controller;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
+import com.orange.demo.common.core.annotation.MyRequestBody;
+import com.orange.demo.common.core.object.*;
+import com.orange.demo.common.core.util.RedisKeyUtil;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.redisson.api.RBucket;
+import org.redisson.api.RedissonClient;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.*;
+
+/**
+ * 在线用户控制器对象。
+ *
+ * @author Jerry
+ * @date 2020-08-08
+ */
+@Api(tags = "在线用户接口")
+@Slf4j
+@RestController
+@RequestMapping("/loginUser")
+public class LoginUserController {
+
+    @Autowired
+    private RedissonClient redissonClient;
+
+    /**
+     * 显示在线用户列表。
+     *
+     * @param loginName 登录名过滤。
+     * @param pageParam 分页参数。
+     * @return 登录用户信息列表。
+     */
+    @PostMapping("/list")
+    public ResponseResult<MyPageData<LoginUserInfo>> list(
+            @MyRequestBody String loginName, @MyRequestBody MyPageParam pageParam) {
+        List<LoginUserInfo> loginUserInfoList = new LinkedList<>();
+        int queryCount = pageParam.getPageNum() * pageParam.getPageSize();
+        int skipCount = (pageParam.getPageNum() - 1) * pageParam.getPageSize();
+        String patternKey;
+        if (StrUtil.isBlank(loginName)) {
+            patternKey = RedisKeyUtil.getSessionIdPrefix() + "*";
+        } else {
+            patternKey = RedisKeyUtil.getSessionIdPrefix(loginName) + "*";
+        }
+        long totalCount = 0L;
+        int pos = 0;
+        Iterable<String> keys = redissonClient.getKeys().getKeysByPattern(patternKey);
+        for (String key : keys) {
+            totalCount++;
+            if (pos++ < skipCount) {
+                continue;
+            }
+            loginUserInfoList.add(this.buildTokenDataByRedisKey(key));
+        }
+        return ResponseResult.success(new MyPageData<>(loginUserInfoList, totalCount));
+    }
+
+    /**
+     * 强制下线指定登录会话。
+     *
+     * @param sessionId 待强制下线的SessionId。
+     * @return 应答结果对象。
+     */
+    @PostMapping("/delete")
+    public ResponseResult<Void> delete(@MyRequestBody String sessionId) {
+        // 为了保证被剔除用户正在进行的操作不被干扰，这里只是删除sessionIdKey即可，这样可以使强制下线操作更加平滑。
+        // 比如，如果删除操作权限或数据权限的redis session key，那么正在请求数据的操作就会报错。
+        redissonClient.getBucket(RedisKeyUtil.makeSessionIdKeyForRedis(sessionId)).delete();
+        return ResponseResult.success();
+    }
+
+    private LoginUserInfo buildTokenDataByRedisKey(String key) {
+        RBucket<String> sessionData = redissonClient.getBucket(key);
+        TokenData tokenData = JSON.parseObject(sessionData.get(), TokenData.class);
+        return BeanUtil.copyProperties(tokenData, LoginUserInfo.class);
+    }
+}

orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/mapper/SysUserMapper.xml

@@ -27,12 +27,12 @@
     <sql id="inputFilterRef">
         <if test="sysUserFilter != null">
             <if test="sysUserFilter.loginName != null and sysUserFilter.loginName != ''">
-                <bind name = "safeLoginName" value = "'%' + sysUserFilter.loginName + '%'" />
-                AND zz_sys_user.login_name LIKE #{safeLoginName}
+                <bind name = "safeSysUserLoginName" value = "'%' + sysUserFilter.loginName + '%'" />
+                AND zz_sys_user.login_name LIKE #{safeSysUserLoginName}
             </if>
             <if test="sysUserFilter.showName != null and sysUserFilter.showName != ''">
-                <bind name = "safeShowName" value = "'%' + sysUserFilter.showName + '%'" />
-                AND zz_sys_user.show_name LIKE #{safeShowName}
+                <bind name = "safeSysUserShowName" value = "'%' + sysUserFilter.showName + '%'" />
+                AND zz_sys_user.show_name LIKE #{safeSysUserShowName}
             </if>
             <if test="sysUserFilter.userStatus != null">
                 AND zz_sys_user.user_status = #{sysUserFilter.userStatus}

orange-demo-multi-service/application/upms/upms-service/src/main/resources/log4j2.xml

@@ -75,5 +75,10 @@
             <AppenderRef ref="kafka_log"/>
             <AppenderRef ref="file_log"/>
         </AsyncLogger>
+        <AsyncLogger name="com.orange.demo.common.log.dao" additivity="false" level="debug">
+            <AppenderRef ref="console"/>
+            <AppenderRef ref="kafka_log"/>
+            <AppenderRef ref="file_log"/>
+        </AsyncLogger>
     </Loggers>
 </configuration>