From 78e53e338a347b7af0bab08ab4c1217976893a8f Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 14 Sep 2021 15:29:35 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7Id=E6=94=B9=E4=B8=BAString=20?= =?UTF-8?q?=E5=85=BC=E5=AE=B9=E5=85=9A=E7=BE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tduck/cloud/account/entity/UserAuthorizeEntity.java | 4 ++-- .../java/com/tduck/cloud/account/entity/UserEntity.java | 7 ++++--- .../java/com/tduck/cloud/account/service/UserService.java | 2 +- .../tduck/cloud/account/service/UserValidateService.java | 2 +- .../tduck/cloud/account/service/impl/UserServiceImpl.java | 2 +- .../account/service/impl/UserValidateServiceImpl.java | 2 +- .../main/java/com/tduck/cloud/account/util/JwtUtils.java | 2 +- .../com/tduck/cloud/project/entity/UserProjectEntity.java | 4 ++-- 8 files changed, 13 insertions(+), 12 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 51f6a44..ca29d20 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 @@ -40,7 +40,7 @@ public class UserAuthorizeEntity extends BaseEntity { /** * 用户Id */ - private Long userId; + private String userId; /** * 平台用户信息 */ @@ -48,4 +48,4 @@ public class UserAuthorizeEntity extends BaseEntity { private Map userInfo; -} \ No newline at end of file +} 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 235f461..144c530 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 @@ -1,5 +1,6 @@ package com.tduck.cloud.account.entity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.tduck.cloud.account.entity.enums.AccountChannelEnum; @@ -17,8 +18,8 @@ import java.time.LocalDateTime; @Data @TableName("ac_user") public class UserEntity extends BaseEntity { - @TableId - private Long id; + @TableId(type = IdType.ASSIGN_UUID) + private String id; /** * 姓名 */ @@ -67,4 +68,4 @@ public class UserEntity extends BaseEntity { private Boolean deleted; -} \ No newline at end of file +} diff --git a/tduck-account/src/main/java/com/tduck/cloud/account/service/UserService.java b/tduck-account/src/main/java/com/tduck/cloud/account/service/UserService.java index 5a2e924..895f435 100644 --- a/tduck-account/src/main/java/com/tduck/cloud/account/service/UserService.java +++ b/tduck-account/src/main/java/com/tduck/cloud/account/service/UserService.java @@ -84,5 +84,5 @@ public interface UserService extends IService { * @param password * @return */ - Boolean updatePassword(Long userId, String password); + Boolean updatePassword(String userId, String password); } diff --git a/tduck-account/src/main/java/com/tduck/cloud/account/service/UserValidateService.java b/tduck-account/src/main/java/com/tduck/cloud/account/service/UserValidateService.java index abc1790..b9def37 100644 --- a/tduck-account/src/main/java/com/tduck/cloud/account/service/UserValidateService.java +++ b/tduck-account/src/main/java/com/tduck/cloud/account/service/UserValidateService.java @@ -74,5 +74,5 @@ public interface UserValidateService { * @param userId * @return code */ - String getRestPasswordCode(Long userId); + String getRestPasswordCode(String userId); } diff --git a/tduck-account/src/main/java/com/tduck/cloud/account/service/impl/UserServiceImpl.java b/tduck-account/src/main/java/com/tduck/cloud/account/service/impl/UserServiceImpl.java index 5614b68..7d1a110 100644 --- a/tduck-account/src/main/java/com/tduck/cloud/account/service/impl/UserServiceImpl.java +++ b/tduck-account/src/main/java/com/tduck/cloud/account/service/impl/UserServiceImpl.java @@ -149,7 +149,7 @@ public class UserServiceImpl extends ServiceImpl impleme } @Override - public Boolean updatePassword(Long userId, String password) { + public Boolean updatePassword(String userId, String password) { UserEntity userEntity = new UserEntity(); userEntity.setId(userId); userEntity.setPassword(DigestUtil.sha256Hex(password)); diff --git a/tduck-account/src/main/java/com/tduck/cloud/account/service/impl/UserValidateServiceImpl.java b/tduck-account/src/main/java/com/tduck/cloud/account/service/impl/UserValidateServiceImpl.java index 5179611..7f3869a 100644 --- a/tduck-account/src/main/java/com/tduck/cloud/account/service/impl/UserValidateServiceImpl.java +++ b/tduck-account/src/main/java/com/tduck/cloud/account/service/impl/UserValidateServiceImpl.java @@ -120,7 +120,7 @@ public class UserValidateServiceImpl implements UserValidateService { } @Override - public String getRestPasswordCode(Long userId) { + public String getRestPasswordCode(String userId) { String code = IdUtil.fastUUID(); redisUtils.set(StrUtil.format(AccountRedisKeyConstants.RETRIEVE_PWD_USER_CODE, code), userId); return code; 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 f15e547..9d65251 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 @@ -26,7 +26,7 @@ public class JwtUtils { /** * 生成jwt token */ - public String generateToken(long userId) { + public String generateToken(String userId) { Date nowDate = new Date(); //过期时间 Date expireDate = new Date(nowDate.getTime() + expire * 1000); 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 e533fd5..9d4ddb2 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 @@ -56,7 +56,7 @@ public class UserProjectEntity extends BaseEntity { /** * 用户ID */ - private Long userId; + private String userId; /*** * 状态 @@ -72,4 +72,4 @@ public class UserProjectEntity extends BaseEntity { private Boolean deleted; -} \ No newline at end of file +}