Pārlūkot izejas kodu

refactor: 删除用户withgitlab字段,功能由门户完成

370774330@qq.com 5 gadi atpakaļ
vecāks
revīzija
cf503d4159

+ 0 - 10
web/src/main/java/seecoder/devcloud/web/model/po/user/UserPO.java

@@ -29,16 +29,6 @@ public class UserPO implements UserDetails {
 
 
 	private UserIdentity role;
 	private UserIdentity role;
 
 
-	public boolean getWithGitlab() {
-		return withGitlab;
-	}
-
-	/**
-	 * 是否关联了gitlab账户
-	 */
-	@Builder.Default
-	private boolean withGitlab = false;
-
 	@Override
 	@Override
 	public Collection<? extends GrantedAuthority> getAuthorities() {
 	public Collection<? extends GrantedAuthority> getAuthorities() {
 		return Collections.singleton(WebSecurityConstants.getAuthority(role));
 		return Collections.singleton(WebSecurityConstants.getAuthority(role));

+ 0 - 3
web/src/main/java/seecoder/devcloud/web/model/vo/user/UserVO.java

@@ -24,9 +24,6 @@ public class UserVO {
     private String email;
     private String email;
     @ApiModelProperty("角色")
     @ApiModelProperty("角色")
     private UserIdentity role;
     private UserIdentity role;
-    @Deprecated
-    @ApiModelProperty("<已过期,先不要管这个字段>是否有对应gitlab账户了, true代表有")
-    private boolean withGitlab;
 
 
     public UserVO(UserPO userPO) {
     public UserVO(UserPO userPO) {
         BeanUtils.copyProperties(userPO,this);
         BeanUtils.copyProperties(userPO,this);

+ 0 - 1
web/src/main/java/seecoder/devcloud/web/service/impl/user/UserServiceImpl.java

@@ -38,7 +38,6 @@ public class UserServiceImpl implements UserService, UserDetailsService {
 			throw new ServiceException("创建gitlab用户失败",e);
 			throw new ServiceException("创建gitlab用户失败",e);
 		}
 		}
 		UserPO loginUser = UserService.loginUser();
 		UserPO loginUser = UserService.loginUser();
-		loginUser.setWithGitlab(true);
 		userMapper.updateUser(loginUser);
 		userMapper.updateUser(loginUser);
 		return new UserVO(loginUser);
 		return new UserVO(loginUser);
 	}
 	}

+ 0 - 2
web/src/test/java/seecoder/devcloud/web/dao/user/UserMapperTest.java

@@ -35,7 +35,6 @@ class UserMapperTest {
                 .email("email")
                 .email("email")
                 .phone("177")
                 .phone("177")
                 .role(UserIdentity.STUDENT)
                 .role(UserIdentity.STUDENT)
-                .withGitlab(false)
                 .username("user")
                 .username("user")
                 .build();
                 .build();
         userMapper.insert(po);
         userMapper.insert(po);
@@ -48,7 +47,6 @@ class UserMapperTest {
                 .email("333email")
                 .email("333email")
                 .phone("188")
                 .phone("188")
                 .role(UserIdentity.TEACHER)
                 .role(UserIdentity.TEACHER)
-                .withGitlab(true)
                 .username("userc")
                 .username("userc")
                 .build();
                 .build();
         userMapper.updateUser(po);
         userMapper.updateUser(po);