From 92ac89f536ef6e1ce9df85454912c63469a4923a Mon Sep 17 00:00:00 2001 From: wangqing <250543222@qq.com> Date: Sun, 21 Mar 2021 00:17:22 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix=EF=BC=9A=20=E8=B7=A8=E5=9F=9F=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E4=B8=8D=E7=94=9F=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tduck/cloud/api/config/FilterConfig.java | 21 +++++++++++++++++++ .../tduck/cloud/api/config/WebMvcConfig.java | 8 ------- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/tduck-api/src/main/java/com/tduck/cloud/api/config/FilterConfig.java b/tduck-api/src/main/java/com/tduck/cloud/api/config/FilterConfig.java index 97d591b..81a8863 100644 --- a/tduck-api/src/main/java/com/tduck/cloud/api/config/FilterConfig.java +++ b/tduck-api/src/main/java/com/tduck/cloud/api/config/FilterConfig.java @@ -27,6 +27,27 @@ public class FilterConfig { private final PlatformSignProperties platformSignProperties; + /** + * 跨域过滤器 + * + * @return + */ + @Bean + public FilterRegistrationBean corsFilterRegistration() { + FilterRegistrationBean registration = new FilterRegistrationBean(); + registration.setDispatcherTypes(DispatcherType.REQUEST); + CorsConfiguration config = new CorsConfiguration(); + config.addAllowedOrigin("*"); + config.addAllowedMethod("*"); + config.addAllowedHeader("*"); + UrlBasedCorsConfigurationSource corsConfigurationSource = new UrlBasedCorsConfigurationSource(); + corsConfigurationSource.registerCorsConfiguration("/**", config); + CorsFilter corsFilter = new CorsFilter(corsConfigurationSource); + registration.setOrder(Integer.MAX_VALUE - 4); + registration.setFilter(corsFilter); + return registration; + } + /** * xss 过滤器 优先级最高 * 包装 XssHttpServletRequestWrapper 解决request只能使用一次 diff --git a/tduck-api/src/main/java/com/tduck/cloud/api/config/WebMvcConfig.java b/tduck-api/src/main/java/com/tduck/cloud/api/config/WebMvcConfig.java index c27ffde..b159f4b 100644 --- a/tduck-api/src/main/java/com/tduck/cloud/api/config/WebMvcConfig.java +++ b/tduck-api/src/main/java/com/tduck/cloud/api/config/WebMvcConfig.java @@ -36,14 +36,6 @@ public class WebMvcConfig implements WebMvcConfigurer { "/**/*.woff", "/**/*.ttf"); - @Override - public void addCorsMappings(CorsRegistry registry) { - registry.addMapping("/**") - .allowedOrigins("*") - .allowCredentials(true) - .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS") - .maxAge(36000); - } @Override public void addInterceptors(InterceptorRegistry registry) { From 516aa26a6e39313cc700dc6d5f58b11f6dd96b54 Mon Sep 17 00:00:00 2001 From: wangqing <250543222@qq.com> Date: Sun, 21 Mar 2021 01:04:49 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix=EF=BC=9A=20=20=20=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E6=A0=85=E6=A0=BC=E8=AE=BE=E7=BD=AE=E6=97=A0=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/tduck.sql | 1 + .../tduck/cloud/project/entity/UserProjectItemEntity.java | 6 ++++++ .../cloud/project/request/OperateProjectItemRequest.java | 5 +++++ ...ltEntityImpl.java => UserProjectResultServiceImpl.java} | 7 ++++++- 4 files changed, 18 insertions(+), 1 deletion(-) rename tduck-project/src/main/java/com/tduck/cloud/project/service/impl/{UserProjectResultEntityImpl.java => UserProjectResultServiceImpl.java} (92%) diff --git a/doc/tduck.sql b/doc/tduck.sql index a34fec0..3a50e8a 100644 --- a/doc/tduck.sql +++ b/doc/tduck.sql @@ -103,6 +103,7 @@ CREATE TABLE `pr_project_template_item` ( `required` tinyint(1) NOT NULL COMMENT '是否必填', `placeholder` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '输入型提示文字', `sort` bigint(20) NULL DEFAULT 0 COMMENT '排序', + `span` int(10) NOT NULL DEFAULT '24' COMMENT '栅格宽度', `expand` json NULL COMMENT '扩展字段 表单项独有字段', `reg_list` json NULL COMMENT '正则表达式 ', `update_time` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '更新时间', diff --git a/tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectItemEntity.java b/tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectItemEntity.java index e432000..5e6a299 100644 --- a/tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectItemEntity.java +++ b/tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectItemEntity.java @@ -67,6 +67,12 @@ public class UserProjectItemEntity extends BaseEntity { * 排序 */ private Long sort; + + /** + * 栅格宽度 + */ + private int span; + /** * 扩展字段 表单项独有字段 */ diff --git a/tduck-project/src/main/java/com/tduck/cloud/project/request/OperateProjectItemRequest.java b/tduck-project/src/main/java/com/tduck/cloud/project/request/OperateProjectItemRequest.java index d9665d5..f1f1612 100644 --- a/tduck-project/src/main/java/com/tduck/cloud/project/request/OperateProjectItemRequest.java +++ b/tduck-project/src/main/java/com/tduck/cloud/project/request/OperateProjectItemRequest.java @@ -59,6 +59,11 @@ public class OperateProjectItemRequest { * 排序 */ private Integer sort; + /** + * 栅格宽度 + */ + private String span; + /** * 扩展字段 表单项独有字段 */ diff --git a/tduck-project/src/main/java/com/tduck/cloud/project/service/impl/UserProjectResultEntityImpl.java b/tduck-project/src/main/java/com/tduck/cloud/project/service/impl/UserProjectResultServiceImpl.java similarity index 92% rename from tduck-project/src/main/java/com/tduck/cloud/project/service/impl/UserProjectResultEntityImpl.java rename to tduck-project/src/main/java/com/tduck/cloud/project/service/impl/UserProjectResultServiceImpl.java index 13d66aa..84c1bb9 100644 --- a/tduck-project/src/main/java/com/tduck/cloud/project/service/impl/UserProjectResultEntityImpl.java +++ b/tduck-project/src/main/java/com/tduck/cloud/project/service/impl/UserProjectResultServiceImpl.java @@ -2,6 +2,7 @@ package com.tduck.cloud.project.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -12,6 +13,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.tduck.cloud.common.constant.CommonConstants; import com.tduck.cloud.common.entity.BaseEntity; +import com.tduck.cloud.common.exception.BaseException; import com.tduck.cloud.common.util.AddressUtils; import com.tduck.cloud.common.util.RedisUtils; import com.tduck.cloud.project.entity.UserProjectItemEntity; @@ -38,7 +40,7 @@ import static com.tduck.cloud.project.constant.ProjectRedisKeyConstants.PROJECT_ */ @Service("projectResultService") @RequiredArgsConstructor -public class UserProjectResultEntityImpl extends ServiceImpl implements UserProjectResultService { +public class UserProjectResultServiceImpl extends ServiceImpl implements UserProjectResultService { private final UserProjectItemService userProjectItemService; private final RedisUtils redisUtils; @@ -84,6 +86,9 @@ public class UserProjectResultEntityImpl extends ServiceImpl> resultList = resultEntityList.stream().map(item -> { Map processData = item.getProcessData(); processData.put(BaseEntity.Fields.createTime, item.getCreateTime());