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

fixes bug#23534 

dev:lucas

qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@109350 d1611594-4594-4d17-8e1d-87c2c4800839
master
lucas.taia 2021-10-28 00:17:00 +00:00
parent 7eb09f6d0f
commit 3bf80d6e0f
6 changed files with 59 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/rjconsultores/ventaboletos/entidad/EmpresaEmailConfig.java
View File

@ -49,6 +49,8 @@ public class EmpresaEmailConfig implements Serializable {
private Integer usuarioId;
@Column(name = "INDAUTENTICACAO")
private Boolean indAutenticacao;
@Column(name = "TIPOAUTORIZACAO")
private String tipoAutorizacao;
public EmpresaEmailConfig() {
@ -134,6 +136,14 @@ public class EmpresaEmailConfig implements Serializable {
this.indAutenticacao = indAutenticacao;
}
public String getTipoAutorizacao() {
return tipoAutorizacao;
}
public void setTipoAutorizacao(String tipoAutorizacao) {
this.tipoAutorizacao = tipoAutorizacao;
}
@Override
public int hashCode() {
final int prime = 31;

11
src/com/rjconsultores/ventaboletos/entidad/EmpresaEmailFlexBus.java
View File

@ -71,6 +71,9 @@ public class EmpresaEmailFlexBus implements Serializable {
@Column(name = "EMAILCOPIAOCULTA")
private String emailCopiaOculta;
@Column(name = "TIPOAUTORIZACAO")
private String tipoAutorizacao;
public EmpresaEmailFlexBus() {
}
@ -187,6 +190,14 @@ public class EmpresaEmailFlexBus implements Serializable {
this.emailCopiaOculta = emailCopiaOculta;
}
public String getTipoAutorizacao() {
return tipoAutorizacao;
}
public void setTipoAutorizacao(String tipoAutorizacao) {
this.tipoAutorizacao = tipoAutorizacao;
}
@Override
public int hashCode() {
final int prime = 31;

9
src/com/rjconsultores/ventaboletos/service/impl/CalculoComissaoServiceImpl.java
View File

@ -56,6 +56,7 @@ import com.rjconsultores.ventaboletos.service.PuntoVentaService;
import com.rjconsultores.ventaboletos.utilerias.DateUtil;
import com.rjconsultores.ventaboletos.utilerias.MoneyHelper;
import com.rjconsultores.ventaboletos.utilerias.SendMail;
import com.rjconsultores.ventaboletos.utilerias.SendMail.AuthType;
import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado;
import com.rjconsultores.ventaboletos.vo.comissao.BoletoComissao;
import com.rjconsultores.ventaboletos.vo.comissao.ComissaoDesconto;
@ -1389,6 +1390,10 @@ public class CalculoComissaoServiceImpl implements CalculoComissaoService {
mail.setSmtpUser(emailConfig.getSmtpEmail());
mail.setAuth(emailConfig.isAutenticacao());
if (StringUtils.isNotEmpty(emailConfig.getTipoAutorizacao())) {
mail.setAuthType(AuthType.valueOf(emailConfig.getTipoAutorizacao()));
}
String assunto = null;
String texto = null;
String nomeArquivo = null;
@ -1416,7 +1421,6 @@ public class CalculoComissaoServiceImpl implements CalculoComissaoService {
mail.addAnexo(Labels.getLabel("busquedaCalculoComissaoController.recibo.email.nomeAnexo", new String[] {nomeArquivo}).concat(".pdf"), baos, MimeType.PDF);
mail.send();
return true;
@ -1440,6 +1444,9 @@ public class CalculoComissaoServiceImpl implements CalculoComissaoService {
emailConfigVO.setSmtpEmail(empresaEmailConfig.getSmtpEmail());
emailConfigVO.setSmtpUser(empresaEmailConfig.getSmtpEmail());
emailConfigVO.setSmtpPorta(empresaEmailConfig.getSmtpPorta());
if (emailConfigVO.getTipoAutorizacao() != null) {
emailConfigVO.setTipoAutorizacao(empresaEmailConfig.getTipoAutorizacao());
}
}
}
return emailConfigVO;

5
src/com/rjconsultores/ventaboletos/service/impl/ContingenciaServiceImpl.java
View File

@ -9,6 +9,7 @@ import javax.mail.AuthenticationFailedException;
import javax.mail.SendFailedException;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -31,6 +32,7 @@ import com.rjconsultores.ventaboletos.service.EmpresaEmailService;
import com.rjconsultores.ventaboletos.utilerias.SendMail;
import com.rjconsultores.ventaboletos.utilerias.StringHelper;
import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado;
import com.rjconsultores.ventaboletos.utilerias.SendMail.AuthType;
/**
* @author vjcor
@ -167,6 +169,9 @@ public class ContingenciaServiceImpl implements ContingenciaService {
EmpresaEmail empresaEmail = empresaEmailService.buscarPorEmpresa(historicoCont.getEmpresa());
EmpresaEmailConfig empresaEmailConfig = empresaEmailConfigService.buscarPorEmpresa(historicoCont.getEmpresa());
mail.setAuth(empresaEmailConfig.getIndAutenticacao());
if (StringUtils.isNotEmpty(empresaEmailConfig.getTipoAutorizacao())) {
mail.setAuthType(AuthType.valueOf(empresaEmailConfig.getTipoAutorizacao()));
}
mail.setEmailFrom(empresaEmail.getEmailDe());
mail.setSmtpHost(empresaEmailConfig.getSmtp());
mail.setSmtpPassword(empresaEmailConfig.getSenha());

19
src/com/rjconsultores/ventaboletos/utilerias/SendMail.java
View File

@ -39,7 +39,7 @@ public class SendMail implements java.io.Serializable {
private static final long serialVersionUID = 2067442255080001075L;
public enum AuthType {TLS,SSL}
public enum AuthType {TLS,SSL,SMTPS,NONE}
private String smtpHost;
private String smtpUser;
@ -126,7 +126,7 @@ public class SendMail implements java.io.Serializable {
adicionarAnexos(multipart);
Transport t = session.getTransport("smtp");
Transport t = session.getTransport(authType.equals(AuthType.SMTPS) ? "smtps" : "smtp");
if (auth) {
t.connect(smtpUser, smtpPassword);
} else {
@ -163,7 +163,7 @@ public class SendMail implements java.io.Serializable {
adicionarAnexos(multipart);
Transport t = session.getTransport("smtp");
Transport t = session.getTransport(authType.equals(AuthType.SMTPS) ? "smtps" : "smtp");
if (auth) {
t.connect(smtpUser, smtpPassword);
} else {
@ -183,7 +183,7 @@ public class SendMail implements java.io.Serializable {
((MimeMessage) message).setSubject(subject, ENCODE_UTF_8);
Transport t = session.getTransport("smtp");
Transport t = session.getTransport(authType.equals(AuthType.SMTPS) ? "smtps" : "smtp");
if (auth) {
t.connect(smtpUser, smtpPassword);
} else {
@ -261,9 +261,18 @@ public class SendMail implements java.io.Serializable {
if (authType.equals(AuthType.TLS)) {
props.setProperty("mail.smtp.starttls.enable", "true");
props.setProperty("mail.smtp.starttls.required", "true");
} else {
} else if (authType.equals(AuthType.SSL)) {
props.put("mail.smtp.socketFactory.port", smtpPort);
props.put("mail.smtp.socketFactory.class", "javax.net.ssl.SSLSocketFactory");
} else if (authType.equals(AuthType.SMTPS)) {
props.setProperty("mail.smtps.ssl.checkserveridentity", "true");
props.setProperty("mail.smtps.quitwait", "false");
} else if (authType.equals(AuthType.NONE)) {
props.setProperty("mail.smtp.starttls.enable", "true");
props.setProperty("mail.smtp.starttls.required", "false");
props.setProperty("mail.smtp.ssl.trust", "*");
props.setProperty("mail.smtp.ssl.checkserveridentity", "false");
props.setProperty("mail.smtp.ssl.enable", "false");
}
props.setProperty("mail.smtp.auth", auth.toString());

9
src/com/rjconsultores/ventaboletos/vo/comissao/EmailConfigVO.java
View File

@ -8,6 +8,7 @@ public class EmailConfigVO {
private String smtpEmail;
private String smtpUser;
private boolean autenticacao;
private String tipoAutorizacao;
public String getSmtp() {
return smtp;
@ -57,4 +58,12 @@ public class EmailConfigVO {
this.smtpUser = smtpUser;
}
public String getTipoAutorizacao() {
return tipoAutorizacao;
}
public void setTipoAutorizacao(String tipoAutorizacao) {
this.tipoAutorizacao = tipoAutorizacao;
}
}