diff --git a/pom.xml b/pom.xml
index cc0ae07a9..fb847555e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,13 +55,13 @@
br.com.rjconsultores
ModelWeb
- 1.0.9
+ 1.0.10
br.com.rjconsultores
Flyway
- 1.0.2
+ 1.0.3
@@ -93,6 +93,38 @@
GeneradorBoletosCNAB
1.0.2
+
+
+ br.com.rjconsultores
+ silvergray
+ 1.0.0
+
+
+
+ org.apache.httpcomponents
+ httpcore
+ 4.4.14
+
+
+
+ org.apache.httpcomponents
+ httpclient
+ 4.5.13
+
+
+
+ org.jboss.resteasy
+ resteasy-jaxrs
+ 3.14.0.Final
+ provided
+
+
+
+ org.jboss.spec
+ jboss-javaee-all-6.0
+ 3.0.3.Final
+ provided
+
commons-beanutils
@@ -144,11 +176,7 @@
zkspring-security
3.0RC
-
- br.com.rjconsultores
- silvergray
- 1.0.0
-
+
commons-collections
commons-collections
@@ -159,34 +187,7 @@
jackson-core-asl
1.9.9
-
- org.jboss.resteasy
- resteasy-jaxrs
- 2.2.1.GA
- provided
-
-
- org.jboss.resteasy
- resteasy-multipart-provider
- 2.2.0.GA
- provided
-
-
- com.sun.xml.stream
- sjsxp
-
-
- javax.xml.bind
- jaxb-api
-
-
-
-
- org.jboss.resteasy
- resteasy-jackson-provider
- 2.3.1.GA
- provided
-
+
com.trg
trg-search
@@ -197,12 +198,7 @@
quartz-all
1.6.5
-
- org.jboss.spec
- jboss-javaee-all-6.0
- 3.0.3.Final
- provided
-
+
org.apache.xmlbeans
xmlbeans
@@ -218,12 +214,14 @@
saxon-dom
8.7
+
com.nimbusds
nimbus-jose-jwt
jdk16
4.11.2
+
org.xhtmlrenderer
flying-saucer-pdf-itext5
@@ -248,7 +246,6 @@
2.6.12
-
\ No newline at end of file
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBoletos.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBoletos.java
index 2dddc7833..9324cc45a 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBoletos.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBoletos.java
@@ -179,12 +179,12 @@ public class RelatorioBoletos extends Relatorio {
sql.append(" INNER JOIN empresa e ");
sql.append(" ON e.empresa_id = fcc.empresa_id ");
sql.append(" AND e.activo = 1 ");
- sql.append(" WHERE fb.activo = 1 ");
sql.append(" INNER JOIN fechamento_paramptovta fppv ");
sql.append(" ON p.puntoventa_id = fppv.puntoventa_id ");
sql.append(" AND e.empresa_id = fppv.empresa_id ");
sql.append(" AND tipopagamento = 'B' ");
sql.append(" AND fppv.activo = 1 ");
+ sql.append(" WHERE fb.activo = 1 ");
if(fecInicio != null && fecFinal != null) {
sql.append(" AND fcc.fecfechamento BETWEEN :fecInicio AND :fecFinal ");
@@ -209,4 +209,4 @@ public class RelatorioBoletos extends Relatorio {
sql.append(" ORDER BY nombempresa, p.numpuntoventa, fcc.fecfechamento ");
return sql.toString();
}
-}
+}
diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyAppInit.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyAppInit.java
index cb9b610c3..7478126b2 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyAppInit.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyAppInit.java
@@ -47,6 +47,8 @@ public class MyAppInit implements org.zkoss.zk.ui.util.WebAppInit {
private static final String HORA_EXEC_CONFERENCIA_MOVIMENTO = "HORA_EXEC_CONFERENCIA_MOVIMENTO";
private static final String HORA_EXEC_MONITORAMENTO_REDUCAOZ = "HORA_EXEC_MONITORAMENTO_REDUCAOZ";
private static final String HORA_INTEGRACAO_SAP = "HORA_INTEGRACAO_SAP";
+ final private static String AMBIENTE_DEV = "dev";
+ final private static String AMBIENTE_CONSULTA = "consulta";
private static Logger log = Logger.getLogger(MyAppInit.class);
SchedulerFactory schedFact = new StdSchedulerFactory();
Scheduler sched;
@@ -97,9 +99,12 @@ public class MyAppInit implements org.zkoss.zk.ui.util.WebAppInit {
jobIntegracaoSap();
}
- executeFlyway();
- customToDatabase();
- imageToDatabase();
+ String ambiente = System.getProperty("ambiente") ==null || System.getProperty("ambiente").isEmpty() ? "" : System.getProperty("ambiente");
+ if( !AMBIENTE_DEV.equals(ambiente.toLowerCase()) && !AMBIENTE_CONSULTA.equals(ambiente.toLowerCase()) ) {
+ executeFlyway();
+ customToDatabase();
+ imageToDatabase();
+ }
}
@@ -159,17 +164,13 @@ public class MyAppInit implements org.zkoss.zk.ui.util.WebAppInit {
String ipConstanteExcepcion = constanteServidorException == null ? "" : constanteServidorException.getValorconstante();
String ipConstanteExclusivo = constanteServidorExclusivo == null ? "" : constanteServidorExclusivo.getValorconstante();
-
-
+
log.info(" IP Constante Excepcion: " + ipConstanteExcepcion);
log.info(" IP Constante Exclusivo: " + ipConstanteExclusivo);
-
-
if (StringUtils.isBlank(ipConstanteExclusivo) && StringUtils.isBlank(ipConstanteExcepcion)){
return false;
- }
-
+ }
List lsIps = getListIp();
@@ -189,7 +190,6 @@ public class MyAppInit implements org.zkoss.zk.ui.util.WebAppInit {
}
}
-
return false;
}
@@ -244,7 +244,6 @@ public class MyAppInit implements org.zkoss.zk.ui.util.WebAppInit {
}
return arrayHoraMinuto;
-
}
private void jobGeneracionCorridas() {