提交代码

yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/model/LoginUser.java

@@ -173,4 +173,11 @@ public class LoginUser implements Serializable
     public void setProjectDeptId(Long projectDeptId) {
         this.projectDeptId = projectDeptId;
     }
+
+    /**
+     * 无参构造方法
+     */
+    public LoginUser() {
+        super();
+    }
 }

yanzhu-auth/src/main/java/com/yanzhu/auth/service/SysLoginService.java

@@ -103,8 +103,8 @@ public class SysLoginService
         recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功");
 
         // 用户项目信息
-        R<List<Map<String, Object>>> projectResult = remoteUserService.getProjects(userInfo.getUserid(), SecurityConstants.INNER);
+        R<List<Map<String, Object>>> projectResult = remoteUserService.getProjects(userInfo.getSysUser().getUserId(), SecurityConstants.INNER);
-        if(StringUtils.isNotNull(projectResult) && StringUtils.isNotNull(projectResult.getData())){
+        if(StringUtils.isNotNull(projectResult) && StringUtils.isNotEmpty(projectResult.getData())){
             List<Map<String, Object>> list = projectResult.getData();
             userInfo.setProjectId(Convert.toLong(list.get(0).get("project_id")));
             userInfo.setProjectDeptId(Convert.toLong(list.get(0).get("dept_id")));

yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/constant/CacheConstants.java

@@ -34,7 +34,7 @@ public class CacheConstants
     public final static String LOGIN_TOKEN_KEY = "login_tokens:";
 
     /**
-     * 验证码 redis key
+     * 验证码 redis keyR
      */
     public static final String CAPTCHA_CODE_KEY = "captcha_codes:";
 

yanzhu-gateway/src/main/java/com/yanzhu/gateway/config/SwaggerProvider.java

@@ -53,7 +53,7 @@ public class SwaggerProvider implements SwaggerResourcesProvider, WebFluxConfigu
                         .contains(routeDefinition.getId()))
                 .forEach(routeDefinition -> routeDefinition.getPredicates().stream()
                         .filter(predicateDefinition -> "Path".equalsIgnoreCase(predicateDefinition.getName()))
-                        .filter(predicateDefinition -> !"ruoyi-auth".equalsIgnoreCase(routeDefinition.getId()))
+                        .filter(predicateDefinition -> !"yanzhu-auth".equalsIgnoreCase(routeDefinition.getId()))
                         .forEach(predicateDefinition -> resourceList
                                 .add(swaggerResource(routeDefinition.getId(), predicateDefinition.getArgs()
                                         .get(NameUtils.GENERATED_NAME_PREFIX + "0").replace("/**", SWAGGER2URL)))));

yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/SysUserOnlineController.java

@@ -1,9 +1,8 @@
 package com.yanzhu.system.controller;
 
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Collection;
+
-import java.util.Collections;
+import com.yanzhu.system.api.model.LoginUser;
-import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -19,7 +18,6 @@ import com.yanzhu.common.log.annotation.Log;
 import com.yanzhu.common.log.enums.BusinessType;
 import com.yanzhu.common.redis.service.RedisService;
 import com.yanzhu.common.security.annotation.RequiresPermissions;
-import com.yanzhu.system.api.model.LoginUser;
 import com.yanzhu.system.domain.SysUserOnline;
 import com.yanzhu.system.service.ISysUserOnlineService;
 
@@ -33,10 +31,10 @@ import com.yanzhu.system.service.ISysUserOnlineService;
 public class SysUserOnlineController extends BaseController
 {
     @Autowired
-    private ISysUserOnlineService userOnlineService;
+    private RedisService redisService;
 
     @Autowired
-    private RedisService redisService;
+    private ISysUserOnlineService userOnlineService;
 
     @RequiresPermissions("monitor:online:list")
     @GetMapping("/list")
@@ -46,23 +44,25 @@ public class SysUserOnlineController extends BaseController
         List<SysUserOnline> userOnlineList = new ArrayList<SysUserOnline>();
         for (String key : keys)
         {
-            LoginUser user = redisService.getCacheObject(key);
+            try{
-            if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName))
+                LoginUser user = redisService.getCacheObject(key);
-            {
+                if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName))
-                userOnlineList.add(userOnlineService.selectOnlineByInfo(ipaddr, userName, user));
+                {
-            }
+                    userOnlineList.add(userOnlineService.selectOnlineByInfo(ipaddr, userName, user));
-            else if (StringUtils.isNotEmpty(ipaddr))
+                }
-            {
+                else if (StringUtils.isNotEmpty(ipaddr))
-                userOnlineList.add(userOnlineService.selectOnlineByIpaddr(ipaddr, user));
+                {
-            }
+                    userOnlineList.add(userOnlineService.selectOnlineByIpaddr(ipaddr, user));
-            else if (StringUtils.isNotEmpty(userName))
+                }
-            {
+                else if (StringUtils.isNotEmpty(userName))
-                userOnlineList.add(userOnlineService.selectOnlineByUserName(userName, user));
+                {
-            }
+                    userOnlineList.add(userOnlineService.selectOnlineByUserName(userName, user));
-            else
+                }
-            {
+                else
-                userOnlineList.add(userOnlineService.loginUserToUserOnline(user));
+                {
-            }
+                    userOnlineList.add(userOnlineService.loginUserToUserOnline(user));
+                }
+            }catch (Exception e){}
         }
         Collections.reverse(userOnlineList);
         userOnlineList.removeAll(Collections.singleton(null));

yanzhu-rocketmq/src/main/resources/bootstrap.yml

@@ -29,7 +29,7 @@ spring:
       address: redis://localhost:6379
 logging:
   level:
-    com.ruoyi.app.mapper: DEBUG
+    com.yanzhu.app.mapper: DEBUG