diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 0d5519e..5090716 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -27,6 +27,7 @@ + diff --git a/.idea/encodings.xml b/.idea/encodings.xml index b80d928..becad6c 100755 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -37,6 +37,8 @@ + + diff --git a/han-note-search/pom.xml b/han-note-search/pom.xml new file mode 100644 index 0000000..70aec9b --- /dev/null +++ b/han-note-search/pom.xml @@ -0,0 +1,73 @@ + + 4.0.0 + + + com.hanserwei + han-note + ${revision} + + + + jar + han-note-search + ${project.artifactId} + 搜索服务 + + + + com.hanserwei + hanserwei-common + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + com.hanserwei + hanserwei-spring-boot-starter-biz-operationlog + + + + + com.hanserwei + hanserwei-spring-boot-starter-jackson + + + + org.springframework.cloud + spring-cloud-starter-bootstrap + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + co.elastic.clients + elasticsearch-java + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/han-note-search/src/main/java/com/hanserwei/hannote/search/HannoteSearchApplication.java b/han-note-search/src/main/java/com/hanserwei/hannote/search/HannoteSearchApplication.java new file mode 100644 index 0000000..e67042a --- /dev/null +++ b/han-note-search/src/main/java/com/hanserwei/hannote/search/HannoteSearchApplication.java @@ -0,0 +1,11 @@ +package com.hanserwei.hannote.search; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class HannoteSearchApplication { + public static void main(String[] args) { + SpringApplication.run(HannoteSearchApplication.class, args); + } +} diff --git a/han-note-search/src/main/java/com/hanserwei/hannote/search/config/ElasticsearchConfig.java b/han-note-search/src/main/java/com/hanserwei/hannote/search/config/ElasticsearchConfig.java new file mode 100644 index 0000000..39aed72 --- /dev/null +++ b/han-note-search/src/main/java/com/hanserwei/hannote/search/config/ElasticsearchConfig.java @@ -0,0 +1,31 @@ +package com.hanserwei.hannote.search.config; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class ElasticsearchConfig { + + @Value("${elasticsearch.host}") + private String host; + + @Value("${elasticsearch.port}") + private int port; + + @Value("${elasticsearch.scheme:http}") + private String scheme; + + @Value("${elasticsearch.username:}") + private String username; + + @Value("${elasticsearch.password:}") + private String password; + + @Value("${elasticsearch.api-key:}") + private String apiKey; + + @Value("${elasticsearch.use-api-key:false}") + private boolean useApiKey; + + +} diff --git a/han-note-search/src/main/java/com/hanserwei/hannote/search/enums/ResponseCodeEnum.java b/han-note-search/src/main/java/com/hanserwei/hannote/search/enums/ResponseCodeEnum.java new file mode 100644 index 0000000..2e1b65a --- /dev/null +++ b/han-note-search/src/main/java/com/hanserwei/hannote/search/enums/ResponseCodeEnum.java @@ -0,0 +1,23 @@ +package com.hanserwei.hannote.search.enums; + +import com.hanserwei.framework.common.exception.BaseExceptionInterface; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum ResponseCodeEnum implements BaseExceptionInterface { + + // ----------- 通用异常状态码 ----------- + SYSTEM_ERROR("SEARCH-10000", "出错啦，后台小哥正在努力修复中..."), + PARAM_NOT_VALID("SEARCH-10001", "参数错误"), + + // ----------- 业务异常状态码 ----------- + ; + + // 异常码 + private final String errorCode; + // 错误信息 + private final String errorMsg; + +} \ No newline at end of file diff --git a/han-note-search/src/main/java/com/hanserwei/hannote/search/exception/GlobalExceptionHandler.java b/han-note-search/src/main/java/com/hanserwei/hannote/search/exception/GlobalExceptionHandler.java new file mode 100644 index 0000000..2f2b83e --- /dev/null +++ b/han-note-search/src/main/java/com/hanserwei/hannote/search/exception/GlobalExceptionHandler.java @@ -0,0 +1,103 @@ +package com.hanserwei.hannote.search.exception; + +import com.hanserwei.framework.common.exception.ApiException; +import com.hanserwei.framework.common.response.Response; +import com.hanserwei.hannote.search.enums.ResponseCodeEnum; +import jakarta.servlet.http.HttpServletRequest; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.MethodArgumentNotValidException; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.Optional; + +@SuppressWarnings("LoggingSimilarMessage") +@ControllerAdvice +@Slf4j +public class GlobalExceptionHandler { + + /** + * 捕获自定义业务异常 + * + * @return Response.fail(e) + */ + @ExceptionHandler({ApiException.class}) + @ResponseBody + public Response handleApiException(HttpServletRequest request, ApiException e) { + log.warn("{} request fail, errorCode: {}, errorMessage: {}", request.getRequestURI(), e.getErrorCode(), e.getErrorMsg()); + return Response.fail(e); + } + + /** + * 捕获参数校验异常 + * + * @return Response.fail(errorCode, errorMessage) + */ + @ExceptionHandler({MethodArgumentNotValidException.class}) + @ResponseBody + public Response handleMethodArgumentNotValidException(HttpServletRequest request, MethodArgumentNotValidException e) { + // 参数错误异常码 + String errorCode = ResponseCodeEnum.PARAM_NOT_VALID.getErrorCode(); + + // 获取 BindingResult + BindingResult bindingResult = e.getBindingResult(); + + StringBuilder sb = new StringBuilder(); + + // 获取校验不通过的字段，并组合错误信息，格式为： email 邮箱格式不正确, 当前值: '123124qq.com'; + Optional.of(bindingResult.getFieldErrors()).ifPresent(errors -> { + errors.forEach(error -> + sb.append(error.getField()) + .append(" ") + .append(error.getDefaultMessage()) + .append(", 当前值: '") + .append(error.getRejectedValue()) + .append("'; ") + + ); + }); + + // 错误信息 + String errorMessage = sb.toString(); + + log.warn("{} request error, errorCode: {}, errorMessage: {}", request.getRequestURI(), errorCode, errorMessage); + + return Response.fail(errorCode, errorMessage); + } + + /** + * 捕获 guava 参数校验异常 + * + * @return Response.fail(ResponseCodeEnum.PARAM_NOT_VALID) + */ + @ExceptionHandler({IllegalArgumentException.class}) + @ResponseBody + public Response handleIllegalArgumentException(HttpServletRequest request, IllegalArgumentException e) { + // 参数错误异常码 + String errorCode = ResponseCodeEnum.PARAM_NOT_VALID.getErrorCode(); + + // 错误信息 + String errorMessage = e.getMessage(); + + log.warn("{} request error, errorCode: {}, errorMessage: {}", request.getRequestURI(), errorCode, errorMessage); + + return Response.fail(errorCode, errorMessage); + } + + /** + * 其他类型异常 + * + * @param request 请求 + * @param e 异常 + * @return Response.fail(ResponseCodeEnum.SYSTEM_ERROR) + */ + @ExceptionHandler({Exception.class}) + @ResponseBody + public Response handleOtherException(HttpServletRequest request, Exception e) { + log.error("{} request error, ", request.getRequestURI(), e); + return Response.fail(ResponseCodeEnum.SYSTEM_ERROR); + } +} + diff --git a/han-note-search/src/main/java/com/hanserwei/hannote/search/index/UserIndex.java b/han-note-search/src/main/java/com/hanserwei/hannote/search/index/UserIndex.java new file mode 100644 index 0000000..e106dd1 --- /dev/null +++ b/han-note-search/src/main/java/com/hanserwei/hannote/search/index/UserIndex.java @@ -0,0 +1,40 @@ +package com.hanserwei.hannote.search.index; + +public class UserIndex { + + /** + * 索引名称 + */ + public static final String NAME = "user"; + + /** + * 用户ID + */ + public static final String FIELD_USER_ID = "id"; + + /** + * 昵称 + */ + public static final String FIELD_USER_NICKNAME = "nickname"; + + /** + * 头像 + */ + public static final String FIELD_USER_AVATAR = "avatar"; + + /** + * 小憨书ID + */ + public static final String FIELD_USER_HAN_NOTE_ID = "han_note_id"; + + /** + * 发布笔记总数 + */ + public static final String FIELD_USER_NOTE_TOTAL = "note_total"; + + /** + * 粉丝总数 + */ + public static final String FIELD_USER_FANS_TOTAL = "fans_total"; + +} \ No newline at end of file diff --git a/han-note-search/src/main/java/com/hanserwei/hannote/search/model/vo/SearchUserReqVO.java b/han-note-search/src/main/java/com/hanserwei/hannote/search/model/vo/SearchUserReqVO.java new file mode 100644 index 0000000..e6ec4cd --- /dev/null +++ b/han-note-search/src/main/java/com/hanserwei/hannote/search/model/vo/SearchUserReqVO.java @@ -0,0 +1,22 @@ +package com.hanserwei.hannote.search.model.vo; + +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotBlank; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class SearchUserReqVO { + + @NotBlank(message = "搜索关键词不能为空") + private String keyword; + + @Min(value = 1, message = "页码不能小于 1") + private Integer pageNo = 1; // 默认值为第一页 + +} \ No newline at end of file diff --git a/han-note-search/src/main/java/com/hanserwei/hannote/search/model/vo/SearchUserRspVO.java b/han-note-search/src/main/java/com/hanserwei/hannote/search/model/vo/SearchUserRspVO.java new file mode 100644 index 0000000..85965e5 --- /dev/null +++ b/han-note-search/src/main/java/com/hanserwei/hannote/search/model/vo/SearchUserRspVO.java @@ -0,0 +1,44 @@ +package com.hanserwei.hannote.search.model.vo; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class SearchUserRspVO { + + /** + * 用户ID + */ + private Long userId; + + /** + * 昵称 + */ + private String nickname; + + /** + * 头像 + */ + private String avatar; + + /** + * 小憨书ID + */ + private String hanNoteId; + + /** + * 笔记发布总数 + */ + private Integer noteTotal; + + /** + * 粉丝总数 + */ + private Integer fansTotal; + +} \ No newline at end of file diff --git a/han-note-search/src/main/java/com/hanserwei/hannote/search/service/UserService.java b/han-note-search/src/main/java/com/hanserwei/hannote/search/service/UserService.java new file mode 100644 index 0000000..fc8daca --- /dev/null +++ b/han-note-search/src/main/java/com/hanserwei/hannote/search/service/UserService.java @@ -0,0 +1,16 @@ +package com.hanserwei.hannote.search.service; + +import com.hanserwei.framework.common.response.PageResponse; +import com.hanserwei.hannote.search.model.vo.SearchUserReqVO; +import com.hanserwei.hannote.search.model.vo.SearchUserRspVO; + +public interface UserService { + + /** + * 搜索用户 + * + * @param searchUserReqVO 搜索用户请求 + * @return 搜索用户响应 + */ + PageResponse searchUser(SearchUserReqVO searchUserReqVO); +} diff --git a/han-note-search/src/main/java/com/hanserwei/hannote/search/service/impl/UserServiceImpl.java b/han-note-search/src/main/java/com/hanserwei/hannote/search/service/impl/UserServiceImpl.java new file mode 100644 index 0000000..4ae366f --- /dev/null +++ b/han-note-search/src/main/java/com/hanserwei/hannote/search/service/impl/UserServiceImpl.java @@ -0,0 +1,14 @@ +package com.hanserwei.hannote.search.service.impl; + +import com.hanserwei.framework.common.response.PageResponse; +import com.hanserwei.hannote.search.model.vo.SearchUserReqVO; +import com.hanserwei.hannote.search.model.vo.SearchUserRspVO; +import com.hanserwei.hannote.search.service.UserService; + +public class UserServiceImpl implements UserService { + + @Override + public PageResponse searchUser(SearchUserReqVO searchUserReqVO) { + return null; + } +} diff --git a/han-note-search/src/main/resources/application.yml b/han-note-search/src/main/resources/application.yml new file mode 100644 index 0000000..377993c --- /dev/null +++ b/han-note-search/src/main/resources/application.yml @@ -0,0 +1,9 @@ +server: + port: 8092 # 项目启动的端口 + +spring: + profiles: + active: dev # 默认激活 dev 本地开发环境 + servlet: + multipart: + max-file-size: 20MB # 单个文件最大大小 \ No newline at end of file diff --git a/han-note-search/src/main/resources/bootstrap.yml b/han-note-search/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..2dec797 --- /dev/null +++ b/han-note-search/src/main/resources/bootstrap.yml @@ -0,0 +1,19 @@ +spring: + application: + name: han-note-search # 应用名称 + profiles: + active: dev # 默认激活 dev 本地开发环境 + cloud: + nacos: + discovery: + enabled: true # 启用服务发现 + group: DEFAULT_GROUP # 所属组 + namespace: han-note # 命名空间 + server-addr: 127.0.0.1:8848 # 指定 Nacos 配置中心的服务器地址 + config: + server-addr: http://127.0.0.1:8848 # 指定 Nacos 配置中心的服务器地址 + prefix: ${spring.application.name} # 配置 Data Id 前缀，这里使用应用名称作为前缀 + group: DEFAULT_GROUP # 所属组 + namespace: han-note # 命名空间 + file-extension: yaml # 配置文件格式 + refresh-enabled: true # 是否开启动态刷新 \ No newline at end of file diff --git a/han-note-search/src/main/resources/logback-spring.xml b/han-note-search/src/main/resources/logback-spring.xml new file mode 100644 index 0000000..dde2a37 --- /dev/null +++ b/han-note-search/src/main/resources/logback-spring.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + ${LOG_FILE}-%i.log + + 30 + + 10MB + + 0 + + false + + + ${LOG_PATTERN} + UTF-8 + + + + + + + 0 + + 256 + + + + + + + + + + + + + + + + + + + + + diff --git a/pom.xml b/pom.xml index d01fbb7..06f0c8f 100755 --- a/pom.xml +++ b/pom.xml @@ -23,6 +23,7 @@ han-note-user-relation han-note-count han-note-data-align + han-note-search @@ -67,6 +68,7 @@ 5.3.2 0.2.21 3.2.0 + 9.2.0 @@ -300,7 +302,12 @@ xxl-job-core ${xxl-job.version} - + + + co.elastic.clients + elasticsearch-java + ${elasticsearch-java.version} +