diff --git a/pom.xml b/pom.xml
index d6e0b6d..3fcaa2c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@
org.postgresql
postgresql
- 42.7.3
+ 42.7.7
org.json
diff --git a/src/main/java/org/ccalm/main/AcceptJSON.java b/src/main/java/org/ccalm/main/AcceptJSON.java
index 1148c2d..6fc5658 100644
--- a/src/main/java/org/ccalm/main/AcceptJSON.java
+++ b/src/main/java/org/ccalm/main/AcceptJSON.java
@@ -2333,7 +2333,7 @@ public class AcceptJSON implements ServletContextAware {
json = e.getJson();
} catch (Exception ex) {
String uuid = UUID.randomUUID().toString();
- logger.error(MarkerFactory.getMarker(uuid), e.getMessage(), e);
+ logger.error(MarkerFactory.getMarker(uuid), ex.getMessage(), ex);
json = Tools.createJSONError(10000,"Internal_Server_Error", (String)null, uuid);
}
return json.toString();
diff --git a/src/main/java/org/ccalm/main/SendWarning.java b/src/main/java/org/ccalm/main/SendWarning.java
index faddc31..0e1cb98 100644
--- a/src/main/java/org/ccalm/main/SendWarning.java
+++ b/src/main/java/org/ccalm/main/SendWarning.java
@@ -123,7 +123,7 @@ public class SendWarning {
t.user_uid,
t.lat,
t.lon,
- u.email,
+ 'irigm@mail.ru' as email, --u.email,
l.short_name,
t.temperature_air,
t.warn_air,
diff --git a/src/main/java/org/ccalm/main/login/LoginController.java b/src/main/java/org/ccalm/main/login/LoginController.java
index fef14fb..70e823c 100644
--- a/src/main/java/org/ccalm/main/login/LoginController.java
+++ b/src/main/java/org/ccalm/main/login/LoginController.java
@@ -5,8 +5,11 @@ import io.jsonwebtoken.Jws;
import io.jsonwebtoken.Jwts;
import jakarta.servlet.ServletContext;
import org.apache.logging.log4j.LogManager;
+import org.ccalm.main.AcceptJSON;
import org.ccalm.main.engine.EngineController;
import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.slf4j.MarkerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -30,7 +33,7 @@ import java.util.UUID;
@Controller
public class LoginController implements ServletContextAware {
- private static final org.apache.logging.log4j.Logger logger = LogManager.getLogger(EngineController.class);
+ private static final Logger logger = LoggerFactory.getLogger(LoginController.class);
private javax.servlet.ServletContext context;
private final NamedParameterJdbcTemplate jdbcTemplate;
diff --git a/src/main/java/org/ccalm/main/utils/LTools.java b/src/main/java/org/ccalm/main/utils/LTools.java
index 8b4b200..9a461ee 100644
--- a/src/main/java/org/ccalm/main/utils/LTools.java
+++ b/src/main/java/org/ccalm/main/utils/LTools.java
@@ -21,9 +21,9 @@ import java.util.UUID;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-public class Tools {
+public class LTools {
//---------------------------------------------------------------------------
- private static final org.slf4j.Logger logger = LoggerFactory.getLogger(Tools.class);
+ private static final org.slf4j.Logger logger = LoggerFactory.getLogger(LTools.class);
//---------------------------------------------------------------------------
public static JSONObject createJSONError(int code, String message, String setting, String marker) {
JSONObject json = new JSONObject();
diff --git a/src/main/java/tools/EmailUtility.java b/src/main/java/tools/EmailUtility.java
index 7bf90db..6c15565 100644
--- a/src/main/java/tools/EmailUtility.java
+++ b/src/main/java/tools/EmailUtility.java
@@ -26,6 +26,7 @@ public class EmailUtility {
String subject, String message) throws AddressException,
MessagingException
{
+
// sets SMTP server properties
Properties properties = new Properties();