diff --git a/pangu-admin/src/main/java/com/pangu/PanguApplication.java b/pangu-admin/src/main/java/com/pangu/PanguApplication.java index a475da9..de246aa 100644 --- a/pangu-admin/src/main/java/com/pangu/PanguApplication.java +++ b/pangu-admin/src/main/java/com/pangu/PanguApplication.java @@ -3,12 +3,14 @@ package com.pangu; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.ComponentScan; /** * 盘古用户平台启动类 * @author pangu */ @SpringBootApplication +@ComponentScan(basePackages = {"com.pangu"}) @MapperScan("com.pangu.**.mapper") public class PanguApplication { diff --git a/pangu-framework/src/main/java/com/pangu/framework/config/SecurityConfig.java b/pangu-framework/src/main/java/com/pangu/framework/config/SecurityConfig.java index 2cdc5cc..f149aa8 100644 --- a/pangu-framework/src/main/java/com/pangu/framework/config/SecurityConfig.java +++ b/pangu-framework/src/main/java/com/pangu/framework/config/SecurityConfig.java @@ -5,6 +5,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.http.SessionCreationPolicy; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.web.SecurityFilterChain; import org.springframework.web.cors.CorsConfiguration; import org.springframework.web.cors.CorsConfigurationSource; @@ -20,6 +21,14 @@ import java.util.Arrays; @EnableWebSecurity public class SecurityConfig { + /** + * 密码加密器 + */ + @Bean + public BCryptPasswordEncoder passwordEncoder() { + return new BCryptPasswordEncoder(); + } + @Bean public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { http diff --git a/pangu-system/pom.xml b/pangu-system/pom.xml index 160d891..5410690 100644 --- a/pangu-system/pom.xml +++ b/pangu-system/pom.xml @@ -31,5 +31,11 @@ com.alibaba easyexcel + + + org.springframework.boot + spring-boot-starter-test + test + diff --git a/pangu-system/src/main/java/com/pangu/member/service/impl/MemberServiceImpl.java b/pangu-system/src/main/java/com/pangu/member/service/impl/MemberServiceImpl.java index a1dc48c..a780b1d 100644 --- a/pangu-system/src/main/java/com/pangu/member/service/impl/MemberServiceImpl.java +++ b/pangu-system/src/main/java/com/pangu/member/service/impl/MemberServiceImpl.java @@ -13,8 +13,9 @@ import com.pangu.member.enums.IdentityTypeEnum; import com.pangu.member.enums.RegisterSourceEnum; import com.pangu.member.mapper.MemberMapper; import com.pangu.member.service.IMemberService; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -29,12 +30,17 @@ import java.util.List; */ @Slf4j @Service -@RequiredArgsConstructor public class MemberServiceImpl extends ServiceImpl implements IMemberService { - private final MemberMapper memberMapper; - private final BCryptPasswordEncoder passwordEncoder; - private final com.pangu.student.service.IStudentService studentService; + @Autowired + private MemberMapper memberMapper; + + @Autowired + private BCryptPasswordEncoder passwordEncoder; + + @Lazy + @Autowired + private com.pangu.student.service.IStudentService studentService; /** 默认密码 */ private static final String DEFAULT_PASSWORD = "123456";