25 12 25

Добавил логгер в настройки.Омталось созранение стате в бд поправить

shine-server-db/build.gradle

@@ -16,7 +16,10 @@ repositories {
 }
 
 dependencies {
-    implementation 'org.xerial:sqlite-jdbc:3.47.0.0'
+    implementation 'org.xerial:sqlite-jdbc:3.47.0.0'  //  sqlite
+
+    implementation "org.slf4j:slf4j-api:2.0.16"          // вызов логгера
+
     implementation project(':shine-server-config')  // модуль с настройками
 }
 

shine-server-db/src/main/java/shine/db/DatabaseInitializer.java

@@ -158,17 +158,14 @@ public class DatabaseInitializer {
                     blockchainName         TEXT    NOT NULL PRIMARY KEY,
                     login                  TEXT    NOT NULL,
                     public_key_base64      TEXT    NOT NULL,
-
+                
                     size_limit             INTEGER NOT NULL,
-                    size_bytes             INTEGER NOT NULL,
-
                     file_size_bytes        INTEGER NOT NULL,
-
+                
                     last_global_number     INTEGER NOT NULL,
                     last_global_hash       TEXT    NOT NULL,
                     updated_at_ms          INTEGER NOT NULL,
-
-                    -- Линии 0..7 (MVP: максимум 8 линий)
+                
                     line0_last_number      INTEGER NOT NULL,
                     line0_last_hash        TEXT    NOT NULL,
                     line1_last_number      INTEGER NOT NULL,

shine-server-db/src/main/java/shine/db/dao/BlockchainStateDAO.java

@@ -135,7 +135,7 @@ public final class BlockchainStateDAO {
             ps.setString(i++, e.getBlockchainName());
             ps.setString(i++, nn(e.getLogin()));
             ps.setString(i++, nn(e.getPublicKeyBase64()));
-            ps.setInt(i++, e.getSizeLimit());
+            ps.setLong(i++, e.getSizeLimit());
             ps.setLong(i++, e.getFileSizeBytes());
             ps.setInt(i++, e.getLastGlobalNumber());
             ps.setString(i++, nn(e.getLastGlobalHash()));

shine-server-db/src/main/java/shine/db/entities/BlockchainStateEntry.java

@@ -13,7 +13,9 @@ public final class BlockchainStateEntry {
     private String login;
     private String publicKeyBase64;
 
-    private int sizeLimit;
+    /** Лимит (теперь long). */
+    private long sizeLimit;
+
     /** Размер файла блокчейна в байтах (то, что будем сверять/чинить при старте). */
     private long fileSizeBytes;
 
@@ -28,7 +30,6 @@ public final class BlockchainStateEntry {
     private long updatedAtMs;
 
     public BlockchainStateEntry() {
-        // по умолчанию хэши пустые (как "0")
         for (int i = 0; i < 8; i++) lastLineHashes[i] = "";
         this.lastGlobalHash = "";
     }
@@ -36,7 +37,7 @@ public final class BlockchainStateEntry {
     public BlockchainStateEntry(String blockchainName,
                                 String login,
                                 String publicKeyBase64,
-                                int sizeLimit,
+                                long sizeLimit,
                                 long fileSizeBytes,
                                 int lastGlobalNumber,
                                 String lastGlobalHash,
@@ -74,8 +75,8 @@ public final class BlockchainStateEntry {
     public String getPublicKeyBase64() { return publicKeyBase64; }
     public void setPublicKeyBase64(String publicKeyBase64) { this.publicKeyBase64 = publicKeyBase64; }
 
-    public int getSizeLimit() { return sizeLimit; }
-    public void setSizeLimit(int sizeLimit) { this.sizeLimit = sizeLimit; }
+    public long getSizeLimit() { return sizeLimit; }
+    public void setSizeLimit(long sizeLimit) { this.sizeLimit = sizeLimit; }
 
     public long getFileSizeBytes() { return fileSizeBytes; }
     public void setFileSizeBytes(long fileSizeBytes) { this.fileSizeBytes = fileSizeBytes; }
@@ -106,12 +107,8 @@ public final class BlockchainStateEntry {
         lastLineHashes[line] = value == null ? "" : value;
     }
 
-    public int[] getLastLineNumbersCopy() {
-        return Arrays.copyOf(lastLineNumbers, 8);
-    }
-    public String[] getLastLineHashesCopy() {
-        return Arrays.copyOf(lastLineHashes, 8);
-    }
+    public int[] getLastLineNumbersCopy() { return Arrays.copyOf(lastLineNumbers, 8); }
+    public String[] getLastLineHashesCopy() { return Arrays.copyOf(lastLineHashes, 8); }
 
     public long getUpdatedAtMs() { return updatedAtMs; }
     public void setUpdatedAtMs(long updatedAtMs) { this.updatedAtMs = updatedAtMs; }