用户Id改为String 兼容党群

tduck-account/src/main/java/com/tduck/cloud/account/service/UserAuthorizeService.java

@@ -42,5 +42,5 @@ public interface UserAuthorizeService extends IService<UserAuthorizeEntity> {
      * @param userId 用户Id
      * @return
      */
-    UserAuthorizeEntity getByUserId(UserAuthorizeTypeEnum type, Long userId);
-}
+    UserAuthorizeEntity getByUserId(UserAuthorizeTypeEnum type, String userId);
+}

tduck-account/src/main/java/com/tduck/cloud/account/service/UserValidateService.java

@@ -35,14 +35,14 @@ public interface UserValidateService {
      * @param email
      * @param userId
      */
-    void sendUpdateAccountEmail(String email, Long userId);
+    void sendUpdateAccountEmail(String email, String userId);
 
     /**
      * 获取需要更改邮箱的UserId
      *
      * @param request
      */
-    Long getUpdateEmailUserId(UpdateUserRequest.Email request);
+    String getUpdateEmailUserId(UpdateUserRequest.Email request);
 
     /**
      * 发送短信验证码

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

@@ -58,9 +58,9 @@ public class UserAuthorizeServiceImpl extends ServiceImpl<UserAuthorizeMapper, U
     }
 
     @Override
-    public UserAuthorizeEntity getByUserId(UserAuthorizeTypeEnum type, Long userId) {
+    public UserAuthorizeEntity getByUserId(UserAuthorizeTypeEnum type, String userId) {
         UserAuthorizeEntity authorizeEntity = this.getOne(Wrappers.<UserAuthorizeEntity>lambdaQuery().eq(UserAuthorizeEntity::getType, type)
                 .eq(UserAuthorizeEntity::getUserId, userId));
         return authorizeEntity;
     }
-}
+}

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

@@ -62,7 +62,7 @@ public class UserValidateServiceImpl implements UserValidateService {
     }
 
     @Override
-    public void sendUpdateAccountEmail(String email, Long userId) {
+    public void sendUpdateAccountEmail(String email, String userId) {
         String code = IdUtil.fastUUID();
         redisUtils.set(StrUtil.format(AccountRedisKeyConstants.UPDATE_USER_EMAIL_CODE, code, email), userId);
         //发送邮件
@@ -71,9 +71,9 @@ public class UserValidateServiceImpl implements UserValidateService {
     }
 
     @Override
-    public Long getUpdateEmailUserId(UpdateUserRequest.Email request) {
+    public String getUpdateEmailUserId(UpdateUserRequest.Email request) {
         String emailCodeKey = StrUtil.format(AccountRedisKeyConstants.UPDATE_USER_EMAIL_CODE, request.getKey(), request.getEmail());
-        Long userId = redisUtils.get(emailCodeKey, Long.class);
+        String userId = redisUtils.get(emailCodeKey, String.class);
         if (ObjectUtil.isNotNull(userId)) {
             redisUtils.remove(emailCodeKey);
             return userId;

tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UploadFileController.java

@@ -35,7 +35,7 @@ public class UploadFileController {
      */
     @Login
     @PostMapping("/user/file/upload")
-    public Result<String> uploadUserFile(@RequestParam("file") MultipartFile file, @RequestAttribute Long userId) throws IOException {
+    public Result<String> uploadUserFile(@RequestParam("file") MultipartFile file, @RequestAttribute String userId) throws IOException {
         String path = new StringBuffer(SecureUtil.md5(String.valueOf(userId)))
                 .append(CharUtil.SLASH)
                 .append(IdUtil.simpleUUID())

tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserController.java

@@ -49,7 +49,7 @@ public class UserController {
      */
     @Login
     @GetMapping("/current/detail")
-    public Result queryCurrentUser(@RequestAttribute Long userId) {
+    public Result queryCurrentUser(@RequestAttribute String userId) {
         UserEntity userEntity = userService.getById(userId);
         UserDetailVO userDetailVO = new UserDetailVO();
         BeanUtil.copyProperties(userEntity, userDetailVO);
@@ -73,7 +73,7 @@ public class UserController {
      */
     @Login
     @PostMapping("/update")
-    public Result updateUser(@RequestBody UserEntity userEntity, @RequestAttribute Long userId) {
+    public Result updateUser(@RequestBody UserEntity userEntity, @RequestAttribute String userId) {
         userEntity.setPassword(null);
         userEntity.setId(userId);
         return Result.success(userService.updateById(userEntity));
@@ -87,7 +87,7 @@ public class UserController {
      */
     @GetMapping("/update-email/msg")
     @Login
-    public Result sendUpdateEmailMsg(@RequestParam String email, @RequestAttribute Long userId) {
+    public Result sendUpdateEmailMsg(@RequestParam String email, @RequestAttribute String userId) {
         Validator.validateEmail(email, "邮箱地址不正确");
         UserEntity userEntity = userService.getUserByEmail(email);
         if (ObjectUtil.isNotNull(userEntity)) {
@@ -110,7 +110,7 @@ public class UserController {
         if (ObjectUtil.isNotNull(userEntity)) {
             return Result.failed("该邮箱已被绑定");
         }
-        Long userId = userValidateService.getUpdateEmailUserId(request);
+        String userId = userValidateService.getUpdateEmailUserId(request);
         if (ObjectUtil.isNull(userId)) {
             return Result.success(false);
         }
@@ -145,7 +145,7 @@ public class UserController {
      */
     @Login
     @GetMapping("/bind/wx/qrcode")
-    public Result getBindWxQrcode(@RequestAttribute Long userId) throws WxErrorException {
+    public Result getBindWxQrcode(@RequestAttribute String userId) throws WxErrorException {
         String bindSceneStr = JsonUtils.objToJson(new WxMpQrCodeGenRequest(WxMpQrCodeGenRequest.QrCodeType.BIND_ACCOUNT, String.valueOf(userId)));
         //5分钟有效
         WxMpQrCodeTicket ticket = wxMpService.getQrcodeService().qrCodeCreateTmpTicket(bindSceneStr, 10 * 60);
@@ -160,7 +160,7 @@ public class UserController {
      */
     @Login
     @PostMapping("/update/phone-number")
-    public Result updatePhoneNumber(@RequestBody UpdateUserRequest.PhoneNumber request, @RequestAttribute Long userId) {
+    public Result updatePhoneNumber(@RequestBody UpdateUserRequest.PhoneNumber request, @RequestAttribute String userId) {
         ValidatorUtils.validateEntity(request);
         Validator.validateMobile(request.getPhoneNumber(), "手机号码不正确");
         //检查验证码是否正确
@@ -203,7 +203,7 @@ public class UserController {
 
     @Login
     @PostMapping("/bind/qq")
-    public Result bindQQAccount(@RequestBody QqLoginRequest request, @RequestAttribute Long userId) {
+    public Result bindQQAccount(@RequestBody QqLoginRequest request, @RequestAttribute String userId) {
         UserAuthorizeEntity authorizeEntity = userAuthorizeService.getQqAuthorization(request.getAuthorizeCode(), request.getRedirectUri(), new UserEntity());
         if (ObjectUtil.isNotNull(authorizeEntity.getUserId()) && userId.equals(authorizeEntity.getUserId())) {
             return Result.success(false);

tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserLoginController.java

@@ -157,7 +157,7 @@ public class UserLoginController {
     public Result retrieveResetPassword(@RequestBody RetrievePasswordRequest.Reset request) {
         ValidatorUtils.validateEntity(request);
         String codeKey = StrUtil.format(AccountRedisKeyConstants.RETRIEVE_PWD_USER_CODE, request.getCode());
-        Long userId = redisUtils.get(codeKey, Long.class);
+        String userId = redisUtils.get(codeKey, String.class);
         if (ObjectUtil.isNull(userId)) {
             return Result.failed("重置密码操作已过期，请重试");
         }
@@ -222,7 +222,7 @@ public class UserLoginController {
         if (StrUtil.isBlank(loginId)) {
             return Result.success();
         }
-        Long userId = redisUtils.get(StrUtil.format(WxMpRedisKeyConstants.WX_MP_LOGIN_QRCODE, loginId), Long.class);
+        String userId = redisUtils.get(StrUtil.format(WxMpRedisKeyConstants.WX_MP_LOGIN_QRCODE, loginId), String.class);
         if (ObjectUtil.isNull(userId)) {
             return Result.success();
         }

tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectController.java

@@ -78,7 +78,7 @@ public class UserProjectController {
      */
     @Login
     @PostMapping("/user/project/create")
-    public Result createProject(@RequestBody UserProjectEntity project, @RequestAttribute Long userId) {
+    public Result createProject(@RequestBody UserProjectEntity project, @RequestAttribute String userId) {
         ValidatorUtils.validateEntity(project, AddGroup.class);
         project.setKey(IdUtil.fastSimpleUUID());
         project.setUserId(userId);
@@ -94,7 +94,7 @@ public class UserProjectController {
      */
     @Login
     @PostMapping("/user/project/use-template/create")
-    public Result createProjectByTemplate(@RequestBody ProjectTemplateEntity request, @RequestAttribute Long userId) {
+    public Result createProjectByTemplate(@RequestBody ProjectTemplateEntity request, @RequestAttribute String userId) {
         String templateKey = request.getKey();
         ProjectTemplateEntity projectTemplateEntity = projectTemplateService.getByKey(templateKey);
         List<ProjectTemplateItemEntity> projectTemplateItemEntities = projectTemplateItemService.listByTemplateKey(templateKey);
@@ -122,7 +122,7 @@ public class UserProjectController {
      */
     @Login
     @PostMapping("/user/project/template/save")
-    public Result saveAsProjectTemplate(@RequestBody UserProjectEntity request, @RequestAttribute Long userId) {
+    public Result saveAsProjectTemplate(@RequestBody UserProjectEntity request, @RequestAttribute String userId) {
         UserProjectEntity projectEntity = projectService.getByKey(request.getKey());
         List<UserProjectItemEntity> itemEntityList = projectItemService.listByProjectKey(request.getKey());
         ProjectTemplateEntity projectTemplateEntity = new ProjectTemplateEntity();
@@ -142,7 +142,7 @@ public class UserProjectController {
      */
     @Login
     @GetMapping("/user/project/list")
-    public Result listProjects(QueryProjectRequest.List request, @RequestAttribute Long userId) {
+    public Result listProjects(QueryProjectRequest.List request, @RequestAttribute String userId) {
         List<UserProjectEntity> entityList = projectService.list(Wrappers.<UserProjectEntity>lambdaQuery().eq(UserProjectEntity::getUserId, userId)
                 .eq(ObjectUtil.isNotNull(request.getStatus()), UserProjectEntity::getStatus, request.getStatus())
                 .orderByDesc(BaseEntity::getUpdateTime));
@@ -154,7 +154,7 @@ public class UserProjectController {
      */
     @Login
     @GetMapping("/user/project/page")
-    public Result queryMyProjects(@RequestAttribute Long userId, QueryProjectRequest.Page request) {
+    public Result queryMyProjects(@RequestAttribute String userId, QueryProjectRequest.Page request) {
         return Result.success(projectService.page(request.toMybatisPage(),
                 Wrappers.<UserProjectEntity>lambdaQuery().eq(UserProjectEntity::getUserId, userId)
                         .eq(UserProjectEntity::getDeleted, false)
@@ -244,7 +244,7 @@ public class UserProjectController {
      */
     @Login
     @PostMapping("/user/project/update")
-    public Result updateProject(@RequestBody UserProjectEntity project, @RequestAttribute Long userId) {
+    public Result updateProject(@RequestBody UserProjectEntity project, @RequestAttribute String userId) {
         ValidatorUtils.validateEntity(project, AddGroup.class);
         UserProjectEntity oldProject = projectService.getByKey(project.getKey());
         if (ObjectUtil.isNotNull(oldProject) && userId.equals(oldProject.getUserId())) {
@@ -486,7 +486,7 @@ public class UserProjectController {
      */
     @Login
     @GetMapping("/user/project/recycle/page")
-    public Result queryRecycleProjects(@RequestAttribute Long userId, QueryProjectRequest.Page request) {
+    public Result queryRecycleProjects(@RequestAttribute String userId, QueryProjectRequest.Page request) {
         Page page = projectService.page(request.toMybatisPage(),
                 Wrappers.<UserProjectEntity>lambdaQuery().eq(UserProjectEntity::getUserId, userId)
                         .eq(UserProjectEntity::getDeleted, true)
@@ -519,7 +519,7 @@ public class UserProjectController {
      */
     @Login
     @PostMapping("/user/project/recycle/delete")
-    public Result deleteRecycleProject(@RequestAttribute Long userId, @RequestBody UserProjectEntity projectEntity) {
+    public Result deleteRecycleProject(@RequestAttribute String userId, @RequestBody UserProjectEntity projectEntity) {
         boolean remove = projectService.remove(Wrappers.<UserProjectEntity>lambdaQuery().eq(UserProjectEntity::getUserId, userId)
                 .eq(UserProjectEntity::getKey, projectEntity.getKey()));
         if (remove) {
@@ -532,4 +532,4 @@ public class UserProjectController {
     }
 
 
-}
+}

tduck-wx-mp/src/main/java/com/tduck/cloud/wx/mp/entity/WxMpUserEntity.java

@@ -59,7 +59,7 @@ public class WxMpUserEntity extends BaseEntity<WxMpUserEntity> {
     /**
      * 账号Id
      */
-    private Long userId;
+    private String userId;
 
 
-}
+}

tduck-wx-mp/src/main/java/com/tduck/cloud/wx/mp/handler/scan/BindAccountScanStrategy.java

@@ -23,10 +23,10 @@ public class BindAccountScanStrategy implements ScanStrategy {
 
     @Override
     public WxMpXmlOutMessage handle(String appId, String openId, WxMpQrCodeGenRequest request) {
-        Long userId = Long.parseLong(request.getData());
+        String userId = request.getData();
         WxMpUserEntity wxMpUserEntity = wxMpUserService.getByAppIdAndOpenId(appId, openId);
         if (ObjectUtil.isNotNull(wxMpUserEntity)) {
-            Long wxUserId = wxMpUserEntity.getUserId();
+            String wxUserId = wxMpUserEntity.getUserId();
             if (ObjectUtil.isNull(wxUserId) || userId.equals(wxUserId)) {
                 wxMpUserEntity.setUserId(userId);
                 wxMpUserService.updateById(wxMpUserEntity);

tduck-wx-mp/src/main/java/com/tduck/cloud/wx/mp/service/WxMpUserService.java

@@ -36,5 +36,5 @@ public interface WxMpUserService extends IService<WxMpUserEntity> {
      * @param userId
      * @return
      */
-    WxMpUserEntity getByUserId(Long userId);
-}
+    WxMpUserEntity getByUserId(String userId);
+}

tduck-wx-mp/src/main/java/com/tduck/cloud/wx/mp/service/impl/WxMpUserServiceImpl.java

@@ -36,8 +36,8 @@ public class WxMpUserServiceImpl extends ServiceImpl<WxMpUserMapper, WxMpUserEnt
     }
 
     @Override
-    public WxMpUserEntity getByUserId(Long userId) {
+    public WxMpUserEntity getByUserId(String userId) {
         WxMpUserEntity wxMpUserEntity = this.getOne(Wrappers.<WxMpUserEntity>lambdaQuery().eq(WxMpUserEntity::getUserId, userId));
         return wxMpUserEntity;
     }
-}
+}