Parcourir la source

tsms to fpsms

create_edit_user
MSI\derek il y a 6 mois
Parent
révision
f6f0a10766
50 fichiers modifiés avec 118 ajouts et 126 suppressions
  1. +7
    -7
      README.md
  2. +1
    -1
      src/main/java/com/ffii/core/utils/JwtTokenUtil.java
  3. +3
    -3
      src/main/java/com/ffii/fpsms/FpsmsApplication.java
  4. +2
    -2
      src/main/java/com/ffii/fpsms/config/AppConfig.java
  5. +1
    -1
      src/main/java/com/ffii/fpsms/config/WebConfig.java
  6. +2
    -2
      src/main/java/com/ffii/fpsms/config/security/SecurityConfig.java
  7. +2
    -2
      src/main/java/com/ffii/fpsms/config/security/jwt/JwtRequestFilter.java
  8. +5
    -5
      src/main/java/com/ffii/fpsms/config/security/jwt/service/JwtUserDetailsService.java
  9. +13
    -14
      src/main/java/com/ffii/fpsms/config/security/jwt/web/JwtAuthenticationController.java
  10. +1
    -2
      src/main/java/com/ffii/fpsms/config/security/service/LoginLogService.java
  11. +1
    -1
      src/main/java/com/ffii/fpsms/model/AbilityModel.java
  12. +1
    -1
      src/main/java/com/ffii/fpsms/model/ExceptionResponse.java
  13. +1
    -1
      src/main/java/com/ffii/fpsms/model/JwtRequest.java
  14. +2
    -2
      src/main/java/com/ffii/fpsms/model/JwtResponse.java
  15. +1
    -1
      src/main/java/com/ffii/fpsms/model/RefreshToken.java
  16. +1
    -1
      src/main/java/com/ffii/fpsms/model/TokenRefreshRequest.java
  17. +1
    -1
      src/main/java/com/ffii/fpsms/model/TokenRefreshResponse.java
  18. +1
    -1
      src/main/java/com/ffii/fpsms/modules/common/ErrorCodes.java
  19. +2
    -2
      src/main/java/com/ffii/fpsms/modules/common/PasswordRule.java
  20. +2
    -2
      src/main/java/com/ffii/fpsms/modules/common/SecurityUtils.java
  21. +1
    -1
      src/main/java/com/ffii/fpsms/modules/common/SettingNames.java
  22. +1
    -1
      src/main/java/com/ffii/fpsms/modules/common/service/AuditLogService.java
  23. +1
    -1
      src/main/java/com/ffii/fpsms/modules/settings/entity/Settings.java
  24. +1
    -1
      src/main/java/com/ffii/fpsms/modules/settings/entity/SettingsRepository.java
  25. +3
    -3
      src/main/java/com/ffii/fpsms/modules/settings/service/SettingsService.java
  26. +3
    -3
      src/main/java/com/ffii/fpsms/modules/settings/web/SettingsController.java
  27. +1
    -1
      src/main/java/com/ffii/fpsms/modules/user/entity/Group.java
  28. +1
    -1
      src/main/java/com/ffii/fpsms/modules/user/entity/GroupRepository.java
  29. +1
    -2
      src/main/java/com/ffii/fpsms/modules/user/entity/User.java
  30. +1
    -1
      src/main/java/com/ffii/fpsms/modules/user/entity/UserRepository.java
  31. +1
    -1
      src/main/java/com/ffii/fpsms/modules/user/req/NewPublicUserReq.java
  32. +1
    -1
      src/main/java/com/ffii/fpsms/modules/user/req/NewUserReq.java
  33. +1
    -1
      src/main/java/com/ffii/fpsms/modules/user/req/SaveGroupReq.java
  34. +1
    -1
      src/main/java/com/ffii/fpsms/modules/user/req/SearchUserReq.java
  35. +1
    -1
      src/main/java/com/ffii/fpsms/modules/user/req/UpdateUserReq.java
  36. +6
    -6
      src/main/java/com/ffii/fpsms/modules/user/service/GroupService.java
  37. +2
    -2
      src/main/java/com/ffii/fpsms/modules/user/service/UserAuthorityService.java
  38. +11
    -16
      src/main/java/com/ffii/fpsms/modules/user/service/UserService.java
  39. +1
    -1
      src/main/java/com/ffii/fpsms/modules/user/service/pojo/AuthRecord.java
  40. +1
    -1
      src/main/java/com/ffii/fpsms/modules/user/service/pojo/UserRecord.java
  41. +2
    -2
      src/main/java/com/ffii/fpsms/modules/user/service/res/LoadUserRes.java
  42. +3
    -3
      src/main/java/com/ffii/fpsms/modules/user/web/GroupController.java
  43. +1
    -1
      src/main/java/com/ffii/fpsms/modules/user/web/TestController.java
  44. +12
    -12
      src/main/java/com/ffii/fpsms/modules/user/web/UserController.java
  45. +1
    -1
      src/main/resources/application-db-2fi.yml
  46. +1
    -1
      src/main/resources/application-db-local.yml
  47. +2
    -2
      src/main/resources/db/changelog/changes/20230720_01_alex/04_update_user_authority.sql
  48. +2
    -2
      src/main/resources/log4j2-prod-linux.yml
  49. +2
    -2
      src/main/resources/log4j2-prod-win.yml
  50. +2
    -2
      src/test/java/com/ffii/fpsms/FpsmsApplicationTests.java

