Download as
Browse Code »

Commit df5e52b1bc0a47b3b39bf01ba3c6d6bdc4eb0598

Authored by gibransodre
1 parent c6b7f04e
Exists in master

Envio do códigoHash criptografado.

Showing 2 changed files with 11 additions and 9 deletions   Show diff stats
src/br/com/controller/QuestionarioController.java
  Diff comments   View file @df5e52b
1 1 package br.com.controller;
2 2  
3 3 import java.io.IOException;
  4 +import java.security.NoSuchAlgorithmException;
4 5 import java.util.Properties;
5 6  
6 7 import javax.servlet.ServletContext;
... ... @@ -19,6 +20,7 @@ import br.com.model.utilities.Email;
19 20 import br.com.model.utilities.ManagerProperties;
20 21 import br.com.model.utilities.StringHelper;
21 22 import br.com.util.DateUtil;
  23 +import br.com.util.GeradorCodigoHash;
22 24  
23 25 @Resource
24 26 public class QuestionarioController {
... ... @@ -61,21 +63,26 @@ public class QuestionarioController {
61 63  
62 64 String dtInicioQuestionario = "";
63 65 String dtFimQuestionario = "";
  66 + String hashAutenticacao = null;
64 67  
65 68 try {
66 69 Properties prop = managerProperties.getProp(this.application.getRealPath("") + "/WEB-INF/intervaloRespostaFormulario.properties");
67 70  
68 71 dtInicioQuestionario = prop.getProperty("dataInicio");
69   - dtFimQuestionario = prop.getProperty("dataFim");
  72 + dtFimQuestionario = prop.getProperty("dataFim");
  73 + hashAutenticacao = GeradorCodigoHash.gerarHash(questionario.getHashAutenticacao());
70 74  
71 75 } catch (IOException e) {
72 76 e.printStackTrace();
  77 + } catch (NoSuchAlgorithmException e) {
  78 +
  79 + e.printStackTrace();
73 80 }
74 81  
75 82 questionario.setDtInicioQuestionario(dtInicioQuestionario);
76 83 questionario.setDtFimQuestionario(dtFimQuestionario);
77 84 questionario.setEmailDestinoOrgao(emailDestinoOrgao);
78   - questionario.setHashAutenticacao(codigoHash);
  85 + questionario.setHashAutenticacao(hashAutenticacao);
79 86 questionario.setNoOrgao(noOrgao);
80 87  
81 88 QuestionarioDao questionarioDao = new QuestionarioDao();
... ... @@ -84,7 +91,7 @@ public class QuestionarioController {
84 91 Contato contato = new Contato();
85 92 contato.setEmail(emailDestinoOrgao);
86 93 contato.setAssunto("assunto");
87   - contato.setMensagem("Código Hash:" + codigoHash);
  94 + contato.setMensagem("Código Hash:" + hashAutenticacao);
88 95 contato.setNome("nome");
89 96  
90 97 if(enviarHashPorEmail(contato))
... ...
src/br/com/dao/QuestionarioDao.java
  Diff comments   View file @df5e52b
... ... @@ -67,8 +67,6 @@ public class QuestionarioDao {
67 67  
68 68 try {
69 69  
70   - String hashAutenticacao = GeradorCodigoHash.gerarHash(questionario.getHashAutenticacao());
71   -
72 70 // FileInputStream fileIn = new FileInputStream(file);
73 71 Date dtInicioQuestionario = DateUtil.dataFormatada(questionario.getDtInicioQuestionario());
74 72 Date dtFimQuestionario = DateUtil.dataFormatada(questionario.getDtFimQuestionario());
... ... @@ -89,7 +87,7 @@ public class QuestionarioDao {
89 87 estado.setDate(1, sqlDtInicioQuestionario);
90 88 estado.setDate(2, sqlDtFimQuestionario);
91 89 estado.setString(3, questionario.getNoOrgao());
92   - estado.setString(4, hashAutenticacao);
  90 + estado.setString(4, questionario.getHashAutenticacao());
93 91 estado.setBoolean(5, false);
94 92 estado.setString(6, questionario.getEmailDestinoOrgao());
95 93 estado.setBinaryStream(7, file);
... ... @@ -112,9 +110,6 @@ public class QuestionarioDao {
112 110 } catch (ParseException e) {
113 111 e.printStackTrace();
114 112 return salvoComSucesso;
115   - } catch (NoSuchAlgorithmException e) {
116   - e.printStackTrace();
117   - return salvoComSucesso;
118 113 } finally {
119 114 if (con != null) {
120 115 try {
... ...