diff --git a/data/db.mv.db b/data/db.mv.db index 60c2a02..52ce82b 100644 Binary files a/data/db.mv.db and b/data/db.mv.db differ diff --git a/src/main/java/ru/ulstu/user/UserService.java b/src/main/java/ru/ulstu/user/UserService.java index 752f234..c8c9f43 100644 --- a/src/main/java/ru/ulstu/user/UserService.java +++ b/src/main/java/ru/ulstu/user/UserService.java @@ -2,6 +2,7 @@ package ru.ulstu.user; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; @@ -24,6 +25,8 @@ public class UserService implements UserDetailsService { private final PasswordEncoder passwordEncoder; private final UserRepository userRepository; private final UserRoleRepository userRoleRepository; + @Value("${admin-password}") + private String adminPassword; public UserService(PasswordEncoder passwordEncoder, UserRepository userRepository, @@ -63,7 +66,6 @@ public class UserService implements UserDetailsService { public void initDefaultAdmin() { String adminLogin = "admin"; - String adminPassword = "adminadmin"; if (getUserByLogin(adminLogin) == null) { UserRole adminRole = userRoleRepository.save(new UserRole(UserRoleConstants.ADMIN)); createUser(new User(adminLogin, adminPassword, Set.of(adminRole))); diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 89e854d..be8bc18 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -3,6 +3,7 @@ # You may use, distribute and modify this code, please write to: romanov73@gmail.com. # # +admin-password=admin spring.main.banner-mode=off logging.level.tech.athene=DEBUG server.port=8080