Browse Source

finish basic portal logic

Bay 5 years ago
parent
commit
431349e6b4
32 changed files with 799 additions and 77 deletions
  1. 31 0
      seecoder-portal-common/src/main/java/cn/seecoder/seecoderportalcommon/vo/MessageVO.java
  2. 56 0
      seecoder-portal-common/src/main/java/cn/seecoder/seecoderportalcommon/vo/TokenVO.java
  3. 24 0
      seecoder-portal-common/src/main/java/cn/seecoder/seecoderportalcommon/vo/dto/ChangeEmailDTO.java
  4. 23 0
      seecoder-portal-common/src/main/java/cn/seecoder/seecoderportalcommon/vo/dto/ChangeNameDTO.java
  5. 23 0
      seecoder-portal-common/src/main/java/cn/seecoder/seecoderportalcommon/vo/dto/ChangeSignatureDTO.java
  6. 23 0
      seecoder-portal-common/src/main/java/cn/seecoder/seecoderportalcommon/vo/dto/PhoneDTO.java
  7. 38 0
      seecoder-portal-common/src/main/java/cn/seecoder/seecoderportalcommon/vo/dto/RegisterDTO.java
  8. 46 0
      seecoder-portal-common/src/main/java/cn/seecoder/seecoderportalcommon/vo/dto/ResetPasswordDTO.java
  9. 10 1
      seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/config/SpringSecurityConfiguration.java
  10. 4 3
      seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/domain/Teacher.java
  11. 18 2
      seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/domain/User.java
  12. 7 0
      seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/mapper/UserMapper.java
  13. 4 0
      seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/repository/TeacherRepository.java
  14. 13 0
      seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/security/SecurityUtils.java
  15. 5 10
      seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/security/jwt/JWTFilter.java
  16. 9 5
      seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/security/jwt/TokenProvider.java
  17. 38 1
      seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/service/TeacherService.java
  18. 45 11
      seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/service/UserService.java
  19. 16 0
      seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/utility/ErrResponse.java
  20. 16 0
      seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/utility/OkResponse.java
  21. 2 0
      seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/utility/ResponseUtil.java
  22. 28 9
      seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/web/rest/AdminController.java
  23. 48 0
      seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/web/rest/AuthController.java
  24. 19 0
      seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/web/rest/ErrorAdvice.java
  25. 66 0
      seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/web/rest/TeacherController.java
  26. 91 0
      seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/web/rest/UserController.java
  27. 24 14
      seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/web/rest/UserJWTController.java
  28. 23 0
      seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/web/rest/dto/UpdateUserByIdDTO.java
  29. 46 0
      seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/web/rest/errors/CustomErrorException.java
  30. 0 11
      seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/web/rest/errors/PhoneAlreadyUsedException.java
  31. 0 10
      seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/web/rest/errors/PhoneVerificationNotMatchException.java
  32. 3 0
      seecoder-portal-server/src/main/resources/application.yml

+ 31 - 0
seecoder-portal-common/src/main/java/cn/seecoder/seecoderportalcommon/vo/MessageVO.java

