fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'fixes bug#AL-2074' (#35) from AL-2074 into master 

Reviewed-on: http://18.235.188.113:3000/adm/ModelWeb/pulls/35
Reviewed-by: pinheiro <valdevir@rjconsultores.com.br>
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
master
Gleison da Cruz 2023-03-09 20:30:22 +00:00
parent c4971cff26 765765802f
commit 537a952dde
3 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId>
<artifactId>ModelWeb</artifactId>
<version>1.0.37</version>
<version>1.0.38</version>
<distributionManagement>
<repository>
<id>rj-releases</id>

15
src/com/rjconsultores/ventaboletos/entidad/Usuario.java
View File

@ -131,6 +131,11 @@ public class Usuario implements Serializable, UserDetails, Auditavel<Usuario> {
@Column(name = "INDRETORNATODASLOCALIDADES")
private Boolean indRetornaTodasLocalidades;
@Column(name = "INDTROCASENHA")
private Boolean indTrocaSenha;
@Transient
@NaoAuditar
private Usuario usuarioClone;
@ -507,6 +512,14 @@ public class Usuario implements Serializable, UserDetails, Auditavel<Usuario> {
public void setIndRetornaTodasLocalidades(Boolean indRetornaTodasLocalidades) {
this.indRetornaTodasLocalidades = indRetornaTodasLocalidades;
}
public Boolean getIndTrocaSenha() {
return indTrocaSenha;
}
public void setIndTrocaSenha(Boolean indTrocaSenha) {
this.indTrocaSenha = indTrocaSenha;
}
@ -539,6 +552,8 @@ public class Usuario implements Serializable, UserDetails, Auditavel<Usuario> {
public String getTextoInclusaoExclusao() {
return String.format("ID [%s]", getUsuarioId());
}
}

7
src/com/rjconsultores/ventaboletos/service/impl/UsuarioServiceImpl.java
View File

@ -180,6 +180,7 @@ public class UsuarioServiceImpl implements UsuarioService, UserDetailsService {
entidad.setFecContrasena(Calendar.getInstance().getTime());
entidad.setUsuariomodifId(entidad.getUsuarioId());
entidad.setFecmodif(Calendar.getInstance().getTime());
entidad.setIndTrocaSenha(Boolean.FALSE);
entidad.setActivo(Boolean.TRUE);
if (entidad.getUsuarioId() != null) {
@ -231,6 +232,12 @@ public class UsuarioServiceImpl implements UsuarioService, UserDetailsService {
throw new CredentialsExpiredException("Senha Expirada");
}
}
if (user.getIndTrocaSenha() != null) {
if (user.getIndTrocaSenha()) {
throw new CredentialsExpiredException("Senha Expirada");
}
}
return user;
}