From 9837e3a5b94208394a2e200c42fd4da0b75460fe Mon Sep 17 00:00:00 2001
From: igor <irigm@mail.ru>
Date: Sun, 14 Sep 2025 14:48:36 +0500
Subject: [PATCH] JSON log

---
 org-ccalm-main.yml                            |  4 +-
 pom.xml                                       | 14 ++++---
 src/main/resources/logback-spring.xml         | 42 +++++++++++++++----
 .../resources/templates/engine/index.html     |  6 +--
 src/main/resources/templates/index_old.html   |  2 +-
 src/main/resources/templates/test.html        |  2 +-
 6 files changed, 49 insertions(+), 21 deletions(-)

diff --git a/org-ccalm-main.yml b/org-ccalm-main.yml
index 74cf477..f49dccd 100644
--- a/org-ccalm-main.yml
+++ b/org-ccalm-main.yml
@@ -10,8 +10,8 @@ spring:
   application:
     name: org-ccalm-main
   datasource:
-    #url: jdbc:postgresql://10.0.0.1:5432/CCALM?ApplicationName=org_ccalm_main&connectTimeout=10000&socketTimeout=30000
-    url: jdbc:postgresql://ccalm.org:5432/CCALM?ApplicationName=org_ccalm_main&ssl=true&sslmode=require&connectTimeout=10000&socketTimeout=10000
+    url: jdbc:postgresql://10.0.0.1:5432/CCALM?ApplicationName=org_ccalm_main&connectTimeout=10000&socketTimeout=30000
+    #url: jdbc:postgresql://ccalm.org:5432/CCALM?ApplicationName=org_ccalm_main&ssl=true&sslmode=require&connectTimeout=10000&socketTimeout=10000
     #url: jdbc:postgresql://127.0.0.1:5432/CCALM?ApplicationName=org_ccalm_main&ssl=true&sslmode=require&connectTimeout=10000&socketTimeout=10000
     username: postgres
     password: 309A86FF65A78FB428F4E38DFE35F730
diff --git a/pom.xml b/pom.xml
index 718c34a..d4cc27f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.4.2</version>
+        <version>3.5.5</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>org.ccalm</groupId>
@@ -81,11 +81,7 @@
         </dependency>
 
 
-        <dependency>
-            <groupId>net.logstash.logback</groupId>
-            <artifactId>logstash-logback-encoder</artifactId>
-            <version>7.4</version>
-        </dependency>
+
         <!-- https://mvnrepository.com/artifact/edu.ucar/netcdfAll -->
         <dependency>
             <groupId>edu.ucar</groupId>
@@ -144,6 +140,12 @@
             <scope>provided</scope>
         </dependency>
 
+        <dependency>
+            <groupId>net.logstash.logback</groupId>
+            <artifactId>logstash-logback-encoder</artifactId>
+            <version>8.1</version>
+        </dependency>
+
     </dependencies>
 
     <build>
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
index 14cb335..4f1e9b8 100644
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
 
-    <conversionRule conversionWord="exOneLine" converterClass="org.ccalm.main.SingleLineThrowableProxyConverter"/>
+    <!-- Ваш кастомный conversionRule для single-line исключений -->
+    <conversionRule conversionWord="exOneLine" converterClass="org.ccalm.dbms.SingleLineThrowableProxyConverter"/>
 
     <property name="LOGS" value="logs" />
     <springProperty scope="context" name="appName" source="spring.application.name"/>
@@ -9,15 +10,38 @@
     <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <file>${LOGS}/${appName}.log</file>
         <encoder class="net.logstash.logback.encoder.LogstashEncoder">
-            <!-- Настраиваем поля для JSON -->
+            <!-- Кастомные имена полей -->
             <fieldNames>
-                <timestamp>timestamp</timestamp>
-                <thread>thread</thread>
+                <timestamp>timestamp</timestamp>  <!-- Без @ -->
                 <level>level</level>
-                <logger>logger</logger>
                 <message>message</message>
-                <exception>exception</exception>
+                <stack_trace>exception</stack_trace>
+                <version>[ignore]</version>
+                <threadName>[ignore]</threadName>
+                <loggerName>[ignore]</loggerName>
+                <levelValue>[ignore]</levelValue>
+                <mdc>[ignore]</mdc>
             </fieldNames>