@@ -0,0 +1,31 @@
+package cn.seecoder.seecoderportalcommon.vo;
+
+/**
+ * @author kunduin
+ */
+public class MessageVO {
+
+    private String message;
+
+    public MessageVO() {
+    }
+
+    public MessageVO(String message) {
+        this.message = message;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    @Override
+    public String toString() {
+        return "MessageVO{" +
+                "message='" + message + '\'' +
+                '}';
+    }
+}

+ 56 - 0
seecoder-portal-common/src/main/java/cn/seecoder/seecoderportalcommon/vo/TokenVO.java

@@ -0,0 +1,56 @@
+package cn.seecoder.seecoderportalcommon.vo;
+
+/**
+ * @author kunduin
+ */
+public class TokenVO {
+    private String token;
+
+    private String name;
+
+    private String redirectUri;
+
+    private UserVO user;
+
+    public String getToken() {
+        return token;
+    }
+
+    public void setToken(String token) {
+        this.token = token;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getRedirectUri() {
+        return redirectUri;
+    }
+
+    public void setRedirectUri(String redirectUri) {
+        this.redirectUri = redirectUri;
+    }
+
+    public UserVO getUser() {
+        return user;
+    }
+
+    public void setUser(UserVO user) {
+        this.user = user;
+    }
+
+    @Override
+    public String toString() {
+        return "TokenVO{" +
+                "token='" + token + '\'' +
+                ", name='" + name + '\'' +
+                ", redirectUri='" + redirectUri + '\'' +
+                ", user=" + user +
+                '}';
+    }
+}

+ 24 - 0
seecoder-portal-common/src/main/java/cn/seecoder/seecoderportalcommon/vo/dto/ChangeEmailDTO.java

@@ -0,0 +1,24 @@
+package cn.seecoder.seecoderportalcommon.vo.dto;
+
+/**
+ * @author kunduin
+ */
+public class ChangeEmailDTO {
+
+    private String newEmail;
+
+    public String getNewEmail() {
+        return newEmail;
+    }
+
+    public void setNewEmail(String newEmail) {
+        this.newEmail = newEmail;
+    }
+
+    @Override
+    public String toString() {
+        return "ChangeEmailDTO{" +
+                "newEmail='" + newEmail + '\'' +
+                '}';
+    }
+}

+ 23 - 0
seecoder-portal-common/src/main/java/cn/seecoder/seecoderportalcommon/vo/dto/ChangeNameDTO.java

@@ -0,0 +1,23 @@
+package cn.seecoder.seecoderportalcommon.vo.dto;
+
+/**
+ * @author kunduin
+ */
+public class ChangeNameDTO {
+    private String newName;
+
+    public String getNewName() {
+        return newName;
+    }
+
+    public void setNewName(String newName) {
+        this.newName = newName;
+    }
+
+    @Override
+    public String toString() {
+        return "ChangeNameDTO{" +
+                "newName='" + newName + '\'' +
+                '}';
+    }
+}

+ 23 - 0
seecoder-portal-common/src/main/java/cn/seecoder/seecoderportalcommon/vo/dto/ChangeSignatureDTO.java

@@ -0,0 +1,23 @@
+package cn.seecoder.seecoderportalcommon.vo.dto;
+
+/**
+ * @author kunduin
+ */
+public class ChangeSignatureDTO {
+    private String newSignature;
+
+    public String getNewSignature() {
+        return newSignature;
+    }
+
+    public void setNewSignature(String newSignature) {
+        this.newSignature = newSignature;
+    }
+
+    @Override
+    public String toString() {
+        return "ChangeSignatureDTO{" +
+                "newSignature='" + newSignature + '\'' +
+                '}';
+    }
+}

+ 23 - 0
seecoder-portal-common/src/main/java/cn/seecoder/seecoderportalcommon/vo/dto/PhoneDTO.java

@@ -0,0 +1,23 @@
+package cn.seecoder.seecoderportalcommon.vo.dto;
+
+/**
+ * @author kunduin
+ */
+public class PhoneDTO {
+    private String phone;
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    @Override
+    public String toString() {
+        return "PhoneDTO{" +
+                "phone='" + phone + '\'' +
+                '}';
+    }
+}

+ 38 - 0
seecoder-portal-common/src/main/java/cn/seecoder/seecoderportalcommon/vo/dto/RegisterDTO.java

@@ -0,0 +1,38 @@
+package cn.seecoder.seecoderportalcommon.vo.dto;
+
+import cn.seecoder.seecoderportalcommon.vo.UserVO;
+
+/**
+ * @author kunduin
+ */
+public class RegisterDTO extends UserVO {
+
+    private String password;
+
+    private String identifyCode;
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public String getIdentifyCode() {
+        return identifyCode;
+    }
+
+    public void setIdentifyCode(String identifyCode) {
+        this.identifyCode = identifyCode;
+    }
+
+    @Override
+    public String toString() {
+        return "RegisterDTO{" +
+                "password='" + password + '\'' +
+                ", identifyCode='" + identifyCode + '\'' +
+                '}';
+    }
+}
+

+ 46 - 0
seecoder-portal-common/src/main/java/cn/seecoder/seecoderportalcommon/vo/dto/ResetPasswordDTO.java

@@ -0,0 +1,46 @@
+package cn.seecoder.seecoderportalcommon.vo.dto;
+
+/**
+ * @author kunduin
+ */
+public class ResetPasswordDTO {
+
+    private String phone;
+
+    private String password;
+
+    private String identifyCode;
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public String getIdentifyCode() {
+        return identifyCode;
+    }
+
+    public void setIdentifyCode(String identifyCode) {
+        this.identifyCode = identifyCode;
+    }
+
+    @Override
+    public String toString() {
+        return "ResetPasswordDTO{" +
+                "phone='" + phone + '\'' +
+                ", password='" + password + '\'' +
+                ", identifyCode='" + identifyCode + '\'' +
+                '}';
+    }
+}

+ 10 - 1
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/config/SpringSecurityConfiguration.java

@@ -46,7 +46,16 @@ public class SpringSecurityConfiguration extends WebSecurityConfigurerAdapter {
 
 
                 // auth
                 // auth
                 .authorizeRequests()
                 .authorizeRequests()
-                .antMatchers("/api/authenticate", "/api/account/register", "/api/account/reset", "/api/message")
+                .antMatchers(
+                        "/api/user/sendMessage",
+                        "/api/user/login",
+                        "/api/user/register",
+                        "/api/user/resetPassword",
+                        "/api/user/sendMessage",
+                        "/api/user/findIdByPhone",
+                        "/api/interaction",
+                        "/api/receiveIDToken",
+                        "/api/authenticate")
                 .permitAll() // authenticate
                 .permitAll() // authenticate
                 .antMatchers("/api/**")
                 .antMatchers("/api/**")
                 .authenticated()
                 .authenticated()

+ 4 - 3
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/domain/Teacher.java

@@ -1,6 +1,7 @@
 package cn.seecoder.seecoderportalserver.domain;
 package cn.seecoder.seecoderportalserver.domain;
 
 
 import cn.seecoder.seecoderportalcommon.vo.TeacherState;
 import cn.seecoder.seecoderportalcommon.vo.TeacherState;
+import org.hibernate.annotations.CreationTimestamp;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.CreatedDate;
 
 
 import javax.persistence.*;
 import javax.persistence.*;
@@ -9,7 +10,7 @@ import java.time.OffsetDateTime;
 /**
 /**
  * @author Kunduin
  * @author Kunduin
  */
  */
-@Entity
+@Entity(name = "teacher")
 @Table(name = "teacher")
 @Table(name = "teacher")
 public class Teacher {
 public class Teacher {
     @Id
     @Id
@@ -25,7 +26,7 @@ public class Teacher {
     @Column(length = 64, nullable = false)
     @Column(length = 64, nullable = false)
     private String jobNumber;
     private String jobNumber;
 
 
-    @Column(length = 512, nullable = false)
+    @Column(length = 512)
     private String certificate = "";
     private String certificate = "";
 
 
     @OneToOne(fetch = FetchType.EAGER)
     @OneToOne(fetch = FetchType.EAGER)
@@ -33,7 +34,7 @@ public class Teacher {
     private User userDetail;
     private User userDetail;
 
 
     @Column(nullable = false)
     @Column(nullable = false)
-    @CreatedDate
+    @CreationTimestamp
     private OffsetDateTime createdTime;
     private OffsetDateTime createdTime;
 
 
     @Column(nullable = false)
     @Column(nullable = false)

+ 18 - 2
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/domain/User.java

@@ -11,9 +11,9 @@ import java.time.OffsetDateTime;
 /**
 /**
  * @author Kunduin
  * @author Kunduin
  */
  */
-@Entity
+@Entity(name = "user")
 @Table(
 @Table(
-        name = "user",
+        name = "portal_user",
         indexes = @Index(name = "user_phone_index", columnList = "phone")
         indexes = @Index(name = "user_phone_index", columnList = "phone")
 )
 )
 public class User {
 public class User {
@@ -52,6 +52,13 @@ public class User {
     @Size(max = 512)
     @Size(max = 512)
     private String signature = "无";
     private String signature = "无";
 
 
+    @OneToOne(
+            mappedBy = "userDetail",
+            fetch = FetchType.LAZY,
+            orphanRemoval = true
+    )
+    private Teacher teacherInfo;
+
     @Column
     @Column
     @CreationTimestamp
     @CreationTimestamp
     private OffsetDateTime createdTime;
     private OffsetDateTime createdTime;
@@ -139,6 +146,14 @@ public class User {
         isValid = valid;
         isValid = valid;
     }
     }
 
 
+    public Teacher getTeacherInfo() {
+        return teacherInfo;
+    }
+
+    public void setTeacherInfo(Teacher teacherInfo) {
+        this.teacherInfo = teacherInfo;
+    }
+
     @Override
     @Override
     public String toString() {
     public String toString() {
         return "User{" +
         return "User{" +
@@ -150,6 +165,7 @@ public class User {
                 ", photo='" + photo + '\'' +
                 ", photo='" + photo + '\'' +
                 ", role=" + role +
                 ", role=" + role +
                 ", signature='" + signature + '\'' +
                 ", signature='" + signature + '\'' +
+                ", teacherInfo=" + teacherInfo +
                 ", createdTime=" + createdTime +
                 ", createdTime=" + createdTime +
                 ", isValid=" + isValid +
                 ", isValid=" + isValid +
                 '}';
                 '}';

+ 7 - 0
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/mapper/UserMapper.java

@@ -6,6 +6,7 @@ import cn.seecoder.seecoderportalserver.domain.Teacher;
 import cn.seecoder.seecoderportalserver.domain.User;
 import cn.seecoder.seecoderportalserver.domain.User;
 import cn.seecoder.seecoderportalserver.security.DomainUserDetails;
 import cn.seecoder.seecoderportalserver.security.DomainUserDetails;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
 
 
 /**
 /**
  * @author Kunduin
  * @author Kunduin
@@ -13,12 +14,18 @@ import org.mapstruct.Mapper;
 @Mapper(componentModel = "spring")
 @Mapper(componentModel = "spring")
 public interface UserMapper {
 public interface UserMapper {
 
 
+    @Mapping(target = "teacherInfo", ignore = true)
     User userVOToUser(UserVO userVO);
     User userVOToUser(UserVO userVO);
 
 
     UserVO userToUserVO(User user);
     UserVO userToUserVO(User user);
 
 
+    User domainToUser(DomainUserDetails domainUserDetails);
+
     DomainUserDetails userToDomainUserDetails(User user);
     DomainUserDetails userToDomainUserDetails(User user);
 
 
+    UserVO domainToUserVO(DomainUserDetails domainUserDetails);
+
+    @Deprecated
     UserVO domainUserDetailToUserVO(DomainUserDetails userDetails);
     UserVO domainUserDetailToUserVO(DomainUserDetails userDetails);
 
 
     TeacherVO teacherToTeacherVO(Teacher teacher);
     TeacherVO teacherToTeacherVO(Teacher teacher);

+ 4 - 0
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/repository/TeacherRepository.java

@@ -2,9 +2,11 @@ package cn.seecoder.seecoderportalserver.repository;
 
 
 import cn.seecoder.seecoderportalcommon.vo.TeacherState;
 import cn.seecoder.seecoderportalcommon.vo.TeacherState;
 import cn.seecoder.seecoderportalserver.domain.Teacher;
 import cn.seecoder.seecoderportalserver.domain.Teacher;
+import cn.seecoder.seecoderportalserver.domain.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 
 import java.util.List;
 import java.util.List;
+import java.util.Optional;
 
 
 /**
 /**
  * @author kunduin
  * @author kunduin
@@ -18,4 +20,6 @@ public interface TeacherRepository extends JpaRepository<Teacher, Long> {
      * @return 教师列表
      * @return 教师列表
      */
      */
     List<Teacher> findAllByState(TeacherState state);
     List<Teacher> findAllByState(TeacherState state);
+
+    Optional<Teacher> findByUserDetail(User user);
 }
 }

+ 13 - 0
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/security/SecurityUtils.java

@@ -0,0 +1,13 @@
+package cn.seecoder.seecoderportalserver.security;
+
+import org.springframework.security.core.context.SecurityContextHolder;
+
+/**
+ * @author kunduin
+ */
+public class SecurityUtils {
+
+    public static DomainUserDetails getCurrentUser() {
+        return (DomainUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+    }
+}

+ 5 - 10
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/security/jwt/JWTFilter.java

@@ -17,7 +17,7 @@ import java.util.Arrays;
 /** @author kunduin */
 /** @author kunduin */
 public class JWTFilter extends GenericFilterBean {
 public class JWTFilter extends GenericFilterBean {
 
 
-    public static final String AUTH_COOKIE_KEY = "auth";
+    public static final String AUTHORIZATION_HEADER = "Authorization";
 
 
     private final TokenProvider tokenProvider;
     private final TokenProvider tokenProvider;
 
 
@@ -38,16 +38,11 @@ public class JWTFilter extends GenericFilterBean {
     }
     }
 
 
     private String resolveToken(HttpServletRequest request) {
     private String resolveToken(HttpServletRequest request) {
-        Cookie[] cookies = request.getCookies();
-        for (Cookie cookie : cookies) {
-            if (AUTH_COOKIE_KEY.equals(cookie.getName())){
-                String bearerToken = cookie.getValue();
-                if (StringUtils.hasText(bearerToken) && bearerToken.startsWith("Bearer ")) {
-                    return bearerToken.substring(7);
-                }
-                break;
-            }
+        String bearerToken = request.getHeader(AUTHORIZATION_HEADER);
+        if (StringUtils.hasText(bearerToken) && bearerToken.startsWith("Bearer ")) {
+            return bearerToken.substring(7);
         }
         }
         return null;
         return null;
+
     }
     }
 }
 }

+ 9 - 5
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/security/jwt/TokenProvider.java

@@ -2,7 +2,6 @@ package cn.seecoder.seecoderportalserver.security.jwt;
 
 
 import cn.seecoder.seecoderportalserver.mapper.UserMapper;
 import cn.seecoder.seecoderportalserver.mapper.UserMapper;
 import cn.seecoder.seecoderportalserver.security.DomainUserDetails;
 import cn.seecoder.seecoderportalserver.security.DomainUserDetails;
-import cn.seecoder.seecoderportalserver.security.DomainUserDetailsService;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.JwtException;
 import io.jsonwebtoken.JwtException;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.Jwts;
@@ -11,11 +10,14 @@ import io.jsonwebtoken.security.Keys;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.security.authentication.CachingUserDetailsService;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.User;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
 
 
 import javax.annotation.PostConstruct;
 import javax.annotation.PostConstruct;
@@ -35,6 +37,8 @@ public class TokenProvider {
 
 
     private final UserMapper userMapper;
     private final UserMapper userMapper;
 
 
+    private final CachingUserDetailsService cachingUserDetailsService;
+
     @Value("${seec.secret}")
     @Value("${seec.secret}")
     private String secret;
     private String secret;
 
 
@@ -44,8 +48,9 @@ public class TokenProvider {
 
 
     private static final String USER_DETAIL_KEY = "user_info";
     private static final String USER_DETAIL_KEY = "user_info";
 
 
-    public TokenProvider(UserMapper userMapper) {
+    public TokenProvider(UserMapper userMapper, UserDetailsService userDetailsService) {
         this.userMapper = userMapper;
         this.userMapper = userMapper;
+        this.cachingUserDetailsService = new CachingUserDetailsService(userDetailsService);
     }
     }
 
 
     @PostConstruct
     @PostConstruct
@@ -64,7 +69,7 @@ public class TokenProvider {
                 .setSubject(authentication.getName())
                 .setSubject(authentication.getName())
                 .claim(AUTHORITIES_KEY, authorities)
                 .claim(AUTHORITIES_KEY, authorities)
                 .claim(USER_DETAIL_KEY,
                 .claim(USER_DETAIL_KEY,
-                        userMapper.domainUserDetailToUserVO((DomainUserDetails) authentication.getPrincipal()))
+                        userMapper.domainToUserVO((DomainUserDetails) authentication.getPrincipal()))
                 .signWith(key, SignatureAlgorithm.HS512)
                 .signWith(key, SignatureAlgorithm.HS512)
                 .compact();
                 .compact();
     }
     }
@@ -77,8 +82,7 @@ public class TokenProvider {
                 Arrays.stream(claims.get(AUTHORITIES_KEY).toString().split(","))
                 Arrays.stream(claims.get(AUTHORITIES_KEY).toString().split(","))
                         .map(SimpleGrantedAuthority::new)
                         .map(SimpleGrantedAuthority::new)
                         .collect(Collectors.toList());
                         .collect(Collectors.toList());
-
-        User principal = new User(claims.getSubject(), "", authorities);
+        UserDetails principal = cachingUserDetailsService.loadUserByUsername(claims.getSubject());
 
 
         return new UsernamePasswordAuthenticationToken(principal, token, authorities);
         return new UsernamePasswordAuthenticationToken(principal, token, authorities);
     }
     }

+ 38 - 1
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/service/TeacherService.java

@@ -4,9 +4,13 @@ import cn.seecoder.seecoderportalcommon.vo.TeacherState;
 import cn.seecoder.seecoderportalserver.domain.Teacher;
 import cn.seecoder.seecoderportalserver.domain.Teacher;
 import cn.seecoder.seecoderportalserver.domain.User;
 import cn.seecoder.seecoderportalserver.domain.User;
 import cn.seecoder.seecoderportalserver.repository.TeacherRepository;
 import cn.seecoder.seecoderportalserver.repository.TeacherRepository;
+import cn.seecoder.seecoderportalserver.repository.UserRepository;
+import cn.seecoder.seecoderportalserver.web.rest.errors.CustomErrorException;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 
 import java.util.List;
 import java.util.List;
+import java.util.Optional;
 
 
 /**
 /**
  * @author kunduin
  * @author kunduin
@@ -16,9 +20,42 @@ public class TeacherService {
 
 
     private final TeacherRepository teacherRepository;
     private final TeacherRepository teacherRepository;
 
 
-    public TeacherService(TeacherRepository teacherRepository) {this.teacherRepository = teacherRepository;}
+    private final UserRepository userRepository;
+
+    public TeacherService(TeacherRepository teacherRepository, UserRepository userRepository) {
+        this.teacherRepository = teacherRepository;
+        this.userRepository = userRepository;
+    }
 
 
     public List<Teacher> findAllByState(TeacherState state) {
     public List<Teacher> findAllByState(TeacherState state) {
         return teacherRepository.findAllByState(state);
         return teacherRepository.findAllByState(state);
     }
     }
+
+    @Transactional(rollbackFor = RuntimeException.class)
+    public Teacher updateState(Long id, TeacherState state) {
+        return teacherRepository.findById(id)
+                .map(teacher -> {
+                    teacher.setState(state);
+                    return teacherRepository.save(teacher);
+                }).orElseThrow(CustomErrorException::userIdNotFound);
+    }
+
+    public Optional<Teacher> findByUserId(Long userId) {
+        return userRepository.findById(userId)
+                .map(user -> Optional.ofNullable(user.getTeacherInfo()))
+                .orElseThrow(CustomErrorException::userIdNotFound);
+    }
+
+    public Teacher apply(Teacher teacher) {
+        teacher.setState(TeacherState.IDENTIFYING);
+        return createTeacher(teacher);
+    }
+
+    public Teacher createTeacher(Teacher teacher) {
+        return teacherRepository.save(teacher);
+    }
+
+    public Teacher save(Teacher teacher) {
+        return teacherRepository.save(teacher);
+    }
 }
 }

+ 45 - 11
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/service/UserService.java

@@ -5,8 +5,7 @@ import cn.seecoder.seecoderportalcommon.vo.UserVO;
 import cn.seecoder.seecoderportalserver.domain.User;
 import cn.seecoder.seecoderportalserver.domain.User;
 import cn.seecoder.seecoderportalserver.mapper.UserMapper;
 import cn.seecoder.seecoderportalserver.mapper.UserMapper;
 import cn.seecoder.seecoderportalserver.repository.UserRepository;
 import cn.seecoder.seecoderportalserver.repository.UserRepository;
-import cn.seecoder.seecoderportalserver.web.rest.errors.PhoneAlreadyUsedException;
-import cn.seecoder.seecoderportalserver.web.rest.errors.PhoneVerificationNotMatchException;
+import cn.seecoder.seecoderportalserver.web.rest.errors.CustomErrorException;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
@@ -42,24 +41,52 @@ public class UserService {
         return userRepository.findByRole(role);
         return userRepository.findByRole(role);
     }
     }
 
 
-    public User updateUserValid(Long userId, Boolean isValid) {
+    @Transactional(rollbackFor = RuntimeException.class)
+    public User updateUserName (Long userId, String name) {
         return userRepository.findById(userId)
         return userRepository.findById(userId)
+                .map(user -> {
+                    user.setName(name);
+                    return userRepository.save(user);
+                }).orElseThrow(CustomErrorException::userIdNotFound);
+    }
+
+    @Transactional(rollbackFor = RuntimeException.class)
+    public User updateUserEmail (Long userId, String email) {
+        return userRepository.findById(userId)
+                .map(user -> {
+                    user.setEmail(email);
+                    return userRepository.save(user);
+                }).orElseThrow(CustomErrorException::userIdNotFound);
+    }
+
+    @Transactional(rollbackFor = RuntimeException.class)
+    public User updateUserSignature (Long userId, String signature) {
+        return userRepository.findById(userId)
+                .map(user -> {
+                    user.setSignature(signature);
+                    return userRepository.save(user);
+                }).orElseThrow(CustomErrorException::userIdNotFound);
+    }
+
+    @Transactional(rollbackFor = RuntimeException.class)
+    public void updateUserValid(Long userId, Boolean isValid) {
+        userRepository.findById(userId)
                 .map(user -> {
                 .map(user -> {
                     user.setValid(isValid);
                     user.setValid(isValid);
                     return userRepository.save(user);
                     return userRepository.save(user);
-                }).orElseThrow(()->new UsernameNotFoundException("找不到用户"));
+                }).orElseThrow(CustomErrorException::userIdNotFound);
     }
     }
 
 
     @Transactional(rollbackFor = RuntimeException.class)
     @Transactional(rollbackFor = RuntimeException.class)
-    public User registerUser(UserVO userDTO, String password, String phoneCode) {
-        checkPhoneMessageOrThrowError(userDTO.getPhone(), phoneCode);
+    public User registerUser(UserVO userVO, String password, String phoneCode) {
+        checkPhoneMessageOrThrowError(userVO.getPhone(), phoneCode);
 
 
         userRepository
         userRepository
-                .findByPhone(userDTO.getPhone())
+                .findByPhone(userVO.getPhone())
                 .ifPresent(user -> {
                 .ifPresent(user -> {
-                    throw new PhoneAlreadyUsedException();
+                    throw CustomErrorException.phoneAlreadyExist();
                 });
                 });
-        User user = userMapper.userVOToUser(userDTO);
+        User user = userMapper.userVOToUser(userVO);
         String encodedPassword = passwordEncoder.encode(password);
         String encodedPassword = passwordEncoder.encode(password);
         user.setPassword(encodedPassword);
         user.setPassword(encodedPassword);
         User savedUser = userRepository.save(user);
         User savedUser = userRepository.save(user);
@@ -67,13 +94,14 @@ public class UserService {
         return savedUser;
         return savedUser;
     }
     }
 
 
-    @Transactional(rollbackFor = Exception.class)
+    @Transactional(rollbackFor = RuntimeException.class)
     public User resetPassword(String phone, String phoneCode, String password) {
     public User resetPassword(String phone, String phoneCode, String password) {
         checkPhoneMessageOrThrowError(phone, phoneCode);
         checkPhoneMessageOrThrowError(phone, phoneCode);
 
 
         User user = userRepository
         User user = userRepository
                 .findByPhone(phone)
                 .findByPhone(phone)
                 .<UsernameNotFoundException>orElseThrow(() -> {
                 .<UsernameNotFoundException>orElseThrow(() -> {
+                    // TODO: use customException
                     throw new UsernameNotFoundException("找不到手机用户[" + phone + "]");
                     throw new UsernameNotFoundException("找不到手机用户[" + phone + "]");
                 });
                 });
         user.setPassword(passwordEncoder.encode(password));
         user.setPassword(passwordEncoder.encode(password));
@@ -84,7 +112,13 @@ public class UserService {
 
 
     private void checkPhoneMessageOrThrowError(String phone, String phoneCode) {
     private void checkPhoneMessageOrThrowError(String phone, String phoneCode) {
         if (!aliService.checkPhoneMessage(phone, phoneCode)) {
         if (!aliService.checkPhoneMessage(phone, phoneCode)) {
-            throw new PhoneVerificationNotMatchException();
+            throw CustomErrorException.phoneVerificationNotMatch();
         }
         }
     }
     }
+
+    public Long findIdByPhone(String phone) {
+        return userRepository.findByPhone(phone)
+                .map(user -> user.getId())
+                .orElseThrow(CustomErrorException::userIdNotFound);
+    }
 }
 }

+ 16 - 0
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/utility/ErrResponse.java

@@ -0,0 +1,16 @@
+package cn.seecoder.seecoderportalserver.utility;
+
+/**
+ * @author kunduin
+ */
+public class ErrResponse {
+
+    public final int code = -1;
+    public final String message;
+
+    public ErrResponse(String message) {this.message = message;}
+
+    public static ErrResponse of(String message) {
+        return new ErrResponse(message);
+    }
+}

+ 16 - 0
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/utility/OkResponse.java

@@ -0,0 +1,16 @@
+package cn.seecoder.seecoderportalserver.utility;
+
+/**
+ * @author kunduin
+ */
+public class OkResponse <T> {
+
+        public final int code = 0;
+        public final T data;
+
+        public OkResponse(T data) {this.data = data;}
+
+        public static <T> OkResponse<T> of(T data) {
+            return new OkResponse<>(data);
+        }
+}

+ 2 - 0
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/utility/ResponseUtil.java

@@ -9,6 +9,7 @@ import java.util.Optional;
 
 
 /** @author kunduin */
 /** @author kunduin */
 public class ResponseUtil {
 public class ResponseUtil {
+
     static <X> ResponseEntity<X> wrapOrNotFound(Optional<X> maybeResponse) {
     static <X> ResponseEntity<X> wrapOrNotFound(Optional<X> maybeResponse) {
         return wrapOrNotFound(maybeResponse, null);
         return wrapOrNotFound(maybeResponse, null);
     }
     }
@@ -18,4 +19,5 @@ public class ResponseUtil {
                 .map(response -> ResponseEntity.ok().headers(header).body(response))
                 .map(response -> ResponseEntity.ok().headers(header).body(response))
                 .orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND));
                 .orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND));
     }
     }
+
 }
 }

+ 28 - 9
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/web/rest/AdminController.java

@@ -7,6 +7,8 @@ import cn.seecoder.seecoderportalcommon.vo.UserVO;
 import cn.seecoder.seecoderportalserver.mapper.UserMapper;
 import cn.seecoder.seecoderportalserver.mapper.UserMapper;
 import cn.seecoder.seecoderportalserver.service.TeacherService;
 import cn.seecoder.seecoderportalserver.service.TeacherService;
 import cn.seecoder.seecoderportalserver.service.UserService;
 import cn.seecoder.seecoderportalserver.service.UserService;
+import cn.seecoder.seecoderportalserver.utility.OkResponse;
+import cn.seecoder.seecoderportalserver.web.rest.dto.UpdateUserByIdDTO;
 import cn.seecoder.seecoderportalserver.web.rest.dto.UpdateUserValidDTO;
 import cn.seecoder.seecoderportalserver.web.rest.dto.UpdateUserValidDTO;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
@@ -31,35 +33,52 @@ public class AdminController {
     }
     }
 
 
     /**
     /**
-     * TODO: RENAME !!!
      * 获取待审批的用户列表
      * 获取待审批的用户列表
      */
      */
     @GetMapping("/getApplication")
     @GetMapping("/getApplication")
-    public List<TeacherVO> getApplication() {
-        return teacherService.findAllByState(TeacherState.IDENTIFYING).stream()
+    public OkResponse<List<TeacherVO>> getApplication() {
+        return OkResponse.of(teacherService.findAllByState(TeacherState.IDENTIFYING).stream()
                 .map(userMapper::teacherToTeacherVO)
                 .map(userMapper::teacherToTeacherVO)
-                .collect(Collectors.toList());
+                .collect(Collectors.toList()));
     }
     }
 
 
     /**
     /**
      * 获取所有 ADMIN 权限的用户
      * 获取所有 ADMIN 权限的用户
      */
      */
     @GetMapping("/getUsers")
     @GetMapping("/getUsers")
-    public List<UserVO> getUsers() {
-        return userService.findUserByRole(UserRole.ADMIN).stream()
+    public OkResponse<List<UserVO>> getUsers() {
+        return OkResponse.of(userService.findUserByRole(UserRole.ADMIN).stream()
                 .map(userMapper::userToUserVO)
                 .map(userMapper::userToUserVO)
-                .collect(Collectors.toList());
+                .collect(Collectors.toList()));
     }
     }
 
 
     /**
     /**
      * 更新用户,改变其 valid 状态
      * 更新用户,改变其 valid 状态
      */
      */
     @PostMapping("/updateUser")
     @PostMapping("/updateUser")
-    public void updateUser(@RequestBody UpdateUserValidDTO updateUserValidDTO) {
+    public OkResponse<Boolean> updateUser(@RequestBody UpdateUserValidDTO updateUserValidDTO) {
         userService.updateUserValid(updateUserValidDTO.getId(), updateUserValidDTO.getValid());
         userService.updateUserValid(updateUserValidDTO.getId(), updateUserValidDTO.getValid());
+        return OkResponse.of(true);
     }
     }
 
 
     /**
     /**
-     *
+     * 使该【教师】通过审核
      */
      */
+    @PostMapping("/passApplication")
+    public OkResponse<TeacherVO> passApplication(@RequestBody UpdateUserByIdDTO idDTO) {
+        return OkResponse.of(userMapper.teacherToTeacherVO(
+                teacherService.updateState(idDTO.getId(), TeacherState.IDENTIFIED)
+        ));
+    }
+
+
+    /**
+     * 使该【教师】通过审核
+     */
+    @PostMapping("/rejectApplication")
+    public OkResponse<TeacherVO> rejectApplication(@RequestBody UpdateUserByIdDTO idDTO) {
+        return OkResponse.of(userMapper.teacherToTeacherVO(
+                teacherService.updateState(idDTO.getId(), TeacherState.REJECTED)
+        ));
+    }
 }
 }

+ 48 - 0
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/web/rest/AuthController.java

@@ -0,0 +1,48 @@
+package cn.seecoder.seecoderportalserver.web.rest;
+
+import cn.seecoder.seecoderportalserver.security.DomainUserDetailsService;
+import cn.seecoder.seecoderportalserver.web.rest.errors.CustomErrorException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletResponse;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
+import java.util.regex.Pattern;
+
+/**
+ * @author kunduin
+ */
+@RestController
+@RequestMapping("/api")
+public class AuthController {
+    private static final Logger log = LoggerFactory.getLogger(DomainUserDetailsService.class);
+
+    private static final String ALLOWED_REDIRECT_DOMAINS =
+            "([\\w.]*\\.seecoder\\.cn)" + "|" +
+            "(localhost:\\d+)";
+
+    @GetMapping("/interaction")
+    public ModelAndView interaction(
+            @RequestParam("redirect_uri") String redirectUri,
+            ModelMap model,
+            HttpServletResponse response) throws UnsupportedEncodingException {
+        log.debug("from: " + redirectUri);
+        String decodeUrl = URLDecoder.decode(redirectUri, StandardCharsets.UTF_8.toString());
+        if (Pattern.matches(ALLOWED_REDIRECT_DOMAINS, decodeUrl)) {
+            Cookie cookie = new Cookie("redirect_uri", redirectUri);
+            cookie.setMaxAge(60 * 1000 * 3);
+            response.addCookie(cookie);
+            return new ModelAndView("redirect:/login", model);
+        }
+        throw CustomErrorException.domainNotAllowed();
+    }
+}

+ 19 - 0
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/web/rest/ErrorAdvice.java

@@ -0,0 +1,19 @@
+package cn.seecoder.seecoderportalserver.web.rest;
+
+import cn.seecoder.seecoderportalserver.utility.ErrResponse;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author kunduin
+ */
+@ControllerAdvice
+@RestController
+public class ErrorAdvice {
+
+    @ExceptionHandler(RuntimeException.class)
+    public ErrResponse handleException(RuntimeException e){
+        return ErrResponse.of(e.getMessage());
+    }
+}

+ 66 - 0
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/web/rest/TeacherController.java

@@ -0,0 +1,66 @@
+package cn.seecoder.seecoderportalserver.web.rest;
+
+import cn.seecoder.seecoderportalcommon.vo.TeacherState;
+import cn.seecoder.seecoderportalcommon.vo.TeacherVO;
+import cn.seecoder.seecoderportalserver.domain.Teacher;
+import cn.seecoder.seecoderportalserver.mapper.UserMapper;
+import cn.seecoder.seecoderportalserver.security.DomainUserDetails;
+import cn.seecoder.seecoderportalserver.security.SecurityUtils;
+import cn.seecoder.seecoderportalserver.service.TeacherService;
+import cn.seecoder.seecoderportalserver.utility.OkResponse;
+import cn.seecoder.seecoderportalserver.web.rest.errors.CustomErrorException;
+import org.springframework.web.bind.annotation.*;
+
+import java.security.Principal;
+
+/**
+ * @author kunduin
+ */
+@RestController
+@RequestMapping("/api/teacher")
+public class TeacherController {
+    private final TeacherService teacherService;
+    private final UserMapper userMapper;
+
+    public TeacherController(TeacherService teacherService, UserMapper userMapper) {
+        this.teacherService = teacherService;
+        this.userMapper = userMapper;
+    }
+
+    @GetMapping("/getInfo")
+    public OkResponse<TeacherVO> getInfo() {
+        DomainUserDetails user = SecurityUtils.getCurrentUser();
+        return teacherService.findByUserId(user.getId())
+                .map(teacher -> OkResponse.of(userMapper.teacherToTeacherVO(teacher)))
+                .orElseThrow(CustomErrorException::teacherNotFound);
+    }
+
+    /**
+     * 申请教师权限
+     */
+    @PostMapping("/apply")
+    public OkResponse<Boolean> apply(@RequestBody TeacherVO teacherVO) {
+        DomainUserDetails user = SecurityUtils.getCurrentUser();
+        Teacher teacher = userMapper.teacherVOToTeacher(teacherVO);
+        teacher.setUserDetail(userMapper.domainToUser(user));
+        teacherService.apply(teacher);
+        return OkResponse.of(true);
+    }
+
+    /**
+     * 重新申请教师权限
+     */
+    @PostMapping("/reapply")
+    public OkResponse<Boolean> reapply(@RequestBody TeacherVO teacherVO) {
+        DomainUserDetails user = SecurityUtils.getCurrentUser();
+        return teacherService.findByUserId(user.getId())
+                .map(teacher -> {
+                    teacher.setState(TeacherState.IDENTIFYING);
+                    teacher.setRealName(teacherVO.getRealName());
+                    teacher.setJobNumber(teacherVO.getJobNumber());
+                    teacher.setOrganization(teacherVO.getOrganization());
+                    teacherService.save(teacher);
+                    return OkResponse.of(true);
+                }).orElseThrow(CustomErrorException::teacherNotFound);
+    }
+}

+ 91 - 0
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/web/rest/UserController.java

@@ -0,0 +1,91 @@
+package cn.seecoder.seecoderportalserver.web.rest;
+
+import cn.seecoder.seecoderportalcommon.vo.MessageVO;
+import cn.seecoder.seecoderportalcommon.vo.dto.*;
+import cn.seecoder.seecoderportalcommon.vo.UserVO;
+import cn.seecoder.seecoderportalserver.mapper.UserMapper;
+import cn.seecoder.seecoderportalserver.security.DomainUserDetails;
+import cn.seecoder.seecoderportalserver.security.SecurityUtils;
+import cn.seecoder.seecoderportalserver.service.AliService;
+import cn.seecoder.seecoderportalserver.service.UserService;
+import cn.seecoder.seecoderportalserver.utility.OkResponse;
+import org.springframework.web.bind.annotation.*;
+
+
+/**
+ * @author kunduin
+ */
+@RestController
+@RequestMapping("/api/user")
+public class UserController {
+
+    private final UserService userService;
+
+    private final UserMapper userMapper;
+
+    private final AliService aliService;
+
+    public UserController(UserService userService, UserMapper userMapper, AliService aliService) {
+        this.userService = userService;
+        this.userMapper = userMapper;
+        this.aliService = aliService;
+    }
+
+    @PostMapping("/register")
+    public OkResponse<UserVO> register(@RequestBody RegisterDTO registerDTO) {
+        return OkResponse.of(userMapper.userToUserVO(
+                userService.registerUser(registerDTO, registerDTO.getPassword(), registerDTO.getIdentifyCode())
+        ));
+    }
+
+    @PostMapping("/sendMessage")
+    public OkResponse<MessageVO> sendMessage(@RequestBody PhoneDTO phoneDTO) {
+        aliService.sendMessage(phoneDTO.getPhone());
+        return OkResponse.of(new MessageVO("短信发送成功"));
+    }
+
+    @GetMapping("/getInfo")
+    public OkResponse<UserVO> getUserInfo(){
+        DomainUserDetails user = SecurityUtils.getCurrentUser();
+        return OkResponse.of(userMapper.domainToUserVO(user));
+    }
+
+    @PostMapping("/saveName")
+    public OkResponse<UserVO> saveName(@RequestBody ChangeNameDTO changeNameDTO) {
+        DomainUserDetails user = SecurityUtils.getCurrentUser();
+        return OkResponse.of(userMapper.userToUserVO(
+                userService.updateUserName(user.getId(), changeNameDTO.getNewName())
+        ));
+    }
+
+    @PostMapping("/saveEmail")
+    public OkResponse<UserVO> saveEmail(@RequestBody ChangeEmailDTO changeEmailDTO){
+        DomainUserDetails user = SecurityUtils.getCurrentUser();
+        return OkResponse.of(userMapper.userToUserVO(
+                userService.updateUserEmail(user.getId(), changeEmailDTO.getNewEmail())
+        ));
+    }
+
+    @PostMapping("/saveSignature")
+    public OkResponse<UserVO> saveSignature(@RequestBody ChangeSignatureDTO changeSignatureDTO){
+        DomainUserDetails user = SecurityUtils.getCurrentUser();
+        return OkResponse.of(userMapper.userToUserVO(
+                userService.updateUserSignature(user.getId(), changeSignatureDTO.getNewSignature())
+        ));
+    }
+
+    @PostMapping("/resetPassword")
+    public OkResponse<Boolean> resetPassword(@RequestBody ResetPasswordDTO resetPasswordDTO) {
+        userService.resetPassword(
+                resetPasswordDTO.getPhone(),
+                resetPasswordDTO.getIdentifyCode(),
+                resetPasswordDTO.getPassword()
+        );
+        return OkResponse.of(true);
+    }
+
+    @GetMapping("/findIdByPhone/{phone}")
+    public OkResponse<Long> findIdByPhone(@PathVariable String phone) {
+        return OkResponse.of(userService.findIdByPhone(phone));
+    }
+}

+ 24 - 14
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/web/rest/UserJWTController.java

@@ -1,23 +1,24 @@
 package cn.seecoder.seecoderportalserver.web.rest;
 package cn.seecoder.seecoderportalserver.web.rest;
 
 
 import cn.seecoder.seecoderportalcommon.vo.LoginVO;
 import cn.seecoder.seecoderportalcommon.vo.LoginVO;
+import cn.seecoder.seecoderportalcommon.vo.TokenVO;
+import cn.seecoder.seecoderportalserver.mapper.UserMapper;
+import cn.seecoder.seecoderportalserver.security.DomainUserDetails;
+import cn.seecoder.seecoderportalserver.security.SecurityUtils;
 import cn.seecoder.seecoderportalserver.security.jwt.TokenProvider;
 import cn.seecoder.seecoderportalserver.security.jwt.TokenProvider;
+import cn.seecoder.seecoderportalserver.utility.OkResponse;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 
 import javax.servlet.http.Cookie;
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import javax.validation.Valid;
 
 
-import static cn.seecoder.seecoderportalserver.security.jwt.JWTFilter.AUTH_COOKIE_KEY;
 
 
 /**
 /**
  * @author Kunduin
  * @author Kunduin
@@ -36,15 +37,20 @@ public class UserJWTController {
 
 
     private final AuthenticationManagerBuilder authenticationManagerBuilder;
     private final AuthenticationManagerBuilder authenticationManagerBuilder;
 
 
+    private final UserMapper userMapper;
+
     public UserJWTController(
     public UserJWTController(
             TokenProvider tokenProvider,
             TokenProvider tokenProvider,
-            AuthenticationManagerBuilder authenticationManagerBuilder) {
+            AuthenticationManagerBuilder authenticationManagerBuilder, UserMapper userMapper) {
         this.tokenProvider = tokenProvider;
         this.tokenProvider = tokenProvider;
         this.authenticationManagerBuilder = authenticationManagerBuilder;
         this.authenticationManagerBuilder = authenticationManagerBuilder;
+        this.userMapper = userMapper;
     }
     }
 
 
-    @PostMapping("/authenticate")
-    public void authorize(@Valid @RequestBody LoginVO loginVO, HttpServletResponse response) {
+    @PostMapping("/user/login")
+    public OkResponse<TokenVO> authorize(
+            @CookieValue(value = "redirect_uri", required = false) String redirectUri,
+            @Valid @RequestBody LoginVO loginVO, HttpServletResponse response) {
         UsernamePasswordAuthenticationToken authenticationToken =
         UsernamePasswordAuthenticationToken authenticationToken =
                 new UsernamePasswordAuthenticationToken(
                 new UsernamePasswordAuthenticationToken(
                         loginVO.getPhone(), loginVO.getPassword());
                         loginVO.getPhone(), loginVO.getPassword());
@@ -53,11 +59,15 @@ public class UserJWTController {
                 authenticationManagerBuilder.getObject().authenticate(authenticationToken);
                 authenticationManagerBuilder.getObject().authenticate(authenticationToken);
         SecurityContextHolder.getContext().setAuthentication(authentication);
         SecurityContextHolder.getContext().setAuthentication(authentication);
         String jwt = tokenProvider.createToken(authentication);
         String jwt = tokenProvider.createToken(authentication);
-        boolean rememberMe = loginVO.getRememberMe() != null && loginVO.getRememberMe();
-        Cookie cookie = new Cookie(AUTH_COOKIE_KEY, "Bearer " + jwt);
-        cookie.setHttpOnly(true);
-        cookie.setSecure(true);
-        cookie.setMaxAge(rememberMe? THIRTY_DAY: ONE_DAY);
-        response.addCookie(cookie);
+        Cookie redirectUriCookie = new Cookie("redirect_uri", null);
+        response.addCookie(redirectUriCookie);
+
+        TokenVO tokenVO = new TokenVO();
+        tokenVO.setToken(jwt);
+        tokenVO.setRedirectUri(redirectUri);
+        DomainUserDetails currentUser = SecurityUtils.getCurrentUser();
+        tokenVO.setName(currentUser.getName());
+        tokenVO.setUser(userMapper.domainToUserVO(currentUser));
+        return OkResponse.of(tokenVO);
     }
     }
 }
 }

+ 23 - 0
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/web/rest/dto/UpdateUserByIdDTO.java

@@ -0,0 +1,23 @@
+package cn.seecoder.seecoderportalserver.web.rest.dto;
+
+/**
+ * @author kunduin
+ */
+public class UpdateUserByIdDTO {
+    private Long id;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Override
+    public String toString() {
+        return "UpdateUserByIdDTO{" +
+                "id=" + id +
+                '}';
+    }
+}

+ 46 - 0
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/web/rest/errors/CustomErrorException.java

@@ -0,0 +1,46 @@
+package cn.seecoder.seecoderportalserver.web.rest.errors;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+/**
+ * @author kunduin
+ */
+@ResponseStatus(HttpStatus.ACCEPTED)
+public class CustomErrorException extends RuntimeException {
+    private final String message;
+
+    public CustomErrorException(String message) {
+        super(message);
+        this.message = message;
+    }
+
+    public int getCode() {
+        return -1;
+    }
+
+    @Override
+    public String getMessage() {
+        return message;
+    }
+
+    public static CustomErrorException userIdNotFound(){
+        return new CustomErrorException("用户id不存在");
+    }
+
+    public static CustomErrorException teacherNotFound() {
+        return new CustomErrorException("教师或申请不存在");
+    }
+
+    public static CustomErrorException phoneVerificationNotMatch() {
+        return new CustomErrorException("验证码错误");
+    }
+
+    public static CustomErrorException phoneAlreadyExist() {
+        return new CustomErrorException("手机号已存在");
+    }
+
+    public static CustomErrorException domainNotAllowed() {
+        return new CustomErrorException("地址是非法地址");
+    }
+}

+ 0 - 11
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/web/rest/errors/PhoneAlreadyUsedException.java

@@ -1,11 +0,0 @@
-package cn.seecoder.seecoderportalserver.web.rest.errors;
-
-/**
- * @author Kunduin
- */
-public class PhoneAlreadyUsedException extends RuntimeException {
-
-    public PhoneAlreadyUsedException() {
-        super("Login name already used!");
-    }
-}

+ 0 - 10
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/web/rest/errors/PhoneVerificationNotMatchException.java

@@ -1,10 +0,0 @@
-package cn.seecoder.seecoderportalserver.web.rest.errors;
-
-/**
- * @author kunduin
- */
-public class PhoneVerificationNotMatchException extends RuntimeException {
-    public PhoneVerificationNotMatchException() {
-        super("Phone verification not right");
-    }
-}

+ 3 - 0
seecoder-portal-server/src/main/resources/application.yml

@@ -2,6 +2,7 @@
 seec:
 seec:
   secret: UenM4KGb6DskRWUenM4KGb6DskRWUenM4KGb6DskRWUenM4KGb6DskRWUenM4KGb6DskRWUenM4KGb6DskRWUenM4KGb6DskRWUenM4KGb6DskRWUenM4KGb6DskRW
   secret: UenM4KGb6DskRWUenM4KGb6DskRWUenM4KGb6DskRWUenM4KGb6DskRWUenM4KGb6DskRWUenM4KGb6DskRWUenM4KGb6DskRWUenM4KGb6DskRWUenM4KGb6DskRW
 
 
+
 aliyun:
 aliyun:
   profile:
   profile:
     access-key-id: LTAI4FiAXXyNfYJLweBXpKPx
     access-key-id: LTAI4FiAXXyNfYJLweBXpKPx
@@ -10,6 +11,8 @@ aliyun:
     sys-domain: dysmsapi.aliyuncs.com
     sys-domain: dysmsapi.aliyuncs.com
     sys-version: 2017-05-25
     sys-version: 2017-05-25
 
 
+
+
 spring:
 spring:
   jpa:
   jpa:
     database: postgresql
     database: postgresql