修改gitignore文件，添加忽略热部署文件

修改token时间为600
添加javaBean验证依赖
增加slf4j日志debug
搭好租户查询用户列表框架

.gitignore

@@ -24,6 +24,7 @@ target/
 *.iws
 *.iml
 *.ipr
+rebel.xml
 
 ### NetBeans ###
 nbproject/private/

pom.xml

@@ -45,6 +45,13 @@
     <dependencyManagement>
         <dependencies>
 
+            <!--JavaBean验证依赖-->
+            <dependency>
+                <groupId>javax.validation</groupId>
+                <artifactId>validation-api</artifactId>
+                <version>2.0.1.Final</version>
+            </dependency>
+
             <!-- SpringCloud 微服务 -->
             <dependency>
                 <groupId>org.springframework.cloud</groupId>

ruoyi-gateway/src/main/java/com/xhpc/gateway/filter/AuthFilter.java

@@ -37,7 +37,7 @@ public class AuthFilter implements GlobalFilter, Ordered {
 
     private static final Logger log = LoggerFactory.getLogger(AuthFilter.class);
 
-    private final static long EXPIRE_TIME = Constants.TOKEN_EXPIRE * 60;
+    private final static long EXPIRE_TIME = Constants.TOKEN_EXPIRE * 600;
 
     // 排除过滤的 uri 地址，nacos自行添加
     @Autowired

xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/XhpcMessageBoardApplication.java

@@ -1,11 +1,11 @@
 package com.xhpc;
 
 import com.xhpc.common.security.annotation.EnableCustomConfig;
-import com.xhpc.common.security.annotation.EnableRyFeignClients;
 import com.xhpc.common.swagger.annotation.EnableCustomSwagger2;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 
 /**
  * @author WH
@@ -14,7 +14,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
  */
 @EnableCustomConfig
 @EnableCustomSwagger2
-@EnableRyFeignClients
+@EnableFeignClients
 @SpringBootApplication
 @MapperScan("com.xhpc.board.mapper")
 public class XhpcMessageBoardApplication {

xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/controller/XhpcMessageBoardController.java

@@ -1,12 +1,12 @@
 package com.xhpc.board.controller;
 
 import com.xhpc.board.domain.PlatformSendMessageToUserRequest;
+import com.xhpc.board.domain.QueryUserListRequest;
+import com.xhpc.board.domain.QueryUserListResponse;
 import com.xhpc.board.service.XhpcMessageBoardService;
 import com.xhpc.common.core.web.domain.AjaxResult;
-import org.springframework.web.bind.annotation.PostMapping;
+import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 
@@ -19,6 +19,7 @@ import javax.annotation.Resource;
  */
 @RestController
 @RequestMapping("/board")
+@Slf4j
 public class XhpcMessageBoardController {
 
     @Resource
@@ -39,4 +40,20 @@ public class XhpcMessageBoardController {
         return AjaxResult.success();
     }
 
+    /**
+     * 租户查询给它发送信息的用户的列表
+     *
+     * @author WH
+     * @date 2022/1/14 10:26
+     * @since version-1.0
+     */
+    @GetMapping("/user/list")
+    public AjaxResult queryUserList(QueryUserListRequest param) {
+
+        QueryUserListResponse queryUserListResponse = xhpcMessageBoardService.queryUserList(param);
+
+        return AjaxResult.success(queryUserListResponse);
+
+    }
+
 }

xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/QueryUserListRequest.java

@@ -0,0 +1,60 @@
+package com.xhpc.board.domain;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * 查询给租户发信息的用户的列表
+ *
+ * @author WH
+ * @date 2022/1/14 11:17
+ * @since version-1.0
+ */
+@NoArgsConstructor
+@Data
+public class QueryUserListRequest {
+
+    /**
+     * senderAccount
+     */
+    @JsonProperty("senderAccount")
+    private String senderAccount;
+    /**
+     * userType
+     */
+    @JsonProperty("userType")
+    private Integer userType;
+    /**
+     * currentPage
+     */
+    @JsonProperty("currentPage")
+    @NotNull(message = "currentPage的参数名不正确或者currentPage的值为空，检查传入参数")
+    @NotBlank(message = "currentPage的参数为''字符串，请检查传入参数")
+    private Integer currentPage;
+    /**
+     * items
+     */
+    @JsonProperty("items")
+    @NotNull(message = "items的参数名不正确或者items的值为空，检查传入参数")
+    @NotBlank(message = "items的参数为''字符串，请检查传入参数")
+    private Integer items;
+    /**
+     * tenantId
+     */
+    @JsonProperty("tenantId")
+    @NotNull(message = "tenantId的参数名不正确或者tenantId的值为空，检查传入参数")
+    @NotBlank(message = "tenantId的参数为''字符串，请检查传入参数")
+    private String tenantId;
+    /**
+     * tenantType
+     */
+    @JsonProperty("tenantType")
+    @NotNull(message = "tenantType的参数名不正确或者tenantType的值为空，检查传入参数")
+    @NotBlank(message = "tenantType的参数为''字符串，请检查传入参数")
+    private Integer tenantType;
+
+}

xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/QueryUserListResponse.java

@@ -0,0 +1,44 @@
+package com.xhpc.board.domain;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * 封装查询用户列表的包装类对象
+ *
+ * @author WH
+ * @date 2022/1/14 11:23
+ * @since version-1.0
+ */
+@NoArgsConstructor
+@Data
+public class QueryUserListResponse {
+
+    @JsonProperty("totalItems")
+    private Long totalItems;
+    @JsonProperty("data")
+    private List<DataDTO> data;
+
+    @NoArgsConstructor
+    @Data
+    public static class DataDTO {
+
+        @JsonProperty("userIcon")
+        private String userIcon;
+        @JsonProperty("userAccount")
+        private String userAccount;
+        @JsonProperty("userType")
+        private Integer userType;
+        @JsonProperty("haveNewInfo")
+        private Integer haveNewInfo;
+        @JsonProperty("tenantId")
+        private String tenantId;
+        @JsonProperty("tenantType")
+        private Integer tenantType;
+
+    }
+
+}

xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/XhpcMessageBoardService.java

@@ -1,9 +1,6 @@
 package com.xhpc.board.service;
 
-import com.xhpc.board.domain.PlatformSendMessageToUserRequest;
+import com.xhpc.board.domain.*;
-import com.xhpc.board.domain.QueryUserMassageResponse;
-import com.xhpc.board.domain.SendMessageToPlatformRequest;
-import com.xhpc.board.domain.UserQueryCondition;
 
 /**
  * 留言板服务的Service
@@ -57,4 +54,16 @@ public interface XhpcMessageBoardService {
      */
     String returnPlatformAvatar(String tenantId, Integer tenantType);
 
+    /**
+     * 平台用户查询哪些用户发留言了的列表
+     *
+     * @param param query list condition
+     * @return 发了信息的用户列表
+     * @author WH
+     * @date 2022/1/14 11:25
+     * @since version-1.0
+     */
+    QueryUserListResponse queryUserList(QueryUserListRequest param);
+
+
 }

xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java

@@ -1,9 +1,6 @@
 package com.xhpc.board.service.impl;
 
-import com.xhpc.board.domain.PlatformSendMessageToUserRequest;
+import com.xhpc.board.domain.*;
-import com.xhpc.board.domain.QueryUserMassageResponse;
-import com.xhpc.board.domain.SendMessageToPlatformRequest;
-import com.xhpc.board.domain.UserQueryCondition;
 import com.xhpc.board.mapper.XhpcMessageBoardMapper;
 import com.xhpc.board.mapper.XhpcMessageBoardReceiveUserMapper;
 import com.xhpc.board.pojo.XhpcMessageBoard;
@@ -244,4 +241,19 @@ public class XhpcMessageBoardServiceImpl implements XhpcMessageBoardService {
         return "https://xhpc-bucket1.oss-cn-hangzhou.aliyuncs.com/avatar/logo.png";
     }
 
+    /**
+     * 平台用户查询哪些用户发留言了的列表
+     *
+     * @param param query list condition
+     * @return 发了信息的用户列表
+     * @author WH
+     * @date 2022/1/14 11:25
+     * @since version-1.0
+     */
+    @Override
+    public QueryUserListResponse queryUserList(QueryUserListRequest param) {
+
+        return null;
+    }
+
 }