Revert "注册给角色权限"

This reverts commit 77deca35ad558a4611e36a6dc0a702ad9f00b69e.

src/main/java/com/izouma/nineth/domain/UserAuthority.java

@@ -1,23 +0,0 @@
-package com.izouma.nineth.domain;
-
-import com.izouma.nineth.annotations.Searchable;
-import com.izouma.nineth.enums.AuthorityName;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import javax.persistence.Entity;
-
-@Data
-@Entity
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-public class UserAuthority  extends BaseEntity{
-    @Searchable
-    private Long userId;
-
-    @Searchable
-    private AuthorityName authorityName;
-}

src/main/java/com/izouma/nineth/repo/UserAuthorityRepo.java

@@ -1,10 +0,0 @@
-package com.izouma.nineth.repo;
-
-import com.izouma.nineth.domain.Follow;
-import com.izouma.nineth.domain.UserAuthority;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-
-public interface UserAuthorityRepo extends JpaRepository<UserAuthority, Long>, JpaSpecificationExecutor<UserAuthority> {
-
-}

src/main/java/com/izouma/nineth/service/UserAuthorityService.java

@@ -1,20 +0,0 @@
-package com.izouma.nineth.service;
-
-import com.izouma.nineth.domain.UserAuthority;
-import com.izouma.nineth.repo.UserAuthorityRepo;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-@Service
-@Slf4j
-@AllArgsConstructor
-public class UserAuthorityService {
-
-    private UserAuthorityRepo userAuthorityRepo;
-
-
-    public void save(UserAuthority userAuthority) {
-        userAuthorityRepo.save(userAuthority);
-    }
-}

src/main/java/com/izouma/nineth/service/UserService.java

@@ -51,7 +51,6 @@ import org.springframework.stereotype.Service;
 import javax.persistence.criteria.Predicate;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.regex.Pattern;
@@ -108,7 +107,6 @@ public class UserService {
 
     public User save(User user) {
         if (user.getId() != null) {
-            user.setCreatedAt(LocalDateTime.now());
             cacheService.clearUserMy(user.getId());
         }
         return userRepo.save(user);

src/main/java/com/izouma/nineth/web/AuthenticationController.java

@@ -1,20 +1,16 @@
 package com.izouma.nineth.web;
 
 import com.izouma.nineth.domain.User;
-import com.izouma.nineth.domain.UserAuthority;
 import com.izouma.nineth.enums.AuthorityName;
 import com.izouma.nineth.exception.AuthenticationException;
 import com.izouma.nineth.security.JwtTokenUtil;
 import com.izouma.nineth.security.JwtUserFactory;
 import com.izouma.nineth.service.CaptchaService;
-import com.izouma.nineth.service.UserAuthorityService;
 import com.izouma.nineth.service.UserService;
-import com.izouma.nineth.utils.UserAuthoritySerializer;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -32,7 +28,6 @@ public class AuthenticationController {
     private final JwtTokenUtil          jwtTokenUtil;
     private final UserService           userService;
     private final CaptchaService        captchaService;
-    private final UserAuthorityService userAuthorityService;
 
     @PostMapping("/login")
     public String loginByUserPwd(String username, String password, Integer expiration) {
@@ -66,7 +61,6 @@ public class AuthenticationController {
 
     @PostMapping("/phoneRegister")
     @ApiOperation(value = "手机号密码注册")
-    @Transactional
     public String phonePwdLogin(String phone, String code, String password, String inviteCode, Long invitor,
                                 Long collectionId, String captcha, String captchaKey) {
 //        boolean verify = captchaService.verify(captchaKey, captcha);
@@ -74,14 +68,7 @@ public class AuthenticationController {
 //            throw new BusinessException("验证码错误");
 //        }
         User user = userService.phoneRegister(phone, code, password, inviteCode, invitor, collectionId);
-        String s = jwtTokenUtil.generateToken(JwtUserFactory.create(user));
-        if (user.getId() != null){
-            UserAuthority userAuthority = new UserAuthority();
-            userAuthority.setUserId(user.getId());
-            userAuthority.setAuthorityName(AuthorityName.ROLE_USER);
-            userAuthorityService.save(userAuthority);
-        }
-        return s;
+        return jwtTokenUtil.generateToken(JwtUserFactory.create(user));
     }
 
     @PostMapping("/mqPhoneRegister")