TASK:history 开放跨域;

src/main/java/com/ai/da/common/config/WebConfig.java

@@ -5,13 +5,22 @@ import org.hibernate.validator.HibernateValidator;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.validation.beanvalidation.MethodValidationPostProcessor;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 
 import javax.validation.Validation;
 import javax.validation.Validator;
 import javax.validation.ValidatorFactory;
 
 @Configuration
-public class WebConfig {
+public class WebConfig extends WebMvcConfigurerAdapter {
+
+    static final String ORIGINS[] = new String[]{"GET", "POST", "PUT", "DELETE"};
+
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        registry.addMapping("/**").allowedOrigins("*").allowCredentials(true).allowedMethods(ORIGINS).maxAge(3600);
+    }
 
     @Bean
     public Validator validator() {
@@ -30,4 +39,4 @@ public class WebConfig {
         methodValidationPostProcessor.setValidator(validator());
         return methodValidationPostProcessor;
     }
-}
+}

src/main/java/com/ai/da/common/security/filter/AuthenticationFilter.java

@@ -50,7 +50,9 @@ public class AuthenticationFilter extends OncePerRequestFilter {
             Arrays.asList("/favicon.ico","/doc.html","api/account/login","api/account/preLogin","api/account/sendEmail",
                     "/webjars/","/swagger-resources","/v2/api-docs","api/account/resetPwd",
                     "/api/python/saveGeneratePicture", "/api/python/getLibraryByUserId",
-                    "/api/third/party/addUser","/api/third/party/editUser","/api/element/initDefaultSysFile");
+                    "/api/third/party/addUser","/api/third/party/editUser","/api/element/initDefaultSysFile"
+                    ,"/api/history/queryUserGroup","/api/history/choose"
+            );
 
     @Override
     protected void doFilterInternal(HttpServletRequest httpServletRequest, @NonNull HttpServletResponse httpServletResponse, @NonNull FilterChain filterChain) throws ServletException, IOException {

src/main/java/com/ai/da/controller/SavedCollectionController.java

@@ -48,13 +48,14 @@ public class SavedCollectionController {
     private AccountService accountService;
 
     @ApiOperation(value = "History用户分页分组列表")
+    @CrossOrigin
     @PostMapping("/queryUserGroup")
     public Response<PageBaseResponse<UserLikeGroupVO>> queryUserGroup(@Valid @RequestBody QueryHistoryPageDTO query) {
         AuthPrincipalVo authPrincipalVo = UserContext.getUserHolder();
         // 分页数据
         QueryWrapper<UserLikeGroup> queryWrapper = new QueryWrapper<>();
 
-        queryWrapper.eq("account_id", authPrincipalVo.getId());
+        queryWrapper.eq("account_id", query.getUserId());
         if(!StringUtils.isEmpty(query.getCollectionName())){
             queryWrapper.like("name", query.getCollectionName());
         }
@@ -76,7 +77,7 @@ public class SavedCollectionController {
         Map<Long,List<UserLikeVO>> groupDetailMap = groupDetails.stream()
                 .collect(Collectors.groupingBy(UserLikeVO::getUserLikeGroupId));
 
-        Account  account = accountService.getById(authPrincipalVo.getId());
+        Account  account = accountService.getById(query.getUserId());
         IPage<UserLikeGroupVO> convert = page.convert((Function<UserLikeGroup, UserLikeGroupVO>) group -> {
             if(group != null){
                 UserLikeGroupVO userLikeGroupVO = CopyUtil.copyObject(group,UserLikeGroupVO.class);
@@ -116,6 +117,7 @@ public class SavedCollectionController {
     }
 
     @ApiOperation(value = "History choose")
+    @CrossOrigin
     @GetMapping("/choose")
     public Response<UserLikeChooseVO> choose(
                 @ApiParam("用户分组id") @RequestParam("userGroupId") Long userGroupId) {

src/main/java/com/ai/da/model/dto/QueryHistoryPageDTO.java

@@ -20,4 +20,6 @@ public class QueryHistoryPageDTO extends PageQueryBaseVo {
 
     @ApiModelProperty("开始时间 时间戳")
     private Long endDate;
+
+    private Long userId;
 }