Browse Source

用户Id改为String 兼容党群

dev
jianjun 4 years ago
parent
commit
78e53e338a
  1. 4
      tduck-account/src/main/java/com/tduck/cloud/account/entity/UserAuthorizeEntity.java
  2. 7
      tduck-account/src/main/java/com/tduck/cloud/account/entity/UserEntity.java
  3. 2
      tduck-account/src/main/java/com/tduck/cloud/account/service/UserService.java
  4. 2
      tduck-account/src/main/java/com/tduck/cloud/account/service/UserValidateService.java
  5. 2
      tduck-account/src/main/java/com/tduck/cloud/account/service/impl/UserServiceImpl.java
  6. 2
      tduck-account/src/main/java/com/tduck/cloud/account/service/impl/UserValidateServiceImpl.java
  7. 2
      tduck-account/src/main/java/com/tduck/cloud/account/util/JwtUtils.java
  8. 4
      tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectEntity.java

4
tduck-account/src/main/java/com/tduck/cloud/account/entity/UserAuthorizeEntity.java

@ -40,7 +40,7 @@ public class UserAuthorizeEntity extends BaseEntity<UserAuthorizeEntity> {
/**
* 用户Id
*/
private Long userId;
private String userId;
/**
* 平台用户信息
*/
@ -48,4 +48,4 @@ public class UserAuthorizeEntity extends BaseEntity<UserAuthorizeEntity> {
private Map<String, Object> userInfo;
}
}

7
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<UserEntity> {
@TableId
private Long id;
@TableId(type = IdType.ASSIGN_UUID)
private String id;
/**
* 姓名
*/
@ -67,4 +68,4 @@ public class UserEntity extends BaseEntity<UserEntity> {
private Boolean deleted;
}
}

2
tduck-account/src/main/java/com/tduck/cloud/account/service/UserService.java

@ -84,5 +84,5 @@ public interface UserService extends IService<UserEntity> {
* @param password
* @return
*/
Boolean updatePassword(Long userId, String password);
Boolean updatePassword(String userId, String password);
}

2
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);
}

2
tduck-account/src/main/java/com/tduck/cloud/account/service/impl/UserServiceImpl.java

@ -149,7 +149,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserEntity> 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));

2
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;

2
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);

4
tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectEntity.java

@ -56,7 +56,7 @@ public class UserProjectEntity extends BaseEntity<UserProjectEntity> {
/**
* 用户ID
*/
private Long userId;
private String userId;
/***
* 状态
@ -72,4 +72,4 @@ public class UserProjectEntity extends BaseEntity<UserProjectEntity> {
private Boolean deleted;
}
}

Loading…
Cancel
Save