Commit 8997304c authored by 陈立彬's avatar 陈立彬

跨域配置&接口请求方式fix

parent 08b33f19
package cn.breeze.elleai;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
import org.springframework.http.server.reactive.ServerHttpRequest;
import org.springframework.http.server.reactive.ServerHttpResponse;
import org.springframework.web.cors.reactive.CorsUtils;
import org.springframework.web.server.ServerWebExchange;
import org.springframework.web.server.WebFilter;
import org.springframework.web.server.WebFilterChain;
import reactor.core.publisher.Mono;
@Configuration
public class CorsConfig {
@Bean
public WebFilter corsFilter2() {
return (ServerWebExchange ctx, WebFilterChain chain) -> {
ServerHttpRequest request = ctx.getRequest();
if (CorsUtils.isCorsRequest(request)) {
HttpHeaders requestHeaders = request.getHeaders();
ServerHttpResponse response = ctx.getResponse();
HttpMethod requestMethod = requestHeaders.getAccessControlRequestMethod();
HttpHeaders headers = response.getHeaders();
headers.add(HttpHeaders.ACCESS_CONTROL_ALLOW_ORIGIN, requestHeaders.getOrigin());
headers.addAll(HttpHeaders.ACCESS_CONTROL_ALLOW_HEADERS,
requestHeaders.getAccessControlRequestHeaders());
if (requestMethod != null) {
headers.add(HttpHeaders.ACCESS_CONTROL_ALLOW_METHODS, requestMethod.name());
}
headers.add(HttpHeaders.ACCESS_CONTROL_ALLOW_CREDENTIALS, "true");
headers.add(HttpHeaders.ACCESS_CONTROL_EXPOSE_HEADERS, "*");
if (request.getMethod() == HttpMethod.OPTIONS) {
response.setStatusCode(HttpStatus.OK);
return Mono.empty();
}
}
return chain.filter(ctx);
};
}
}
...@@ -37,7 +37,7 @@ public class ChatCompletionController { ...@@ -37,7 +37,7 @@ public class ChatCompletionController {
} }
@Operation(summary = "启用/禁用助手") @Operation(summary = "启用/禁用助手")
@GetMapping("/assistant/update_status/{id}/{status}") @PostMapping("/assistant/update_status/{id}/{status}")
public ApiResponse<String> updateQaAssistantStatus(@PathVariable("id") Integer id, public ApiResponse<String> updateQaAssistantStatus(@PathVariable("id") Integer id,
@PathVariable("status") Integer status) { @PathVariable("status") Integer status) {
chatCompletionService.updateQaAssistantStatus(id, status); chatCompletionService.updateQaAssistantStatus(id, status);
...@@ -45,7 +45,7 @@ public class ChatCompletionController { ...@@ -45,7 +45,7 @@ public class ChatCompletionController {
} }
@Operation(summary = "删除助手") @Operation(summary = "删除助手")
@GetMapping("/assistant/delete/{id}") @PostMapping("/assistant/delete/{id}")
public ApiResponse<String> deleteQaAssistant(@PathVariable("id") Integer id) { public ApiResponse<String> deleteQaAssistant(@PathVariable("id") Integer id) {
chatCompletionService.deleteQaAssistant(id); chatCompletionService.deleteQaAssistant(id);
return ApiResponse.ok("ok"); return ApiResponse.ok("ok");
...@@ -59,7 +59,7 @@ public class ChatCompletionController { ...@@ -59,7 +59,7 @@ public class ChatCompletionController {
} }
@Operation(summary = "助手列表") @Operation(summary = "助手列表")
@PostMapping("/assistant/list") @GetMapping("/assistant/list")
public ApiResponse<PageResult<QaAssistantDto>> list(@RequestBody QaAssistantRequestDto request) { public ApiResponse<PageResult<QaAssistantDto>> list(@RequestBody QaAssistantRequestDto request) {
PageResult<QaAssistantDto> pageResult = chatCompletionService.qaAssistantPaginQuery(request); PageResult<QaAssistantDto> pageResult = chatCompletionService.qaAssistantPaginQuery(request);
return ApiResponse.ok(pageResult); return ApiResponse.ok(pageResult);
...@@ -74,7 +74,7 @@ public class ChatCompletionController { ...@@ -74,7 +74,7 @@ public class ChatCompletionController {
} }
@Operation(summary = "AI问答会话列表") @Operation(summary = "AI问答会话列表")
@PostMapping("/user/list") @GetMapping("/user/list")
public ApiResponse<PageResult<UserChatCompletionDto>> userQaList(@RequestBody UserQaRequestDto request) { public ApiResponse<PageResult<UserChatCompletionDto>> userQaList(@RequestBody UserQaRequestDto request) {
PageResult<UserChatCompletionDto> pageResult = chatCompletionService.userQaPaginQuery(request); PageResult<UserChatCompletionDto> pageResult = chatCompletionService.userQaPaginQuery(request);
return ApiResponse.ok(pageResult); return ApiResponse.ok(pageResult);
......
...@@ -23,21 +23,21 @@ public class ChatCompletionMobileController { ...@@ -23,21 +23,21 @@ public class ChatCompletionMobileController {
private final AppChatCompletionService chatCompletionService; private final AppChatCompletionService chatCompletionService;
@Operation(summary = "助手列表") @Operation(summary = "助手列表")
@PostMapping("/assistant/list") @GetMapping("/assistant/list")
public ApiResponse<PageResult<QaAssistantDto>> assistantList(@RequestBody QaAssistantRequestDto request) { public ApiResponse<PageResult<QaAssistantDto>> assistantList(@RequestBody QaAssistantRequestDto request) {
PageResult<QaAssistantDto> pageResult = chatCompletionService.qaAssistantPaginQuery(request); PageResult<QaAssistantDto> pageResult = chatCompletionService.qaAssistantPaginQuery(request);
return ApiResponse.ok(pageResult); return ApiResponse.ok(pageResult);
} }
@Operation(summary = "热门提问") @Operation(summary = "热门提问")
@PostMapping("/hot/list") @GetMapping("/hot/list")
public ApiResponse<PageResult<HotQaMobileDto>> hotList(@RequestBody QaAssistantRequestDto request) { public ApiResponse<PageResult<HotQaMobileDto>> hotList(@RequestBody QaAssistantRequestDto request) {
PageResult<HotQaMobileDto> pageResult = new PageResult<>(); PageResult<HotQaMobileDto> pageResult = new PageResult<>();
return ApiResponse.ok(pageResult); return ApiResponse.ok(pageResult);
} }
@Operation(summary = "历史对话") @Operation(summary = "历史对话")
@PostMapping("/history") @GetMapping("/history")
public ApiResponse<PageResult<UserChatCompletionHistoryDto>> history(@RequestParam("user_id") String userId, public ApiResponse<PageResult<UserChatCompletionHistoryDto>> history(@RequestParam("user_id") String userId,
@RequestBody UserQaHistoryRequestDto request) { @RequestBody UserQaHistoryRequestDto request) {
request.setUserId(userId); request.setUserId(userId);
......
...@@ -9,24 +9,12 @@ import cn.breeze.elleai.application.dto.request.ExamineSceneCategoryRequestDto; ...@@ -9,24 +9,12 @@ import cn.breeze.elleai.application.dto.request.ExamineSceneCategoryRequestDto;
import cn.breeze.elleai.application.dto.request.ExamineSceneRequestDto; import cn.breeze.elleai.application.dto.request.ExamineSceneRequestDto;
import cn.breeze.elleai.application.dto.response.*; import cn.breeze.elleai.application.dto.response.*;
import cn.breeze.elleai.application.service.AppExamineService; import cn.breeze.elleai.application.service.AppExamineService;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSONObject;
import io.micrometer.common.util.StringUtils;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.text.DecimalFormat;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@RestController @RestController
@RequestMapping(value = "/front/examine") @RequestMapping(value = "/front/examine")
@Tag(name = "AI对练移动端") @Tag(name = "AI对练移动端")
...@@ -36,21 +24,21 @@ public class ExamineMobileController { ...@@ -36,21 +24,21 @@ public class ExamineMobileController {
private final AppExamineService examineService; private final AppExamineService examineService;
@Operation(summary = "对练场景列表") @Operation(summary = "对练场景列表")
@PostMapping("/scene/list") @GetMapping("/scene/list")
public ApiResponse<PageResult<ExamineSceneDto>> list(@RequestBody ExamineSceneRequestDto request) { public ApiResponse<PageResult<ExamineSceneDto>> list(@RequestBody ExamineSceneRequestDto request) {
PageResult<ExamineSceneDto> pageResult = examineService.examineMobileScenePaginQuery(request); PageResult<ExamineSceneDto> pageResult = examineService.examineMobileScenePaginQuery(request);
return ApiResponse.ok(pageResult); return ApiResponse.ok(pageResult);
} }
@Operation(summary = "对练场景分类列表") @Operation(summary = "对练场景分类列表")
@PostMapping("/scene_category/list") @GetMapping("/scene_category/list")
public ApiResponse<PageResult<ExamineSceneCategoryDto>> list(@RequestBody ExamineSceneCategoryRequestDto request) { public ApiResponse<PageResult<ExamineSceneCategoryDto>> list(@RequestBody ExamineSceneCategoryRequestDto request) {
PageResult<ExamineSceneCategoryDto> pageResult = examineService.examineSceneCategoryMobilePaginQuery(request); PageResult<ExamineSceneCategoryDto> pageResult = examineService.examineSceneCategoryMobilePaginQuery(request);
return ApiResponse.ok(pageResult); return ApiResponse.ok(pageResult);
} }
@Operation(summary = "对练列表") @Operation(summary = "对练列表")
@PostMapping("/list") @GetMapping("/list")
public ApiResponse<PageResult<ExamineMobileDto>> list(@RequestBody ExamineRequestDto request) { public ApiResponse<PageResult<ExamineMobileDto>> list(@RequestBody ExamineRequestDto request) {
PageResult<ExamineMobileDto> pageResult = examineService.examineMobilePaginQuery(request); PageResult<ExamineMobileDto> pageResult = examineService.examineMobilePaginQuery(request);
return ApiResponse.ok(pageResult); return ApiResponse.ok(pageResult);
...@@ -64,7 +52,7 @@ public class ExamineMobileController { ...@@ -64,7 +52,7 @@ public class ExamineMobileController {
} }
@Operation(summary = "用户对练记录列表") @Operation(summary = "用户对练记录列表")
@PostMapping("/record/list") @GetMapping("/record/list")
public ApiResponse<PageResult<ExamineRecordMobileDto>> recordList(@RequestParam("user_id")String userId, public ApiResponse<PageResult<ExamineRecordMobileDto>> recordList(@RequestParam("user_id")String userId,
@RequestBody ExamineRecordRequestDto request) { @RequestBody ExamineRecordRequestDto request) {
...@@ -81,7 +69,7 @@ public class ExamineMobileController { ...@@ -81,7 +69,7 @@ public class ExamineMobileController {
} }
@Operation(summary = "获取题目列表") @Operation(summary = "获取题目列表")
@PostMapping("/get_examine_qa") @GetMapping("/get_examine_qa")
public ApiResponse<PageResult<ExamineMobileDto>> getExamineQa(@RequestBody ExamineRequestDto request) { public ApiResponse<PageResult<ExamineMobileDto>> getExamineQa(@RequestBody ExamineRequestDto request) {
PageResult<ExamineMobileDto> pageResult = examineService.examineMobilePaginQuery(request); PageResult<ExamineMobileDto> pageResult = examineService.examineMobilePaginQuery(request);
return ApiResponse.ok(pageResult); return ApiResponse.ok(pageResult);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment