merge dev

web/src/main/java/seecoder/devcloud/web/dao/GeneralInsertUpdateSqlProvider.java

@@ -25,7 +25,6 @@ public class GeneralInsertUpdateSqlProvider {
         Map<String, String> map;
         try {
             map = getFieldsMap(obj, true, false);
-            // 创建 需要赋当前的时间的timestamp字段 在这里排除，否则无法正常赋值
             for (String col: ignoredCols){
                 map.remove(camelCase2Underscore(col));
             }
@@ -128,6 +127,7 @@ public class GeneralInsertUpdateSqlProvider {
              * #{colname}可以直接取到实体的属性
              * 多参数的时候
              * #{param1.colname}来取实体的属性
+             * 注：实体类一定要放第一个参数
              */
             String paramPrefix =  singleParam? "#{" : "#{param1.";
             if ((!"id".equals(col) && includeNullValue) || f.get(obj) != null) {

web/src/main/java/seecoder/devcloud/web/dao/user/GroupMemberMapper.java

@@ -13,7 +13,6 @@ import java.util.List;
  * @date 2021/3/4
  * @description:
  */
-
 @Mapper
 @Repository
 public interface GroupMemberMapper {

web/src/main/java/seecoder/devcloud/web/infrastructure/security/WebSecurityConstants.java

@@ -1,16 +1,16 @@
-package seecoder.devcloud.web.infrastructure.security;
-
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-
-public abstract class WebSecurityConstants {
-	private static final String ROLE_PREFIX = "ROLE_";
-
-	public static final String STUDENT_ROLE = "STUDENT";
-	public static final String TEACHER_ROLE = "TEACHER";
-	public static final String ADMIN_ROLE = "ADMIN";
-
-	public static final GrantedAuthority STUDENT_AUTHORITY = new SimpleGrantedAuthority(ROLE_PREFIX + STUDENT_ROLE);
-	public static final GrantedAuthority TEACHER_AUTHORITY = new SimpleGrantedAuthority(ROLE_PREFIX + TEACHER_ROLE);
-	public static final GrantedAuthority ADMIN_AUTHORITY = new SimpleGrantedAuthority(ROLE_PREFIX + ADMIN_ROLE);
-}
+//package seecoder.devcloud.web.infrastructure.security;
+//
+//import org.springframework.security.core.GrantedAuthority;
+//import org.springframework.security.core.authority.SimpleGrantedAuthority;
+//
+//public abstract class WebSecurityConstants {
+//	private static final String ROLE_PREFIX = "ROLE_";
+//
+//	public static final String STUDENT_ROLE = "STUDENT";
+//	public static final String TEACHER_ROLE = "TEACHER";
+//	public static final String ADMIN_ROLE = "ADMIN";
+//
+//	public static final GrantedAuthority STUDENT_AUTHORITY = new SimpleGrantedAuthority(ROLE_PREFIX + STUDENT_ROLE);
+//	public static final GrantedAuthority TEACHER_AUTHORITY = new SimpleGrantedAuthority(ROLE_PREFIX + TEACHER_ROLE);
+//	public static final GrantedAuthority ADMIN_AUTHORITY = new SimpleGrantedAuthority(ROLE_PREFIX + ADMIN_ROLE);
+//}

web/src/main/java/seecoder/devcloud/web/service/impl/user/GroupServiceImpl.java

@@ -18,7 +18,6 @@ import seecoder.devcloud.web.enums.GroupType;
 import seecoder.devcloud.web.po.user.Group;
 import seecoder.devcloud.web.po.user.User;
 import seecoder.devcloud.web.service.user.GroupService;
-import seecoder.devcloud.web.vo.user.CustomUserDetails;
 import seecoder.devcloud.web.vo.user.GroupVO;
 
 import java.util.ArrayList;

web/src/main/java/seecoder/devcloud/web/service/user/GroupService.java

@@ -5,7 +5,6 @@ package seecoder.devcloud.web.service.user;
 import org.springframework.stereotype.Service;
 import seecoder.devcloud.common.exceptions.EntityNotFoundException;
 import seecoder.devcloud.common.exceptions.ServiceException;
-import seecoder.devcloud.web.vo.user.CustomUserDetails;
 import seecoder.devcloud.web.vo.user.GroupVO;
 import seecoder.devcloud.web.vo.user.InnerGroupVO;
 

web/src/main/java/seecoder/devcloud/web/vo/user/CustomUserDetails.java

@@ -1,85 +1,85 @@
-package seecoder.devcloud.web.vo.user;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-
-import lombok.*;
-import org.apache.commons.codec.digest.DigestUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
-import seecoder.devcloud.web.po.user.User;
-
-import java.util.Collections;
-import java.util.Set;
-
-import static seecoder.devcloud.web.enums.UserIdentity.STUDENT;
-import static seecoder.devcloud.web.enums.UserIdentity.TEACHER;
-import static seecoder.devcloud.web.infrastructure.security.WebSecurityConstants.*;
-
-
-@Data
-@EqualsAndHashCode
-@ToString
-@NoArgsConstructor
-@AllArgsConstructor
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class CustomUserDetails implements UserDetails {
-	private Integer id;
-	private String username;
-	private String password;
-	private Set<GrantedAuthority> authorities;
-
-	CustomUserDetails(User user) {
-		BeanUtils.copyProperties(user, this);
-		switch (user.getRole()) {
-			case STUDENT:
-				this.authorities = Collections.singleton(STUDENT_AUTHORITY);
-				break;
-			case TEACHER:
-				this.authorities = Collections.singleton(TEACHER_AUTHORITY);
-				break;
-			default:
-				throw new UsernameNotFoundException(username);
-		}
-	}
-
-	CustomUserDetails(String username, String password) {
-		this.id = 0;
-		this.username = username;
-		this.password = DigestUtils.sha256Hex(password);
-		this.authorities = Collections.singleton(ADMIN_AUTHORITY);
-	}
-
-	@Override
-	public boolean isAccountNonExpired() {
-		return true;
-	}
-
-	@Override
-	public boolean isAccountNonLocked() {
-		return true;
-	}
-
-	@Override
-	public boolean isCredentialsNonExpired() {
-		return true;
-	}
-
-	@Override
-	public boolean isEnabled() {
-		return true;
-	}
-
-	public boolean isStudent() {
-		return authorities.contains(STUDENT_AUTHORITY);
-	}
-
-	public boolean isTeacher() {
-		return authorities.contains(TEACHER_AUTHORITY);
-	}
-
-	public boolean isAdmin() {
-		return authorities.contains(ADMIN_AUTHORITY);
-	}
-}
+//package seecoder.devcloud.web.vo.user;
+//
+//import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+//
+//import lombok.*;
+//import org.apache.commons.codec.digest.DigestUtils;
+//import org.springframework.beans.BeanUtils;
+//import org.springframework.security.core.GrantedAuthority;
+//import org.springframework.security.core.userdetails.UserDetails;
+//import org.springframework.security.core.userdetails.UsernameNotFoundException;
+//import seecoder.devcloud.web.po.user.User;
+//
+//import java.util.Collections;
+//import java.util.Set;
+//
+//import static seecoder.devcloud.web.enums.UserIdentity.STUDENT;
+//import static seecoder.devcloud.web.enums.UserIdentity.TEACHER;
+//import static seecoder.devcloud.web.infrastructure.security.WebSecurityConstants.*;
+//
+//
+//@Data
+//@EqualsAndHashCode
+//@ToString
+//@NoArgsConstructor
+//@AllArgsConstructor
+//@JsonIgnoreProperties(ignoreUnknown = true)
+//public class CustomUserDetails implements UserDetails {
+//	private Integer id;
+//	private String username;
+//	private String password;
+//	private Set<GrantedAuthority> authorities;
+//
+//	CustomUserDetails(User user) {
+//		BeanUtils.copyProperties(user, this);
+//		switch (user.getRole()) {
+//			case STUDENT:
+//				this.authorities = Collections.singleton(STUDENT_AUTHORITY);
+//				break;
+//			case TEACHER:
+//				this.authorities = Collections.singleton(TEACHER_AUTHORITY);
+//				break;
+//			default:
+//				throw new UsernameNotFoundException(username);
+//		}
+//	}
+//
+//	CustomUserDetails(String username, String password) {
+//		this.id = 0;
+//		this.username = username;
+//		this.password = DigestUtils.sha256Hex(password);
+//		this.authorities = Collections.singleton(ADMIN_AUTHORITY);
+//	}
+//
+//	@Override
+//	public boolean isAccountNonExpired() {
+//		return true;
+//	}
+//
+//	@Override
+//	public boolean isAccountNonLocked() {
+//		return true;
+//	}
+//
+//	@Override
+//	public boolean isCredentialsNonExpired() {
+//		return true;
+//	}
+//
+//	@Override
+//	public boolean isEnabled() {
+//		return true;
+//	}
+//
+//	public boolean isStudent() {
+//		return authorities.contains(STUDENT_AUTHORITY);
+//	}
+//
+//	public boolean isTeacher() {
+//		return authorities.contains(TEACHER_AUTHORITY);
+//	}
+//
+//	public boolean isAdmin() {
+//		return authorities.contains(ADMIN_AUTHORITY);
+//	}
+//}