| @@ -1,7 +1,7 @@ | |||||
| # TSMS Backend | |||||
| # FPSMS Backend | |||||
| ## Getting started | ## Getting started | ||||
| 1. Create a schema named `tsmsdb` in MySQL workbench | |||||
| 1. Create a schema named `fpsmsdb` in MySQL workbench | |||||
| 2. Create a `launch.json` file and put it into the `.vscode` folder | 2. Create a `launch.json` file and put it into the `.vscode` folder | ||||
| ```json | ```json | ||||
| { | { | ||||
| @@ -9,18 +9,18 @@ | |||||
| "configurations": [ | "configurations": [ | ||||
| { | { | ||||
| "type": "java", | "type": "java", | ||||
| "name": "TsmsApplication", | |||||
| "name": "FpsmsApplication", | |||||
| "request": "launch", | "request": "launch", | ||||
| "mainClass": "com.ffii.tsms.TsmsApplication", | |||||
| "projectName": "TSMS-backend" | |||||
| "mainClass": "com.ffii.fpsms.fpsmsApplication", | |||||
| "projectName": "FPSMS-backend" | |||||
| }, | }, | ||||
| { | { | ||||
| "type": "java", | "type": "java", | ||||
| "name": "Launch Local", | "name": "Launch Local", | ||||
| "request": "launch", | "request": "launch", | ||||
| "mainClass": "com.ffii.tsms.TsmsApplication", | |||||
| "mainClass": "com.ffii.fpsms.fpsmsApplication", | |||||
| "console": "internalConsole", | "console": "internalConsole", | ||||
| "projectName": "TSMS-backend", | |||||
| "projectName": "FPSMS-backend", | |||||
| "args": "--spring.profiles.active=db-local,ldap-local" | "args": "--spring.profiles.active=db-local,ldap-local" | ||||
| } | } | ||||
| ] | ] | ||||
| @@ -15,7 +15,7 @@ import org.springframework.context.annotation.Scope; | |||||
| import org.springframework.security.core.userdetails.UserDetails; | import org.springframework.security.core.userdetails.UserDetails; | ||||
| import org.springframework.stereotype.Component; | import org.springframework.stereotype.Component; | ||||
| import com.ffii.tsms.model.RefreshToken; | |||||
| import com.ffii.fpsms.model.RefreshToken; | |||||
| import io.jsonwebtoken.Claims; | import io.jsonwebtoken.Claims; | ||||
| import io.jsonwebtoken.Jwts; | import io.jsonwebtoken.Jwts; | ||||
| @@ -1,13 +1,13 @@ | |||||
| package com.ffii.tsms; | |||||
| package com.ffii.fpsms; | |||||
| import org.springframework.boot.SpringApplication; | import org.springframework.boot.SpringApplication; | ||||
| import org.springframework.boot.autoconfigure.SpringBootApplication; | import org.springframework.boot.autoconfigure.SpringBootApplication; | ||||
| @SpringBootApplication | @SpringBootApplication | ||||
| public class TsmsApplication { | |||||
| public class FpsmsApplication { | |||||
| public static void main(String[] args) { | public static void main(String[] args) { | ||||
| SpringApplication.run(TsmsApplication.class, args); | |||||
| SpringApplication.run(FpsmsApplication.class, args); | |||||
| } | } | ||||
| } | } | ||||
| @@ -1,4 +1,4 @@ | |||||
| package com.ffii.tsms.config; | |||||
| package com.ffii.fpsms.config; | |||||
| import javax.sql.DataSource; | import javax.sql.DataSource; | ||||
| @@ -16,7 +16,7 @@ import com.ffii.core.support.JdbcDao; | |||||
| @Configuration | @Configuration | ||||
| // @EnableJpaRepositories("com.ffii.ars.*") | // @EnableJpaRepositories("com.ffii.ars.*") | ||||
| // @ComponentScan(basePackages = { "com.ffii.core.*" }) | // @ComponentScan(basePackages = { "com.ffii.core.*" }) | ||||
| @ComponentScan(basePackages = { "com.ffii.core.*","com.ffii.tsms.*"}) | |||||
| @ComponentScan(basePackages = { "com.ffii.core.*","com.ffii.fpsms.*"}) | |||||
| // @EntityScan("com.ffii.ars.*") | // @EntityScan("com.ffii.ars.*") | ||||
| @EnableScheduling | @EnableScheduling | ||||
| @EnableAsync | @EnableAsync | ||||
| @@ -1,4 +1,4 @@ | |||||
| package com.ffii.tsms.config; | |||||
| package com.ffii.fpsms.config; | |||||
| import org.springframework.context.annotation.Bean; | import org.springframework.context.annotation.Bean; | ||||
| import org.springframework.context.annotation.Configuration; | import org.springframework.context.annotation.Configuration; | ||||
| @@ -1,4 +1,4 @@ | |||||
| package com.ffii.tsms.config.security; | |||||
| package com.ffii.fpsms.config.security; | |||||
| import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
| import org.springframework.beans.factory.annotation.Qualifier; | import org.springframework.beans.factory.annotation.Qualifier; | ||||
| @@ -21,7 +21,7 @@ import org.springframework.security.crypto.password.PasswordEncoder; | |||||
| import org.springframework.security.web.SecurityFilterChain; | import org.springframework.security.web.SecurityFilterChain; | ||||
| import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; | import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; | ||||
| import com.ffii.tsms.config.security.jwt.JwtRequestFilter; | |||||
| import com.ffii.fpsms.config.security.jwt.JwtRequestFilter; | |||||
| @Configuration | @Configuration | ||||
| @EnableWebSecurity | @EnableWebSecurity | ||||
| @@ -1,4 +1,4 @@ | |||||
| package com.ffii.tsms.config.security.jwt; | |||||
| package com.ffii.fpsms.config.security.jwt; | |||||
| import java.io.IOException; | import java.io.IOException; | ||||
| @@ -11,7 +11,7 @@ import org.springframework.stereotype.Component; | |||||
| import org.springframework.web.filter.OncePerRequestFilter; | import org.springframework.web.filter.OncePerRequestFilter; | ||||
| import com.ffii.core.utils.JwtTokenUtil; | import com.ffii.core.utils.JwtTokenUtil; | ||||
| import com.ffii.tsms.config.security.jwt.service.JwtUserDetailsService; | |||||
| import com.ffii.fpsms.config.security.jwt.service.JwtUserDetailsService; | |||||
| import io.jsonwebtoken.ExpiredJwtException; | import io.jsonwebtoken.ExpiredJwtException; | ||||
| import jakarta.servlet.FilterChain; | import jakarta.servlet.FilterChain; | ||||
| @@ -1,14 +1,14 @@ | |||||
| package com.ffii.tsms.config.security.jwt.service; | |||||
| package com.ffii.fpsms.config.security.jwt.service; | |||||
| import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
| import org.springframework.security.core.userdetails.UserDetailsService; | import org.springframework.security.core.userdetails.UserDetailsService; | ||||
| import org.springframework.security.core.userdetails.UsernameNotFoundException; | import org.springframework.security.core.userdetails.UsernameNotFoundException; | ||||
| import org.springframework.stereotype.Service; | import org.springframework.stereotype.Service; | ||||
| import com.ffii.tsms.modules.user.entity.User; | |||||
| import com.ffii.tsms.modules.user.entity.UserRepository; | |||||
| import com.ffii.tsms.modules.user.service.UserAuthorityService; | |||||
| import com.ffii.tsms.modules.user.service.UserService; | |||||
| import com.ffii.fpsms.modules.user.entity.User; | |||||
| import com.ffii.fpsms.modules.user.entity.UserRepository; | |||||
| import com.ffii.fpsms.modules.user.service.UserAuthorityService; | |||||
| import com.ffii.fpsms.modules.user.service.UserService; | |||||
| @Service | @Service | ||||
| public class JwtUserDetailsService implements UserDetailsService { | public class JwtUserDetailsService implements UserDetailsService { | ||||
| @@ -1,4 +1,4 @@ | |||||
| package com.ffii.tsms.config.security.jwt.web; | |||||
| package com.ffii.fpsms.config.security.jwt.web; | |||||
| import java.time.Instant; | import java.time.Instant; | ||||
| import java.util.HashSet; | import java.util.HashSet; | ||||
| @@ -20,19 +20,18 @@ import org.springframework.web.server.ResponseStatusException; | |||||
| import com.ffii.core.utils.AES; | import com.ffii.core.utils.AES; | ||||
| import com.ffii.core.utils.JwtTokenUtil; | import com.ffii.core.utils.JwtTokenUtil; | ||||
| import com.ffii.tsms.config.security.jwt.service.JwtUserDetailsService; | |||||
| import com.ffii.tsms.config.security.service.LoginLogService; | |||||
| import com.ffii.tsms.model.AbilityModel; | |||||
| import com.ffii.tsms.model.ExceptionResponse; | |||||
| import com.ffii.tsms.model.JwtRequest; | |||||
| import com.ffii.tsms.model.JwtResponse; | |||||
| import com.ffii.tsms.model.RefreshToken; | |||||
| import com.ffii.tsms.model.TokenRefreshRequest; | |||||
| import com.ffii.tsms.model.TokenRefreshResponse; | |||||
| import com.ffii.tsms.modules.common.SecurityUtils; | |||||
| import com.ffii.tsms.modules.user.entity.User; | |||||
| import com.ffii.tsms.modules.user.entity.UserRepository; | |||||
| import com.ffii.tsms.modules.user.service.UserAuthorityService; | |||||
| import com.ffii.fpsms.config.security.jwt.service.JwtUserDetailsService; | |||||
| import com.ffii.fpsms.config.security.service.LoginLogService; | |||||
| import com.ffii.fpsms.model.AbilityModel; | |||||
| import com.ffii.fpsms.model.ExceptionResponse; | |||||
| import com.ffii.fpsms.model.JwtRequest; | |||||
| import com.ffii.fpsms.model.JwtResponse; | |||||
| import com.ffii.fpsms.model.RefreshToken; | |||||
| import com.ffii.fpsms.model.TokenRefreshRequest; | |||||
| import com.ffii.fpsms.model.TokenRefreshResponse; | |||||
| import com.ffii.fpsms.modules.user.entity.User; | |||||
| import com.ffii.fpsms.modules.user.entity.UserRepository; | |||||
| import com.ffii.fpsms.modules.user.service.UserAuthorityService; | |||||
| import jakarta.servlet.http.HttpServletRequest; | import jakarta.servlet.http.HttpServletRequest; | ||||
| import jakarta.validation.Valid; | import jakarta.validation.Valid; | ||||
| @@ -1,11 +1,10 @@ | |||||
| package com.ffii.tsms.config.security.service; | |||||
| package com.ffii.fpsms.config.security.service; | |||||
| import java.util.Date; | import java.util.Date; | ||||
| import java.util.HashMap; | import java.util.HashMap; | ||||
| import java.util.List; | import java.util.List; | ||||
| import java.util.Map; | import java.util.Map; | ||||
| import org.springframework.beans.factory.annotation.Autowired; | |||||
| import org.springframework.stereotype.Service; | import org.springframework.stereotype.Service; | ||||
| import org.springframework.transaction.annotation.Isolation; | import org.springframework.transaction.annotation.Isolation; | ||||
| import org.springframework.transaction.annotation.Transactional; | import org.springframework.transaction.annotation.Transactional; | ||||
| @@ -1,4 +1,4 @@ | |||||
| package com.ffii.tsms.model; | |||||
| package com.ffii.fpsms.model; | |||||
| public class AbilityModel { | public class AbilityModel { | ||||
| @@ -1,4 +1,4 @@ | |||||
| package com.ffii.tsms.model; | |||||
| package com.ffii.fpsms.model; | |||||
| public class ExceptionResponse { | public class ExceptionResponse { | ||||
| private String message; | private String message; | ||||
| @@ -1,4 +1,4 @@ | |||||
| package com.ffii.tsms.model; | |||||
| package com.ffii.fpsms.model; | |||||
| import java.io.Serializable; | import java.io.Serializable; | ||||
| @@ -1,9 +1,9 @@ | |||||
| package com.ffii.tsms.model; | |||||
| package com.ffii.fpsms.model; | |||||
| import java.io.Serializable; | import java.io.Serializable; | ||||
| import java.util.Set; | import java.util.Set; | ||||
| import com.ffii.tsms.modules.user.entity.User; | |||||
| import com.ffii.fpsms.modules.user.entity.User; | |||||
| public class JwtResponse implements Serializable { | public class JwtResponse implements Serializable { | ||||
| @@ -1,4 +1,4 @@ | |||||
| package com.ffii.tsms.model; | |||||
| package com.ffii.fpsms.model; | |||||
| import java.time.Instant; | import java.time.Instant; | ||||
| @@ -1,4 +1,4 @@ | |||||
| package com.ffii.tsms.model; | |||||
| package com.ffii.fpsms.model; | |||||
| import jakarta.validation.constraints.NotBlank; | import jakarta.validation.constraints.NotBlank; | ||||
| public class TokenRefreshRequest { | public class TokenRefreshRequest { | ||||
| @@ -1,4 +1,4 @@ | |||||
| package com.ffii.tsms.model; | |||||
| package com.ffii.fpsms.model; | |||||
| public class TokenRefreshResponse { | public class TokenRefreshResponse { | ||||
| private String accessToken; | private String accessToken; | ||||
| @@ -1,4 +1,4 @@ | |||||
| package com.ffii.tsms.modules.common; | |||||
| package com.ffii.fpsms.modules.common; | |||||
| public class ErrorCodes { | public class ErrorCodes { | ||||
| @@ -1,8 +1,8 @@ | |||||
| package com.ffii.tsms.modules.common; | |||||
| package com.ffii.fpsms.modules.common; | |||||
| import com.fasterxml.jackson.annotation.JsonIgnore; | import com.fasterxml.jackson.annotation.JsonIgnore; | ||||
| import com.ffii.core.utils.PasswordUtils.IPasswordRule; | import com.ffii.core.utils.PasswordUtils.IPasswordRule; | ||||
| import com.ffii.tsms.modules.settings.service.SettingsService; | |||||
| import com.ffii.fpsms.modules.settings.service.SettingsService; | |||||
| public class PasswordRule implements IPasswordRule { | public class PasswordRule implements IPasswordRule { | ||||
| @@ -1,4 +1,4 @@ | |||||
| package com.ffii.tsms.modules.common; | |||||
| package com.ffii.fpsms.modules.common; | |||||
| import java.util.Optional; | import java.util.Optional; | ||||
| @@ -12,7 +12,7 @@ import org.springframework.security.core.userdetails.UserDetails; | |||||
| import org.springframework.security.core.userdetails.UserDetailsService; | import org.springframework.security.core.userdetails.UserDetailsService; | ||||
| import org.springframework.security.core.userdetails.UsernameNotFoundException; | import org.springframework.security.core.userdetails.UsernameNotFoundException; | ||||
| import com.ffii.tsms.modules.user.entity.User; | |||||
| import com.ffii.fpsms.modules.user.entity.User; | |||||
| /** | /** | ||||
| * Security Utils - for Spring Security | * Security Utils - for Spring Security | ||||
| @@ -1,4 +1,4 @@ | |||||
| package com.ffii.tsms.modules.common; | |||||
| package com.ffii.fpsms.modules.common; | |||||
| public abstract class SettingNames { | public abstract class SettingNames { | ||||
| /* | /* | ||||
| @@ -1,4 +1,4 @@ | |||||
| package com.ffii.tsms.modules.common.service; | |||||
| package com.ffii.fpsms.modules.common.service; | |||||
| import java.util.Date; | import java.util.Date; | ||||
| import java.util.List; | import java.util.List; | ||||
| @@ -1,4 +1,4 @@ | |||||
| package com.ffii.tsms.modules.settings.entity; | |||||
| package com.ffii.fpsms.modules.settings.entity; | |||||
| import com.ffii.core.entity.IdEntity; | import com.ffii.core.entity.IdEntity; | ||||
| @@ -1,4 +1,4 @@ | |||||
| package com.ffii.tsms.modules.settings.entity; | |||||
| package com.ffii.fpsms.modules.settings.entity; | |||||
| import java.util.Optional; | import java.util.Optional; | ||||
| @@ -1,4 +1,4 @@ | |||||
| package com.ffii.tsms.modules.settings.service; | |||||
| package com.ffii.fpsms.modules.settings.service; | |||||
| import java.time.LocalDate; | import java.time.LocalDate; | ||||
| import java.time.LocalDateTime; | import java.time.LocalDateTime; | ||||
| @@ -14,8 +14,8 @@ import org.springframework.transaction.annotation.Transactional; | |||||
| import com.ffii.core.exception.InternalServerErrorException; | import com.ffii.core.exception.InternalServerErrorException; | ||||
| import com.ffii.core.support.AbstractIdEntityService; | import com.ffii.core.support.AbstractIdEntityService; | ||||
| import com.ffii.core.support.JdbcDao; | import com.ffii.core.support.JdbcDao; | ||||
| import com.ffii.tsms.modules.settings.entity.Settings; | |||||
| import com.ffii.tsms.modules.settings.entity.SettingsRepository; | |||||
| import com.ffii.fpsms.modules.settings.entity.Settings; | |||||
| import com.ffii.fpsms.modules.settings.entity.SettingsRepository; | |||||
| @Service | @Service | ||||
| @@ -1,4 +1,4 @@ | |||||
| package com.ffii.tsms.modules.settings.web; | |||||
| package com.ffii.fpsms.modules.settings.web; | |||||
| import java.util.List; | import java.util.List; | ||||
| @@ -13,8 +13,8 @@ import org.springframework.web.bind.annotation.RestController; | |||||
| import com.ffii.core.exception.BadRequestException; | import com.ffii.core.exception.BadRequestException; | ||||
| import com.ffii.core.exception.NotFoundException; | import com.ffii.core.exception.NotFoundException; | ||||
| import com.ffii.tsms.modules.settings.entity.Settings; | |||||
| import com.ffii.tsms.modules.settings.service.SettingsService; | |||||
| import com.ffii.fpsms.modules.settings.entity.Settings; | |||||
| import com.ffii.fpsms.modules.settings.service.SettingsService; | |||||
| import jakarta.validation.Valid; | import jakarta.validation.Valid; | ||||
| import jakarta.validation.constraints.NotBlank; | import jakarta.validation.constraints.NotBlank; | ||||
| @@ -1,4 +1,4 @@ | |||||
| package com.ffii.tsms.modules.user.entity; | |||||
| package com.ffii.fpsms.modules.user.entity; | |||||
| import jakarta.persistence.Column; | import jakarta.persistence.Column; | ||||
| import jakarta.persistence.Entity; | import jakarta.persistence.Entity; | ||||
| @@ -1,4 +1,4 @@ | |||||
| package com.ffii.tsms.modules.user.entity; | |||||
| package com.ffii.fpsms.modules.user.entity; | |||||
| import com.ffii.core.support.AbstractRepository; | import com.ffii.core.support.AbstractRepository; | ||||
| @@ -1,4 +1,4 @@ | |||||
| package com.ffii.tsms.modules.user.entity; | |||||
| package com.ffii.fpsms.modules.user.entity; | |||||
| import java.time.LocalDate; | import java.time.LocalDate; | ||||
| import java.util.Collection; | import java.util.Collection; | ||||
| @@ -8,7 +8,6 @@ import jakarta.persistence.Entity; | |||||
| import jakarta.persistence.Table; | import jakarta.persistence.Table; | ||||
| import jakarta.persistence.Transient; | import jakarta.persistence.Transient; | ||||
| import jakarta.validation.constraints.NotBlank; | import jakarta.validation.constraints.NotBlank; | ||||
| import jakarta.validation.constraints.NotNull; | |||||
| import org.springframework.security.core.GrantedAuthority; | import org.springframework.security.core.GrantedAuthority; | ||||
| import org.springframework.security.core.userdetails.UserDetails; | import org.springframework.security.core.userdetails.UserDetails; | ||||
| @@ -1,4 +1,4 @@ | |||||
| package com.ffii.tsms.modules.user.entity; | |||||
| package com.ffii.fpsms.modules.user.entity; | |||||
| import java.util.List; | import java.util.List; | ||||
| import java.util.Optional; | import java.util.Optional; | ||||
| @@ -1,4 +1,4 @@ | |||||
| package com.ffii.tsms.modules.user.req; | |||||
| package com.ffii.fpsms.modules.user.req; | |||||
| import jakarta.validation.constraints.Pattern; | import jakarta.validation.constraints.Pattern; | ||||
| import jakarta.validation.constraints.Size; | import jakarta.validation.constraints.Size; | ||||
| @@ -1,4 +1,4 @@ | |||||
| package com.ffii.tsms.modules.user.req; | |||||
| package com.ffii.fpsms.modules.user.req; | |||||
| import jakarta.validation.constraints.Pattern; | import jakarta.validation.constraints.Pattern; | ||||
| import jakarta.validation.constraints.Size; | import jakarta.validation.constraints.Size; | ||||
| @@ -1,4 +1,4 @@ | |||||
| package com.ffii.tsms.modules.user.req; | |||||
| package com.ffii.fpsms.modules.user.req; | |||||
| import java.util.List; | import java.util.List; | ||||
| @@ -1,4 +1,4 @@ | |||||
| package com.ffii.tsms.modules.user.req; | |||||
| package com.ffii.fpsms.modules.user.req; | |||||
| public class SearchUserReq { | public class SearchUserReq { | ||||
| private Integer id; | private Integer id; | ||||
| @@ -1,4 +1,4 @@ | |||||
| package com.ffii.tsms.modules.user.req; | |||||
| package com.ffii.fpsms.modules.user.req; | |||||
| import java.time.LocalDate; | import java.time.LocalDate; | ||||
| import java.util.List; | import java.util.List; | ||||
| @@ -1,4 +1,4 @@ | |||||
| package com.ffii.tsms.modules.user.service; | |||||
| package com.ffii.fpsms.modules.user.service; | |||||
| import java.util.Date; | import java.util.Date; | ||||
| import java.util.List; | import java.util.List; | ||||
| @@ -15,11 +15,11 @@ import com.ffii.core.support.AbstractBaseEntityService; | |||||
| import com.ffii.core.support.JdbcDao; | import com.ffii.core.support.JdbcDao; | ||||
| import com.ffii.core.utils.JsonUtils; | import com.ffii.core.utils.JsonUtils; | ||||
| import com.ffii.core.utils.Params; | import com.ffii.core.utils.Params; | ||||
| import com.ffii.tsms.modules.common.SecurityUtils; | |||||
| import com.ffii.tsms.modules.common.service.AuditLogService; | |||||
| import com.ffii.tsms.modules.user.entity.Group; | |||||
| import com.ffii.tsms.modules.user.entity.GroupRepository; | |||||
| import com.ffii.tsms.modules.user.req.SaveGroupReq; | |||||
| import com.ffii.fpsms.modules.common.SecurityUtils; | |||||
| import com.ffii.fpsms.modules.common.service.AuditLogService; | |||||
| import com.ffii.fpsms.modules.user.entity.Group; | |||||
| import com.ffii.fpsms.modules.user.entity.GroupRepository; | |||||
| import com.ffii.fpsms.modules.user.req.SaveGroupReq; | |||||
| import jakarta.persistence.Table; | import jakarta.persistence.Table; | ||||
| import jakarta.validation.Valid; | import jakarta.validation.Valid; | ||||
| @@ -1,4 +1,4 @@ | |||||
| package com.ffii.tsms.modules.user.service; | |||||
| package com.ffii.fpsms.modules.user.service; | |||||
| import java.util.HashSet; | import java.util.HashSet; | ||||
| import java.util.List; | import java.util.List; | ||||
| @@ -11,7 +11,7 @@ import org.springframework.transaction.annotation.Transactional; | |||||
| import com.ffii.core.support.AbstractService; | import com.ffii.core.support.AbstractService; | ||||
| import com.ffii.core.support.JdbcDao; | import com.ffii.core.support.JdbcDao; | ||||
| import com.ffii.tsms.modules.user.entity.User; | |||||
| import com.ffii.fpsms.modules.user.entity.User; | |||||
| @Service | @Service | ||||
| public class UserAuthorityService extends AbstractService { | public class UserAuthorityService extends AbstractService { | ||||
| @@ -1,15 +1,12 @@ | |||||
| package com.ffii.tsms.modules.user.service; | |||||
| package com.ffii.fpsms.modules.user.service; | |||||
| import java.io.UnsupportedEncodingException; | import java.io.UnsupportedEncodingException; | ||||
| import java.util.LinkedHashSet; | import java.util.LinkedHashSet; | ||||
| import java.util.List; | import java.util.List; | ||||
| import java.util.Locale; | |||||
| import java.util.Map; | import java.util.Map; | ||||
| import java.util.Optional; | import java.util.Optional; | ||||
| import java.util.Set; | import java.util.Set; | ||||
| import java.util.stream.Collectors; | |||||
| import org.apache.commons.lang3.LocaleUtils; | |||||
| import org.apache.commons.lang3.StringUtils; | import org.apache.commons.lang3.StringUtils; | ||||
| import org.springframework.beans.BeanUtils; | import org.springframework.beans.BeanUtils; | ||||
| import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
| @@ -25,18 +22,16 @@ import com.ffii.core.support.AbstractBaseEntityService; | |||||
| import com.ffii.core.support.JdbcDao; | import com.ffii.core.support.JdbcDao; | ||||
| import com.ffii.core.utils.Params; | import com.ffii.core.utils.Params; | ||||
| import com.ffii.core.utils.PasswordUtils; | import com.ffii.core.utils.PasswordUtils; | ||||
| import com.ffii.tsms.modules.common.ErrorCodes; | |||||
| import com.ffii.tsms.modules.common.PasswordRule; | |||||
| import com.ffii.tsms.modules.settings.service.SettingsService; | |||||
| import com.ffii.tsms.modules.user.entity.User; | |||||
| import com.ffii.tsms.modules.user.entity.UserRepository; | |||||
| import com.ffii.tsms.modules.user.req.NewPublicUserReq; | |||||
| import com.ffii.tsms.modules.user.req.NewUserReq; | |||||
| import com.ffii.tsms.modules.user.req.SearchUserReq; | |||||
| import com.ffii.tsms.modules.user.req.UpdateUserReq; | |||||
| import com.ffii.tsms.modules.user.service.pojo.UserRecord; | |||||
| import jakarta.mail.internet.InternetAddress; | |||||
| import com.ffii.fpsms.modules.common.ErrorCodes; | |||||
| import com.ffii.fpsms.modules.common.PasswordRule; | |||||
| import com.ffii.fpsms.modules.settings.service.SettingsService; | |||||
| import com.ffii.fpsms.modules.user.entity.User; | |||||
| import com.ffii.fpsms.modules.user.entity.UserRepository; | |||||
| import com.ffii.fpsms.modules.user.req.NewPublicUserReq; | |||||
| import com.ffii.fpsms.modules.user.req.NewUserReq; | |||||
| import com.ffii.fpsms.modules.user.req.SearchUserReq; | |||||
| import com.ffii.fpsms.modules.user.req.UpdateUserReq; | |||||
| import com.ffii.fpsms.modules.user.service.pojo.UserRecord; | |||||
| @Service | @Service | ||||
| public class UserService extends AbstractBaseEntityService<User, Long, UserRepository> { | public class UserService extends AbstractBaseEntityService<User, Long, UserRepository> { | ||||
| @@ -1,4 +1,4 @@ | |||||
| package com.ffii.tsms.modules.user.service.pojo; | |||||
| package com.ffii.fpsms.modules.user.service.pojo; | |||||
| public class AuthRecord { | public class AuthRecord { | ||||
| private Integer id; | private Integer id; | ||||
| @@ -1,4 +1,4 @@ | |||||
| package com.ffii.tsms.modules.user.service.pojo; | |||||
| package com.ffii.fpsms.modules.user.service.pojo; | |||||
| import java.time.LocalDateTime; | import java.time.LocalDateTime; | ||||
| @@ -1,8 +1,8 @@ | |||||
| package com.ffii.tsms.modules.user.service.res; | |||||
| package com.ffii.fpsms.modules.user.service.res; | |||||
| import java.util.List; | import java.util.List; | ||||
| import com.ffii.tsms.modules.user.entity.User; | |||||
| import com.ffii.fpsms.modules.user.entity.User; | |||||
| public class LoadUserRes { | public class LoadUserRes { | ||||
| private User data; | private User data; | ||||
| @@ -1,4 +1,4 @@ | |||||
| package com.ffii.tsms.modules.user.web; | |||||
| package com.ffii.fpsms.modules.user.web; | |||||
| import java.util.Map; | import java.util.Map; | ||||
| @@ -20,8 +20,8 @@ import com.ffii.core.response.IdRes; | |||||
| import com.ffii.core.response.RecordsRes; | import com.ffii.core.response.RecordsRes; | ||||
| import com.ffii.core.utils.CriteriaArgsBuilder; | import com.ffii.core.utils.CriteriaArgsBuilder; | ||||
| import com.ffii.core.utils.Params; | import com.ffii.core.utils.Params; | ||||
| import com.ffii.tsms.modules.user.req.SaveGroupReq; | |||||
| import com.ffii.tsms.modules.user.service.GroupService; | |||||
| import com.ffii.fpsms.modules.user.req.SaveGroupReq; | |||||
| import com.ffii.fpsms.modules.user.service.GroupService; | |||||
| import jakarta.servlet.http.HttpServletRequest; | import jakarta.servlet.http.HttpServletRequest; | ||||
| import jakarta.validation.Valid; | import jakarta.validation.Valid; | ||||
| @@ -1,4 +1,4 @@ | |||||
| package com.ffii.tsms.modules.user.web; | |||||
| package com.ffii.fpsms.modules.user.web; | |||||
| import org.apache.commons.logging.Log; | import org.apache.commons.logging.Log; | ||||
| import org.apache.commons.logging.LogFactory; | import org.apache.commons.logging.LogFactory; | ||||
| @@ -1,4 +1,4 @@ | |||||
| package com.ffii.tsms.modules.user.web; | |||||
| package com.ffii.fpsms.modules.user.web; | |||||
| import java.io.UnsupportedEncodingException; | import java.io.UnsupportedEncodingException; | ||||
| @@ -25,17 +25,17 @@ import com.ffii.core.exception.NotFoundException; | |||||
| import com.ffii.core.exception.UnprocessableEntityException; | import com.ffii.core.exception.UnprocessableEntityException; | ||||
| import com.ffii.core.response.IdRes; | import com.ffii.core.response.IdRes; | ||||
| import com.ffii.core.utils.PasswordUtils; | import com.ffii.core.utils.PasswordUtils; | ||||
| import com.ffii.tsms.modules.common.ErrorCodes; | |||||
| import com.ffii.tsms.modules.common.PasswordRule; | |||||
| import com.ffii.tsms.modules.common.SecurityUtils; | |||||
| import com.ffii.tsms.modules.settings.service.SettingsService; | |||||
| import com.ffii.tsms.modules.user.entity.User; | |||||
| import com.ffii.tsms.modules.user.req.NewPublicUserReq; | |||||
| import com.ffii.tsms.modules.user.req.NewUserReq; | |||||
| import com.ffii.tsms.modules.user.req.SearchUserReq; | |||||
| import com.ffii.tsms.modules.user.req.UpdateUserReq; | |||||
| import com.ffii.tsms.modules.user.service.UserService; | |||||
| import com.ffii.tsms.modules.user.service.res.LoadUserRes; | |||||
| import com.ffii.fpsms.modules.common.ErrorCodes; | |||||
| import com.ffii.fpsms.modules.common.PasswordRule; | |||||
| import com.ffii.fpsms.modules.common.SecurityUtils; | |||||
| import com.ffii.fpsms.modules.settings.service.SettingsService; | |||||
| import com.ffii.fpsms.modules.user.entity.User; | |||||
| import com.ffii.fpsms.modules.user.req.NewPublicUserReq; | |||||
| import com.ffii.fpsms.modules.user.req.NewUserReq; | |||||
| import com.ffii.fpsms.modules.user.req.SearchUserReq; | |||||
| import com.ffii.fpsms.modules.user.req.UpdateUserReq; | |||||
| import com.ffii.fpsms.modules.user.service.UserService; | |||||
| import com.ffii.fpsms.modules.user.service.res.LoadUserRes; | |||||
| import jakarta.validation.Valid; | import jakarta.validation.Valid; | ||||
| import jakarta.validation.constraints.NotBlank; | import jakarta.validation.constraints.NotBlank; | ||||
| @@ -1,5 +1,5 @@ | |||||
| spring: | spring: | ||||
| datasource: | datasource: | ||||
| jdbc-url: jdbc:mysql://192.168.1.81:3306/arsdb?useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8 | |||||
| jdbc-url: jdbc:mysql://192.168.1.81:3306/fpsmsdb?useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8 | |||||
| username: root | username: root | ||||
| password: secret | password: secret | ||||
| @@ -1,5 +1,5 @@ | |||||
| spring: | spring: | ||||
| datasource: | datasource: | ||||
| jdbc-url: jdbc:mysql://127.0.0.1:3306/tsmsdb?useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8 | |||||
| jdbc-url: jdbc:mysql://127.0.0.1:3306/fpsmsdb?useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8 | |||||
| username: root | username: root | ||||
| password: secret | password: secret | ||||
| @@ -1,5 +1,5 @@ | |||||
| --liquibase formatted sql | --liquibase formatted sql | ||||
| --changeset alex:update_user_authority | --changeset alex:update_user_authority | ||||
| INSERT INTO `tsmsdb`.`user_authority` (`userId`, `authId`) VALUES ('1', '1'); | |||||
| INSERT INTO `tsmsdb`.`user_authority` (`userId`, `authId`) VALUES ('1', '2'); | |||||
| INSERT INTO `fpsmsdb`.`user_authority` (`userId`, `authId`) VALUES ('1', '1'); | |||||
| INSERT INTO `fpsmsdb`.`user_authority` (`userId`, `authId`) VALUES ('1', '2'); | |||||
| @@ -7,8 +7,8 @@ Configutation: | |||||
| Appenders: | Appenders: | ||||
| RollingFile: | RollingFile: | ||||
| name: RollingFile_Appender | name: RollingFile_Appender | ||||
| fileName: ${log_location}tsms-all.log | |||||
| filePattern: ${log_location}tsms-all.log.%i.gz | |||||
| fileName: ${log_location}fpsms-all.log | |||||
| filePattern: ${log_location}fpsms-all.log.%i.gz | |||||
| PatternLayout: | PatternLayout: | ||||
| Pattern: "%d %p [%l] - %m%n" | Pattern: "%d %p [%l] - %m%n" | ||||
| Policies: | Policies: | ||||
| @@ -7,8 +7,8 @@ Configutation: | |||||
| Appenders: | Appenders: | ||||
| RollingFile: | RollingFile: | ||||
| name: RollingFile_Appender | name: RollingFile_Appender | ||||
| fileName: ${log_location}tsms-all.log | |||||
| filePattern: ${log_location}tsms-all.log.%i.gz | |||||
| fileName: ${log_location}fpsms-all.log | |||||
| filePattern: ${log_location}fpsms-all.log.%i.gz | |||||
| PatternLayout: | PatternLayout: | ||||
| Pattern: "%d %p [%l] - %m%n" | Pattern: "%d %p [%l] - %m%n" | ||||
| Policies: | Policies: | ||||
| @@ -1,10 +1,10 @@ | |||||
| package com.ffii.tsms; | |||||
| package com.ffii.fpsms; | |||||
| import org.junit.jupiter.api.Test; | import org.junit.jupiter.api.Test; | ||||
| import org.springframework.boot.test.context.SpringBootTest; | import org.springframework.boot.test.context.SpringBootTest; | ||||
| @SpringBootTest | @SpringBootTest | ||||
| class TsmsApplicationTests { | |||||
| class FpsmsApplicationTests { | |||||
| @Test | @Test | ||||
| void contextLoads() { | void contextLoads() { | ||||