From a1012acb7bc19d3c73dba2a2cce98a5da926fa7a Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 14 Sep 2021 17:19:27 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=B5=B0gataway=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cloud/api/web/interceptor/AuthorizationInterceptor.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tduck-api/src/main/java/com/tduck/cloud/api/web/interceptor/AuthorizationInterceptor.java b/tduck-api/src/main/java/com/tduck/cloud/api/web/interceptor/AuthorizationInterceptor.java index 3ab3ab8..c37516c 100644 --- a/tduck-api/src/main/java/com/tduck/cloud/api/web/interceptor/AuthorizationInterceptor.java +++ b/tduck-api/src/main/java/com/tduck/cloud/api/web/interceptor/AuthorizationInterceptor.java @@ -54,7 +54,8 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter { } //设置userId到request里，后续根据userId，获取用户信息 - request.setAttribute(USER_KEY, claims.getSubject()); + String userId = (String) claims.get("userId"); + request.setAttribute(USER_KEY, userId); return true; } From 9846bccab4e9e1233a4a663ed6290d27630ed729 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 14 Sep 2021 22:20:27 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E6=95=B0=E5=AD=97?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E7=9A=84Id=20=E6=9C=89=E9=A1=BA=E5=BA=8F?= =?UTF-8?q?=E5=A4=9A=E5=A5=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/tduck/cloud/account/entity/UserEntity.java | 2 +- .../com/tduck/cloud/project/entity/UserProjectEntity.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tduck-account/src/main/java/com/tduck/cloud/account/entity/UserEntity.java b/tduck-account/src/main/java/com/tduck/cloud/account/entity/UserEntity.java index 144c530..e2ecb11 100644 --- a/tduck-account/src/main/java/com/tduck/cloud/account/entity/UserEntity.java +++ b/tduck-account/src/main/java/com/tduck/cloud/account/entity/UserEntity.java @@ -18,7 +18,7 @@ import java.time.LocalDateTime; @Data @TableName("ac_user") public class UserEntity extends BaseEntity { - @TableId(type = IdType.ASSIGN_UUID) + @TableId(type = IdType.ASSIGN_ID) private String id; /** * 姓名 diff --git a/tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectEntity.java b/tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectEntity.java index 9d4ddb2..80cf9a6 100644 --- a/tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectEntity.java +++ b/tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectEntity.java @@ -1,5 +1,6 @@ package com.tduck.cloud.project.entity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -23,8 +24,8 @@ import javax.validation.constraints.NotBlank; @TableName("pr_user_project") @FieldNameConstants public class UserProjectEntity extends BaseEntity { - @TableId - private Long id; + @TableId(type = IdType.ASSIGN_ID) + private String id; /** * 项目code */ From a66b05a59e28bdfd2c9b08f94b9bef2ea9ed25f0 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 15 Sep 2021 09:15:09 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E5=85=9A=E7=BE=A4jwt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/tduck/cloud/account/util/JwtUtils.java | 8 ++++++-- .../api/web/interceptor/AuthorizationInterceptor.java | 3 ++- .../com/tduck/cloud/common/constant/CommonConstants.java | 4 ++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/tduck-account/src/main/java/com/tduck/cloud/account/util/JwtUtils.java b/tduck-account/src/main/java/com/tduck/cloud/account/util/JwtUtils.java index 6bcfec0..6ec2e97 100644 --- a/tduck-account/src/main/java/com/tduck/cloud/account/util/JwtUtils.java +++ b/tduck-account/src/main/java/com/tduck/cloud/account/util/JwtUtils.java @@ -1,5 +1,6 @@ package com.tduck.cloud.account.util; +import com.tduck.cloud.common.constant.CommonConstants; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; @@ -8,6 +9,8 @@ import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; import java.util.Date; +import java.util.HashMap; +import java.util.Map; /** * jwt工具类 @@ -30,10 +33,11 @@ public class JwtUtils { Date nowDate = new Date(); //过期时间 Date expireDate = new Date(nowDate.getTime() + expire * 1000); - + Map map = new HashMap<>(); + map.put(CommonConstants.JWT_KEY_USER_ID,userId); return Jwts.builder() .setHeaderParam("typ", "JWT") - .setSubject(userId) + .setClaims(map) .setIssuedAt(nowDate) .setExpiration(expireDate) .signWith(SignatureAlgorithm.HS512, secret) diff --git a/tduck-api/src/main/java/com/tduck/cloud/api/web/interceptor/AuthorizationInterceptor.java b/tduck-api/src/main/java/com/tduck/cloud/api/web/interceptor/AuthorizationInterceptor.java index c37516c..ca761f0 100644 --- a/tduck-api/src/main/java/com/tduck/cloud/api/web/interceptor/AuthorizationInterceptor.java +++ b/tduck-api/src/main/java/com/tduck/cloud/api/web/interceptor/AuthorizationInterceptor.java @@ -4,6 +4,7 @@ import cn.hutool.core.util.StrUtil; import com.tduck.cloud.account.util.JwtUtils; import com.tduck.cloud.api.annotation.Login; import com.tduck.cloud.api.exception.AuthorizationException; +import com.tduck.cloud.common.constant.CommonConstants; import io.jsonwebtoken.Claims; import org.springframework.stereotype.Component; import org.springframework.web.method.HandlerMethod; @@ -54,7 +55,7 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter { } //设置userId到request里，后续根据userId，获取用户信息 - String userId = (String) claims.get("userId"); + String userId = (String) claims.get(CommonConstants.JWT_KEY_USER_ID); request.setAttribute(USER_KEY, userId); return true; diff --git a/tduck-common/src/main/java/com/tduck/cloud/common/constant/CommonConstants.java b/tduck-common/src/main/java/com/tduck/cloud/common/constant/CommonConstants.java index 9f4637f..3aa2de3 100644 --- a/tduck-common/src/main/java/com/tduck/cloud/common/constant/CommonConstants.java +++ b/tduck-common/src/main/java/com/tduck/cloud/common/constant/CommonConstants.java @@ -21,6 +21,10 @@ public interface CommonConstants { * 文件下载content_type */ String FILE_DOWNLOAD_CONTENT_TYPE = "application/octet-stream;charset=UTF-8"; + /** + * jwt userID key + */ + String JWT_KEY_USER_ID = "userId"; /** From 78eae132cda60ab2a331eab6254792407aec0e6e Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 15 Sep 2021 10:37:48 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=99=A4=E4=B8=AA=E5=88=ABId=E5=A4=96=20?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=94=B9=E4=B8=BAvarchar64?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cloud/account/entity/UserAuthorizeEntity.java | 5 ++++- .../project/entity/ProjectTemplateCategoryEntity.java | 2 +- .../cloud/project/entity/ProjectTemplateEntity.java | 7 +++++-- .../project/entity/ProjectTemplateItemEntity.java | 9 ++++++--- .../cloud/project/entity/ProjectThemeEntity.java | 7 +++++-- .../cloud/project/entity/UserProjectItemEntity.java | 9 ++++++--- .../cloud/project/entity/UserProjectLogicEntity.java | 11 +++++++---- .../cloud/project/entity/UserProjectResultEntity.java | 7 ++++--- .../project/entity/UserProjectSettingEntity.java | 9 ++++----- .../cloud/project/entity/UserProjectThemeEntity.java | 9 ++++++--- .../tduck/cloud/project/vo/OperateProjectItemVO.java | 2 +- 11 files changed, 49 insertions(+), 28 deletions(-) diff --git a/tduck-account/src/main/java/com/tduck/cloud/account/entity/UserAuthorizeEntity.java b/tduck-account/src/main/java/com/tduck/cloud/account/entity/UserAuthorizeEntity.java index ca29d20..fd515f7 100644 --- a/tduck-account/src/main/java/com/tduck/cloud/account/entity/UserAuthorizeEntity.java +++ b/tduck-account/src/main/java/com/tduck/cloud/account/entity/UserAuthorizeEntity.java @@ -1,6 +1,8 @@ package com.tduck.cloud.account.entity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.tduck.cloud.account.entity.enums.UserAuthorizeTypeEnum; import com.tduck.cloud.common.entity.BaseEntity; @@ -19,7 +21,8 @@ import java.util.Map; @Data @TableName(value = "ac_user_authorize", autoResultMap = true) public class UserAuthorizeEntity extends BaseEntity { - private Long id; + @TableId(type = IdType.ASSIGN_ID) + private String id; /** * 第三方平台类型 */ diff --git a/tduck-project/src/main/java/com/tduck/cloud/project/entity/ProjectTemplateCategoryEntity.java b/tduck-project/src/main/java/com/tduck/cloud/project/entity/ProjectTemplateCategoryEntity.java index f1d58bd..2743b39 100644 --- a/tduck-project/src/main/java/com/tduck/cloud/project/entity/ProjectTemplateCategoryEntity.java +++ b/tduck-project/src/main/java/com/tduck/cloud/project/entity/ProjectTemplateCategoryEntity.java @@ -25,4 +25,4 @@ public class ProjectTemplateCategoryEntity extends BaseEntity { - private Long id; + @TableId(type = IdType.ASSIGN_ID) + private String id; /** * 模板唯一标识 */ @@ -60,4 +63,4 @@ public class ProjectTemplateEntity extends BaseEntity { private Long status; -} \ No newline at end of file +} diff --git a/tduck-project/src/main/java/com/tduck/cloud/project/entity/ProjectTemplateItemEntity.java b/tduck-project/src/main/java/com/tduck/cloud/project/entity/ProjectTemplateItemEntity.java index 291fc67..b60b49b 100644 --- a/tduck-project/src/main/java/com/tduck/cloud/project/entity/ProjectTemplateItemEntity.java +++ b/tduck-project/src/main/java/com/tduck/cloud/project/entity/ProjectTemplateItemEntity.java @@ -1,6 +1,8 @@ package com.tduck.cloud.project.entity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.tduck.cloud.common.entity.BaseEntity; import com.tduck.cloud.common.mybatis.handler.JacksonTypeHandler; @@ -23,7 +25,8 @@ import java.util.Map; @Data @TableName(value = "pr_project_template_item", autoResultMap = true) public class ProjectTemplateItemEntity extends BaseEntity { - private Long id; + @TableId(type = IdType.ASSIGN_ID) + private String id; /** * 项目Id */ @@ -32,7 +35,7 @@ public class ProjectTemplateItemEntity extends BaseEntity> regList; -} \ No newline at end of file +} diff --git a/tduck-project/src/main/java/com/tduck/cloud/project/entity/ProjectThemeEntity.java b/tduck-project/src/main/java/com/tduck/cloud/project/entity/ProjectThemeEntity.java index ea514f0..8c00624 100644 --- a/tduck-project/src/main/java/com/tduck/cloud/project/entity/ProjectThemeEntity.java +++ b/tduck-project/src/main/java/com/tduck/cloud/project/entity/ProjectThemeEntity.java @@ -1,6 +1,8 @@ package com.tduck.cloud.project.entity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.tduck.cloud.common.entity.BaseEntity; import com.tduck.cloud.common.mybatis.handler.JacksonTypeHandler; @@ -21,7 +23,8 @@ import java.util.List; @FieldNameConstants public class ProjectThemeEntity extends BaseEntity { - private Long id; + @TableId(type = IdType.ASSIGN_ID) + private String id; /** * 主题名称 */ @@ -48,4 +51,4 @@ public class ProjectThemeEntity extends BaseEntity { private List color; -} \ No newline at end of file +} 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 c6525b7..cba1476 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 @@ -1,6 +1,8 @@ package com.tduck.cloud.project.entity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.tduck.cloud.common.entity.BaseEntity; import com.tduck.cloud.common.mybatis.handler.JacksonTypeHandler; @@ -26,7 +28,8 @@ import java.util.Map; @TableName(value = "pr_user_project_item", autoResultMap = true) @FieldNameConstants public class UserProjectItemEntity extends BaseEntity { - private Long id; + @TableId(type = IdType.ASSIGN_ID) + private String id; /** * 项目Id */ @@ -35,7 +38,7 @@ public class UserProjectItemEntity extends BaseEntity { /** * 表单项Id */ - private Long formItemId; + private String formItemId; /** * 表单项类型 */ @@ -96,4 +99,4 @@ public class UserProjectItemEntity extends BaseEntity { private List> regList; -} \ No newline at end of file +} diff --git a/tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectLogicEntity.java b/tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectLogicEntity.java index dab6935..3c9b6df 100644 --- a/tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectLogicEntity.java +++ b/tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectLogicEntity.java @@ -1,6 +1,8 @@ package com.tduck.cloud.project.entity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.tduck.cloud.common.entity.BaseEntity; import com.tduck.cloud.common.mybatis.handler.JacksonTypeHandler; @@ -21,7 +23,8 @@ import java.util.Set; @Accessors(chain = true) @TableName(value = "pr_user_project_logic", autoResultMap = true) public class UserProjectLogicEntity extends BaseEntity { - private Long id; + @TableId(type = IdType.ASSIGN_ID) + private String id; /** * 项目key */ @@ -30,7 +33,7 @@ public class UserProjectLogicEntity extends BaseEntity { /** * 表单项Id */ - private Long formItemId; + private String formItemId; /** * 条件成立的表达式 */ @@ -52,7 +55,7 @@ public class UserProjectLogicEntity extends BaseEntity { /** * 表单项Id */ - private Long formItemId; + private String formItemId; /** * 表达式 */ @@ -63,4 +66,4 @@ public class UserProjectLogicEntity extends BaseEntity { private Object optionValue; } -} \ No newline at end of file +} diff --git a/tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectResultEntity.java b/tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectResultEntity.java index 3f2f68f..1ad87a3 100644 --- a/tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectResultEntity.java +++ b/tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectResultEntity.java @@ -1,5 +1,6 @@ package com.tduck.cloud.project.entity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -29,8 +30,8 @@ public class UserProjectResultEntity extends BaseEntity /** * */ - @TableId - private Long id; + @TableId(type = IdType.ASSIGN_ID) + private String id; /** * 项目key */ @@ -96,4 +97,4 @@ public class UserProjectResultEntity extends BaseEntity */ @TableField(typeHandler = JacksonTypeHandler.class) private Map wxUserInfo; -} \ No newline at end of file +} diff --git a/tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectSettingEntity.java b/tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectSettingEntity.java index 8070231..f254c70 100644 --- a/tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectSettingEntity.java +++ b/tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectSettingEntity.java @@ -1,9 +1,7 @@ package com.tduck.cloud.project.entity; -import com.baomidou.mybatisplus.annotation.FieldStrategy; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; import com.tduck.cloud.common.entity.BaseEntity; import lombok.Data; @@ -21,7 +19,8 @@ import java.time.LocalDateTime; @Data @TableName(value = "pr_user_project_setting", autoResultMap = true) public class UserProjectSettingEntity extends BaseEntity { - private Long id; + @TableId(type = IdType.ASSIGN_ID) + private String id; /** * 项目key */ @@ -125,4 +124,4 @@ public class UserProjectSettingEntity extends BaseEntity { - private Long id; + @TableId(type = IdType.ASSIGN_ID) + private String id; /** * 项目key */ @@ -24,7 +27,7 @@ public class UserProjectThemeEntity extends BaseEntity { /** * 主题Id */ - private Long themeId; + private String themeId; /** * logo图片 */ @@ -64,4 +67,4 @@ public class UserProjectThemeEntity extends BaseEntity { private Boolean showNumber; -} \ No newline at end of file +} diff --git a/tduck-project/src/main/java/com/tduck/cloud/project/vo/OperateProjectItemVO.java b/tduck-project/src/main/java/com/tduck/cloud/project/vo/OperateProjectItemVO.java index c9b3108..973fe4d 100644 --- a/tduck-project/src/main/java/com/tduck/cloud/project/vo/OperateProjectItemVO.java +++ b/tduck-project/src/main/java/com/tduck/cloud/project/vo/OperateProjectItemVO.java @@ -21,7 +21,7 @@ public class OperateProjectItemVO { /** * 数据Id */ - private Long itemDataId; + private String itemDataId; /** * 操作是否成功