+ 7
- 7
README.md Voir le fichier

@@ -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"
}
]


+ 1
- 1
src/main/java/com/ffii/core/utils/JwtTokenUtil.java Voir le fichier

@@ -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;


src/main/java/com/ffii/tsms/TsmsApplication.java → src/main/java/com/ffii/fpsms/FpsmsApplication.java Voir le fichier

@@ -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);
}

}

src/main/java/com/ffii/tsms/config/AppConfig.java → src/main/java/com/ffii/fpsms/config/AppConfig.java Voir le fichier

@@ -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

src/main/java/com/ffii/tsms/config/WebConfig.java → src/main/java/com/ffii/fpsms/config/WebConfig.java Voir le fichier

@@ -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;

src/main/java/com/ffii/tsms/config/security/SecurityConfig.java → src/main/java/com/ffii/fpsms/config/security/SecurityConfig.java Voir le fichier

@@ -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

src/main/java/com/ffii/tsms/config/security/jwt/JwtRequestFilter.java → src/main/java/com/ffii/fpsms/config/security/jwt/JwtRequestFilter.java Voir le fichier

@@ -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;

src/main/java/com/ffii/tsms/config/security/jwt/service/JwtUserDetailsService.java → src/main/java/com/ffii/fpsms/config/security/jwt/service/JwtUserDetailsService.java Voir le fichier

