Merge branch 'dev_epmet_mix' of http://git.elinkit.com.cn:7070/r/tduck-platform into dev_epmet_mix

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<UserAuthorizeEntity> {
-    private Long id;
+    @TableId(type = IdType.ASSIGN_ID)
+    private String id;
     /**
      * 第三方平台类型
      */

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<UserEntity> {
-    @TableId(type = IdType.ASSIGN_UUID)
+    @TableId(type = IdType.ASSIGN_ID)
     private String id;
     /**
      * 姓名

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<String,Object> 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)

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,8 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter {
         }
 
         //设置userId到request里，后续根据userId，获取用户信息
-        request.setAttribute(USER_KEY, claims.getSubject());
+        String userId = (String) claims.get(CommonConstants.JWT_KEY_USER_ID);
+        request.setAttribute(USER_KEY, userId);
 
         return true;
     }

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";
 
 
     /**

tduck-project/src/main/java/com/tduck/cloud/project/entity/ProjectTemplateCategoryEntity.java

@@ -25,4 +25,4 @@ public class ProjectTemplateCategoryEntity extends BaseEntity<ProjectTemplateCat
      */
     private Integer sort;
 
-}
+}

tduck-project/src/main/java/com/tduck/cloud/project/entity/ProjectTemplateEntity.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.validator.group.AddGroup;
@@ -21,7 +23,8 @@ import javax.validation.constraints.NotNull;
 @Data
 @TableName(value = "pr_project_template", autoResultMap = true)
 public class ProjectTemplateEntity extends BaseEntity<ProjectTemplateEntity> {
-    private Long id;
+    @TableId(type = IdType.ASSIGN_ID)
+    private String id;
     /**
      * 模板唯一标识
      */
@@ -60,4 +63,4 @@ public class ProjectTemplateEntity extends BaseEntity<ProjectTemplateEntity> {
     private Long status;
 
 
-}
+}

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<ProjectTemplateItemEntity> {
-    private Long id;
+    @TableId(type = IdType.ASSIGN_ID)
+    private String id;
     /**
      * 项目Id
      */
@@ -32,7 +35,7 @@ public class ProjectTemplateItemEntity extends BaseEntity<ProjectTemplateItemEnt
     /**
      * 表单项Id
      */
-    private Long formItemId;
+    private String formItemId;
     /**
      * 表单项类型
      */
@@ -89,4 +92,4 @@ public class ProjectTemplateItemEntity extends BaseEntity<ProjectTemplateItemEnt
     @TableField(typeHandler = JacksonTypeHandler.class)
     private List<Map<String, Object>> regList;
 
-}
+}

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<ProjectThemeEntity> {
 
-    private Long id;
+    @TableId(type = IdType.ASSIGN_ID)
+    private String id;
     /**
      * 主题名称
      */
@@ -48,4 +51,4 @@ public class ProjectThemeEntity extends BaseEntity<ProjectThemeEntity> {
     private List<String> color;
 
 
-}
+}

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<UserProjectEntity> {
-    @TableId
-    private Long id;
+    @TableId(type = IdType.ASSIGN_ID)
+    private String id;
     /**
      * 项目code
      */

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<UserProjectItemEntity> {
-    private Long id;
+    @TableId(type = IdType.ASSIGN_ID)
+    private String id;
     /**
      * 项目Id
      */
@@ -35,7 +38,7 @@ public class UserProjectItemEntity extends BaseEntity<UserProjectItemEntity> {
     /**
      * 表单项Id
      */
-    private Long formItemId;
+    private String formItemId;
     /**
      * 表单项类型
      */
@@ -96,4 +99,4 @@ public class UserProjectItemEntity extends BaseEntity<UserProjectItemEntity> {
     private List<Map<String, Object>> regList;
 
 
-}
+}

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<UserProjectLogicEntity> {
-    private Long id;
+    @TableId(type = IdType.ASSIGN_ID)
+    private String id;
     /**
      * 项目key
      */
@@ -30,7 +33,7 @@ public class UserProjectLogicEntity extends BaseEntity<UserProjectLogicEntity> {
     /**
      * 表单项Id
      */
-    private Long formItemId;
+    private String formItemId;
     /**
      * 条件成立的表达式
      */
@@ -52,7 +55,7 @@ public class UserProjectLogicEntity extends BaseEntity<UserProjectLogicEntity> {
         /**
          * 表单项Id
          */
-        private Long formItemId;
+        private String formItemId;
         /**
          * 表达式
          */
@@ -63,4 +66,4 @@ public class UserProjectLogicEntity extends BaseEntity<UserProjectLogicEntity> {
         private Object optionValue;
     }
 
-}
+}

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<UserProjectResultEntity>
     /**
      *
      */
-    @TableId
-    private Long id;
+    @TableId(type = IdType.ASSIGN_ID)
+    private String id;
     /**
      * 项目key
      */
@@ -96,4 +97,4 @@ public class UserProjectResultEntity extends BaseEntity<UserProjectResultEntity>
      */
     @TableField(typeHandler = JacksonTypeHandler.class)
     private Map<String, Object> wxUserInfo;
-}
+}

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<UserProjectSettingEntity> {
-    private Long id;
+    @TableId(type = IdType.ASSIGN_ID)
+    private String id;
     /**
      * 项目key
      */
@@ -125,4 +124,4 @@ public class UserProjectSettingEntity extends BaseEntity<UserProjectSettingEntit
     private String shareDesc;
 
 
-}
+}

tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectThemeEntity.java

@@ -1,5 +1,7 @@
 package com.tduck.cloud.project.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.tduck.cloud.common.entity.BaseEntity;
 import lombok.Data;
@@ -15,7 +17,8 @@ import javax.validation.constraints.NotBlank;
 @Data
 @TableName(value = "pr_user_project_theme", autoResultMap = true)
 public class UserProjectThemeEntity extends BaseEntity<UserProjectThemeEntity> {
-    private Long id;
+    @TableId(type = IdType.ASSIGN_ID)
+    private String id;
     /**
      * 项目key
      */
@@ -24,7 +27,7 @@ public class UserProjectThemeEntity extends BaseEntity<UserProjectThemeEntity> {
     /**
      * 主题Id
      */
-    private Long themeId;
+    private String themeId;
     /**
      * logo图片
      */
@@ -64,4 +67,4 @@ public class UserProjectThemeEntity extends BaseEntity<UserProjectThemeEntity> {
     private Boolean showNumber;
 
 
-}
+}

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;
 
     /**
      * 操作是否成功