From 8f5cb469b825cce61734c84fd633f0dfc3000ee6 Mon Sep 17 00:00:00 2001
From: guyue <1721849008@qq.com>
Date: 星期二, 08 七月 2025 18:50:01 +0800
Subject: [PATCH] 第三方接口请求数据完成
---
src/main/java/com/linghu/service/KeywordService.java | 11
src/main/java/com/linghu/model/dto/SearchTaskResponse.java | 1
src/main/java/com/linghu/service/impl/KeywordServiceImpl.java | 63 +++-
src/main/java/com/linghu/utils/OpenCryptUtil.java | 57 +++++
pom.xml | 10
src/main/java/com/linghu/model/dto/SearchTaskRequest.java | 2
src/main/java/com/linghu/config/Swagger2Config.java | 2
src/main/java/com/linghu/controller/CollectController.java | 305 ++++++++++++++------------
src/main/java/com/linghu/model/dto/TaskListResponse.java | 1
src/main/java/com/linghu/model/dto/TaskStatusResponse.java | 1
src/main/java/com/linghu/utils/JwtUtils.java | 2
src/main/java/com/linghu/ExceptionHandler/GlobalExceptionHandler.java | 28 ++
src/main/java/com/linghu/controller/AuthController.java | 35 ++
src/main/java/com/linghu/model/dto/UserDto.java | 11 +
src/main/java/com/linghu/ExceptionHandler/TokenEmptyException.java | 7
src/main/java/com/linghu/controller/KeywordController.java | 84 ++++++-
src/main/java/com/linghu/model/dto/TaskCancelResponse.java | 4
src/main/resources/application.yml | 14 +
src/main/java/com/linghu/model/dto/TaskResultResponse.java | 6
19 files changed, 453 insertions(+), 191 deletions(-)
diff --git a/pom.xml b/pom.xml
index fa484e4..1e8b972 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,6 +94,16 @@
<artifactId>jackson-datatype-jsr310</artifactId>
<version>2.13.4</version>
</dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>2.15.2</version>
+ </dependency>
+ <dependency>
+ <groupId>com.opencrypt</groupId>
+ <artifactId>open-crypt</artifactId>
+ <version>1.0.4</version>
+ </dependency>
</dependencies>
<dependencyManagement>
<dependencies>
diff --git a/src/main/java/com/linghu/ExceptionHandler/GlobalExceptionHandler.java b/src/main/java/com/linghu/ExceptionHandler/GlobalExceptionHandler.java
new file mode 100644
index 0000000..8c9e0c2
--- /dev/null
+++ b/src/main/java/com/linghu/ExceptionHandler/GlobalExceptionHandler.java
@@ -0,0 +1,28 @@
+//package com.linghu.ExceptionHandler;
+//
+//import com.linghu.model.common.ResponseResult;
+//import org.springframework.http.HttpStatus;
+//import org.springframework.http.ResponseEntity;
+//import org.springframework.web.bind.annotation.ExceptionHandler;
+//import org.springframework.web.bind.annotation.ResponseStatus;
+//import org.springframework.web.bind.annotation.RestControllerAdvice;
+//
+//@RestControllerAdvice
+//public class GlobalExceptionHandler {
+//
+// // 捕获特定的异常，例如 Token 为空的情况
+// @ExceptionHandler(TokenEmptyException.class)
+// @ResponseStatus(HttpStatus.BAD_REQUEST)
+// public ResponseEntity<String> handleTokenEmptyException(TokenEmptyException e) {
+// // 返回自定义的错误信息
+// return ResponseEntity.status(HttpStatus.BAD_REQUEST).body("Token 不能为空");
+// }
+//
+// // 捕获其他全局异常
+// @ExceptionHandler(Exception.class)
+// @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
+// public ResponseEntity<String> handleGlobalException(Exception e) {
+// // 返回通用的错误信息
+// return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("服务器内部错误: " + e.getMessage());
+// }
+//}
\ No newline at end of file
diff --git a/src/main/java/com/linghu/ExceptionHandler/TokenEmptyException.java b/src/main/java/com/linghu/ExceptionHandler/TokenEmptyException.java
new file mode 100644
index 0000000..b65f6a2
--- /dev/null
+++ b/src/main/java/com/linghu/ExceptionHandler/TokenEmptyException.java
@@ -0,0 +1,7 @@
+//package com.linghu.ExceptionHandler;
+//
+//public class TokenEmptyException extends RuntimeException {
+// public TokenEmptyException() {
+// super("Token 不能为空");
+// }
+//}
\ No newline at end of file
diff --git a/src/main/java/com/linghu/config/Swagger2Config.java b/src/main/java/com/linghu/config/Swagger2Config.java
index 1be5a11..474463c 100644
--- a/src/main/java/com/linghu/config/Swagger2Config.java
+++ b/src/main/java/com/linghu/config/Swagger2Config.java
@@ -58,7 +58,7 @@
authorizationScopes[0] = authorizationScope;
return Arrays.asList(new SecurityReference("BearerToken", authorizationScopes));
}
-
+//http://localhost:8080/swagger-ui.html
private ApiInfo apiInfo() {
return new ApiInfoBuilder()
.title("灵狐GEO系统 接口文档")
diff --git a/src/main/java/com/linghu/controller/AuthController.java b/src/main/java/com/linghu/controller/AuthController.java
index cc8d706..aa7f072 100644
--- a/src/main/java/com/linghu/controller/AuthController.java
+++ b/src/main/java/com/linghu/controller/AuthController.java
@@ -3,13 +3,10 @@
import java.util.HashMap;
import java.util.Map;
+import com.linghu.utils.OpenCryptUtil;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import com.linghu.model.entity.User;
import com.linghu.utils.JwtUtils;
@@ -49,4 +46,32 @@
// 返回用户信息
return ResponseEntity.ok(user);
}
+ //open-crypt解析token
+ @GetMapping("/parseToken")
+ @ApiOperation(value = "解析token")
+ public ResponseEntity<?> parseToken(@RequestParam String token) {
+ if (token == null || "".equals(token)){
+ return ResponseEntity.ok("token为空");
+ }
+ // 解析token，获取用户信息
+ OpenCryptUtil openCryptUtil = new OpenCryptUtil();
+ String decrypt = openCryptUtil.decrypt(token);
+ System.out.println(decrypt);
+ System.out.println("----------------");
+
+ // 返回用户信息
+ return ResponseEntity.ok(decrypt);
+ }
+
+ @GetMapping("/getToken")
+ @ApiOperation(value = "获取token")
+ public ResponseEntity<?> getToken(@RequestBody User user) {
+ // 创建用户对
+
+ // 创建JwtUtils对象，并生成JWT令牌
+ OpenCryptUtil openCryptUtil = new OpenCryptUtil();
+ String decrypt = openCryptUtil.encrypt(user);
+ // 返回JWT令牌
+ return ResponseEntity.ok(decrypt);
+ }
}
\ No newline at end of file
diff --git a/src/main/java/com/linghu/controller/CollectController.java b/src/main/java/com/linghu/controller/CollectController.java
index 434c9d6..e3bab81 100644
--- a/src/main/java/com/linghu/controller/CollectController.java
+++ b/src/main/java/com/linghu/controller/CollectController.java
@@ -3,13 +3,18 @@
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
-import java.util.Date;
import java.util.List;
import java.util.Map;
+import java.util.Optional;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletRequest;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.linghu.model.dto.*;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.ParameterizedTypeReference;
@@ -21,8 +26,6 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.linghu.model.common.ResponseResult;
-import com.linghu.model.dto.HealthResponse;
-import com.linghu.model.dto.SearchTaskRequest;
import com.linghu.model.entity.Keyword;
import com.linghu.model.entity.Question;
import com.linghu.model.entity.User;
@@ -30,23 +33,19 @@
import com.linghu.service.QuestionService;
import com.linghu.service.ReferenceService;
import com.linghu.utils.JwtUtils;
-import com.linghu.model.dto.SearchTaskResponse;
-import com.linghu.model.dto.TaskStatusResponse;
-import com.linghu.model.dto.TaskCancelResponse;
-import com.linghu.model.dto.TaskListResponse;
import io.jsonwebtoken.lang.Collections;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import reactor.core.publisher.Mono;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.* ;
import org.springframework.http.HttpStatus;
-import com.linghu.model.dto.TaskResultResponse;
import com.linghu.model.dto.TaskResultResponse.QuestionResult;
import com.linghu.model.dto.TaskResultResponse.UserResult;
import com.linghu.model.entity.Reference;
import java.util.stream.Collectors;
+import java.util.stream.IntStream;
@RestController
@RequestMapping("/collect")
@@ -71,25 +70,38 @@
@PostMapping("/search")
@ApiOperation(value = "开始采集")
- public Mono<ResponseResult<SearchTaskResponse>> createSearchTask(
+ public Mono<SearchTaskResponse> createSearchTask(
@RequestBody SearchTaskRequest searchTaskRequest,
- HttpServletRequest request) {
+ HttpServletRequest request) throws JsonProcessingException {
String token = request.getHeader("Authorization");
User user = jwtUtils.parseToken(token);
- List<User> users = new ArrayList<>();
- users.add(user);
+ // 复制到UserDto
+ UserDto userDto = new UserDto();
+ userDto.setName(user.getUser_name());
+ userDto.setEmail(user.getUser_email());
+ userDto.setPassword(user.getPassword());
+
+ // List<User> users = new ArrayList<>();
+ // users.add(user);
+ List<UserDto> users = new ArrayList<>();
+ users.add(userDto);
searchTaskRequest.setUsers(users);
+ // json格式
+ ObjectMapper objectMapper = new ObjectMapper();
+ System.out.println(objectMapper.writeValueAsString(searchTaskRequest));
return webClient.post()
- .uri(baseUrl + "/search")
+ .uri(baseUrl + "/api/v1/search")
.contentType(MediaType.APPLICATION_JSON)
.bodyValue(searchTaskRequest)
.retrieve()
- .bodyToMono(new ParameterizedTypeReference<ResponseResult<SearchTaskResponse>>() {
+ .onStatus(HttpStatus::is4xxClientError, response -> response.bodyToMono(String.class)
+ .flatMap(errorBody -> Mono.error(new RuntimeException(errorBody))))
+ .bodyToMono(new ParameterizedTypeReference<SearchTaskResponse>() {
})
.flatMap(responseResult -> {
// 提取任务ID
- SearchTaskResponse taskResponse = responseResult.getData();
+ SearchTaskResponse taskResponse = responseResult;
if (taskResponse != null && taskResponse.getTask_id() != null) {
// 保存任务ID到关键词
LambdaUpdateWrapper<Keyword> updateWrapper = new LambdaUpdateWrapper<>();
@@ -99,10 +111,13 @@
// 可选：更新响应中的其他信息
// taskResponse.setMessage("任务已提交并保存，ID: " + taskResponse.getTaskId());
}
- return Mono.just(responseResult);
+ return Mono.just(taskResponse);
})
.onErrorResume(e -> {
- return Mono.just(ResponseResult.error("调用失败: " + e.getMessage()));
+ // return Mono.just(ResponseResult.error("调用失败: " + e.getMessage()));
+ SearchTaskResponse task = new SearchTaskResponse();
+ task.setMessage("调用失败: " + e.getMessage());
+ return Mono.just(task);
});
}
@@ -110,11 +125,11 @@
@GetMapping("/status")
public Mono<TaskStatusResponse> getTaskStatus(String taskId) {
return webClient.get()
- .uri(baseUrl + "/tasks/" + taskId)
+ .uri(baseUrl + "/api/v1/tasks/" + taskId)
.accept(MediaType.APPLICATION_JSON)
.retrieve()
- .onStatus(HttpStatus::is4xxClientError, response -> response.bodyToMono(String.class)
- .flatMap(errorBody -> Mono.error(new RuntimeException("任务不存在: " + errorBody))))
+ .onStatus(HttpStatus::is4xxClientError, response -> response.bodyToMono(TaskStatusResponse.class)
+ .flatMap(errorBody -> Mono.error(new RuntimeException(errorBody.getDetail()))))
.bodyToMono(TaskStatusResponse.class)
.flatMap(result -> {
TaskStatusResponse taskStatusResponse = result;
@@ -130,6 +145,15 @@
questionService.updateBatchById(updateQuestions);
}
return Mono.just(result);
+ })
+ .onErrorResume(e -> {
+ // 创建一个自定义的错误响应对象
+ TaskStatusResponse errorResponse = new TaskStatusResponse();
+ errorResponse.setStatus("ERROR");
+ errorResponse.setMessage(e.getMessage());
+ errorResponse.setDetail(e.getMessage());
+
+ return Mono.just(errorResponse);
});
}
@@ -137,20 +161,12 @@
@ApiOperation(value = "取消任务")
public Mono<ResponseResult<TaskCancelResponse>> cancelTask(@PathVariable String taskId) {
return webClient.post()
- .uri(baseUrl + "/tasks/" + taskId + "/cancel")
+ .uri(baseUrl + "/api/v1/tasks/" + taskId + "/cancel")
.contentType(MediaType.APPLICATION_JSON)
.bodyValue(Collections.emptyMap()) // 添加空请求体
.retrieve()
- .onStatus(HttpStatus::isError, response -> {
- if (response.statusCode() == HttpStatus.NOT_FOUND) {
- return response.bodyToMono(String.class)
- .flatMap(errorBody -> Mono.error(new RuntimeException("任务不存在")));
- } else if (response.statusCode() == HttpStatus.BAD_REQUEST) {
- return response.bodyToMono(String.class)
- .flatMap(errorBody -> Mono.error(new RuntimeException("任务已经完成，无法取消")));
- }
- return response.createException().flatMap(Mono::error);
- })
+ .onStatus(HttpStatus::isError, response -> response.bodyToMono(TaskCancelResponse.class)
+ .flatMap(errorBody -> Mono.error(new RuntimeException(errorBody.getDetail()))))
.bodyToMono(TaskCancelResponse.class)
.map(data -> ResponseResult.success(data))
.onErrorResume(e -> {
@@ -165,9 +181,9 @@
@ApiOperation(value = "获取任务结果")
@GetMapping("/tasks/{taskId}")
- public Mono<ResponseResult<TaskResultResponse>> getTaskResult(@PathVariable String taskId) {
+ public Mono<TaskResultResponse> getTaskResult(@PathVariable String taskId) {
return webClient.get()
- .uri(baseUrl + "/tasks/" + taskId + "/result")
+ .uri(baseUrl + "/api/v1/tasks/" + taskId + "/result")
.accept(MediaType.APPLICATION_JSON)
.retrieve()
.onStatus(HttpStatus::is4xxClientError, response -> {
@@ -180,10 +196,9 @@
}
return response.createException().flatMap(Mono::error);
})
- .bodyToMono(new ParameterizedTypeReference<ResponseResult<TaskResultResponse>>() {
- })
+ .bodyToMono(TaskResultResponse.class)
.flatMap(responseResult -> {
- TaskResultResponse result = responseResult.getData();
+ TaskResultResponse result = responseResult;
if (result != null && result.getResults() != null) {
return updateQuestionAndReference(result)
.thenReturn(responseResult);
@@ -192,77 +207,77 @@
})
.onErrorResume(e -> {
System.out.println("获取任务结果失败");
- return Mono.just(ResponseResult.error(e.getMessage()));
+ TaskResultResponse result = new TaskResultResponse();
+ result.setDetail("获取任务结果失败: " + e.getMessage());
+ return Mono.just(result);
});
}
- /*
- * private Mono<Void> updateQuestionAndReference(TaskResultResponse result) {
- * return Mono.fromRunnable(() -> {
- * // 1. 更新关键词状态
- * LambdaUpdateWrapper<Keyword> keywordUpdate = new LambdaUpdateWrapper<>();
- * keywordUpdate.eq(Keyword::getTask_id, result.getTask_id())
- * .set(Keyword::getStatus, "completed");
- * keywordService.update(keywordUpdate);
- *
- * // 查询关键词ID
- * LambdaQueryWrapper<Keyword> keywordQuery = new LambdaQueryWrapper<>();
- * keywordQuery.eq(Keyword::getTask_id, result.getTask_id());
- * Keyword keyword = keywordService.getOne(keywordQuery);
- *
- * if (keyword == null) {
- * System.out.println("未找到关联的关键词，task_id: " + result.getTask_id());
- * return;
- * }
- *
- * // 2. 处理每个用户的问题结果
- * for (UserResult userResult : result.getResults()) {
- * for (QuestionResult questionResult : userResult.getQuestions_results()) {
- * // 2.1 查询问题ID
- * LambdaQueryWrapper<Question> queryWrapper = new LambdaQueryWrapper<>();
- * queryWrapper.eq(Question::getQuestion, questionResult.getQuestion())
- * .eq(Question::getKeyword_id, keyword.getKeyword_id());
- * Question question = questionService.getOne(queryWrapper);
- *
- * if (question != null) {
- * // 更新问题状态
- * LambdaUpdateWrapper<Question> updateWrapper = new LambdaUpdateWrapper<>();
- * updateWrapper.eq(Question::getQuestion_id, question.getQuestion_id())
- * .set(Question::getStatus, questionResult.getStatus())
- * .set(Question::getResponse, questionResult.getResponse())
- * .set(Question::getExtracted_count, questionResult.getExtracted_count())
- * .set(Question::getError, questionResult.getError())
- * .set(Question::getTimestamp, LocalDateTime.parse(
- * questionResult.getTimestamp(),
- * DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSSSS")
- * ));
- * questionService.update(updateWrapper);
- *
- * // 2.2 保存引用数据
- * List<Reference> references = questionResult.getReferences().stream()
- * .map(ref -> {
- * Reference reference = new Reference();
- * reference.setQuestion_id(question.getQuestion_id());
- * reference.setTitle(ref.getTitle());
- * reference.setUrl(ref.getUrl());
- * reference.setDomain(ref.getDomain());
- * reference.setCreate_time(new Date());
- * return reference;
- * })
- * .collect(Collectors.toList());
- *
- * if (!references.isEmpty()) {
- * referenceService.saveBatch(references);
- * }
- * } else {
- * System.out.println("未找到匹配的问题，question " + question.getQuestion());
- *
- * }
- * }
- * }
- * });
- * }
- */
+// private Mono<Void> updateQuestionAndReference(TaskResultResponse result) {
+// return Mono.fromRunnable(() -> {
+// // 1. 更新关键词状态
+// LambdaUpdateWrapper<Keyword> keywordUpdate = new LambdaUpdateWrapper<>();
+// keywordUpdate.eq(Keyword::getTask_id, result.getTask_id())
+// .set(Keyword::getStatus, "completed");
+// keywordService.update(keywordUpdate);
+//
+// // 查询关键词ID
+// LambdaQueryWrapper<Keyword> keywordQuery = new LambdaQueryWrapper<>();
+// keywordQuery.eq(Keyword::getTask_id, result.getTask_id());
+// Keyword keyword = keywordService.getOne(keywordQuery);
+//
+// if (keyword == null) {
+// System.out.println("未找到关联的关键词，task_id: " + result.getTask_id());
+// return;
+// }
+//
+// // 2. 处理每个用户的问题结果
+// for (UserResult userResult : result.getResults()) {
+// for (QuestionResult questionResult : userResult.getQuestions_results()) {
+// // 2.1 查询问题ID
+// LambdaQueryWrapper<Question> queryWrapper = new LambdaQueryWrapper<>();
+// queryWrapper.eq(Question::getQuestion, questionResult.getQuestion())
+// .eq(Question::getKeyword_id, keyword.getKeyword_id());
+// Question question = questionService.getOne(queryWrapper);
+//
+// if (question != null) {
+// // 更新问题状态
+// LambdaUpdateWrapper<Question> updateWrapper = new LambdaUpdateWrapper<>();
+// updateWrapper.eq(Question::getQuestion_id, question.getQuestion_id())
+// .set(Question::getStatus, questionResult.getStatus())
+// .set(Question::getResponse, questionResult.getResponse())
+// .set(Question::getExtracted_count, questionResult.getExtracted_count())
+// .set(Question::getError, questionResult.getError())
+// .set(Question::getTimestamp, LocalDateTime.parse(
+// questionResult.getTimestamp(),
+// DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSSSS")
+// ));
+// questionService.update(updateWrapper);
+//
+// // 2.2 保存引用数据
+// List<Reference> references = questionResult.getReferences().stream()
+// .map(ref -> {
+// Reference reference = new Reference();
+// reference.setQuestion_id(question.getQuestion_id());
+// reference.setTitle(ref.getTitle());
+// reference.setUrl(ref.getUrl());
+// reference.setDomain(ref.getDomain());
+// reference.setCreate_time(LocalDateTime.now());
+// return reference;
+// })
+// .collect(Collectors.toList());
+//
+// if (!references.isEmpty()) {
+// referenceService.saveBatch(references);
+// }
+// } else {
+// System.out.println("未找到匹配的问题，question " + question.getQuestion());
+//
+// }
+// }
+// }
+// });
+// }
private Mono<Void> updateQuestionAndReference(TaskResultResponse result) {
return Mono.fromRunnable(() -> {
@@ -279,12 +294,11 @@
Keyword keyword = keywordService.getOne(keywordQuery);
if (keyword == null) {
- // log.error("未找到关联的关键词，task_id: {}", result.getTask_id());
System.out.println("未找到关联的关键词，task_id: " + result.getTask_id());
return;
}
- // 2. 批量查询所有问题（假设Question有task_id和keyword_id字段）
+ // 2. 批量查询所有问题
LambdaQueryWrapper<Question> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(Question::getKeyword_id, keyword.getKeyword_id());
List<Question> questions = questionService.list(queryWrapper);
@@ -297,7 +311,7 @@
List<Question> questionsToUpdate = new ArrayList<>();
List<Reference> allReferences = new ArrayList<>();
- // 遍历结果，只收集数据不执行数据库操作
+ // 遍历结果
for (UserResult userResult : result.getResults()) {
for (QuestionResult questionResult : userResult.getQuestions_results()) {
try {
@@ -316,55 +330,60 @@
question.setTimestamp(
LocalDateTime.parse(questionResult.getTimestamp(), formatter));
}
+ //更新
+// questionService.updateById(question);
questionsToUpdate.add(question);
- // 收集引用数据
- List<Reference> references = questionResult.getReferences().stream()
- .map(ref -> {
- Reference reference = new Reference();
- reference.setQuestion_id(question.getQuestion_id());
- reference.setTitle(ref.getTitle());
- reference.setUrl(ref.getUrl());
- reference.setDomain(ref.getDomain());
- reference.setCreate_time(LocalDateTime.now());
- return reference;
- })
- .collect(Collectors.toList());
+ // 收集引用数据，处理空集合情况
+ List<Reference> references =
+ Optional.ofNullable(questionResult.getReferences())
+ .orElse(Collections.emptyList())
+ .stream()
+ .map(ref -> {
+ Reference reference = new Reference();
+ reference.setQuestion_id(question.getQuestion_id());
+ reference.setTitle(ref.getTitle());
+ reference.setUrl(ref.getUrl());
+ reference.setDomain(ref.getDomain());
+ reference.setCreate_time(LocalDateTime.now());
+ return reference;
+ })
+ .collect(Collectors.toList());
- allReferences.addAll(references);
- } else {
- // log.warn("未找到匹配的问题，question: {}, keyword_id: {}",
- // questionResult.getQuestion(), keyword.getKeyword_id());
+ // 添加到总引用列表
+ if (!references.isEmpty()) {
+ allReferences.addAll(references);
+ }
}
} catch (Exception e) {
- // log.error("处理问题结果失败，question: {}, error: {}",
- // questionResult.getQuestion(), e.getMessage(), e);
+ System.out.println("处理问题结果失败: " + e.getMessage());
}
}
}
// 4. 批量更新问题
+ System.out.println(questionsToUpdate);
if (!questionsToUpdate.isEmpty()) {
questionService.updateBatchById(questionsToUpdate);
- // log.info("成功批量更新 {} 个问题", questionsToUpdate.size());
+ System.out.println("成功批量更新 " + questionsToUpdate.size() + " 个问题");
}
- // 5. 批量插入引用
+ // 5. 批量插入引用，使用流式分批处理
if (!allReferences.isEmpty()) {
- // 分批处理，每批1000条记录，避免内存溢出
int batchSize = 1000;
- for (int i = 0; i < allReferences.size(); i += batchSize) {
- List<Reference> batch = allReferences.subList(
- i, Math.min(i + batchSize, allReferences.size()));
- referenceService.saveBatch(batch);
- }
- // log.info("成功批量插入 {} 条引用数据", allReferences.size());
+ IntStream.iterate(0, i -> i + batchSize)
+ .limit((allReferences.size() + batchSize - 1) / batchSize)
+ .forEach(i -> {
+ List<Reference> batch = allReferences.subList(
+ i, Math.min(i + batchSize, allReferences.size()));
+ referenceService.saveBatch(batch);
+ });
+ System.out.println("成功批量插入 " + allReferences.size() + " 条引用数据");
}
} catch (Exception e) {
- // log.error("更新问题和引用数据失败，task_id: {}, error: {}",
- // result.getTask_id(), e.getMessage(), e);
+ System.out.println("更新问题和引用数据失败: " + e.getMessage());
throw new RuntimeException("更新问题和引用数据失败", e);
}
});
@@ -372,15 +391,19 @@
@GetMapping("/tasks/all")
@ApiOperation(value = "获取所有任务列表")
- public Mono<ResponseResult<TaskListResponse>> getAllTasks() {
+ public Mono<TaskListResponse> getAllTasks() {
return webClient.get()
- .uri(baseUrl + "/tasks")
+ .uri(baseUrl + "/api/v1/tasks")
.accept(MediaType.APPLICATION_JSON)
.retrieve()
- .bodyToMono(new ParameterizedTypeReference<ResponseResult<TaskListResponse>>() {
+ .bodyToMono(new ParameterizedTypeReference<TaskListResponse>() {
})
.onErrorResume(e -> {
- return Mono.just(ResponseResult.error("获取任务列表失败: " + e.getMessage()));
+ TaskListResponse response = new TaskListResponse();
+ response.setDetail("获取任务列表失败: " + e.getMessage());
+ return Mono.just(response);
+
+ // return Mono.just(ResponseResult.error("获取任务列表失败: " + e.getMessage()));
});
}
diff --git a/src/main/java/com/linghu/controller/KeywordController.java b/src/main/java/com/linghu/controller/KeywordController.java
index eabba3a..9b6e913 100644
--- a/src/main/java/com/linghu/controller/KeywordController.java
+++ b/src/main/java/com/linghu/controller/KeywordController.java
@@ -21,6 +21,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.ByteArrayOutputStream;
+import java.util.ArrayList;
import java.util.List;
@RestController
@@ -41,15 +42,17 @@
*/
@GetMapping("/statics")
@ApiOperation(value = "EChart图")
- public ResponseResult<KeywordStaticsListVO> statics(@RequestParam("id") Integer keywordId, @RequestParam(value = "questionId",required = false) Integer questionId) {
- return keywordService.statics(keywordId,questionId);
+ public ResponseResult<KeywordStaticsListVO> statics(@RequestParam("id") Integer keywordId,
+ @RequestParam(value = "questionId", required = false) Integer questionId) {
+ return keywordService.statics(keywordId, questionId);
}
@PostMapping(value = "/exportStatics")
@ApiOperation(value = "EChart图导出")
- public ResponseEntity<byte[]> exportStatics(@RequestParam("id") Integer keywordId, @RequestParam(value = "questionId",required = false) Integer questionId, HttpServletResponse response) {
+ public ResponseEntity<byte[]> exportStatics(@RequestParam("id") Integer keywordId,
+ @RequestParam(value = "questionId", required = false) Integer questionId, HttpServletResponse response) {
Keyword keyword = keywordMapper.selectById(keywordId);
- List<KeywordStaticsVO> voList = keywordMapper.statics(keywordId,questionId,keyword.getNum());
+ List<KeywordStaticsVO> voList = keywordMapper.statics(keywordId, questionId, keyword.getNum());
// 3. 导出Excel
ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -63,24 +66,30 @@
.contentType(MediaType.APPLICATION_OCTET_STREAM)
.body(out.toByteArray());
}
+
/**
* 根据类别查看
*/
@GetMapping("/getResultByTypeId")
@ApiOperation(value = "根据类别查看")
- public ResponseResult<List<PlatformProportionVO>> getResultByTypeId(@RequestParam("id") Integer keywordId, @RequestParam(value = "questionId",required = false) Integer questionId, @RequestParam(value = "typeId",required = false) Integer typeId) {
- return keywordService.getResultByTypeId(keywordId,questionId,typeId);
+ public ResponseResult<List<PlatformProportionVO>> getResultByTypeId(@RequestParam("id") Integer keywordId,
+ @RequestParam(value = "questionId", required = false) Integer questionId,
+ @RequestParam(value = "typeId", required = false) Integer typeId) {
+ return keywordService.getResultByTypeId(keywordId, questionId, typeId);
}
-
/**
* 导出：根据类别查看
*/
@PostMapping(value = "/exportGetResultByTypeId")
@ApiOperation(value = "导出：根据类别查看")
- public ResponseEntity<byte[]> exportGetResultByTypeId(@RequestParam("id") Integer keywordId, @RequestParam(value = "questionId",required = false) Integer questionId, @RequestParam(value = "typeId",required = false) Integer typeId,@RequestParam(value = "isNow") Integer isNow ) {
+ public ResponseEntity<byte[]> exportGetResultByTypeId(@RequestParam("id") Integer keywordId,
+ @RequestParam(value = "questionId", required = false) Integer questionId,
+ @RequestParam(value = "typeId", required = false) Integer typeId,
+ @RequestParam(value = "isNow") Integer isNow) {
Keyword keyword = keywordService.getById(keywordId);
- List<PlatformProportionVO> result = keywordMapper.getResultByTypeId(keywordId, questionId, keyword.getNum() - isNow, typeId);
+ List<PlatformProportionVO> result = keywordMapper.getResultByTypeId(keywordId, questionId,
+ keyword.getNum() - isNow, typeId);
// 3. 导出Excel
ByteArrayOutputStream out = new ByteArrayOutputStream();
EasyExcel.write(out, PlatformProportionVO.class)
@@ -99,8 +108,10 @@
*/
@GetMapping("/getResultByPlatformId")
@ApiOperation(value = "根据平台查看")
- public ResponseResult<List<ResultListVO>> getResultByPlatformId(@RequestParam("id") Integer keywordId, @RequestParam(value = "questionId",required = false) Integer questionId, @RequestParam(value = "platformId",required = false) Integer platformId) {
- return keywordService.getResultByPlatformId(keywordId,questionId,platformId);
+ public ResponseResult<List<ResultListVO>> getResultByPlatformId(@RequestParam("id") Integer keywordId,
+ @RequestParam(value = "questionId", required = false) Integer questionId,
+ @RequestParam(value = "platformId", required = false) Integer platformId) {
+ return keywordService.getResultByPlatformId(keywordId, questionId, platformId);
}
/**
@@ -108,9 +119,13 @@
*/
@GetMapping("/exportGetResultByPlatformId")
@ApiOperation(value = "根据平台查看")
- public ResponseEntity<byte[]> exportGetResultByPlatformId(@RequestParam("id") Integer keywordId, @RequestParam(value = "questionId",required = false) Integer questionId, @RequestParam(value = "platformId",required = false) Integer platformId,@RequestParam(value = "isNow") Integer isNow) {
+ public ResponseEntity<byte[]> exportGetResultByPlatformId(@RequestParam("id") Integer keywordId,
+ @RequestParam(value = "questionId", required = false) Integer questionId,
+ @RequestParam(value = "platformId", required = false) Integer platformId,
+ @RequestParam(value = "isNow") Integer isNow) {
Keyword keyword = keywordService.getById(keywordId);
- List<ResultListVO> result = keywordMapper.getResultByPlatformId(keywordId, questionId, keyword.getNum() - isNow, platformId);
+ List<ResultListVO> result = keywordMapper.getResultByPlatformId(keywordId, questionId, keyword.getNum() - isNow,
+ platformId);
// 3. 导出Excel
ByteArrayOutputStream out = new ByteArrayOutputStream();
EasyExcel.write(out, ResultListVO.class)
@@ -137,13 +152,54 @@
return ResponseResult.success(reference);
}
-
/**
* 投喂
*/
+ /**
+ * 批量新增关键词
+ */
+ @PostMapping("/batchAdd")
+ @ApiOperation(value = "批量新增关键词")
+ public ResponseResult<String> batchAdd(String keywords, String order_id) {
+ Boolean saveKeywords = keywordService.saveKeywords(keywords, order_id);
+ if (saveKeywords) {
+ return ResponseResult.success("新增成功");
+ } else {
+ return ResponseResult.error("新增失败");
+ }
+ }
+ /**
+ * 根据订单ID查询关键词
+ */
+ @GetMapping("/getKeywordsByOrderId")
+ @ApiOperation(value = "根据订单ID查询关键词")
+ public ResponseResult<List<Keyword>> getKeywordsByOrderId(@RequestParam("orderId") String orderId) {
+ List<Keyword> keywords = keywordService.getKeywordsByOrderId(orderId);
+ return ResponseResult.success(keywords);
+ }
+
+ /**
+ * 修改关键词
+ */
+ @PostMapping("/updateKeyword")
+ @ApiOperation(value = "修改关键词")
+ public ResponseResult<String> updateKeyword(@RequestBody Keyword keyword) {
+ keywordService.updateById(keyword);
+ return ResponseResult.success("修改成功");
+ }
+
+ /**
+ * 删除关键词
+ */
+ @DeleteMapping("/deleteKeyword")
+ @ApiOperation(value = "删除关键词")
+ public ResponseResult<String> deleteKeyword(@RequestParam("keywordId") Integer keywordId) {
+ keywordService.removeById(keywordId);
+ return ResponseResult.success("删除成功");
+ }
}
diff --git a/src/main/java/com/linghu/model/dto/SearchTaskRequest.java b/src/main/java/com/linghu/model/dto/SearchTaskRequest.java
index ede867d..8254e4a 100644
--- a/src/main/java/com/linghu/model/dto/SearchTaskRequest.java
+++ b/src/main/java/com/linghu/model/dto/SearchTaskRequest.java
@@ -12,7 +12,7 @@
public class SearchTaskRequest {
@Valid
@NotEmpty(message = "用户列表不能为空")
- private List<User> users;
+ private List<UserDto> users;
@NotEmpty(message = "问题列表不能为空")
private List<String> questions;
diff --git a/src/main/java/com/linghu/model/dto/SearchTaskResponse.java b/src/main/java/com/linghu/model/dto/SearchTaskResponse.java
index 6015651..02365b7 100644
--- a/src/main/java/com/linghu/model/dto/SearchTaskResponse.java
+++ b/src/main/java/com/linghu/model/dto/SearchTaskResponse.java
@@ -7,5 +7,6 @@
private String task_id;
private String status;
private String message;
+ private String detail;
}
diff --git a/src/main/java/com/linghu/model/dto/TaskCancelResponse.java b/src/main/java/com/linghu/model/dto/TaskCancelResponse.java
index a204e11..499b5a7 100644
--- a/src/main/java/com/linghu/model/dto/TaskCancelResponse.java
+++ b/src/main/java/com/linghu/model/dto/TaskCancelResponse.java
@@ -7,10 +7,14 @@
private String task_id;
private String status;
private String message;
+ private String detail;
public TaskCancelResponse(String taskId, String status, String message) {
this.task_id = taskId;
this.status = status;
this.message = message;
}
+ public TaskCancelResponse() {
+ super();
+ }
}
\ No newline at end of file
diff --git a/src/main/java/com/linghu/model/dto/TaskListResponse.java b/src/main/java/com/linghu/model/dto/TaskListResponse.java
index efce31e..59e8c79 100644
--- a/src/main/java/com/linghu/model/dto/TaskListResponse.java
+++ b/src/main/java/com/linghu/model/dto/TaskListResponse.java
@@ -6,5 +6,6 @@
@Data
public class TaskListResponse {
private Integer tasks_count;
+ private String detail;
private Map<String, TaskStatusResponse> tasks;
}
\ No newline at end of file
diff --git a/src/main/java/com/linghu/model/dto/TaskResultResponse.java b/src/main/java/com/linghu/model/dto/TaskResultResponse.java
index afcab4d..f1dff21 100644
--- a/src/main/java/com/linghu/model/dto/TaskResultResponse.java
+++ b/src/main/java/com/linghu/model/dto/TaskResultResponse.java
@@ -4,6 +4,8 @@
import lombok.NoArgsConstructor;
import lombok.AllArgsConstructor;
+import java.time.Duration;
+import java.time.LocalDateTime;
import java.util.Date;
import java.util.List;
@@ -15,8 +17,9 @@
private Integer total_users;
private Integer total_questions;
private Integer successful_users;
- private Date total_duration;
+ private String total_duration;
private List<UserResult> results;
+ private String detail;
@Data
@NoArgsConstructor
@@ -26,6 +29,7 @@
private String user_name;
private String user_email;
private String status;
+ private String error;
private List<QuestionResult> questions_results;
}
diff --git a/src/main/java/com/linghu/model/dto/TaskStatusResponse.java b/src/main/java/com/linghu/model/dto/TaskStatusResponse.java
index 3222219..02238d5 100644
--- a/src/main/java/com/linghu/model/dto/TaskStatusResponse.java
+++ b/src/main/java/com/linghu/model/dto/TaskStatusResponse.java
@@ -16,6 +16,7 @@
private int questions_count;
private boolean save_to_database;
private String webhook_url;
+ private String detail;
private List<QuestionStatus> questions_status;
@Data
diff --git a/src/main/java/com/linghu/model/dto/UserDto.java b/src/main/java/com/linghu/model/dto/UserDto.java
new file mode 100644
index 0000000..9900646
--- /dev/null
+++ b/src/main/java/com/linghu/model/dto/UserDto.java
@@ -0,0 +1,11 @@
+package com.linghu.model.dto;
+
+import com.linghu.model.entity.User;
+import lombok.Data;
+
+@Data
+public class UserDto {
+ private String name;
+ private String email;
+ private String password;
+}
diff --git a/src/main/java/com/linghu/service/KeywordService.java b/src/main/java/com/linghu/service/KeywordService.java
index 145a70c..1301fd5 100644
--- a/src/main/java/com/linghu/service/KeywordService.java
+++ b/src/main/java/com/linghu/service/KeywordService.java
@@ -10,10 +10,10 @@
import java.util.List;
/**
-* @author xy
-* @description 针对表【keyword】的数据库操作Service
-* @createDate 2025-07-04 20:17:33
-*/
+ * @author xy
+ * @description 针对表【keyword】的数据库操作Service
+ * @createDate 2025-07-04 20:17:33
+ */
public interface KeywordService extends IService<Keyword> {
ResponseResult<KeywordStaticsListVO> statics(Integer keywordId, Integer questionId);
@@ -21,5 +21,8 @@
ResponseResult<List<PlatformProportionVO>> getResultByTypeId(Integer keywordId, Integer questionId, Integer typeId);
ResponseResult<List<ResultListVO>> getResultByPlatformId(Integer keywordId, Integer questionId, Integer platformId);
+
List<Keyword> getKeywordsByOrderId(String orderId);
+
+ Boolean saveKeywords(String keywords, String order_id);
}
diff --git a/src/main/java/com/linghu/service/impl/KeywordServiceImpl.java b/src/main/java/com/linghu/service/impl/KeywordServiceImpl.java
index 568e27b..b849f0e 100644
--- a/src/main/java/com/linghu/service/impl/KeywordServiceImpl.java
+++ b/src/main/java/com/linghu/service/impl/KeywordServiceImpl.java
@@ -9,73 +9,76 @@
import com.linghu.service.KeywordService;
import com.linghu.mapper.KeywordMapper;
-
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
-* @author xy
-* @description 针对表【keyword】的数据库操作Service实现
-* @createDate 2025-07-04 20:17:33
-*/
+ * @author xy
+ * @description 针对表【keyword】的数据库操作Service实现
+ * @createDate 2025-07-04 20:17:33
+ */
@Service
-public class KeywordServiceImpl extends ServiceImpl<KeywordMapper, Keyword> implements KeywordService{
+public class KeywordServiceImpl extends ServiceImpl<KeywordMapper, Keyword> implements KeywordService {
@Autowired
private KeywordMapper keywordMapper;
@Override
public ResponseResult<KeywordStaticsListVO> statics(Integer keywordId, Integer questionId) {
KeywordStaticsListVO vo = new KeywordStaticsListVO();
- //1.关键词是否存在
+ // 1.关键词是否存在
Keyword keyword = this.getById(keywordId);
if (keyword == null) {
return ResponseResult.error("关键词不存在");
}
- if (!"completed".equals(keyword.getStatus())){
+ if (!"completed".equals(keyword.getStatus())) {
return ResponseResult.error("关键词采集未完成");
}
- List<KeywordStaticsVO> statics = this.getBaseMapper().statics(keywordId,questionId,keyword.getNum());
+ List<KeywordStaticsVO> statics = this.getBaseMapper().statics(keywordId, questionId, keyword.getNum());
vo.setNowRecord(statics);
- if (keyword.getNum()!=0){
- statics = this.getBaseMapper().statics(keywordId,questionId,keyword.getNum()-1);
+ if (keyword.getNum() != 0) {
+ statics = this.getBaseMapper().statics(keywordId, questionId, keyword.getNum() - 1);
vo.setBeforeRecord(statics);
}
return ResponseResult.success(vo);
}
@Override
- public ResponseResult<List<PlatformProportionVO>> getResultByTypeId(Integer keywordId, Integer questionId, Integer typeId) {
- //1.关键词是否存在
+ public ResponseResult<List<PlatformProportionVO>> getResultByTypeId(Integer keywordId, Integer questionId,
+ Integer typeId) {
+ // 1.关键词是否存在
Keyword keyword = this.getById(keywordId);
if (keyword == null) {
return ResponseResult.error("关键词不存在");
}
- if (!"completed".equals(keyword.getStatus())){
+ if (!"completed".equals(keyword.getStatus())) {
return ResponseResult.error("关键词采集未完成");
}
- List<PlatformProportionVO> result = this.getBaseMapper().getResultByTypeId(keywordId, questionId, keyword.getNum(), typeId);
+ List<PlatformProportionVO> result = this.getBaseMapper().getResultByTypeId(keywordId, questionId,
+ keyword.getNum(), typeId);
return ResponseResult.success(result);
}
@Override
- public ResponseResult<List<ResultListVO>> getResultByPlatformId(Integer keywordId, Integer questionId, Integer platformId) {
- //1.关键词是否存在
+ public ResponseResult<List<ResultListVO>> getResultByPlatformId(Integer keywordId, Integer questionId,
+ Integer platformId) {
+ // 1.关键词是否存在
Keyword keyword = this.getById(keywordId);
if (keyword == null) {
return ResponseResult.error("关键词不存在");
}
- if (!"completed".equals(keyword.getStatus())){
+ if (!"completed".equals(keyword.getStatus())) {
return ResponseResult.error("关键词采集未完成");
}
- List<ResultListVO> result = this.getBaseMapper().getResultByPlatformId(keywordId, questionId, keyword.getNum(), platformId);
+ List<ResultListVO> result = this.getBaseMapper().getResultByPlatformId(keywordId, questionId, keyword.getNum(),
+ platformId);
return ResponseResult.success(result);
}
-
-
@Override
public List<Keyword> getKeywordsByOrderId(String orderId) {
@@ -84,4 +87,22 @@
return keywordMapper.selectList(queryWrapper);
}
+ @Override
+ public Boolean saveKeywords(String keywords, String order_id) {
+ if (StringUtils.hasText(keywords)) {
+ List<Keyword> keywordList = new ArrayList<>();
+ String[] keywordArray = keywords.split("\\n");
+ for (String keyword : keywordArray) {
+ Keyword newKeyword = new Keyword();
+ newKeyword.setKeyword_name(keyword);
+ newKeyword.setOrder_id(order_id);
+ newKeyword.setStatus("notSubmitted");
+ keywordList.add(newKeyword);
+ }
+ return this.saveBatch(keywordList);
+ }else {
+ return false;
+ }
+ }
+
}
diff --git a/src/main/java/com/linghu/utils/JwtUtils.java b/src/main/java/com/linghu/utils/JwtUtils.java
index 408f751..6d5d475 100644
--- a/src/main/java/com/linghu/utils/JwtUtils.java
+++ b/src/main/java/com/linghu/utils/JwtUtils.java
@@ -46,6 +46,7 @@
return Jwts.builder()
.setSubject(user.getUser_name())
.claim("email", user.getUser_email())
+ .claim("password", user.getPassword())
.setIssuedAt(new Date())
.setExpiration(new Date(System.currentTimeMillis() + expiration * 1000))
.signWith(key, SignatureAlgorithm.HS256)
@@ -66,6 +67,7 @@
User user = new User();
user.setUser_name(claims.getSubject()); // 主题是用户名
user.setUser_email(claims.get("email", String.class));
+ user.setPassword( claims.get("password", String.class));
// 添加角色信息（如果存在）
// if (claims.containsKey("roles")) {
diff --git a/src/main/java/com/linghu/utils/OpenCryptUtil.java b/src/main/java/com/linghu/utils/OpenCryptUtil.java
new file mode 100644
index 0000000..388af01
--- /dev/null
+++ b/src/main/java/com/linghu/utils/OpenCryptUtil.java
@@ -0,0 +1,57 @@
+package com.linghu.utils;
+
+
+import cn.afocus.crypt.sign.UserSign;
+
+import cn.afocus.crypt.sign.UserSign;
+import com.alibaba.fastjson.JSON;
+import com.linghu.model.entity.User;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+
+@Component
+public class OpenCryptUtil {
+
+ // 加密密钥（从配置文件读取，避免硬编码）
+ @Value("${app.crypt.secret-key}") // 长度需符合算法要求（如AES-256需32位）
+ private String secret;
+
+ // 初始化向量（CBC模式需要，可选）
+// @Value("${app.crypt.iv:1234567890abcdef}") // 16位（AES-128/256通用）
+// private String iv;
+
+ // 初始化加密配置（若需要）
+ @PostConstruct
+ public void init() {
+ // 若 open-crypt 需要初始化，可在此处处理
+ // 例如：CryptoUtils.init(secretKey, iv);
+ }
+
+ /**
+ * AES加密（假设 open-crypt 默认使用AES-CBC模式）
+ */
+ public String encrypt(User user) {
+ try {
+ // 调用 open-crypt 的加密方法（根据实际API调整）
+ //user转为 json
+ String json = JSON.toJSONString(user);
+ return UserSign.gen(json, "fY9tX7vX7qH5bN2cD8eM4xD2fH7uL4xM".getBytes());
+ } catch (Exception e) {
+ throw new RuntimeException("加密失败：" + e.getMessage(), e);
+ }
+ }
+
+ /**
+ * AES解密
+ */
+ public String decrypt(String token) {
+ try {
+ // 调用 open-crypt 的解密方法
+ return UserSign.decrypt(token, "fY9tX7vX7qH5bN2cD8eM4xD2fH7uL4xM".getBytes());
+ } catch (Exception e) {
+ throw new RuntimeException("解密失败：" + e.getMessage(), e);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index ecda751..a9824ed 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -5,7 +5,10 @@
jwt:
secret: linghu-system-mySuperSecretKeyThatIsAtLeast-key-2024
expiration: 3600
-
+ #open-crypt
+app:
+ crypt:
+ secret-key: "fY9tX7vX7qH5bN2cD8eM4xD2fH7uL4xM"
spring:
datasource:
url: jdbc:mysql://192.168.110.21:3306/linghu_geo_system?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&characterEncoding=UTF-8
@@ -24,6 +27,11 @@
logic-not-delete-value: 0
configuration:
map-underscore-to-camel-case: false
-
+ log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
+logging:
+ level:
+ # 将Mapper接口所在的包路径设置为DEBUG级别
+ com.linghu.mapper: DEBUG # 替换为你的Mapper接口包路径
linghu:
- url: http://182.92.208.99:8000/api/v1
\ No newline at end of file
+ url: http://182.92.208.99:8000
\ No newline at end of file
--
Gitblit v1.7.1