admin/gateway-mnp-dbc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix MNP_SM_2460 + Rimozione TIMAC

Browse Source
This commit is contained in:
vincenzofariello
2025-03-18 18:55:26 +01:00
parent 0c19fce11b
commit f2070def85
5 changed files with 38 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dbcmnpsrc/FE/mnpdev/crontab/web/jsp/GUI/ErrorJSP.jsp
View File

@@ -24,7 +24,7 @@ ErrorJSP
<table width = "100%" border = "0">
<tr>
<td HEIGHT = "100%" width = "10%" bgcolor = "#D61414" valign = "top">
<IMG src ="/MNP-GUI/images/LogoMnp.gif">
<IMG src ="<%=Res.ReqURL%>/images/LogoMnp.gif">
</td>
<td align = "right" valign = "top" width = "90%">
<!-- td dove scrivere i dati a destra -->

4
dbcmnpsrc/FE/mnpdev/crontab/web/jsp/GUI/LoginCrontab.jsp
View File

@@ -102,7 +102,7 @@ System.out.println("Sono dentro la LoginCrontab.jsp");
<table width = "100%" class = "tableBannerRosso" border = 0>
<tr>
<td align = "left" width = "100%"><IMG border = 0 SRC ="/MNP-GUI/images/banner.gif"></td>
<td align = "left" width = "100%"><IMG border = 0 SRC ="<%=Res.ReqURL%>/images/banner.gif"></td>
</tr>
</table>
@@ -115,7 +115,7 @@ System.out.println("Sono dentro la LoginCrontab.jsp");
<td align = "right" valign = "top" width = "90%">
<BR>
<i><b><FONT face = "Arial" color = "#455598" size = 4 weight = "700">MNP-GUI</Font></b></i>
<form name="loginForm" method="post" action="/MNP-GUI/Login.do" target="_self">
<form name="loginForm" method="post" action="<%=Res.ReqURL%>/Login.do" target="_self">
<INPUT type="hidden" name="ipclient">
<INPUT type="hidden" name="hostnameclient">
<INPUT type="hidden" name="utenzaclient">

4
dbcmnpsrc/FE/mnpdev/crontab/web/jsp/GUI/SecurityInfoClient.jsp
View File

@@ -77,7 +77,7 @@ function inviaDatiClient() {
<table width = "100%" class = "tableBannerRosso" border = 0>
<tr>
<td align = "left" width = "100%"><IMG border = 0 SRC ="/MNP-GUI/images/banner.gif"></td>
<td align = "left" width = "100%"><IMG border = 0 SRC ="<%=Res.ReqURL%>/images/banner.gif"></td>
</tr>
</table>
@@ -90,7 +90,7 @@ function inviaDatiClient() {
<td align = "right" valign = "top" width = "90%">
<BR>
<i><b><FONT face = "Arial" color = "#455598" size = 4 weight = "700">MNP-GUI</Font></b></i>
<form name="loginForm" method="post" action="/MNP-GUI/Login.do" target="_self">
<form name="loginForm" method="post" action="<%=Res.ReqURL%>/Login.do" target="_self">
<INPUT type="hidden" name="ipclient">
<INPUT type="hidden" name="hostnameclient">
<INPUT type="hidden" name="utenzaclient">

29
dbcmnpsrc/FE/mnpdev/mnp/src/mnp/proxy/ws/WSRestHandler.java
View File

@@ -4,7 +4,6 @@ import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
import mnp.database.hb.dto.MnpGinoRetrieveOut;
import mnp.database.hb.dto.MnpGispRetrieveOut;
import mnp.database.hb.dto.MnpSdpRetrieveOut;
import mnp.log.ProcessLogger;
import mnp.proxy.ws.fetrcs.*;
@@ -329,7 +328,7 @@ public class WSRestHandler extends GenericHandler {
logWrite("9999", "retrieveESORestPost: INIZIO CHIAMATA SERVIZIO REST");
String risposta = "";
try {
Header[] headers = setHeader("retriverGispXML");
Header[] headers = setHeaderRetrieveESO("retriveESO");
String url = Resources.getESO_RETRIEVE_REST_POST_URL();
risposta = restPost(url,headers,requestSdpJson,log);
logWrite("9999", "retrieveESORestPost: url chiamato: "+url);
@@ -363,6 +362,32 @@ public class WSRestHandler extends GenericHandler {
return headers;
}
private Header[] setHeaderRetrieveESO(String restService) {
Date now = new Date();
TID tid = new TID();
// Authorization HTTP - Basic: recupero credenziali <USERNAME:PASSWORD> codificate in BASE64 dal file di resources.properties
String encodedAuth = Resources.getESO_RETRIEVE_REST_POST_AUTHBASIC_BASE64();
// Headers
Header[] headers = new BasicHeader[9];
headers[0] = new BasicHeader("Content-Type", "application/json; charset=UTF-8");
headers[1] = new BasicHeader("sourceSystem", system);
headers[2] = new BasicHeader("channel", system);
headers[3] = new BasicHeader("interactionDate-Date", DateUtils.toDcoString(now));
headers[4] = new BasicHeader("interactionDate-Time", DateUtils.getHourMinSec(now) + ".000");
headers[5] = new BasicHeader("sessionID", tid.toString());
headers[6] = new BasicHeader("businessID", tid.toString());
headers[7] = new BasicHeader("transactionID", tid.toString());
headers[8] = new BasicHeader("Authorization", "Basic " + encodedAuth);
logWrite("9999", restService + ": HEADER DEL SERVIZIO REST: ");
for (Header header : headers) {
logWrite("9999", " -> " + header.toString());
}
return headers;
}
private void manageErrorDTO(Gson gson, String risposta) throws Exception {
ErrorDTO errorDTO = gson.fromJson(risposta, ErrorDTO.class);
logWrite("9999", "CODICE DI ERRORE DELLA RESPONSE: " + errorDTO.getCode());

6
dbcmnpsrc/FE/mnpdev/mnp/src/mnp/utility/Resources.java
View File

@@ -2515,4 +2515,10 @@ public class Resources {
init();
return trim(props.getProperty("ESO_RETRIEVE_REST_POST_URL"));
}
public static String getESO_RETRIEVE_REST_POST_AUTHBASIC_BASE64() {
init();
return trim(props.getProperty("ESO_RETRIEVE_REST_POST_AUTHBASIC_BASE64"));
}
}