提交 5765fd99 作者: obcy

解决跨域

上级 34b0fb4d
package com.zzsn.knowbase.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.cors.CorsConfiguration;
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
import org.springframework.web.filter.CorsFilter;
/**
* Description: 解决跨域问题
* Author: EDY
* Date: 2024/1/10
*/
@Configuration
public class CorsConfig {
@Bean
public CorsFilter corsFilter() {
UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
CorsConfiguration config = new CorsConfiguration();
config.addAllowedOrigin("*");
config.addAllowedHeader("*");
config.addAllowedMethod("*");
source.registerCorsConfiguration("/**", config);
return new CorsFilter(source);
}
}
...@@ -36,7 +36,7 @@ public class KbAuthorizedUserController { ...@@ -36,7 +36,7 @@ public class KbAuthorizedUserController {
return authorizedUserService.add(authorizedUser); return authorizedUserService.add(authorizedUser);
} }
/** /**
* 编辑知识库 * 编辑授权用户
* */ * */
@PostMapping("/edit") @PostMapping("/edit")
public Result<?> edit(@RequestBody KbAuthorizedUser authorizedUser){ public Result<?> edit(@RequestBody KbAuthorizedUser authorizedUser){
...@@ -44,7 +44,7 @@ public class KbAuthorizedUserController { ...@@ -44,7 +44,7 @@ public class KbAuthorizedUserController {
} }
/** /**
* 删除知识库 * 删除授权用户
* */ * */
@GetMapping("/del") @GetMapping("/del")
public Result<?> del(@RequestParam(name="id",required=true) String id){ public Result<?> del(@RequestParam(name="id",required=true) String id){
......
...@@ -2,6 +2,7 @@ package com.zzsn.knowbase.controller; ...@@ -2,6 +2,7 @@ package com.zzsn.knowbase.controller;
import com.zzsn.knowbase.entity.KbKnowledgeProject; import com.zzsn.knowbase.entity.KbKnowledgeProject;
import com.zzsn.knowbase.enums.KnowTypeEnum;
import com.zzsn.knowbase.service.KbKnowledgeProjectService; import com.zzsn.knowbase.service.KbKnowledgeProjectService;
import com.zzsn.knowbase.vo.Result; import com.zzsn.knowbase.vo.Result;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
...@@ -53,6 +54,7 @@ public class KbKnowledgeProjectController { ...@@ -53,6 +54,7 @@ public class KbKnowledgeProjectController {
@GetMapping("/list") @GetMapping("/list")
public Result<?> list( public Result<?> list(
@RequestParam(name="sign",defaultValue = "1") String sign, @RequestParam(name="sign",defaultValue = "1") String sign,
@RequestParam(name="category",required = false) String category,
@RequestParam(name="projectId",required = false) String projectId @RequestParam(name="projectId",required = false) String projectId
){ ){
if (!"1".equals(sign)){ if (!"1".equals(sign)){
...@@ -60,8 +62,13 @@ public class KbKnowledgeProjectController { ...@@ -60,8 +62,13 @@ public class KbKnowledgeProjectController {
return Result.error("查询非顶级节点列表时需要projectId参数"); return Result.error("查询非顶级节点列表时需要projectId参数");
} }
} }
return knowledgeProjectService.lists(sign,projectId); return knowledgeProjectService.lists(sign,projectId,category);
} }
@GetMapping("/type")
public Result<?> type(){
return Result.OK(KnowTypeEnum.getAllAsMap());
}
} }
package com.zzsn.knowbase.enums;
/**
* Description:
*
* @author: EDY
* @since: 2024/1/9
*/
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* Description:
* Author: EDY
* Date: 2023/10/9
*/
public enum KnowTypeEnum {
Notice("公告","1"),
LeadershipSpeech("领导讲话","2"),
YearReport("年报","3"),
JournalArticle("期刊论文","3"),
Book("图书","4"),
ResearchReport("研报","5"),
Policies("政策法规","6"),
Message("资讯","7"),
;
public static List<KnowTypeEnum> getAll(){
KnowTypeEnum[] values = KnowTypeEnum.values();
return Arrays.asList(values);
}
public static Map<String,String> getAllAsMap(){
Map<String , String> res = new HashMap<>();
KnowTypeEnum[] values = KnowTypeEnum.values();
for (KnowTypeEnum value : values) {
res.put(value.des,value.type);
}
return res;
}
public static KnowTypeEnum getByDes(String des) {
for (KnowTypeEnum enumValue : KnowTypeEnum.values()) {
if (enumValue.getDes().equals(des)) {
return enumValue;
}
}
throw new IllegalArgumentException("No enum constant with value: " + des);
}
public static KnowTypeEnum getByType(String type) {
for (KnowTypeEnum enumValue : KnowTypeEnum.values()) {
if (enumValue.getType().equals(type)) {
return enumValue;
}
}
throw new IllegalArgumentException("No enum constant with value: " + type);
}
/**路径描述*/
private final String des;
/**路径描述*/
private final String type;
public String getType() {
return type;
}
public String getDes() {
return des;
}
KnowTypeEnum( String des ,String type) {
this.des = des;
this.type = type;
}
}
...@@ -27,5 +27,5 @@ public interface KbKnowledgeProjectService extends IService<KbKnowledgeProject> ...@@ -27,5 +27,5 @@ public interface KbKnowledgeProjectService extends IService<KbKnowledgeProject>
Result<?> del(String id); Result<?> del(String id);
Result<?> lists(String sign, String projectId); Result<?> lists(String sign, String projectId, String category);
} }
...@@ -2,6 +2,7 @@ package com.zzsn.knowbase.service.impl; ...@@ -2,6 +2,7 @@ package com.zzsn.knowbase.service.impl;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zzsn.knowbase.entity.KbKnowledgeProject; import com.zzsn.knowbase.entity.KbKnowledgeProject;
...@@ -120,12 +121,16 @@ public class KbKnowledgeProjectServiceImpl extends ServiceImpl<KbKnowledgeProjec ...@@ -120,12 +121,16 @@ public class KbKnowledgeProjectServiceImpl extends ServiceImpl<KbKnowledgeProjec
} }
@Override @Override
public Result<?> lists(String sign, String projectId) { public Result<?> lists(String sign, String projectId, String category) {
List<KbKnowledgeProject> kbKnowledgeProjects ; List<KbKnowledgeProject> kbKnowledgeProjects ;
if ("1".equals(sign)&&StringUtils.isBlank(projectId)){ if ("1".equals(sign)&&StringUtils.isBlank(projectId)){
kbKnowledgeProjects = super.list(Wrappers.<KbKnowledgeProject>lambdaQuery().eq(KbKnowledgeProject::getPid, KbKnowledgeProjectService.ROOT_PID_VALUE)); kbKnowledgeProjects = super.list(Wrappers.<KbKnowledgeProject>lambdaQuery()
.eq(KbKnowledgeProject::getPid, KbKnowledgeProjectService.ROOT_PID_VALUE)
.eq(StrUtil.isNotBlank(category),KbKnowledgeProject::getCategory,category));
}else { }else {
kbKnowledgeProjects = super.list(Wrappers.<KbKnowledgeProject>lambdaQuery().eq(KbKnowledgeProject::getPid,projectId)); kbKnowledgeProjects = super.list(Wrappers.<KbKnowledgeProject>lambdaQuery()
.eq(KbKnowledgeProject::getPid,projectId)
.eq(StrUtil.isNotBlank(category),KbKnowledgeProject::getCategory,category));
} }
return Result.OK(kbKnowledgeProjects); return Result.OK(kbKnowledgeProjects);
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论