Skip to content

Commit ea91257

Browse files
Merge branch 'master' into feature/stream-fix-with-try-resources
2 parents e2bc3f0 + 45e82c5 commit ea91257

24 files changed

+82
-34
lines changed

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
12
target/
23
.idea/
3-
*.iml
4+
*.iml
5+
/target/

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Biblioteca Java para consumo do WebService de NFe/NFCe
33

44
## Dúvidas, Sugestões ou Consultoria
5-
Entre no Discord do Projeto: https://discord.gg/ZXpqnaV
5+
[![Java Brasil](https://discordapp.com/api/guilds/519583346066587676/widget.png?style=banner2)](https://discord.gg/ZXpqnaV)
66

77
## Gostou do Projeto? Dê sua colaboração pelo Pix: 01713390108 <img src="https://swconsultoria.com.br/pix.png" width="200">
88

docs/docs/tutorial/baixar-documento.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ public class DistribuicaoDFeTeste {
2222
public static void main(String[] args) {
2323
try {
2424
// Inicia As Configurações (1)
25-
ConfiguracoesNfe config = Config.iniciaConfiguracoes();
25+
URI uri = Objects.requireNonNull(DistribuicaoDFeTeste.class.getClassLoader().getResource("arquivo-certificado.pfx")).toURI();
26+
Certificado certificado = CertificadoService.certificadoPfx(Paths.get(file.toURI()).toString(), "senha-do-seu-certificado");
27+
ConfiguracoesNfe configuracoesNfe = ConfiguracoesNfe.criarConfiguracoes(EstadosEnum.PR, AmbienteEnum.HOMOLOGACAO, certificado, "");
2628

2729
// Informe o CNPJ Do Destinatario (Deve ser o Mesmo do Certificado)
2830
String cnpj = "XXX";
@@ -31,7 +33,7 @@ public class DistribuicaoDFeTeste {
3133

3234
// Para Consulta Via CHAVE
3335
// String chave = "35170843283811001202550010046314601229130549";
34-
// retorno = Nfe.distribuicaoDfe(PessoaEnum.JURIDICA, cnpj, ConsultaDFeEnum.CHAVE, chave);
36+
// retorno = Nfe.distribuicaoDfe(configuracoesNfe, PessoaEnum.JURIDICA, cnpj, ConsultaDFeEnum.CHAVE, chave);
3537

3638
// Para Consulta Via NSU
3739
String nsu = "000000000000000";
@@ -76,4 +78,4 @@ public class DistribuicaoDFeTeste {
7678
}
7779
```
7880

79-
1. Acesse o menu [Configurações (Certificado)](./configuracoes.md)
81+
1. Acesse o menu [Configurações (Certificado)](./configuracoes.md)

src/main/java/br/com/swconsultoria/nfe/AtorInteressado.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ static TRetEnvEvento eventoAtorInteressado(ConfiguracoesNfe config, TEnvEvento e
2020

2121
try {
2222

23-
String xml = XmlNfeUtil.objectToXml(enviEvento);
23+
String xml = XmlNfeUtil.objectToXml(enviEvento, config.getEncode());
2424
xml = xml.replaceAll(" xmlns:ns2=\"http://www.w3.org/2000/09/xmldsig#\"", "");
2525
xml = xml.replaceAll("<evento v", "<evento xmlns=\"http://www.portalfiscal.inf.br/nfe\" v");
2626

src/main/java/br/com/swconsultoria/nfe/Cancelar.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ static TRetEnvEvento eventoCancelamento(ConfiguracoesNfe config, TEnvEvento envi
2020

2121
try {
2222

23-
String xml = XmlNfeUtil.objectToXml(enviEvento);
23+
String xml = XmlNfeUtil.objectToXml(enviEvento, config.getEncode());
2424
xml = xml.replaceAll(" xmlns:ns2=\"http://www.w3.org/2000/09/xmldsig#\"", "");
2525
xml = xml.replaceAll("<evento v", "<evento xmlns=\"http://www.portalfiscal.inf.br/nfe\" v");
2626

@@ -39,7 +39,7 @@ static br.com.swconsultoria.nfe.schema.envEventoCancSubst.TRetEnvEvento eventoCa
3939

4040
try {
4141

42-
String xml = XmlNfeUtil.objectToXml(enviEvento);
42+
String xml = XmlNfeUtil.objectToXml(enviEvento, config.getEncode());
4343
xml = xml.replaceAll(" xmlns:ns2=\"http://www.w3.org/2000/09/xmldsig#\"", "");
4444
xml = xml.replaceAll("<evento v", "<evento xmlns=\"http://www.portalfiscal.inf.br/nfe\" v");
4545

src/main/java/br/com/swconsultoria/nfe/CartaCorrecao.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ static TRetEnvEvento eventoCCe(ConfiguracoesNfe config, TEnvEvento enviEvento, b
2020

2121
try {
2222

23-
String xml = XmlNfeUtil.objectToXml(enviEvento);
23+
String xml = XmlNfeUtil.objectToXml(enviEvento, config.getEncode());
2424
xml = xml.replaceAll(" xmlns:ns2=\"http://www.w3.org/2000/09/xmldsig#\"", "");
2525
xml = xml.replaceAll("<evento v", "<evento xmlns=\"http://www.portalfiscal.inf.br/nfe\" v");
2626

src/main/java/br/com/swconsultoria/nfe/ConsultaCadastro.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ static TRetConsCad consultaCadastro(ConfiguracoesNfe config, PessoaEnum tipoPess
5656

5757
consCad.setInfCons(infCons);
5858

59-
String xml = XmlNfeUtil.objectToXml(consCad);
59+
String xml = XmlNfeUtil.objectToXml(consCad, config.getEncode());
6060

6161
log.info("[XML-ENVIO]: " + xml);
6262

src/main/java/br/com/swconsultoria/nfe/ConsultaRecibo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ static TRetConsReciNFe reciboNfe(ConfiguracoesNfe config, String recibo, Documen
5050
consReciNFe.setTpAmb(config.getAmbiente().getCodigo());
5151
consReciNFe.setNRec(recibo);
5252

53-
String xml = XmlNfeUtil.objectToXml(consReciNFe);
53+
String xml = XmlNfeUtil.objectToXml(consReciNFe, config.getEncode());
5454

5555
log.info("[XML-ENVIO]: " + xml);
5656

src/main/java/br/com/swconsultoria/nfe/ConsultaXml.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ static TRetConsSitNFe consultaXml(ConfiguracoesNfe config, String chave, Documen
4444
consSitNFe.setXServ("CONSULTAR");
4545
consSitNFe.setChNFe(chave);
4646

47-
String xml = XmlNfeUtil.objectToXml(consSitNFe);
47+
String xml = XmlNfeUtil.objectToXml(consSitNFe, config.getEncode());
4848

4949
log.info("[XML-ENVIO]: " +xml);
5050

src/main/java/br/com/swconsultoria/nfe/DistribuicaoDFe.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ static RetDistDFeInt consultaNfe(ConfiguracoesNfe config, PessoaEnum tipoPessoa,
7373
break;
7474
}
7575

76-
String xml = XmlNfeUtil.objectToXml(distDFeInt);
76+
String xml = XmlNfeUtil.objectToXml(distDFeInt, config.getEncode());
7777

7878
log.info("[XML-ENVIO]: " + xml);
7979

0 commit comments

Comments
 (0)