@@ -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 {

src/main/java/com/ffii/tsms/config/security/jwt/web/JwtAuthenticationController.java → src/main/java/com/ffii/fpsms/config/security/jwt/web/JwtAuthenticationController.java Voir le fichier

@@ -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;

src/main/java/com/ffii/tsms/config/security/service/LoginLogService.java → src/main/java/com/ffii/fpsms/config/security/service/LoginLogService.java Voir le fichier

@@ -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;

src/main/java/com/ffii/tsms/model/AbilityModel.java → src/main/java/com/ffii/fpsms/model/AbilityModel.java Voir le fichier

@@ -1,4 +1,4 @@
package com.ffii.tsms.model;
package com.ffii.fpsms.model;

public class AbilityModel {


src/main/java/com/ffii/tsms/model/ExceptionResponse.java → src/main/java/com/ffii/fpsms/model/ExceptionResponse.java Voir le fichier

@@ -1,4 +1,4 @@
package com.ffii.tsms.model;
package com.ffii.fpsms.model;

public class ExceptionResponse {
private String message;

src/main/java/com/ffii/tsms/model/JwtRequest.java → src/main/java/com/ffii/fpsms/model/JwtRequest.java Voir le fichier

@@ -1,4 +1,4 @@
package com.ffii.tsms.model;
package com.ffii.fpsms.model;


import java.io.Serializable;

src/main/java/com/ffii/tsms/model/JwtResponse.java → src/main/java/com/ffii/fpsms/model/JwtResponse.java Voir le fichier

@@ -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 {


src/main/java/com/ffii/tsms/model/RefreshToken.java → src/main/java/com/ffii/fpsms/model/RefreshToken.java Voir le fichier

@@ -1,4 +1,4 @@
package com.ffii.tsms.model;
package com.ffii.fpsms.model;

import java.time.Instant;


src/main/java/com/ffii/tsms/model/TokenRefreshRequest.java → src/main/java/com/ffii/fpsms/model/TokenRefreshRequest.java Voir le fichier

@@ -1,4 +1,4 @@
package com.ffii.tsms.model;
package com.ffii.fpsms.model;
import jakarta.validation.constraints.NotBlank;

public class TokenRefreshRequest {

src/main/java/com/ffii/tsms/model/TokenRefreshResponse.java → src/main/java/com/ffii/fpsms/model/TokenRefreshResponse.java Voir le fichier

@@ -1,4 +1,4 @@
package com.ffii.tsms.model;
package com.ffii.fpsms.model;

public class TokenRefreshResponse {
private String accessToken;

src/main/java/com/ffii/tsms/modules/common/ErrorCodes.java → src/main/java/com/ffii/fpsms/modules/common/ErrorCodes.java Voir le fichier

@@ -1,4 +1,4 @@
package com.ffii.tsms.modules.common;
package com.ffii.fpsms.modules.common;

public class ErrorCodes {


src/main/java/com/ffii/tsms/modules/common/PasswordRule.java → src/main/java/com/ffii/fpsms/modules/common/PasswordRule.java Voir le fichier

@@ -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 {

src/main/java/com/ffii/tsms/modules/common/SecurityUtils.java → src/main/java/com/ffii/fpsms/modules/common/SecurityUtils.java Voir le fichier

@@ -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

src/main/java/com/ffii/tsms/modules/common/SettingNames.java → src/main/java/com/ffii/fpsms/modules/common/SettingNames.java Voir le fichier

@@ -1,4 +1,4 @@
package com.ffii.tsms.modules.common;
package com.ffii.fpsms.modules.common;

public abstract class SettingNames {
/*

src/main/java/com/ffii/tsms/modules/common/service/AuditLogService.java → src/main/java/com/ffii/fpsms/modules/common/service/AuditLogService.java Voir le fichier

@@ -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;

src/main/java/com/ffii/tsms/modules/settings/entity/Settings.java → src/main/java/com/ffii/fpsms/modules/settings/entity/Settings.java Voir le fichier

@@ -1,4 +1,4 @@
package com.ffii.tsms.modules.settings.entity;
package com.ffii.fpsms.modules.settings.entity;

import com.ffii.core.entity.IdEntity;


src/main/java/com/ffii/tsms/modules/settings/entity/SettingsRepository.java → src/main/java/com/ffii/fpsms/modules/settings/entity/SettingsRepository.java Voir le fichier

@@ -1,4 +1,4 @@
package com.ffii.tsms.modules.settings.entity;
package com.ffii.fpsms.modules.settings.entity;

import java.util.Optional;


src/main/java/com/ffii/tsms/modules/settings/service/SettingsService.java → src/main/java/com/ffii/fpsms/modules/settings/service/SettingsService.java Voir le fichier

@@ -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

src/main/java/com/ffii/tsms/modules/settings/web/SettingsController.java → src/main/java/com/ffii/fpsms/modules/settings/web/SettingsController.java Voir le fichier

@@ -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;

src/main/java/com/ffii/tsms/modules/user/entity/Group.java → src/main/java/com/ffii/fpsms/modules/user/entity/Group.java Voir le fichier

@@ -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;

src/main/java/com/ffii/tsms/modules/user/entity/GroupRepository.java → src/main/java/com/ffii/fpsms/modules/user/entity/GroupRepository.java Voir le fichier

@@ -1,4 +1,4 @@
package com.ffii.tsms.modules.user.entity;
package com.ffii.fpsms.modules.user.entity;

import com.ffii.core.support.AbstractRepository;


src/main/java/com/ffii/tsms/modules/user/entity/User.java → src/main/java/com/ffii/fpsms/modules/user/entity/User.java Voir le fichier

@@ -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;

src/main/java/com/ffii/tsms/modules/user/entity/UserRepository.java → src/main/java/com/ffii/fpsms/modules/user/entity/UserRepository.java Voir le fichier

@@ -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;

src/main/java/com/ffii/tsms/modules/user/req/NewPublicUserReq.java → src/main/java/com/ffii/fpsms/modules/user/req/NewPublicUserReq.java Voir le fichier

@@ -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;

src/main/java/com/ffii/tsms/modules/user/req/NewUserReq.java → src/main/java/com/ffii/fpsms/modules/user/req/NewUserReq.java Voir le fichier

@@ -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;

src/main/java/com/ffii/tsms/modules/user/req/SaveGroupReq.java → src/main/java/com/ffii/fpsms/modules/user/req/SaveGroupReq.java Voir le fichier

@@ -1,4 +1,4 @@
package com.ffii.tsms.modules.user.req;
package com.ffii.fpsms.modules.user.req;

import java.util.List;


src/main/java/com/ffii/tsms/modules/user/req/SearchUserReq.java → src/main/java/com/ffii/fpsms/modules/user/req/SearchUserReq.java Voir le fichier

@@ -1,4 +1,4 @@
package com.ffii.tsms.modules.user.req;
package com.ffii.fpsms.modules.user.req;

public class SearchUserReq {
private Integer id;

src/main/java/com/ffii/tsms/modules/user/req/UpdateUserReq.java → src/main/java/com/ffii/fpsms/modules/user/req/UpdateUserReq.java Voir le fichier

@@ -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;

src/main/java/com/ffii/tsms/modules/user/service/GroupService.java → src/main/java/com/ffii/fpsms/modules/user/service/GroupService.java Voir le fichier

@@ -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;

src/main/java/com/ffii/tsms/modules/user/service/UserAuthorityService.java → src/main/java/com/ffii/fpsms/modules/user/service/UserAuthorityService.java Voir le fichier

@@ -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 {

src/main/java/com/ffii/tsms/modules/user/service/UserService.java → src/main/java/com/ffii/fpsms/modules/user/service/UserService.java Voir le fichier

@@ -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<User, Long, UserRepository> {

src/main/java/com/ffii/tsms/modules/user/service/pojo/AuthRecord.java → src/main/java/com/ffii/fpsms/modules/user/service/pojo/AuthRecord.java Voir le fichier

@@ -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;

src/main/java/com/ffii/tsms/modules/user/service/pojo/UserRecord.java → src/main/java/com/ffii/fpsms/modules/user/service/pojo/UserRecord.java Voir le fichier

@@ -1,4 +1,4 @@
package com.ffii.tsms.modules.user.service.pojo;
package com.ffii.fpsms.modules.user.service.pojo;

import java.time.LocalDateTime;


src/main/java/com/ffii/tsms/modules/user/service/res/LoadUserRes.java → src/main/java/com/ffii/fpsms/modules/user/service/res/LoadUserRes.java Voir le fichier

@@ -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;

src/main/java/com/ffii/tsms/modules/user/web/GroupController.java → src/main/java/com/ffii/fpsms/modules/user/web/GroupController.java Voir le fichier

@@ -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;

src/main/java/com/ffii/tsms/modules/user/web/TestController.java → src/main/java/com/ffii/fpsms/modules/user/web/TestController.java Voir le fichier

@@ -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;

src/main/java/com/ffii/tsms/modules/user/web/UserController.java → src/main/java/com/ffii/fpsms/modules/user/web/UserController.java Voir le fichier

@@ -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;

+ 1
- 1
src/main/resources/application-db-2fi.yml Voir le fichier

@@ -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

+ 1
- 1
src/main/resources/application-db-local.yml Voir le fichier

@@ -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

+ 2
- 2
src/main/resources/db/changelog/changes/20230720_01_alex/04_update_user_authority.sql Voir le fichier

@@ -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');
INSERT INTO `fpsmsdb`.`user_authority` (`userId`, `authId`) VALUES ('1', '1');
INSERT INTO `fpsmsdb`.`user_authority` (`userId`, `authId`) VALUES ('1', '2');

+ 2
- 2
src/main/resources/log4j2-prod-linux.yml Voir le fichier

@@ -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:


+ 2
- 2
src/main/resources/log4j2-prod-win.yml Voir le fichier

@@ -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:


src/test/java/com/ffii/tsms/ArsApplicationTests.java → src/test/java/com/ffii/fpsms/FpsmsApplicationTests.java Voir le fichier

@@ -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() {

Chargement…
Annuler
Enregistrer