+
+            <!-- Формат timestamp -->
+            <timestampPattern>yyyy-MM-dd'T'HH:mm:ss.SSS'Z'</timestampPattern>
+            <timestampTimeZone>UTC</timestampTimeZone>
+
+            <!-- Включаем маркеры (tags для MarkerFactory) -->
+            <includeTags>true</includeTags>
+
+            <!-- Отключаем лишние данные -->
+            <includeCallerData>false</includeCallerData>
+            <includeContext>false</includeContext>
+
+            <!-- Single-line исключения -->
+            <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
+                <maxDepthPerThrowable>1</maxDepthPerThrowable>
+                <maxLength>1024</maxLength>
+                <shortenedClassNameLength>20</shortenedClassNameLength>
+                <exclude>$$FastClassByCGLIB$$</exclude>
+                <exclude>$$EnhancerBySpringCGLIB$$</exclude>
+            </throwableConverter>
         </encoder>
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <fileNamePattern>${LOGS}/${appName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
@@ -29,11 +53,13 @@
 
     <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>%d{yyyy-MM-dd'T'HH:mm:ss.SSS'Z'} | %level | %logger{36} | %msg%n</pattern>
+            <pattern>
+                %d{yyyy-MM-dd'T'HH:mm:ss.SSS'Z'} | %level | %logger{36} | %marker | %msg%n
+            </pattern>
         </encoder>
     </appender>
 
-    <root level="warn">
+    <root level="info">
         <appender-ref ref="FILE" />
         <appender-ref ref="CONSOLE" />
     </root>
diff --git a/src/main/resources/templates/engine/index.html b/src/main/resources/templates/engine/index.html
index 9295c2b..14f3b52 100644
--- a/src/main/resources/templates/engine/index.html
+++ b/src/main/resources/templates/engine/index.html
@@ -30,7 +30,7 @@
 	<script type="text/javascript" src="/api/translation/v01/array"></script>
 	<link rel="stylesheet" type="text/css" href="../resources/metadata/dbms/dbms.css?v=16"/>
 	<script type="text/javascript" src="../resources/metadata/dbms/BrowserDetect.js?v=16"></script>
-	<script type="text/javascript" src="../resources/metadata/dbms/tools.js?v=16"></script>
+	<script type="text/javascript" src="../resources/metadata/dbms/tools.js?v=17"></script>
 	<script type="text/javascript" src="../resources/metadata/dbms/window.js?v=16"></script>
 	<script type="text/javascript" src="../resources/metadata/dbms/editrecord.js?v=16"></script>
 	<script type="text/javascript" src="../resources/metadata/dbms/showrecord.js?v=16"></script>
@@ -1411,8 +1411,8 @@ new Calendar({
 		if(opt!=null) opt.selected = true;
 	});
 
-	//getJsonData(url+"geodatalist/GeoTIFF?fn=smap_list",
-	getJsonData("https://geoserver.ccalm.org/geodatalist/GeoTIFF?fn=smap_list",
+	getJsonData(url+"geodatalist/GeoTIFF?fn=smap_list",
+	//getJsonData("https://geoserver.ccalm.org/geodatalist/GeoTIFF?fn=smap_list",
 		function(result){
 			let list = document.getElementById("filter_smap_day");
 			let opt=null;
diff --git a/src/main/resources/templates/index_old.html b/src/main/resources/templates/index_old.html
index fdc8c78..554188b 100644
--- a/src/main/resources/templates/index_old.html
+++ b/src/main/resources/templates/index_old.html
@@ -5,7 +5,7 @@
         <title>Automated system of data collection</title>
         <meta name="yandex-verification" content="2cb5374be0668fe9" />
 
-		<script src="../resources/metadata/dbms/tools.js?v=9"></script>
+		<script src="../resources/metadata/dbms/tools.js?v=17"></script>
 		<script src="../resources/metadata/dbms/window.js?v=10"></script>
         
         <meta name="description" content="According to the implementation of the Road Map program to improve national and regional locust control in the Caucasus and Central Asia (CCA) developed a system of monitoring and analysis designed to control locusts in the CCA using a geographic information system and remote sensing technology">
diff --git a/src/main/resources/templates/test.html b/src/main/resources/templates/test.html
index c969d89..71cdb48 100644
--- a/src/main/resources/templates/test.html
+++ b/src/main/resources/templates/test.html
@@ -10,7 +10,7 @@
 	
 	<script type="text/javascript" src="/api/translation/v01/array"></script>
 
-	<script src="./resources/metadata/dbms/tools.js?v=10"></script>
+	<script src="./resources/metadata/dbms/tools.js?v=17"></script>
 	<script src="./resources/metadata/dbms/window.js?v=11"></script>
 
 	<link rel="stylesheet" href="./resources/engine/css/buttons.css?v=8">