From f6f0a107664f1883a87e8fe1b524a83e39ecfa56 Mon Sep 17 00:00:00 2001 From: "MSI\\derek" Date: Fri, 21 Feb 2025 13:48:29 +0800 Subject: [PATCH] tsms to fpsms --- README.md | 14 +++++----- .../com/ffii/core/utils/JwtTokenUtil.java | 2 +- .../FpsmsApplication.java} | 6 ++--- .../{tsms => fpsms}/config/AppConfig.java | 4 +-- .../{tsms => fpsms}/config/WebConfig.java | 2 +- .../config/security/SecurityConfig.java | 4 +-- .../config/security/jwt/JwtRequestFilter.java | 4 +-- .../jwt/service/JwtUserDetailsService.java | 10 +++---- .../jwt/web/JwtAuthenticationController.java | 27 +++++++++---------- .../security/service/LoginLogService.java | 3 +-- .../{tsms => fpsms}/model/AbilityModel.java | 2 +- .../model/ExceptionResponse.java | 2 +- .../{tsms => fpsms}/model/JwtRequest.java | 2 +- .../{tsms => fpsms}/model/JwtResponse.java | 4 +-- .../{tsms => fpsms}/model/RefreshToken.java | 2 +- .../model/TokenRefreshRequest.java | 2 +- .../model/TokenRefreshResponse.java | 2 +- .../modules/common/ErrorCodes.java | 2 +- .../modules/common/PasswordRule.java | 4 +-- .../modules/common/SecurityUtils.java | 4 +-- .../modules/common/SettingNames.java | 2 +- .../common/service/AuditLogService.java | 2 +- .../modules/settings/entity/Settings.java | 2 +- .../settings/entity/SettingsRepository.java | 2 +- .../settings/service/SettingsService.java | 6 ++--- .../settings/web/SettingsController.java | 6 ++--- .../modules/user/entity/Group.java | 2 +- .../modules/user/entity/GroupRepository.java | 2 +- .../modules/user/entity/User.java | 3 +-- .../modules/user/entity/UserRepository.java | 2 +- .../modules/user/req/NewPublicUserReq.java | 2 +- .../modules/user/req/NewUserReq.java | 2 +- .../modules/user/req/SaveGroupReq.java | 2 +- .../modules/user/req/SearchUserReq.java | 2 +- .../modules/user/req/UpdateUserReq.java | 2 +- .../modules/user/service/GroupService.java | 12 ++++----- .../user/service/UserAuthorityService.java | 4 +-- .../modules/user/service/UserService.java | 27 ++++++++----------- .../modules/user/service/pojo/AuthRecord.java | 2 +- .../modules/user/service/pojo/UserRecord.java | 2 +- .../modules/user/service/res/LoadUserRes.java | 4 +-- .../modules/user/web/GroupController.java | 6 ++--- .../modules/user/web/TestController.java | 2 +- .../modules/user/web/UserController.java | 24 ++++++++--------- src/main/resources/application-db-2fi.yml | 2 +- src/main/resources/application-db-local.yml | 2 +- .../04_update_user_authority.sql | 4 +-- src/main/resources/log4j2-prod-linux.yml | 4 +-- src/main/resources/log4j2-prod-win.yml | 4 +-- .../FpsmsApplicationTests.java} | 4 +-- 50 files changed, 118 insertions(+), 126 deletions(-) rename src/main/java/com/ffii/{tsms/TsmsApplication.java => fpsms/FpsmsApplication.java} (63%) rename src/main/java/com/ffii/{tsms => fpsms}/config/AppConfig.java (90%) rename src/main/java/com/ffii/{tsms => fpsms}/config/WebConfig.java (96%) rename src/main/java/com/ffii/{tsms => fpsms}/config/security/SecurityConfig.java (97%) rename src/main/java/com/ffii/{tsms => fpsms}/config/security/jwt/JwtRequestFilter.java (95%) rename src/main/java/com/ffii/{tsms => fpsms}/config/security/jwt/service/JwtUserDetailsService.java (71%) rename src/main/java/com/ffii/{tsms => fpsms}/config/security/jwt/web/JwtAuthenticationController.java (89%) rename src/main/java/com/ffii/{tsms => fpsms}/config/security/service/LoginLogService.java (93%) rename src/main/java/com/ffii/{tsms => fpsms}/model/AbilityModel.java (89%) rename src/main/java/com/ffii/{tsms => fpsms}/model/ExceptionResponse.java (94%) rename src/main/java/com/ffii/{tsms => fpsms}/model/JwtRequest.java (95%) rename src/main/java/com/ffii/{tsms => fpsms}/model/JwtResponse.java (93%) rename src/main/java/com/ffii/{tsms => fpsms}/model/RefreshToken.java (94%) rename src/main/java/com/ffii/{tsms => fpsms}/model/TokenRefreshRequest.java (90%) rename src/main/java/com/ffii/{tsms => fpsms}/model/TokenRefreshResponse.java (96%) rename src/main/java/com/ffii/{tsms => fpsms}/modules/common/ErrorCodes.java (93%) rename src/main/java/com/ffii/{tsms => fpsms}/modules/common/PasswordRule.java (96%) rename src/main/java/com/ffii/{tsms => fpsms}/modules/common/SecurityUtils.java (98%) rename src/main/java/com/ffii/{tsms => fpsms}/modules/common/SettingNames.java (98%) rename src/main/java/com/ffii/{tsms => fpsms}/modules/common/service/AuditLogService.java (97%) rename src/main/java/com/ffii/{tsms => fpsms}/modules/settings/entity/Settings.java (96%) rename src/main/java/com/ffii/{tsms => fpsms}/modules/settings/entity/SettingsRepository.java (85%) rename src/main/java/com/ffii/{tsms => fpsms}/modules/settings/service/SettingsService.java (97%) rename src/main/java/com/ffii/{tsms => fpsms}/modules/settings/web/SettingsController.java (91%) rename src/main/java/com/ffii/{tsms => fpsms}/modules/user/entity/Group.java (93%) rename src/main/java/com/ffii/{tsms => fpsms}/modules/user/entity/GroupRepository.java (74%) rename src/main/java/com/ffii/{tsms => fpsms}/modules/user/entity/User.java (97%) rename src/main/java/com/ffii/{tsms => fpsms}/modules/user/entity/UserRepository.java (88%) rename src/main/java/com/ffii/{tsms => fpsms}/modules/user/req/NewPublicUserReq.java (92%) rename src/main/java/com/ffii/{tsms => fpsms}/modules/user/req/NewUserReq.java (90%) rename src/main/java/com/ffii/{tsms => fpsms}/modules/user/req/SaveGroupReq.java (97%) rename src/main/java/com/ffii/{tsms => fpsms}/modules/user/req/SearchUserReq.java (96%) rename src/main/java/com/ffii/{tsms => fpsms}/modules/user/req/UpdateUserReq.java (98%) rename src/main/java/com/ffii/{tsms => fpsms}/modules/user/service/GroupService.java (94%) rename src/main/java/com/ffii/{tsms => fpsms}/modules/user/service/UserAuthorityService.java (94%) rename src/main/java/com/ffii/{tsms => fpsms}/modules/user/service/UserService.java (92%) rename src/main/java/com/ffii/{tsms => fpsms}/modules/user/service/pojo/AuthRecord.java (92%) rename src/main/java/com/ffii/{tsms => fpsms}/modules/user/service/pojo/UserRecord.java (98%) rename src/main/java/com/ffii/{tsms => fpsms}/modules/user/service/res/LoadUserRes.java (88%) rename src/main/java/com/ffii/{tsms => fpsms}/modules/user/web/GroupController.java (94%) rename src/main/java/com/ffii/{tsms => fpsms}/modules/user/web/TestController.java (93%) rename src/main/java/com/ffii/{tsms => fpsms}/modules/user/web/UserController.java (91%) rename src/test/java/com/ffii/{tsms/ArsApplicationTests.java => fpsms/FpsmsApplicationTests.java} (73%) diff --git a/README.md b/README.md index ad7936d..34fca51 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -# TSMS Backend +# FPSMS Backend ## 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 ```json { @@ -9,18 +9,18 @@ "configurations": [ { "type": "java", - "name": "TsmsApplication", + "name": "FpsmsApplication", "request": "launch", - "mainClass": "com.ffii.tsms.TsmsApplication", - "projectName": "TSMS-backend" + "mainClass": "com.ffii.fpsms.fpsmsApplication", + "projectName": "FPSMS-backend" }, { "type": "java", "name": "Launch Local", "request": "launch", - "mainClass": "com.ffii.tsms.TsmsApplication", + "mainClass": "com.ffii.fpsms.fpsmsApplication", "console": "internalConsole", - "projectName": "TSMS-backend", + "projectName": "FPSMS-backend", "args": "--spring.profiles.active=db-local,ldap-local" } ] diff --git a/src/main/java/com/ffii/core/utils/JwtTokenUtil.java b/src/main/java/com/ffii/core/utils/JwtTokenUtil.java index b058f71..4808795 100644 --- a/src/main/java/com/ffii/core/utils/JwtTokenUtil.java +++ b/src/main/java/com/ffii/core/utils/JwtTokenUtil.java @@ -15,7 +15,7 @@ import org.springframework.context.annotation.Scope; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.stereotype.Component; -import com.ffii.tsms.model.RefreshToken; +import com.ffii.fpsms.model.RefreshToken; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; diff --git a/src/main/java/com/ffii/tsms/TsmsApplication.java b/src/main/java/com/ffii/fpsms/FpsmsApplication.java similarity index 63% rename from src/main/java/com/ffii/tsms/TsmsApplication.java rename to src/main/java/com/ffii/fpsms/FpsmsApplication.java index 939668e..30f021e 100644 --- a/src/main/java/com/ffii/tsms/TsmsApplication.java +++ b/src/main/java/com/ffii/fpsms/FpsmsApplication.java @@ -1,13 +1,13 @@ -package com.ffii.tsms; +package com.ffii.fpsms; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication -public class TsmsApplication { +public class FpsmsApplication { public static void main(String[] args) { - SpringApplication.run(TsmsApplication.class, args); + SpringApplication.run(FpsmsApplication.class, args); } } diff --git a/src/main/java/com/ffii/tsms/config/AppConfig.java b/src/main/java/com/ffii/fpsms/config/AppConfig.java similarity index 90% rename from src/main/java/com/ffii/tsms/config/AppConfig.java rename to src/main/java/com/ffii/fpsms/config/AppConfig.java index 2286aed..583199c 100644 --- a/src/main/java/com/ffii/tsms/config/AppConfig.java +++ b/src/main/java/com/ffii/fpsms/config/AppConfig.java @@ -1,4 +1,4 @@ -package com.ffii.tsms.config; +package com.ffii.fpsms.config; import javax.sql.DataSource; @@ -16,7 +16,7 @@ import com.ffii.core.support.JdbcDao; @Configuration // @EnableJpaRepositories("com.ffii.ars.*") // @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.*") @EnableScheduling @EnableAsync diff --git a/src/main/java/com/ffii/tsms/config/WebConfig.java b/src/main/java/com/ffii/fpsms/config/WebConfig.java similarity index 96% rename from src/main/java/com/ffii/tsms/config/WebConfig.java rename to src/main/java/com/ffii/fpsms/config/WebConfig.java index bf3c622..1b0ec0e 100644 --- a/src/main/java/com/ffii/tsms/config/WebConfig.java +++ b/src/main/java/com/ffii/fpsms/config/WebConfig.java @@ -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.Configuration; diff --git a/src/main/java/com/ffii/tsms/config/security/SecurityConfig.java b/src/main/java/com/ffii/fpsms/config/security/SecurityConfig.java similarity index 97% rename from src/main/java/com/ffii/tsms/config/security/SecurityConfig.java rename to src/main/java/com/ffii/fpsms/config/security/SecurityConfig.java index 6a92d38..15b4bb0 100644 --- a/src/main/java/com/ffii/tsms/config/security/SecurityConfig.java +++ b/src/main/java/com/ffii/fpsms/config/security/SecurityConfig.java @@ -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.Qualifier; @@ -21,7 +21,7 @@ import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; -import com.ffii.tsms.config.security.jwt.JwtRequestFilter; +import com.ffii.fpsms.config.security.jwt.JwtRequestFilter; @Configuration @EnableWebSecurity diff --git a/src/main/java/com/ffii/tsms/config/security/jwt/JwtRequestFilter.java b/src/main/java/com/ffii/fpsms/config/security/jwt/JwtRequestFilter.java similarity index 95% rename from src/main/java/com/ffii/tsms/config/security/jwt/JwtRequestFilter.java rename to src/main/java/com/ffii/fpsms/config/security/jwt/JwtRequestFilter.java index b035eec..6797752 100644 --- a/src/main/java/com/ffii/tsms/config/security/jwt/JwtRequestFilter.java +++ b/src/main/java/com/ffii/fpsms/config/security/jwt/JwtRequestFilter.java @@ -1,4 +1,4 @@ -package com.ffii.tsms.config.security.jwt; +package com.ffii.fpsms.config.security.jwt; import java.io.IOException; @@ -11,7 +11,7 @@ import org.springframework.stereotype.Component; import org.springframework.web.filter.OncePerRequestFilter; 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 jakarta.servlet.FilterChain; diff --git a/src/main/java/com/ffii/tsms/config/security/jwt/service/JwtUserDetailsService.java b/src/main/java/com/ffii/fpsms/config/security/jwt/service/JwtUserDetailsService.java similarity index 71% rename from src/main/java/com/ffii/tsms/config/security/jwt/service/JwtUserDetailsService.java rename to src/main/java/com/ffii/fpsms/config/security/jwt/service/JwtUserDetailsService.java index c335928..31cb45d 100644 --- a/src/main/java/com/ffii/tsms/config/security/jwt/service/JwtUserDetailsService.java +++ b/src/main/java/com/ffii/fpsms/config/security/jwt/service/JwtUserDetailsService.java @@ -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.security.core.userdetails.UserDetailsService; import org.springframework.security.core.userdetails.UsernameNotFoundException; 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 public class JwtUserDetailsService implements UserDetailsService { diff --git a/src/main/java/com/ffii/tsms/config/security/jwt/web/JwtAuthenticationController.java b/src/main/java/com/ffii/fpsms/config/security/jwt/web/JwtAuthenticationController.java similarity index 89% rename from src/main/java/com/ffii/tsms/config/security/jwt/web/JwtAuthenticationController.java rename to src/main/java/com/ffii/fpsms/config/security/jwt/web/JwtAuthenticationController.java index ef2a78a..f7d40ef 100644 --- a/src/main/java/com/ffii/tsms/config/security/jwt/web/JwtAuthenticationController.java +++ b/src/main/java/com/ffii/fpsms/config/security/jwt/web/JwtAuthenticationController.java @@ -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.util.HashSet; @@ -20,19 +20,18 @@ import org.springframework.web.server.ResponseStatusException; import com.ffii.core.utils.AES; 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.validation.Valid; diff --git a/src/main/java/com/ffii/tsms/config/security/service/LoginLogService.java b/src/main/java/com/ffii/fpsms/config/security/service/LoginLogService.java similarity index 93% rename from src/main/java/com/ffii/tsms/config/security/service/LoginLogService.java rename to src/main/java/com/ffii/fpsms/config/security/service/LoginLogService.java index ae953b3..7568678 100644 --- a/src/main/java/com/ffii/tsms/config/security/service/LoginLogService.java +++ b/src/main/java/com/ffii/fpsms/config/security/service/LoginLogService.java @@ -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.HashMap; import java.util.List; import java.util.Map; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Isolation; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/ffii/tsms/model/AbilityModel.java b/src/main/java/com/ffii/fpsms/model/AbilityModel.java similarity index 89% rename from src/main/java/com/ffii/tsms/model/AbilityModel.java rename to src/main/java/com/ffii/fpsms/model/AbilityModel.java index 79d8ab0..19fe360 100644 --- a/src/main/java/com/ffii/tsms/model/AbilityModel.java +++ b/src/main/java/com/ffii/fpsms/model/AbilityModel.java @@ -1,4 +1,4 @@ -package com.ffii.tsms.model; +package com.ffii.fpsms.model; public class AbilityModel { diff --git a/src/main/java/com/ffii/tsms/model/ExceptionResponse.java b/src/main/java/com/ffii/fpsms/model/ExceptionResponse.java similarity index 94% rename from src/main/java/com/ffii/tsms/model/ExceptionResponse.java rename to src/main/java/com/ffii/fpsms/model/ExceptionResponse.java index f22c306..58cdd9c 100644 --- a/src/main/java/com/ffii/tsms/model/ExceptionResponse.java +++ b/src/main/java/com/ffii/fpsms/model/ExceptionResponse.java @@ -1,4 +1,4 @@ -package com.ffii.tsms.model; +package com.ffii.fpsms.model; public class ExceptionResponse { private String message; diff --git a/src/main/java/com/ffii/tsms/model/JwtRequest.java b/src/main/java/com/ffii/fpsms/model/JwtRequest.java similarity index 95% rename from src/main/java/com/ffii/tsms/model/JwtRequest.java rename to src/main/java/com/ffii/fpsms/model/JwtRequest.java index 2d2b2cc..9d731fd 100644 --- a/src/main/java/com/ffii/tsms/model/JwtRequest.java +++ b/src/main/java/com/ffii/fpsms/model/JwtRequest.java @@ -1,4 +1,4 @@ -package com.ffii.tsms.model; +package com.ffii.fpsms.model; import java.io.Serializable; diff --git a/src/main/java/com/ffii/tsms/model/JwtResponse.java b/src/main/java/com/ffii/fpsms/model/JwtResponse.java similarity index 93% rename from src/main/java/com/ffii/tsms/model/JwtResponse.java rename to src/main/java/com/ffii/fpsms/model/JwtResponse.java index 9b0d4e7..79c2af7 100644 --- a/src/main/java/com/ffii/tsms/model/JwtResponse.java +++ b/src/main/java/com/ffii/fpsms/model/JwtResponse.java @@ -1,9 +1,9 @@ -package com.ffii.tsms.model; +package com.ffii.fpsms.model; import java.io.Serializable; 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 { diff --git a/src/main/java/com/ffii/tsms/model/RefreshToken.java b/src/main/java/com/ffii/fpsms/model/RefreshToken.java similarity index 94% rename from src/main/java/com/ffii/tsms/model/RefreshToken.java rename to src/main/java/com/ffii/fpsms/model/RefreshToken.java index 159113f..bdd4534 100644 --- a/src/main/java/com/ffii/tsms/model/RefreshToken.java +++ b/src/main/java/com/ffii/fpsms/model/RefreshToken.java @@ -1,4 +1,4 @@ -package com.ffii.tsms.model; +package com.ffii.fpsms.model; import java.time.Instant; diff --git a/src/main/java/com/ffii/tsms/model/TokenRefreshRequest.java b/src/main/java/com/ffii/fpsms/model/TokenRefreshRequest.java similarity index 90% rename from src/main/java/com/ffii/tsms/model/TokenRefreshRequest.java rename to src/main/java/com/ffii/fpsms/model/TokenRefreshRequest.java index 23d18ae..6d946a6 100644 --- a/src/main/java/com/ffii/tsms/model/TokenRefreshRequest.java +++ b/src/main/java/com/ffii/fpsms/model/TokenRefreshRequest.java @@ -1,4 +1,4 @@ -package com.ffii.tsms.model; +package com.ffii.fpsms.model; import jakarta.validation.constraints.NotBlank; public class TokenRefreshRequest { diff --git a/src/main/java/com/ffii/tsms/model/TokenRefreshResponse.java b/src/main/java/com/ffii/fpsms/model/TokenRefreshResponse.java similarity index 96% rename from src/main/java/com/ffii/tsms/model/TokenRefreshResponse.java rename to src/main/java/com/ffii/fpsms/model/TokenRefreshResponse.java index 983cc9a..d08b0cd 100644 --- a/src/main/java/com/ffii/tsms/model/TokenRefreshResponse.java +++ b/src/main/java/com/ffii/fpsms/model/TokenRefreshResponse.java @@ -1,4 +1,4 @@ -package com.ffii.tsms.model; +package com.ffii.fpsms.model; public class TokenRefreshResponse { private String accessToken; diff --git a/src/main/java/com/ffii/tsms/modules/common/ErrorCodes.java b/src/main/java/com/ffii/fpsms/modules/common/ErrorCodes.java similarity index 93% rename from src/main/java/com/ffii/tsms/modules/common/ErrorCodes.java rename to src/main/java/com/ffii/fpsms/modules/common/ErrorCodes.java index fd95d5f..7da8d24 100644 --- a/src/main/java/com/ffii/tsms/modules/common/ErrorCodes.java +++ b/src/main/java/com/ffii/fpsms/modules/common/ErrorCodes.java @@ -1,4 +1,4 @@ -package com.ffii.tsms.modules.common; +package com.ffii.fpsms.modules.common; public class ErrorCodes { diff --git a/src/main/java/com/ffii/tsms/modules/common/PasswordRule.java b/src/main/java/com/ffii/fpsms/modules/common/PasswordRule.java similarity index 96% rename from src/main/java/com/ffii/tsms/modules/common/PasswordRule.java rename to src/main/java/com/ffii/fpsms/modules/common/PasswordRule.java index f5fc7ce..9221112 100644 --- a/src/main/java/com/ffii/tsms/modules/common/PasswordRule.java +++ b/src/main/java/com/ffii/fpsms/modules/common/PasswordRule.java @@ -1,8 +1,8 @@ -package com.ffii.tsms.modules.common; +package com.ffii.fpsms.modules.common; import com.fasterxml.jackson.annotation.JsonIgnore; 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 { diff --git a/src/main/java/com/ffii/tsms/modules/common/SecurityUtils.java b/src/main/java/com/ffii/fpsms/modules/common/SecurityUtils.java similarity index 98% rename from src/main/java/com/ffii/tsms/modules/common/SecurityUtils.java rename to src/main/java/com/ffii/fpsms/modules/common/SecurityUtils.java index 2930fb4..d0608e1 100644 --- a/src/main/java/com/ffii/tsms/modules/common/SecurityUtils.java +++ b/src/main/java/com/ffii/fpsms/modules/common/SecurityUtils.java @@ -1,4 +1,4 @@ -package com.ffii.tsms.modules.common; +package com.ffii.fpsms.modules.common; 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.UsernameNotFoundException; -import com.ffii.tsms.modules.user.entity.User; +import com.ffii.fpsms.modules.user.entity.User; /** * Security Utils - for Spring Security diff --git a/src/main/java/com/ffii/tsms/modules/common/SettingNames.java b/src/main/java/com/ffii/fpsms/modules/common/SettingNames.java similarity index 98% rename from src/main/java/com/ffii/tsms/modules/common/SettingNames.java rename to src/main/java/com/ffii/fpsms/modules/common/SettingNames.java index 674e04d..66e7adf 100644 --- a/src/main/java/com/ffii/tsms/modules/common/SettingNames.java +++ b/src/main/java/com/ffii/fpsms/modules/common/SettingNames.java @@ -1,4 +1,4 @@ -package com.ffii.tsms.modules.common; +package com.ffii.fpsms.modules.common; public abstract class SettingNames { /* diff --git a/src/main/java/com/ffii/tsms/modules/common/service/AuditLogService.java b/src/main/java/com/ffii/fpsms/modules/common/service/AuditLogService.java similarity index 97% rename from src/main/java/com/ffii/tsms/modules/common/service/AuditLogService.java rename to src/main/java/com/ffii/fpsms/modules/common/service/AuditLogService.java index 55aa3a4..a399b8f 100644 --- a/src/main/java/com/ffii/tsms/modules/common/service/AuditLogService.java +++ b/src/main/java/com/ffii/fpsms/modules/common/service/AuditLogService.java @@ -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.List; diff --git a/src/main/java/com/ffii/tsms/modules/settings/entity/Settings.java b/src/main/java/com/ffii/fpsms/modules/settings/entity/Settings.java similarity index 96% rename from src/main/java/com/ffii/tsms/modules/settings/entity/Settings.java rename to src/main/java/com/ffii/fpsms/modules/settings/entity/Settings.java index 52e8d39..f2db165 100644 --- a/src/main/java/com/ffii/tsms/modules/settings/entity/Settings.java +++ b/src/main/java/com/ffii/fpsms/modules/settings/entity/Settings.java @@ -1,4 +1,4 @@ -package com.ffii.tsms.modules.settings.entity; +package com.ffii.fpsms.modules.settings.entity; import com.ffii.core.entity.IdEntity; diff --git a/src/main/java/com/ffii/tsms/modules/settings/entity/SettingsRepository.java b/src/main/java/com/ffii/fpsms/modules/settings/entity/SettingsRepository.java similarity index 85% rename from src/main/java/com/ffii/tsms/modules/settings/entity/SettingsRepository.java rename to src/main/java/com/ffii/fpsms/modules/settings/entity/SettingsRepository.java index fdf27ef..05994c2 100644 --- a/src/main/java/com/ffii/tsms/modules/settings/entity/SettingsRepository.java +++ b/src/main/java/com/ffii/fpsms/modules/settings/entity/SettingsRepository.java @@ -1,4 +1,4 @@ -package com.ffii.tsms.modules.settings.entity; +package com.ffii.fpsms.modules.settings.entity; import java.util.Optional; diff --git a/src/main/java/com/ffii/tsms/modules/settings/service/SettingsService.java b/src/main/java/com/ffii/fpsms/modules/settings/service/SettingsService.java similarity index 97% rename from src/main/java/com/ffii/tsms/modules/settings/service/SettingsService.java rename to src/main/java/com/ffii/fpsms/modules/settings/service/SettingsService.java index c1a8d19..d6637ad 100644 --- a/src/main/java/com/ffii/tsms/modules/settings/service/SettingsService.java +++ b/src/main/java/com/ffii/fpsms/modules/settings/service/SettingsService.java @@ -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.LocalDateTime; @@ -14,8 +14,8 @@ import org.springframework.transaction.annotation.Transactional; import com.ffii.core.exception.InternalServerErrorException; import com.ffii.core.support.AbstractIdEntityService; 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 diff --git a/src/main/java/com/ffii/tsms/modules/settings/web/SettingsController.java b/src/main/java/com/ffii/fpsms/modules/settings/web/SettingsController.java similarity index 91% rename from src/main/java/com/ffii/tsms/modules/settings/web/SettingsController.java rename to src/main/java/com/ffii/fpsms/modules/settings/web/SettingsController.java index 3a76fcb..046037f 100644 --- a/src/main/java/com/ffii/tsms/modules/settings/web/SettingsController.java +++ b/src/main/java/com/ffii/fpsms/modules/settings/web/SettingsController.java @@ -1,4 +1,4 @@ -package com.ffii.tsms.modules.settings.web; +package com.ffii.fpsms.modules.settings.web; 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.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.constraints.NotBlank; diff --git a/src/main/java/com/ffii/tsms/modules/user/entity/Group.java b/src/main/java/com/ffii/fpsms/modules/user/entity/Group.java similarity index 93% rename from src/main/java/com/ffii/tsms/modules/user/entity/Group.java rename to src/main/java/com/ffii/fpsms/modules/user/entity/Group.java index e6d7bd2..8c6c049 100644 --- a/src/main/java/com/ffii/tsms/modules/user/entity/Group.java +++ b/src/main/java/com/ffii/fpsms/modules/user/entity/Group.java @@ -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.Entity; diff --git a/src/main/java/com/ffii/tsms/modules/user/entity/GroupRepository.java b/src/main/java/com/ffii/fpsms/modules/user/entity/GroupRepository.java similarity index 74% rename from src/main/java/com/ffii/tsms/modules/user/entity/GroupRepository.java rename to src/main/java/com/ffii/fpsms/modules/user/entity/GroupRepository.java index 966f7f8..95dc1d2 100644 --- a/src/main/java/com/ffii/tsms/modules/user/entity/GroupRepository.java +++ b/src/main/java/com/ffii/fpsms/modules/user/entity/GroupRepository.java @@ -1,4 +1,4 @@ -package com.ffii.tsms.modules.user.entity; +package com.ffii.fpsms.modules.user.entity; import com.ffii.core.support.AbstractRepository; diff --git a/src/main/java/com/ffii/tsms/modules/user/entity/User.java b/src/main/java/com/ffii/fpsms/modules/user/entity/User.java similarity index 97% rename from src/main/java/com/ffii/tsms/modules/user/entity/User.java rename to src/main/java/com/ffii/fpsms/modules/user/entity/User.java index e319e6f..510a11f 100644 --- a/src/main/java/com/ffii/tsms/modules/user/entity/User.java +++ b/src/main/java/com/ffii/fpsms/modules/user/entity/User.java @@ -1,4 +1,4 @@ -package com.ffii.tsms.modules.user.entity; +package com.ffii.fpsms.modules.user.entity; import java.time.LocalDate; import java.util.Collection; @@ -8,7 +8,6 @@ import jakarta.persistence.Entity; import jakarta.persistence.Table; import jakarta.persistence.Transient; import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; diff --git a/src/main/java/com/ffii/tsms/modules/user/entity/UserRepository.java b/src/main/java/com/ffii/fpsms/modules/user/entity/UserRepository.java similarity index 88% rename from src/main/java/com/ffii/tsms/modules/user/entity/UserRepository.java rename to src/main/java/com/ffii/fpsms/modules/user/entity/UserRepository.java index 1abe93e..a1f4dd8 100644 --- a/src/main/java/com/ffii/tsms/modules/user/entity/UserRepository.java +++ b/src/main/java/com/ffii/fpsms/modules/user/entity/UserRepository.java @@ -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.Optional; diff --git a/src/main/java/com/ffii/tsms/modules/user/req/NewPublicUserReq.java b/src/main/java/com/ffii/fpsms/modules/user/req/NewPublicUserReq.java similarity index 92% rename from src/main/java/com/ffii/tsms/modules/user/req/NewPublicUserReq.java rename to src/main/java/com/ffii/fpsms/modules/user/req/NewPublicUserReq.java index 076573d..e6ee279 100644 --- a/src/main/java/com/ffii/tsms/modules/user/req/NewPublicUserReq.java +++ b/src/main/java/com/ffii/fpsms/modules/user/req/NewPublicUserReq.java @@ -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.Size; diff --git a/src/main/java/com/ffii/tsms/modules/user/req/NewUserReq.java b/src/main/java/com/ffii/fpsms/modules/user/req/NewUserReq.java similarity index 90% rename from src/main/java/com/ffii/tsms/modules/user/req/NewUserReq.java rename to src/main/java/com/ffii/fpsms/modules/user/req/NewUserReq.java index 53f5429..560b5f9 100644 --- a/src/main/java/com/ffii/tsms/modules/user/req/NewUserReq.java +++ b/src/main/java/com/ffii/fpsms/modules/user/req/NewUserReq.java @@ -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.Size; diff --git a/src/main/java/com/ffii/tsms/modules/user/req/SaveGroupReq.java b/src/main/java/com/ffii/fpsms/modules/user/req/SaveGroupReq.java similarity index 97% rename from src/main/java/com/ffii/tsms/modules/user/req/SaveGroupReq.java rename to src/main/java/com/ffii/fpsms/modules/user/req/SaveGroupReq.java index c2517a8..c16e0c2 100644 --- a/src/main/java/com/ffii/tsms/modules/user/req/SaveGroupReq.java +++ b/src/main/java/com/ffii/fpsms/modules/user/req/SaveGroupReq.java @@ -1,4 +1,4 @@ -package com.ffii.tsms.modules.user.req; +package com.ffii.fpsms.modules.user.req; import java.util.List; diff --git a/src/main/java/com/ffii/tsms/modules/user/req/SearchUserReq.java b/src/main/java/com/ffii/fpsms/modules/user/req/SearchUserReq.java similarity index 96% rename from src/main/java/com/ffii/tsms/modules/user/req/SearchUserReq.java rename to src/main/java/com/ffii/fpsms/modules/user/req/SearchUserReq.java index bf5dd59..0276f5c 100644 --- a/src/main/java/com/ffii/tsms/modules/user/req/SearchUserReq.java +++ b/src/main/java/com/ffii/fpsms/modules/user/req/SearchUserReq.java @@ -1,4 +1,4 @@ -package com.ffii.tsms.modules.user.req; +package com.ffii.fpsms.modules.user.req; public class SearchUserReq { private Integer id; diff --git a/src/main/java/com/ffii/tsms/modules/user/req/UpdateUserReq.java b/src/main/java/com/ffii/fpsms/modules/user/req/UpdateUserReq.java similarity index 98% rename from src/main/java/com/ffii/tsms/modules/user/req/UpdateUserReq.java rename to src/main/java/com/ffii/fpsms/modules/user/req/UpdateUserReq.java index 531eba6..b70c049 100644 --- a/src/main/java/com/ffii/tsms/modules/user/req/UpdateUserReq.java +++ b/src/main/java/com/ffii/fpsms/modules/user/req/UpdateUserReq.java @@ -1,4 +1,4 @@ -package com.ffii.tsms.modules.user.req; +package com.ffii.fpsms.modules.user.req; import java.time.LocalDate; import java.util.List; diff --git a/src/main/java/com/ffii/tsms/modules/user/service/GroupService.java b/src/main/java/com/ffii/fpsms/modules/user/service/GroupService.java similarity index 94% rename from src/main/java/com/ffii/tsms/modules/user/service/GroupService.java rename to src/main/java/com/ffii/fpsms/modules/user/service/GroupService.java index f7cc523..678fa41 100644 --- a/src/main/java/com/ffii/tsms/modules/user/service/GroupService.java +++ b/src/main/java/com/ffii/fpsms/modules/user/service/GroupService.java @@ -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.List; @@ -15,11 +15,11 @@ import com.ffii.core.support.AbstractBaseEntityService; import com.ffii.core.support.JdbcDao; import com.ffii.core.utils.JsonUtils; 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.validation.Valid; diff --git a/src/main/java/com/ffii/tsms/modules/user/service/UserAuthorityService.java b/src/main/java/com/ffii/fpsms/modules/user/service/UserAuthorityService.java similarity index 94% rename from src/main/java/com/ffii/tsms/modules/user/service/UserAuthorityService.java rename to src/main/java/com/ffii/fpsms/modules/user/service/UserAuthorityService.java index 6d2e4f7..b3f4c8b 100644 --- a/src/main/java/com/ffii/tsms/modules/user/service/UserAuthorityService.java +++ b/src/main/java/com/ffii/fpsms/modules/user/service/UserAuthorityService.java @@ -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.List; @@ -11,7 +11,7 @@ import org.springframework.transaction.annotation.Transactional; import com.ffii.core.support.AbstractService; import com.ffii.core.support.JdbcDao; -import com.ffii.tsms.modules.user.entity.User; +import com.ffii.fpsms.modules.user.entity.User; @Service public class UserAuthorityService extends AbstractService { diff --git a/src/main/java/com/ffii/tsms/modules/user/service/UserService.java b/src/main/java/com/ffii/fpsms/modules/user/service/UserService.java similarity index 92% rename from src/main/java/com/ffii/tsms/modules/user/service/UserService.java rename to src/main/java/com/ffii/fpsms/modules/user/service/UserService.java index 3bb0e39..9cb249d 100644 --- a/src/main/java/com/ffii/tsms/modules/user/service/UserService.java +++ b/src/main/java/com/ffii/fpsms/modules/user/service/UserService.java @@ -1,15 +1,12 @@ -package com.ffii.tsms.modules.user.service; +package com.ffii.fpsms.modules.user.service; import java.io.UnsupportedEncodingException; import java.util.LinkedHashSet; import java.util.List; -import java.util.Locale; import java.util.Map; import java.util.Optional; import java.util.Set; -import java.util.stream.Collectors; -import org.apache.commons.lang3.LocaleUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; 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.utils.Params; 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 public class UserService extends AbstractBaseEntityService { diff --git a/src/main/java/com/ffii/tsms/modules/user/service/pojo/AuthRecord.java b/src/main/java/com/ffii/fpsms/modules/user/service/pojo/AuthRecord.java similarity index 92% rename from src/main/java/com/ffii/tsms/modules/user/service/pojo/AuthRecord.java rename to src/main/java/com/ffii/fpsms/modules/user/service/pojo/AuthRecord.java index 33ad0b5..2ff0107 100644 --- a/src/main/java/com/ffii/tsms/modules/user/service/pojo/AuthRecord.java +++ b/src/main/java/com/ffii/fpsms/modules/user/service/pojo/AuthRecord.java @@ -1,4 +1,4 @@ -package com.ffii.tsms.modules.user.service.pojo; +package com.ffii.fpsms.modules.user.service.pojo; public class AuthRecord { private Integer id; diff --git a/src/main/java/com/ffii/tsms/modules/user/service/pojo/UserRecord.java b/src/main/java/com/ffii/fpsms/modules/user/service/pojo/UserRecord.java similarity index 98% rename from src/main/java/com/ffii/tsms/modules/user/service/pojo/UserRecord.java rename to src/main/java/com/ffii/fpsms/modules/user/service/pojo/UserRecord.java index 6af65aa..861db6f 100644 --- a/src/main/java/com/ffii/tsms/modules/user/service/pojo/UserRecord.java +++ b/src/main/java/com/ffii/fpsms/modules/user/service/pojo/UserRecord.java @@ -1,4 +1,4 @@ -package com.ffii.tsms.modules.user.service.pojo; +package com.ffii.fpsms.modules.user.service.pojo; import java.time.LocalDateTime; diff --git a/src/main/java/com/ffii/tsms/modules/user/service/res/LoadUserRes.java b/src/main/java/com/ffii/fpsms/modules/user/service/res/LoadUserRes.java similarity index 88% rename from src/main/java/com/ffii/tsms/modules/user/service/res/LoadUserRes.java rename to src/main/java/com/ffii/fpsms/modules/user/service/res/LoadUserRes.java index c2a47c6..5fb3193 100644 --- a/src/main/java/com/ffii/tsms/modules/user/service/res/LoadUserRes.java +++ b/src/main/java/com/ffii/fpsms/modules/user/service/res/LoadUserRes.java @@ -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 com.ffii.tsms.modules.user.entity.User; +import com.ffii.fpsms.modules.user.entity.User; public class LoadUserRes { private User data; diff --git a/src/main/java/com/ffii/tsms/modules/user/web/GroupController.java b/src/main/java/com/ffii/fpsms/modules/user/web/GroupController.java similarity index 94% rename from src/main/java/com/ffii/tsms/modules/user/web/GroupController.java rename to src/main/java/com/ffii/fpsms/modules/user/web/GroupController.java index 89752b4..a231f8c 100644 --- a/src/main/java/com/ffii/tsms/modules/user/web/GroupController.java +++ b/src/main/java/com/ffii/fpsms/modules/user/web/GroupController.java @@ -1,4 +1,4 @@ -package com.ffii.tsms.modules.user.web; +package com.ffii.fpsms.modules.user.web; import java.util.Map; @@ -20,8 +20,8 @@ import com.ffii.core.response.IdRes; import com.ffii.core.response.RecordsRes; import com.ffii.core.utils.CriteriaArgsBuilder; 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.validation.Valid; diff --git a/src/main/java/com/ffii/tsms/modules/user/web/TestController.java b/src/main/java/com/ffii/fpsms/modules/user/web/TestController.java similarity index 93% rename from src/main/java/com/ffii/tsms/modules/user/web/TestController.java rename to src/main/java/com/ffii/fpsms/modules/user/web/TestController.java index dd8a382..e66d591 100644 --- a/src/main/java/com/ffii/tsms/modules/user/web/TestController.java +++ b/src/main/java/com/ffii/fpsms/modules/user/web/TestController.java @@ -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.LogFactory; diff --git a/src/main/java/com/ffii/tsms/modules/user/web/UserController.java b/src/main/java/com/ffii/fpsms/modules/user/web/UserController.java similarity index 91% rename from src/main/java/com/ffii/tsms/modules/user/web/UserController.java rename to src/main/java/com/ffii/fpsms/modules/user/web/UserController.java index 8ab3cdf..812efa9 100644 --- a/src/main/java/com/ffii/tsms/modules/user/web/UserController.java +++ b/src/main/java/com/ffii/fpsms/modules/user/web/UserController.java @@ -1,4 +1,4 @@ -package com.ffii.tsms.modules.user.web; +package com.ffii.fpsms.modules.user.web; import java.io.UnsupportedEncodingException; @@ -25,17 +25,17 @@ import com.ffii.core.exception.NotFoundException; import com.ffii.core.exception.UnprocessableEntityException; import com.ffii.core.response.IdRes; 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.constraints.NotBlank; diff --git a/src/main/resources/application-db-2fi.yml b/src/main/resources/application-db-2fi.yml index 661776e..b004de2 100644 --- a/src/main/resources/application-db-2fi.yml +++ b/src/main/resources/application-db-2fi.yml @@ -1,5 +1,5 @@ spring: 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 password: secret \ No newline at end of file diff --git a/src/main/resources/application-db-local.yml b/src/main/resources/application-db-local.yml index 0e698ad..4fa8584 100644 --- a/src/main/resources/application-db-local.yml +++ b/src/main/resources/application-db-local.yml @@ -1,5 +1,5 @@ spring: 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 password: secret \ No newline at end of file diff --git a/src/main/resources/db/changelog/changes/20230720_01_alex/04_update_user_authority.sql b/src/main/resources/db/changelog/changes/20230720_01_alex/04_update_user_authority.sql index 6336b37..7a74958 100644 --- a/src/main/resources/db/changelog/changes/20230720_01_alex/04_update_user_authority.sql +++ b/src/main/resources/db/changelog/changes/20230720_01_alex/04_update_user_authority.sql @@ -1,5 +1,5 @@ --liquibase formatted sql --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'); \ No newline at end of file +INSERT INTO `fpsmsdb`.`user_authority` (`userId`, `authId`) VALUES ('1', '1'); +INSERT INTO `fpsmsdb`.`user_authority` (`userId`, `authId`) VALUES ('1', '2'); \ No newline at end of file diff --git a/src/main/resources/log4j2-prod-linux.yml b/src/main/resources/log4j2-prod-linux.yml index 1859476..c90a291 100644 --- a/src/main/resources/log4j2-prod-linux.yml +++ b/src/main/resources/log4j2-prod-linux.yml @@ -7,8 +7,8 @@ Configutation: Appenders: RollingFile: 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: Pattern: "%d %p [%l] - %m%n" Policies: diff --git a/src/main/resources/log4j2-prod-win.yml b/src/main/resources/log4j2-prod-win.yml index 8e770f5..d4f8a75 100644 --- a/src/main/resources/log4j2-prod-win.yml +++ b/src/main/resources/log4j2-prod-win.yml @@ -7,8 +7,8 @@ Configutation: Appenders: RollingFile: 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: Pattern: "%d %p [%l] - %m%n" Policies: diff --git a/src/test/java/com/ffii/tsms/ArsApplicationTests.java b/src/test/java/com/ffii/fpsms/FpsmsApplicationTests.java similarity index 73% rename from src/test/java/com/ffii/tsms/ArsApplicationTests.java rename to src/test/java/com/ffii/fpsms/FpsmsApplicationTests.java index 01e63dd..013d85c 100644 --- a/src/test/java/com/ffii/tsms/ArsApplicationTests.java +++ b/src/test/java/com/ffii/fpsms/FpsmsApplicationTests.java @@ -1,10 +1,10 @@ -package com.ffii.tsms; +package com.ffii.fpsms; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; @SpringBootTest -class TsmsApplicationTests { +class FpsmsApplicationTests { @Test void contextLoads() {