igor/org.ccalm.main
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://git.mesh.kz/igor/org.ccalm.main into develop

Browse Source 
# Conflicts:
#	src/main/java/org/ccalm/main/AcceptJSON.java
#	src/main/java/org/ccalm/main/SendWarning.java
#	src/main/java/org/ccalm/main/engine/EngineController.java
#	src/main/java/org/ccalm/main/login/LoginController.java
#	src/main/java/org/ccalm/main/utils/LTools.java
This commit is contained in:
igor
2025-06-24 23:22:38 +05:00
parent ed14a3fa9e 9f45e71b59
commit 7d8ab90e49
11 changed files with 148 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

122
src/main/java/org/ccalm/main/AcceptASDCController.java
View File

@ -25,6 +25,7 @@ import java.util.*;
//import javax.servlet.ServletContext;
//import javax.servlet.http.HttpServletResponse;
//import javax.servlet.http.Part;
import javax.xml.XMLConstants;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@ -90,7 +91,7 @@ public class AcceptASDCController implements ServletContextAware {
return hexString.toString();
} catch (NoSuchAlgorithmException ex) {
logger.error("Error",ex);
logger.error(ex.getMessage(),ex);
}
return "";
}
@ -206,7 +207,7 @@ public class AcceptASDCController implements ServletContextAware {
JSONObject obj = new JSONObject();
obj.put("error_code",1);
obj.put("error_message", ex.getMessage());
logger.error("Error",ex);
logger.error(ex.getMessage(), ex);
return obj.toString();
}
stmt.close();
@ -221,7 +222,7 @@ public class AcceptASDCController implements ServletContextAware {
} catch (Exception ex) {
ex.printStackTrace();
logger.error("Error",ex);
logger.error(ex.getMessage(), ex);
result.put("error_code",1);
result.put("error_message", ex.getMessage());
return result.toString();
@ -274,7 +275,7 @@ public class AcceptASDCController implements ServletContextAware {
rs = st.executeQuery("select 1 from main.frmlocusthealth where uid='"+uid+"'");
} catch( SQLException ex ) {
logRotate(data_dir+"errors.log",ex.getMessage());
logger.error("Error",ex);
logger.error(ex.getMessage(), ex);
JSONObject obj = new JSONObject();
obj.put("error_code",1);
obj.put("error_message", ex.getMessage());
@ -288,7 +289,7 @@ public class AcceptASDCController implements ServletContextAware {
st.close();
} catch (SQLException ex) {
logRotate(data_dir+"errors.log",ex.getMessage());
logger.error("Error",ex);
logger.error(ex.getMessage(), ex);
JSONObject obj = new JSONObject();
obj.put("error_code",1);
obj.put("error_message", ex.getMessage());
@ -590,7 +591,7 @@ public class AcceptASDCController implements ServletContextAware {
stmtn = new PreparedStatementNamed(conn, sql);
} catch (SQLException ex) {
logRotate(data_dir+"errors.log",ex.getMessage()+" "+sql);
logger.error("Error",ex);
logger.error(ex.getMessage(), ex);
JSONObject obj = new JSONObject();
obj.put("error_code",1);
obj.put("error_message", ex.getMessage());
@ -806,7 +807,7 @@ public class AcceptASDCController implements ServletContextAware {
stmt.execute();
} catch (SQLException ex) {
logRotate(data_dir+"errors.log",ex.getMessage());
logger.error("Error",ex);
logger.error(ex.getMessage(), ex);
JSONObject obj = new JSONObject();
obj.put("error_code",1);
obj.put("error_message", ex.getMessage());
@ -818,7 +819,7 @@ public class AcceptASDCController implements ServletContextAware {
String tmpDir = "temp"+File.separator;
try{ new File(dataDir+tmpDir).mkdirs(); }catch (Exception ex) {
logRotate(data_dir+"errors.log",ex.getMessage());
logger.error("Error",ex);
logger.error(ex.getMessage(), ex);
JSONObject obj = new JSONObject();
obj.put("error_code",1);
obj.put("error_message", ex.getMessage());
@ -880,7 +881,7 @@ public class AcceptASDCController implements ServletContextAware {
ex.printStackTrace();
result.put("error_code",1);
result.put("error_message", ex.getMessage());
logger.error("Error",ex);
logger.error(ex.getMessage(), ex);
return result.toString();
}finally {
try{ if(conn!=null) conn.close(); }catch(Exception e){}
@ -942,7 +943,7 @@ public class AcceptASDCController implements ServletContextAware {
JSONObject obj = new JSONObject();
obj.put("error_code",1);
obj.put("error_message", ex.getMessage());
logger.error("Error",ex);
logger.error(ex.getMessage(), ex);
return obj.toString();
}
try {
@ -951,7 +952,7 @@ public class AcceptASDCController implements ServletContextAware {
JSONObject obj = new JSONObject();
obj.put("error_code",1);
obj.put("error_message", ex.getMessage());
logger.error("Error",ex);
logger.error(ex.getMessage(), ex);
return obj.toString();
}
try {
@ -960,7 +961,7 @@ public class AcceptASDCController implements ServletContextAware {
JSONObject obj = new JSONObject();
obj.put("error_code",1);
obj.put("error_message", ex.getMessage());
logger.error("Error",ex);
logger.error(ex.getMessage(), ex);
return obj.toString();
}
@ -972,7 +973,7 @@ public class AcceptASDCController implements ServletContextAware {
JSONObject obj = new JSONObject();
obj.put("error_code",1);
obj.put("error_message", ex.getMessage());
logger.error("Error",ex);
logger.error(ex.getMessage(), ex);
return obj.toString();
}
@ -983,7 +984,7 @@ public class AcceptASDCController implements ServletContextAware {
JSONObject obj = new JSONObject();
obj.put("error_code",1);
obj.put("error_message", ex.getMessage());
logger.error("Error",ex);
logger.error(ex.getMessage(), ex);
return obj.toString();
}
@ -993,7 +994,7 @@ public class AcceptASDCController implements ServletContextAware {
JSONObject obj = new JSONObject();
obj.put("error_code",1);
obj.put("error_message", ex.getMessage());
logger.error("Error",ex);
logger.error(ex.getMessage(), ex);
return obj.toString();
}
@ -1008,7 +1009,7 @@ public class AcceptASDCController implements ServletContextAware {
JSONObject obj = new JSONObject();
obj.put("error_code",1);
obj.put("error_message", ex.getMessage());
logger.error("Error",ex);
logger.error(ex.getMessage(), ex);
return obj.toString();
}
if(rs!=null)
@ -1028,7 +1029,7 @@ public class AcceptASDCController implements ServletContextAware {
JSONObject obj = new JSONObject();
obj.put("error_code",1);
obj.put("error_message", ex.getMessage());
logger.error("Error",ex);
logger.error(ex.getMessage(), ex);
return obj.toString();
}
}else {
@ -1042,7 +1043,7 @@ public class AcceptASDCController implements ServletContextAware {
ex.printStackTrace();
result.put("error_code",1);
result.put("error_message", ex.getMessage());
logger.error("Error",ex);
logger.error(ex.getMessage(), ex);
return result.toString();
}finally {
try{ if(conn!=null) conn.close(); }catch(Exception e){}
@ -1067,7 +1068,7 @@ public class AcceptASDCController implements ServletContextAware {
String tmpDir = "temp"+File.separator;
try{ new File(dataDir+tmpDir).mkdirs(); }catch (Exception ex) {
logRotate(data_dir+"errors.log",ex.getMessage());
logger.error("Error",ex);
logger.error(ex.getMessage(), ex);
result="<?xml version=\"1.0\" encoding=\"utf-8\"?><metadata fn=\"-1\"><![CDATA["+ex.getMessage()+"]]></metadata>";
return result;
}
@ -1102,14 +1103,14 @@ public class AcceptASDCController implements ServletContextAware {
stm.execute("SET timezone TO 'UTC';");
} catch( SQLException ex ) {
logRotate(data_dir+"errors.log",ex.getMessage());
logger.error("Error",ex);
logger.error(ex.getMessage(), ex);
result="<?xml version=\"1.0\" encoding=\"utf-8\"?><metadata fn=\"-1\"><![CDATA["+ex.getMessage()+"]]></metadata>";
return result;
}
stm.close();
} catch (SQLException ex) {
logRotate(data_dir+"errors.log",ex.getMessage());
logger.error("Error",ex);
logger.error(ex.getMessage(), ex);
result="<?xml version=\"1.0\" encoding=\"utf-8\"?><metadata fn=\"-1\"><![CDATA["+ex.getMessage()+"]]></metadata>";
return result;
}
@ -1130,11 +1131,12 @@ public class AcceptASDCController implements ServletContextAware {
try {
DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
dbFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();
doc = dBuilder.parse(body);
} catch (Exception ex) {
logRotate(data_dir+"errors.log",ex.getMessage());
logger.error("Error",ex);
logger.error(ex.getMessage(), ex);
result="<metadata fn=\"-1\"><![CDATA[Parsing request error!]]></metadata>";
return result;
}
@ -1159,7 +1161,7 @@ public class AcceptASDCController implements ServletContextAware {
rs = st.executeQuery("select 1 from main.frmlocust where uid='"+uid+"'");
} catch( SQLException ex ) {
logRotate(data_dir+"errors.log",ex.getMessage());
logger.error("Error",ex);
logger.error(ex.getMessage(), ex);
result=("<?xml version=\"1.0\" encoding=\"utf-8\"?><metadata fn=\"-1\"><![CDATA["+ex.getMessage()+"]]></metadata>");
return result;
}
@ -1171,7 +1173,7 @@ public class AcceptASDCController implements ServletContextAware {
st.close();
} catch (SQLException ex) {
logRotate(data_dir+"errors.log",ex.getMessage());
logger.error("Error",ex);
logger.error(ex.getMessage(), ex);
result=("<?xml version=\"1.0\" encoding=\"utf-8\"?><metadata fn=\"-1\"><![CDATA["+ex.getMessage()+"]]></metadata>");
return result;
}
@ -1263,7 +1265,7 @@ public class AcceptASDCController implements ServletContextAware {
stmt = conn.prepareStatement(sql);
} catch (SQLException ex) {
logRotate(data_dir+"errors.log",ex.getMessage()+" "+sql);
logger.error("Error",ex);
logger.error(ex.getMessage(), ex);
result=("<?xml version=\"1.0\" encoding=\"utf-8\"?><metadata fn=\"-1\"><![CDATA["+ex.getMessage()+"]]></metadata>");
return result;
}
@ -1432,7 +1434,7 @@ public class AcceptASDCController implements ServletContextAware {
stmt = conn.prepareStatement(sql);
} catch (SQLException ex) {
logRotate(data_dir+"errors.log",ex.getMessage()+" "+sql);
logger.error("Error",ex);
logger.error(ex.getMessage(), ex);
result=("<?xml version=\"1.0\" encoding=\"utf-8\"?><metadata fn=\"-1\"><![CDATA["+ex.getMessage()+"]]></metadata>");
return result;
}
@ -1572,7 +1574,7 @@ public class AcceptASDCController implements ServletContextAware {
try{
tm = new java.sql.Timestamp(dfm.parse(date).getTime());
} catch (Exception ex) {
logger.error("Error",ex.getMessage());
logger.error(ex.getMessage(), ex);
}
stmt.setTimestamp(14, tm);
}
@ -1688,7 +1690,7 @@ public class AcceptASDCController implements ServletContextAware {
} catch (SQLException ex) {
logRotate(data_dir+"errors.log",ex.getMessage());
logger.error("Error",ex);
logger.error(ex.getMessage(), ex);
result=("<?xml version=\"1.0\" encoding=\"utf-8\"?><metadata fn=\"-1\"><![CDATA["+ex.getMessage()+"]]></metadata>");
return result;
}
@ -1698,7 +1700,7 @@ public class AcceptASDCController implements ServletContextAware {
stmt.execute();
} catch (SQLException ex) {
logRotate(data_dir+"errors.log",ex.getMessage());
logger.error("Error",ex.getMessage());
logger.error(ex.getMessage(), ex);
result=("<?xml version=\"1.0\" encoding=\"utf-8\"?><metadata fn=\"-1\"><![CDATA["+ex.getMessage()+"]]></metadata>");
return result;
}
@ -1749,7 +1751,7 @@ public class AcceptASDCController implements ServletContextAware {
rs = st.executeQuery("select 1 from main.frmlocustdel where uid=main.strtouuid('"+uid+"')");
} catch( SQLException ex ) {
logRotate(data_dir+"errors.log",ex.getMessage());
logger.error("Error",ex.getMessage());
logger.error(ex.getMessage(), ex);
result=("<?xml version=\"1.0\" encoding=\"utf-8\"?><metadata fn=\"-1\"><![CDATA["+ex.getMessage()+"]]></metadata>");
return result;
}
@ -1883,7 +1885,7 @@ public class AcceptASDCController implements ServletContextAware {
stmt = conn.prepareStatement(sql);
} catch (SQLException ex) {
logRotate(data_dir+"errors.log",ex.getMessage());
logger.error("Error",ex);
logger.error(ex.getMessage(), ex);
result=("<?xml version=\"1.0\" encoding=\"utf-8\"?><metadata fn=\"-1\"><![CDATA["+ex.getMessage()+"]]></metadata>");
return result;
}
@ -2110,7 +2112,7 @@ public class AcceptASDCController implements ServletContextAware {
stmt = conn.prepareStatement(sql);
} catch (SQLException ex) {
logRotate(data_dir+"errors.log",ex.getMessage());
logger.error("Error",ex);
logger.error(ex.getMessage(), ex);
result=("<?xml version=\"1.0\" encoding=\"utf-8\"?><metadata fn=\"-1\"><![CDATA["+ex.getMessage()+"]]></metadata>");
return result;
}
@ -2275,7 +2277,7 @@ public class AcceptASDCController implements ServletContextAware {
try{
tm = new java.sql.Timestamp(dfm.parse(date).getTime());
} catch (Exception ex) {
logger.error("Error",ex.getMessage());
logger.error(ex.getMessage(), ex);
}
stmt.setTimestamp(14, tm);
}
@ -2435,7 +2437,7 @@ public class AcceptASDCController implements ServletContextAware {
} catch (SQLException ex) {
logRotate(data_dir+"errors.log",ex.getMessage());
logger.error("Error",ex);
logger.error(ex.getMessage(), ex);
result="<?xml version=\"1.0\" encoding=\"utf-8\"?><metadata fn=\"-1\"><![CDATA["+ex.getMessage()+"]]></metadata>";
return result;
}
@ -2445,7 +2447,7 @@ public class AcceptASDCController implements ServletContextAware {
stmt.execute();
} catch (SQLException ex) {
logRotate(data_dir+"errors.log",ex.getMessage());
logger.error("Error",ex);
logger.error(ex.getMessage(), ex);
result="<?xml version=\"1.0\" encoding=\"utf-8\"?><metadata fn=\"-1\"><![CDATA["+ex.getMessage()+"]]></metadata>";
return result;
}
@ -2490,7 +2492,7 @@ public class AcceptASDCController implements ServletContextAware {
} catch (Exception ex) {
//logRotate(data_dir+"errors.log",ex.getMessage());
logger.error("Error",ex);
logger.error(ex.getMessage(), ex);
}finally {
if(conn!=null){ try{ conn.close(); }catch(Exception e){} }
}
@ -2530,7 +2532,7 @@ public class AcceptASDCController implements ServletContextAware {
stm.close();
} catch (SQLException ex) {
logRotate(data_dir+"errors.log",ex.getMessage());
logger.error("Error",ex);
logger.error(ex.getMessage(), ex);
result="<?xml version=\"1.0\" encoding=\"utf-8\"?><metadata fn=\"-1\"><![CDATA["+ex.getMessage()+"]]></metadata>";
response.setContentType("application/xml");
return result;
@ -2587,7 +2589,7 @@ public class AcceptASDCController implements ServletContextAware {
rs = st.executeQuery(sql);
} catch( SQLException ex ) {
logRotate(data_dir+"errors.log",ex.getMessage());
logger.error("Error",ex);
logger.error(ex.getMessage(), ex);
result="<metadata fn=\"-1\"><![CDATA[SQL arror: "+ex.getMessage()+"]]></metadata>";
response.setContentType("application/xml");
return result;
@ -2632,7 +2634,7 @@ public class AcceptASDCController implements ServletContextAware {
}
} catch (SQLException ex) {
logRotate(data_dir+"errors.log",ex.getMessage());
logger.error("Error",ex);
logger.error(ex.getMessage(), ex);
result="<metadata fn=\"-1\"><![CDATA[SQL arror: "+ex.getMessage()+"]]></metadata>";
response.setContentType("application/xml");
return result;
@ -2647,7 +2649,7 @@ public class AcceptASDCController implements ServletContextAware {
String dataDir = data_dir;
String tmpDir = "temp"+File.separator;
try{ new File(dataDir+tmpDir).mkdirs(); }catch (Exception ex) {
logger.error("Error",ex);
logger.error(ex.getMessage(), ex);
result="<?xml version=\"1.0\" encoding=\"utf-8\"?><metadata fn=\"-1\"><![CDATA["+ex.getMessage()+"]]></metadata>";
response.setContentType("application/xml");
return result;
@ -2674,7 +2676,7 @@ public class AcceptASDCController implements ServletContextAware {
} catch (Exception ex) {
logRotate(data_dir+"errors.log",ex.getMessage());
logger.error("Error",ex);
logger.error(ex.getMessage(), ex);
}
result="<?xml version=\"1.0\" encoding=\"utf-8\"?><metadata fn=\"6\"><![CDATA[1]]></metadata>";
}else
@ -2686,7 +2688,7 @@ public class AcceptASDCController implements ServletContextAware {
} catch (Exception ex) {
logRotate(data_dir+"errors.log",ex.getMessage());
logger.error("Error",ex);
logger.error(ex.getMessage(), ex);
}finally {
if(conn!=null) {try { conn.close(); } catch (SQLException e) {} }
}
@ -2754,7 +2756,7 @@ public class AcceptASDCController implements ServletContextAware {
rs = st.executeQuery(sql);
} catch (SQLException ex) {
ex.printStackTrace();
logger.error("Error:",ex);
logger.error(ex.getMessage(), ex);
result.put("error_code",1);
result.put("error_message", ex.getMessage());
return result.toString();
@ -2783,7 +2785,7 @@ public class AcceptASDCController implements ServletContextAware {
stmt = conn.prepareStatement(sql);
} catch (SQLException ex) {
ex.printStackTrace();
logger.error("Error:",ex);
logger.error(ex.getMessage(), ex);
result.put("error_code",1);
result.put("error_message", ex.getMessage());
return result.toString();
@ -2812,7 +2814,7 @@ public class AcceptASDCController implements ServletContextAware {
stmt = conn.prepareStatement(sql);
} catch (SQLException ex) {
ex.printStackTrace();
logger.error("Error:",ex);
logger.error(ex.getMessage(), ex);
result.put("error_code",1);
result.put("error_message", ex.getMessage());
return result.toString();
@ -2828,7 +2830,7 @@ public class AcceptASDCController implements ServletContextAware {
stmt.setString(7, tbl.fields.get(0).getStrVal());
} catch (SQLException ex) {
ex.printStackTrace();
logger.error("Error:",ex);
logger.error(ex.getMessage(), ex);
result.put("error_code",1);
result.put("error_message", ex.getMessage());
return result.toString();
@ -2839,7 +2841,7 @@ public class AcceptASDCController implements ServletContextAware {
stmt.execute();
} catch (SQLException ex) {
ex.printStackTrace();
logger.error("Error:",ex);
logger.error(ex.getMessage(), ex);
result.put("error_code",1);
result.put("error_message", ex.getMessage());
return result.toString();
@ -2847,7 +2849,7 @@ public class AcceptASDCController implements ServletContextAware {
} catch (SQLException ex) {
ex.printStackTrace();
logger.error("Error:",ex);
logger.error(ex.getMessage(), ex);
result.put("error_code",1);
result.put("error_message", ex.getMessage());
return result.toString();
@ -2895,7 +2897,7 @@ public class AcceptASDCController implements ServletContextAware {
rs = st.executeQuery(sql);
} catch (SQLException ex) {
ex.printStackTrace();
logger.error("Error:",ex);
logger.error(ex.getMessage(), ex);
result.put("error_code",1);
result.put("error_message", ex.getMessage());
return result.toString();
@ -2942,7 +2944,7 @@ public class AcceptASDCController implements ServletContextAware {
stmt = conn.prepareStatement(sql);
} catch (SQLException ex) {
ex.printStackTrace();
logger.error("Error:",ex);
logger.error(ex.getMessage(), ex);
result.put("error_code",1);
result.put("error_message", ex.getMessage());
return result.toString();
@ -3000,7 +3002,7 @@ public class AcceptASDCController implements ServletContextAware {
stmt.setString(7, tbl.fields.get(0).getStrVal());*/
} catch (SQLException ex) {
ex.printStackTrace();
logger.error("Error:",ex);
logger.error(ex.getMessage(), ex);
result.put("error_code",1);
result.put("error_message", ex.getMessage());
return result.toString();
@ -3013,7 +3015,7 @@ public class AcceptASDCController implements ServletContextAware {
}
} catch (IOException ex) {
ex.printStackTrace();
logger.error("Error:",ex);
logger.error(ex.getMessage(), ex);
result.put("error_code",1);
result.put("error_message", ex.getMessage());
return result.toString();
@ -3021,7 +3023,7 @@ public class AcceptASDCController implements ServletContextAware {
} catch (Exception ex) {
ex.printStackTrace();
logger.error("Error:",ex);
logger.error(ex.getMessage(), ex);
result.put("error_code",1);
result.put("error_message", ex.getMessage());
return result.toString();
@ -3106,7 +3108,7 @@ public class AcceptASDCController implements ServletContextAware {
rs = st.executeQuery(sql);
} catch( SQLException ex ) {
logRotate(data_dir+"errors.log",ex.getMessage());
logger.error("Error",ex);
logger.error(ex.getMessage(), ex);
result=ex.getMessage();
return result;
}
@ -3154,7 +3156,7 @@ public class AcceptASDCController implements ServletContextAware {
} catch (SQLException ex) {
logRotate(data_dir+"errors.log",ex.getMessage());
logger.error("Error",ex);
logger.error(ex.getMessage(), ex);
result=ex.getMessage();
return result;
}
@ -3169,7 +3171,7 @@ public class AcceptASDCController implements ServletContextAware {
rs = st.executeQuery(sql);
} catch( SQLException ex ) {
logRotate(data_dir+"errors.log",ex.getMessage());
logger.error("Error",ex);
logger.error(ex.getMessage(), ex);
result=ex.getMessage();
return result;
}
@ -3217,7 +3219,7 @@ public class AcceptASDCController implements ServletContextAware {
} catch (SQLException ex) {
logRotate(data_dir+"errors.log",ex.getMessage());
logger.error("Error",ex);
logger.error(ex.getMessage(), ex);
result=ex.getMessage();
return result;
}
@ -3226,7 +3228,7 @@ public class AcceptASDCController implements ServletContextAware {
} catch (Exception ex) {
logRotate(data_dir+"errors.log",ex.getMessage());
logger.error("error",ex);
logger.error(ex.getMessage(), ex);
}finally{
if(conn!=null){ try{ conn.close(); }catch(Exception e){} }
}
@ -3281,7 +3283,7 @@ public class AcceptASDCController implements ServletContextAware {
}catch(Exception ex)
{
System.out.println(ex.getMessage());
logger.error("Error",ex);
logger.error(ex.getMessage(), ex);
result=false;
}
return result;
@ -3306,7 +3308,7 @@ public class AcceptASDCController implements ServletContextAware {
writer.newLine();
writer.close();
} catch (IOException ex) {
logger.error("Error",ex);
logger.error(ex.getMessage(), ex);
}
}
}

3
src/main/java/org/ccalm/main/AcceptJSON.java
View File

@ -37,6 +37,7 @@ import com.zaxxer.hikari.HikariDataSource;
import jakarta.servlet.ServletContext;
import org.ccalm.main.models.FrmLocustModel;
import org.ccalm.main.utils.CustomException;
import org.ccalm.main.utils.LTools;
import org.json.JSONObject;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
@ -2330,7 +2331,7 @@ public class AcceptJSON implements ServletContextAware {
logger.error(MarkerFactory.getMarker(uuid), e.getMessage(), e);
}
json = e.getJson();
} catch (Exception e) {
} catch (Exception ex) {
String uuid = UUID.randomUUID().toString();
logger.error(MarkerFactory.getMarker(uuid), e.getMessage(), e);
json = Tools.createJSONError(10000,"Internal_Server_Error", (String)null, uuid);

1
src/main/java/org/ccalm/main/DownloadNDVI.java
View File

@ -62,6 +62,7 @@ public class DownloadNDVI implements ServletContextAware {
//String fullPath = context.getRealPath("/WEB-INF/config.xml");
//File fXmlFile = new File(fullPath);
DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
dbFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();
//Document doc = dBuilder.parse(fXmlFile);
Document doc = dBuilder.parse(new ClassPathResource("config.xml").getInputStream());

2
src/main/java/org/ccalm/main/MainController.java
View File

@ -160,7 +160,7 @@ public class MainController implements ServletContextAware {
}
} catch( DataAccessException ex )
{
logger.error("Error",ex);
logger.error(ex.getMessage(), ex);
}
result.put("Error_code", "0");

8
src/main/java/org/ccalm/main/SendWarning.java
View File

@ -72,9 +72,9 @@ public class SendWarning {
result.put("value", value);
}
}
} catch (Exception e) {
} catch (Exception ex) {
String uuid = UUID.randomUUID().toString();
logger.error(MarkerFactory.getMarker(uuid), e.getMessage(), e);
logger.error(MarkerFactory.getMarker(uuid),ex.getMessage(), ex);
}
return result;
}
@ -266,9 +266,9 @@ public class SendWarning {
}
} catch (Exception e) {
} catch (Exception ex) {
String uuid = UUID.randomUUID().toString();
logger.error(MarkerFactory.getMarker(uuid), e.getMessage(), e);
logger.error(MarkerFactory.getMarker(uuid),ex.getMessage(), ex);
}
return new ResponseEntity<>(result, HttpStatus.OK);
}

2
src/main/java/org/ccalm/main/UpdateLocust.java
View File

@ -309,7 +309,7 @@ public class UpdateLocust {
try{
tm = new java.sql.Timestamp(dfm.parse(locust.date).getTime());
} catch (Exception ex) {
logger.error("Error",ex.getMessage());
logger.error(ex.getMessage(), ex);
}
parameters.addValue("date", locust.date, Types.DATE);
}

1
src/main/java/org/ccalm/main/engine/EngineController.java
View File

@ -178,6 +178,7 @@ public class EngineController implements ServletContextAware {
Document doc = null;
try {
DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
dbFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();
doc = dBuilder.parse(isXML);
} catch (Exception ex) {

73
src/main/java/org/ccalm/main/login/LoginController.java Normal file
View File

@ -0,0 +1,73 @@
package org.ccalm.main.login;
import io.jsonwebtoken.Claims;
import io.jsonwebtoken.Jws;
import io.jsonwebtoken.Jwts;
import jakarta.servlet.ServletContext;
import org.apache.logging.log4j.LogManager;
import org.ccalm.main.engine.EngineController;
import org.json.JSONObject;
import org.slf4j.MarkerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.context.ServletContextAware;
import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
import tctable.Tools;
import tools.DBTools;
import tools.User;
import java.io.FileInputStream;
import java.security.PublicKey;
import java.sql.*;
import java.util.List;
import java.util.Properties;
import java.util.Set;
import java.util.UUID;
@Controller
public class LoginController implements ServletContextAware {
private static final org.apache.logging.log4j.Logger logger = LogManager.getLogger(EngineController.class);
private javax.servlet.ServletContext context;
private final NamedParameterJdbcTemplate jdbcTemplate;
@Autowired
public LoginController(NamedParameterJdbcTemplate jdbcTemplate) {
this.jdbcTemplate = jdbcTemplate;
}
@Override
public void setServletContext(ServletContext servletContext) {
this.context=context;
}
@RequestMapping(value = "/login/login", method = RequestMethod.GET)
public String home(
@ModelAttribute User user,
Model model,
@CookieValue(value = "jwt_a", defaultValue = "") String jwt_a,
@RequestParam(required=false,name="lng", defaultValue = "1") String language_id
) {
String sql = "select identifier,translation from main._translations t where t.del=false and t.language_id=:language_id";
try {
MapSqlParameterSource parameters = new MapSqlParameterSource();
parameters.addValue("language_id", Integer.valueOf(language_id));
List<String> ret = jdbcTemplate.query(sql, parameters, new DBTools.JsonRowMapper());
for (int i = 0; i < ret.size(); i++) {
JSONObject json = new JSONObject(ret.get(i));
model.addAttribute(json.getString("identifier"), json.getString("identifier"));
}
} catch (Exception ex) {
String uuid = UUID.randomUUID().toString();
logger.error(MarkerFactory.getMarker(uuid), ex.getMessage(), ex);
}
return "login/login";
}
}

4
src/main/java/org/ccalm/main/utils/CustomException.java
View File

@ -71,8 +71,8 @@ public class CustomException extends Exception {
json.put("error_message", this.getErrorMessages());
json.put("error_setting", this.getErrorSettings());
json.put("error_marker", this.getErrorMarker());
} catch (JSONException e) {
logger.error("Error", e);
} catch (JSONException ex) {
logger.error(ex.getMessage(), ex);
}
return json;
}

0
src/main/java/org/ccalm/main/utils/Tools.java → src/main/java/org/ccalm/main/utils/LTools.java
View File

2
src/main/java/tools/PreparedStatementNamed.java
View File

@ -194,7 +194,7 @@ public class PreparedStatementNamed {
try{
tm = new java.sql.Timestamp(dfm.parse(value).getTime());
} catch (Exception ex) {
logger.error("Error",ex.getMessage());
logger.error(ex.getMessage(), ex);
}
for (int i = 0; i < fields.size(); i++) {
if (fields.get(i).name.equals(name)) {