update_16

pom.xml

@@ -87,7 +87,7 @@
 		<dependency>
 			<groupId>org.xerial</groupId>
 			<artifactId>sqlite-jdbc</artifactId>
-			<version>3.42.0.0</version>
+			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

src/main/java/com/scbfkj/uni/api/DataProcessApi.java

@@ -1,11 +0,0 @@
-package com.scbfkj.uni.api;
-
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-public class DataProcessApi {
-
-
-
-
-}

src/main/java/com/scbfkj/uni/api/GenericApi.java

@@ -12,7 +12,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 

src/main/java/com/scbfkj/uni/api/LogAop.java

@@ -3,7 +3,6 @@ package com.scbfkj.uni.api;
 import com.scbfkj.uni.library.RequestUtil;
 import com.scbfkj.uni.library.UniReturnUtil;
 import com.scbfkj.uni.process.DataBase;
-import com.scbfkj.uni.service.LoggerService;
 import com.scbfkj.uni.service.SecurityService;
 import com.scbfkj.uni.system.Config;
 import jakarta.annotation.Resource;
@@ -47,7 +46,7 @@ public class LogAop {
             String uri = request.getRequestURI();
 //        请求参数
             Object[] args = joinPoint.getArgs();
-            if (Config.enable) {
+            if (Config.securityEnable) {
                 if (Objects.isNull(apiInfos) || apiInfos.isEmpty()) {
                     apiInfos = DataBase.query(Config.securityConnectionStr, "select * from apiinfo", new ArrayList<>() {{
                         add(new Object[]{});

src/main/java/com/scbfkj/uni/api/Test.java

@@ -1,18 +0,0 @@
-package com.scbfkj.uni.api;
-
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Map;
-
-@RestController
-public class Test {
-    @PostMapping("test")
-    public ResponseEntity test(@RequestHeader Map<String, Object> headers, @RequestBody Map<String, Object> body) {
-
-        return ResponseEntity.ok(body);
-    }
-}

src/main/java/com/scbfkj/uni/config/InitBeanConfig.java

@@ -1,8 +0,0 @@
-package com.scbfkj.uni.config;
-
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class InitBeanConfig {
-
-}

src/main/java/com/scbfkj/uni/config/WebSocketConfig.java

@@ -0,0 +1,28 @@
+package com.scbfkj.uni.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.messaging.simp.config.MessageBrokerRegistry;
+import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker;
+import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
+import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer;
+
+@Configuration
+@EnableWebSocketMessageBroker
+public class WebSocketConfig implements WebSocketMessageBrokerConfigurer {
+
+    @Override
+    public void configureMessageBroker(MessageBrokerRegistry config) {
+
+//        对应 @SendTo 比如@SendTo("/topic/greeting")
+        config.enableSimpleBroker("/topic");
+//        对应 @MessageMapping 比如@MessageMapping("/hello") 会自动添加前缀路径形成的完整路径为/app/hello
+        config.setApplicationDestinationPrefixes("/app");
+    }
+
+    @Override
+    public void registerStompEndpoints(StompEndpointRegistry registry) {
+//        建立连接的url
+        registry.addEndpoint("/gs-guide-websocket").setAllowedOriginPatterns("*");
+    }
+
+}

src/main/java/com/scbfkj/uni/process/RabbitMq.java → src/main/java/com/scbfkj/uni/process/ActiveMQ.java

@@ -1,4 +1,4 @@
 package com.scbfkj.uni.process;
 
-public class RabbitMq {
+public class ActiveMQ {
 }

src/main/java/com/scbfkj/uni/process/Kafka.java

@@ -19,30 +19,12 @@ import org.springframework.util.StringUtils;
 
 import java.time.Duration;
 import java.util.*;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.ThreadPoolExecutor;
 
 public class Kafka {
-    private static final KeyedObjectPool<String, Producer<String, String>> producerPool = new GenericKeyedObjectPool<>(new BaseKeyedPooledObjectFactory<>() {
-        @Override
-        public Producer<String, String> create(String key) throws Exception {
-            Map<String, Object> connectConfigMaps = (Map<String, Object>) DataFormatUtil.stringToMap(key);
-            connectConfigMaps.put("request.timeout.ms", 60000);
-            connectConfigMaps.put("max.request.size", 10240000);
-            connectConfigMaps.put("compression.type", "gzip");
-            connectConfigMaps.put("key.serializer", "org.apache.kafka.common.serialization.StringSerializer");
-            connectConfigMaps.put("value.serializer", "org.apache.kafka.common.serialization.StringSerializer");
 
-            return new KafkaProducer<>(connectConfigMaps);
-        }
-
-        @Override
-        public PooledObject<Producer<String, String>> wrap(Producer<String, String> value) {
-            return new DefaultPooledObject<>(value);
-        }
-    });
+    // 因为生产者是线程安全的所以相同的连接只需要一个生产者实例 不需要对象池
+    public static final Map<String, Producer<String, String>> producerMap = new HashMap<>();
+//    消费者是非线程安全的所以需要一个对象池
     private static final KeyedObjectPool<String, Consumer<String, String>> consumerPool = new GenericKeyedObjectPool<>(new BaseKeyedPooledObjectFactory<>() {
         @Override
         public Consumer<String, String> create(String key) throws Exception {
@@ -67,20 +49,28 @@ public class Kafka {
         }
 
         List<Object> sendResult = new ArrayList<>();
-        Producer<String, String> producer = null;
-        try {
-            producer = producerPool.borrowObject(connection);
+        Producer<String, String> producer = createProducer(connection);
 //            多线程发送
-            Producer<String, String> finalProducer = producer;
-            datas.parallelStream().forEach(it -> {
-                sendResult.add(finalProducer.send(new ProducerRecord<>(topic, DataFormatUtil.toString(it))));
-            });
-        } finally {
-            if (Objects.nonNull(producer))
-                producerPool.returnObject(connection, producer);
+        datas.parallelStream().forEach(it -> {
+            sendResult.add(producer.send(new ProducerRecord<>(topic, DataFormatUtil.toString(it))));
+        });
+        return UniReturnUtil.success(sendResult);
+    }
+
+    public synchronized static Producer<String, String> createProducer(String connectionStr) throws JsonProcessingException {
+        if (producerMap.containsKey(connectionStr)) {
+            return producerMap.get(connectionStr);
         }
+        Map<String, Object> connectConfigMaps = (Map<String, Object>) DataFormatUtil.stringToMap(connectionStr);
+        connectConfigMaps.put("request.timeout.ms", 60000);
+        connectConfigMaps.put("max.request.size", 10240000);
+        connectConfigMaps.put("compression.type", "gzip");
+        connectConfigMaps.put("key.serializer", "org.apache.kafka.common.serialization.StringSerializer");
+        connectConfigMaps.put("value.serializer", "org.apache.kafka.common.serialization.StringSerializer");
 
-        return UniReturnUtil.success(sendResult);
+        KafkaProducer<String, String> kafkaProducer = new KafkaProducer<>(connectConfigMaps);
+        producerMap.put(connectionStr, kafkaProducer);
+        return kafkaProducer;
     }
 
     public static Map<String, Object> receptionMessage(String connectConfig, String sourceObjectName, String libraryId, String pollNumber, String fetch) throws Exception {
@@ -94,20 +84,22 @@ public class Kafka {
         }
         String key = DataFormatUtil.toString(connectConfig);
         Consumer<String, String> consumer = consumerPool.borrowObject(key);
-        consumer.subscribe(Collections.singleton(sourceObjectName));
-        ConsumerRecords<String, String> records = consumer.poll(Duration.ofSeconds(1));
-        List<String> messageList = new ArrayList<>();
-        if (records.count() > 0) {
-            for (ConsumerRecord<String, String> record : records.records(sourceObjectName)) {
-                String readValue = record.value().trim();
-                if (!StringUtils.hasLength(readValue) || readValue.equals("{}")) {
-                    continue;
+        try {
+            List<String> messageList = new ArrayList<>();
+            consumer.subscribe(Collections.singleton(sourceObjectName));
+            ConsumerRecords<String, String> records = consumer.poll(Duration.ofSeconds(1));
+            if (records.count() > 0) {
+                for (ConsumerRecord<String, String> record : records.records(sourceObjectName)) {
+                    String readValue = record.value().trim();
+                    if (!StringUtils.hasLength(readValue) || readValue.equals("{}")) {
+                        continue;
+                    }
+                    messageList.add(readValue);
                 }
-                messageList.add(readValue);
             }
+            return UniReturnUtil.success(messageList);
+        } finally {
+            consumerPool.returnObject(key, consumer);
         }
-        consumerPool.returnObject(key, consumer);
-        return UniReturnUtil.success(messageList);
-
     }
 }

src/main/java/com/scbfkj/uni/process/IBMMQ.java → src/main/java/com/scbfkj/uni/process/RabbitMQ.java

@@ -1,4 +1,4 @@
 package com.scbfkj.uni.process;
 
-public class IBMMQ {
+public class RabbitMQ {
 }

src/main/java/com/scbfkj/uni/service/DataProcessService.java

@@ -209,7 +209,7 @@ public class DataProcessService {
             it = it.trim();
             String type = it.split("\\.")[0];
             if (!List.of("string", "list", "map", "array", "long", "integer", "boolean", "double", "float", "datetime").contains(type.toLowerCase())) {
-                if (Objects.equals("null", type)) {
+                if (Objects.equals("null", type.toLowerCase())) {
                     result.add(null);
                 } else {
                     result.add(type);

src/main/java/com/scbfkj/uni/service/LoggerService.java

@@ -8,7 +8,9 @@ import com.scbfkj.uni.process.DataBase;
 import com.scbfkj.uni.process.Elasticsearch;
 import com.scbfkj.uni.process.Kafka;
 import com.scbfkj.uni.system.Config;
+import org.springframework.core.io.ClassPathResource;
 import org.springframework.stereotype.Component;
+import org.springframework.util.FileCopyUtils;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -19,11 +21,10 @@ import java.util.*;
 @Component
 public class LoggerService {
 
-    private static String logConnection = """
-            {"jdbcUrl":"jdbc:sqlite:logs/log_","driverClassName":"org.sqlite.JDBC"}""";
 
     private static Map<String, Integer> flag = new HashMap<>();
 
+
     //写日志方法：log()--提供给程序内部使用
     //用户操作日志
     public static void logUser(LocalDateTime requestTime, String requestIP, String requestPath
@@ -64,20 +65,20 @@ public class LoggerService {
         //调用工具类的获取雪花编号getUniqueNumber(时间戳+当前容器编号+0)
         //打开雪花编号对应的临时Sqlite（日志文件夹下）
         //写入数据
-//
-//        try {
-//            String tableName = "servicelog";
-//            String connectionStr = getCurrentThreadConnection(tableName);
-//            if (!Objects.equals(returnCode, "0")) {
-//                tableName = "serviceerrlog";
-//            }
-////            insertLog(connectionStr,
-////                    "insert into %s ('begintime','endtime','serviceid','resource','preresource','returncode','returnmessage','lifecycleid') values (?,?,?,?,?,?,?,?,?)".formatted(tableName),
-////                    List.of(beginTime, endTime, serviceID, resource, preResource, returnCode, returnMessage, dataObjectID));
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//            System.out.println(UniReturnUtil.getMessage(e));
-//        }
+
+        try {
+            String tableName = "servicelog";
+            String connectionStr = getTimeConnection();
+            if (!Objects.equals(returnCode, "0")) {
+                tableName = "serviceerrlog";
+            }
+            insertLog(connectionStr,
+                    "insert into %s ('begintime','endtime','serviceid','resource','preresource','returncode','returnmessage','lifecycleid') values (?,?,?,?,?,?,?,?,?)".formatted(tableName),
+                    List.of(beginTime, endTime, serviceID, resource, preResource, returnCode, returnMessage, dataObjectID));
+        } catch (Exception e) {
+            e.printStackTrace();
+            System.out.println(UniReturnUtil.getMessage(e));
+        }
     }
 
     //系统异常日志
@@ -89,7 +90,7 @@ public class LoggerService {
 
         try {
             String tableName = "systemerrlog";
-            String connectionStr = getCurrentThreadConnection(tableName);
+            String connectionStr = getTimeConnection();
             insertLog(connectionStr,
                     "insert into %s ('occurrenceTime','occurrenceAddress','detailedMessage') values (?,?,?)".formatted(tableName),
                     List.of(occurrenceTime, occurrenceAddress, detailedMessage));
@@ -98,10 +99,12 @@ public class LoggerService {
         }
     }
 
-    private static String getCurrentThreadConnection(String targetName) throws Exception {
-        long id = Thread.currentThread().getId();
+    private synchronized static String getTimeConnection() throws Exception {
+        long timeMillis = System.currentTimeMillis();
+        long name = timeMillis / Config.splitCount;
+
 
-        String fileName = "logs" + File.separator + "log_" + id + "_" + targetName;
+        String fileName = "logs" + File.separator + name + ".sqlite";
         File file = new File(fileName);
         HashMap<String, Object> connectionMap = new HashMap<>();
 
@@ -109,187 +112,94 @@ public class LoggerService {
         connectionMap.put("driverClassName", "org.sqlite.JDBC");
         String newConnection = DataFormatUtil.toString(connectionMap);
         if (!file.exists()) {
-            String sql = null;
-            if (targetName.equals("interfacelog")) {
-                sql = """
-                        CREATE TABLE interfacelog (
-                             
-                            logid         Integer
-                                primary key autoincrement,
-                            requesttime DATETIME,
-                            requestip TEXT,
-                            requestpath TEXT,
-                            requestdata TEXT,
-                            sessionid TEXT,
-                            returndate DATETIME,
-                            returndata TEXT,
-                            returncode TEXT,
-                            returnmessage TEXT,
-                            dataobjectid TEXT,
-                            applicationid TEXT
-                         )
-                                                """;
-            } else if (targetName.equals("servicelog")) {
-                sql = """
-                        CREATE TABLE servicelog (
-                             
-                            logid         Integer
-                                primary key autoincrement,
-                             begintime DATETIME,
-                             endtime DATETIME,
-                             serviceid TEXT,
-                             resource TEXT,
-                             requestdata TEXT,
-                             returndata TEXT,
-                             returncode TEXT,
-                             returnmessage TEXT,
-                             lifecycleid TEXT
-                         )
-                                                                        """;
-            } else if (targetName.equals("serviceerrlog")) {
-                sql = """
-                        CREATE TABLE serviceerrlog (
-                             
-                            logid         Integer
-                                primary key autoincrement,
-                             begintime DATETIME,
-                             endtime DATETIME,
-                             serviceid TEXT,
-                             resource TEXT,
-                             requestdata TEXT,
-                             returndata TEXT,
-                             returncode TEXT,
-                             returnmessage TEXT,
-                             lifecycleid TEXT
-                         )
-                        """;
-            } else if (targetName.equals("systemerrlog")) {
-                sql = """
-                        create table systemerrlog
-                         (
-                             logid         Integer
-                                 primary key autoincrement,
-                             occurrencetime DATETIME,
-                             occurrenceaddress TEXT,
-                             detailedmessage TEXT
-                         );
-
-
-                                                 """;
-            } else if (targetName.equals("userlog")) {
-                sql = """
-                        CREATE TABLE userlog (
-                              
-                            logid         Integer
-                                primary key autoincrement,
-                            requesttime DATETIME,
-                            requestip TEXT,
-                            requestpath TEXT,
-                            requestdata TEXT,
-                            sessionid TEXT,
-                            returndate DATETIME,
-                            returndata TEXT,
-                            returncode TEXT,
-                            returnmessage TEXT,
-                            dataobjectid TEXT,
-                            applicationid TEXT,
-                            userid TEXT
-                          )
-                        """;
-            }
-//            创建表结构
-            DataBase.exec(newConnection, sql);
-            try (Connection connection = createConnection(newConnection);
-                 Statement statement = connection.createStatement()
-            ) {
-                statement.execute(sql);
-            }
-
+            ClassPathResource resource = new ClassPathResource("template.sqlite");
+            File template = resource.getFile();
+            FileCopyUtils.copy(template, file);
         }
         return newConnection;
     }
-
-    /**
-     * 读取日志并发送到目标存储介质，最后删除已经发送成功的日志
-     *
-     * @param fileName
-     * @return
-     */
-    private static void apply(String fileName) {
-        String newConnection = logConnection.replace("log_", fileName);
-        String tableName = fileName.substring(fileName.lastIndexOf("_") + 1);
-        try {
-            List<Map<String, Object>> result = DataBase.query(newConnection, "select * from %s where 1=?".formatted(tableName), Collections.singletonList(new Object[]{1}));
-            if (result.isEmpty()) {
-                if (!flag.containsKey(fileName)) {
-                    flag.put(fileName, 0);
-                }
-                int value = flag.get(fileName) + 1;
-                if (value > 10) {
-                    new File("logs" + File.separator + fileName).delete();
-                    flag.remove(fileName);
-                    return;
-                } else {
-                    flag.put(fileName, value);
-
-                }
-
-            } else {
-                if (!flag.containsKey(fileName)) {
-                    flag.put(fileName, 0);
-                }
-                flag.put(fileName, 0);
-            }
-//           删除成功的日志
-            if (!result.isEmpty()) {
-                for (String target : Config.targets) {
-                    Object type = JsonPath.read(target, "$.type");
-                    if (Objects.isNull(type)) throw new RuntimeException("日志输出目标类型没有配置");
-                    switch (type.toString()) {
-                        case "DB" -> {
-                            DatabaseScriptUtil.exec(target, tableName, result, "1", null, null);
-                        }
-                        case "KAFKA" -> {
-                            Kafka.sendMessage(target, tableName, result.stream().map(DataFormatUtil::toString).toList());
-                        }
-                        case "ES" -> {
-                            Elasticsearch.send(target, tableName, result);
-                        }
-                    }
-                }
-                DatabaseScriptUtil.exec(newConnection, tableName, result.stream().map(it -> (Map<String, Object>) new HashMap<String, Object>() {{
-                    put("logid", it.get("logid"));
-                }}).toList(), "3", null, null);
-            }
-        } catch (Exception e) {
-            System.out.println(UniReturnUtil.getMessage(e));
-        }
-
-    }
-
-    public static void sendLog() throws FileNotFoundException {
-        File logDir = new File("logs");
-        if (logDir.exists()) {
-            if (logDir.isDirectory()) {
-                File[] files = logDir.listFiles();
-
-
-                List<File> logs = new ArrayList<>();
-                if (files != null) {
-                    logs = Arrays.stream(files).toList();
-                }
-                logs.parallelStream().forEach(it -> {
-                    String fileName = it.getName();
-                    apply(fileName);
-                });
-
-            } else {
-                throw new FileNotFoundException("logs 不是文件夹");
-            }
-        } else {
-            throw new FileNotFoundException("日志目录没有找到");
-        }
-    }
+//
+//    /**
+//     * 读取日志并发送到目标存储介质，最后删除已经发送成功的日志
+//     *
+//     * @param fileName
+//     * @return
+//     */
+//    private static void apply(String fileName) {
+//        String newConnection = logConnection.replace("log_", fileName);
+//        String tableName = fileName.substring(fileName.lastIndexOf("_") + 1);
+//        try {
+//            List<Map<String, Object>> result = DataBase.query(newConnection, "select * from %s where 1=?".formatted(tableName), Collections.singletonList(new Object[]{1}));
+//            if (result.isEmpty()) {
+//                if (!flag.containsKey(fileName)) {
+//                    flag.put(fileName, 0);
+//                }
+//                int value = flag.get(fileName) + 1;
+//                if (value > 10) {
+//                    new File("logs" + File.separator + fileName).delete();
+//                    flag.remove(fileName);
+//                    return;
+//                } else {
+//                    flag.put(fileName, value);
+//
+//                }
+//
+//            } else {
+//                if (!flag.containsKey(fileName)) {
+//                    flag.put(fileName, 0);
+//                }
+//                flag.put(fileName, 0);
+//            }
+////           删除成功的日志
+//            if (!result.isEmpty()) {
+//                for (String target : Config.targets) {
+//                    Object type = JsonPath.read(target, "$.type");
+//                    if (Objects.isNull(type)) throw new RuntimeException("日志输出目标类型没有配置");
+//                    switch (type.toString()) {
+//                        case "DB" -> {
+//                            DatabaseScriptUtil.exec(target, tableName, result, "1", null, null);
+//                        }
+//                        case "KAFKA" -> {
+//                            Kafka.sendMessage(target, tableName, result.stream().map(DataFormatUtil::toString).toList());
+//                        }
+//                        case "ES" -> {
+//                            Elasticsearch.send(target, tableName, result);
+//                        }
+//                    }
+//                }
+//                DatabaseScriptUtil.exec(newConnection, tableName, result.stream().map(it -> (Map<String, Object>) new HashMap<String, Object>() {{
+//                    put("logid", it.get("logid"));
+//                }}).toList(), "3", null, null);
+//            }
+//        } catch (Exception e) {
+//            System.out.println(UniReturnUtil.getMessage(e));
+//        }
+//
+//    }
+//
+//    public static void sendLog() throws FileNotFoundException {
+//        File logDir = new File("logs");
+//        if (logDir.exists()) {
+//            if (logDir.isDirectory()) {
+//                File[] files = logDir.listFiles();
+//
+//
+//                List<File> logs = new ArrayList<>();
+//                if (files != null) {
+//                    logs = Arrays.stream(files).toList();
+//                }
+//                logs.parallelStream().forEach(it -> {
+//                    String fileName = it.getName();
+//                    apply(fileName);
+//                });
+//
+//            } else {
+//                throw new FileNotFoundException("logs 不是文件夹");
+//            }
+//        } else {
+//            throw new FileNotFoundException("日志目录没有找到");
+//        }
+//    }
 
     private static void insertLog(String connection, String sql, List<Object> args) {
         try (
@@ -299,7 +209,7 @@ public class LoggerService {
                 preparedStatement.setObject(i + 1, args.get(i));
             }
             preparedStatement.executeUpdate();
-        } catch (SQLException e) {
+        } catch (SQLException | ClassNotFoundException e) {
             throw new RuntimeException(e);
         }
     }
@@ -311,17 +221,17 @@ public class LoggerService {
 
             ResultSet resultSet = preparedStatement.executeQuery();
             return DataBase.getResult(connection, sql, resultSet);
-        } catch (SQLException e) {
+        } catch (SQLException | ClassNotFoundException e) {
             throw new RuntimeException(e);
         }
     }
 
-    private static Connection createConnection(String connection) throws SQLException {
+    private static Connection createConnection(String connection) throws SQLException, ClassNotFoundException {
         Map<?, ?> map = DataFormatUtil.toMap(connection);
         String jdbcUrl = DataFormatUtil.toString(map.get("jdbcUrl"));
         String driverClassName = DataFormatUtil.toString(map.get("driverClassName"));
-        Driver driver = DriverManager.getDriver(driverClassName);
-        return driver.connect(jdbcUrl, null);
+        Class.forName(driverClassName);
+        Driver driver = DriverManager.getDriver(jdbcUrl);
+        return driver.connect(jdbcUrl, new Properties());
     }
-
 }

src/main/java/com/scbfkj/uni/system/Config.java

@@ -1,17 +1,5 @@
 package com.scbfkj.uni.system;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.oracle.truffle.api.Option;
-import com.scbfkj.uni.library.DataEncryptionUtil;
-import com.scbfkj.uni.library.DataFormatUtil;
-import com.scbfkj.uni.service.DataProcessService;
-import com.zaxxer.hikari.HikariConfig;
-import com.zaxxer.hikari.pool.HikariPool;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Resource;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Component;
 
 import java.util.*;
@@ -26,13 +14,16 @@ public class Config {
             {"jdbcUrl":"jdbc:sqlite:systemset.sqlite","driverClassName":"org.sqlite.JDBC"}""";
 
     //    是否启动安全验证
-    public static boolean enable;
+    public static boolean securityEnable;
     public static boolean debug;
 
     public static String containerCode;
 
     public static List<String> targets = new ArrayList<>();
 
+//    本地日志缓存分片
+    public static int splitCount=1000;
+
 
 
 }

src/main/java/com/scbfkj/uni/system/SystemInit.java

@@ -2,17 +2,16 @@ package com.scbfkj.uni.system;
 
 import com.scbfkj.uni.library.DataEncryptionUtil;
 import com.scbfkj.uni.service.ControlService;
+import com.scbfkj.uni.service.LoggerService;
 import jakarta.annotation.PostConstruct;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.io.ClassPathResource;
 import org.springframework.stereotype.Component;
 
-import java.io.File;
-import java.io.FileNotFoundException;
+import java.io.*;
 import java.time.LocalDateTime;
 import java.util.List;
 
-import com.scbfkj.uni.service.LoggerService;
-
 
 @Component
 public class SystemInit {
@@ -22,10 +21,10 @@ public class SystemInit {
     private String centerConfig;
 
     @Value("${db.security.config}")
-    private String securityconfig;
+    private String securityConfig;
 
     @Value("${app.security.enable:true}")
-    private boolean enableSecurity;
+    private boolean securityEnable = false;
     @Value("${app.container.code}")
     private String containerCode;
 
@@ -34,15 +33,15 @@ public class SystemInit {
     private List<String> targets;
 
     @Value("${debug:false}")
-    private boolean debug=true;
+    private boolean debug = true;
 
     @PostConstruct
     public void init() throws Exception {
         Config.containerCode = containerCode;
-        Config.enable = enableSecurity;
-        Config.debug=debug;
+        Config.securityEnable = securityEnable;
+        Config.debug = debug;
         Config.centerConnectionStr = DataEncryptionUtil.decryptRSAByPrivateKey(centerConfig);
-        Config.securityConnectionStr = DataEncryptionUtil.decryptRSAByPrivateKey(securityconfig);
+        Config.securityConnectionStr = DataEncryptionUtil.decryptRSAByPrivateKey(securityConfig);
 
 //        日志配置初始化
         for (String targetStr : targets) {
@@ -59,6 +58,7 @@ public class SystemInit {
 //                System.out.println(exception.getMessage());
 //            }
 //        }, "* * * * * *");
+        LoggerService.logSystemError(LocalDateTime.now(), "", "");
 
     }
 
@@ -75,4 +75,20 @@ public class SystemInit {
         }
     }
 
+    private String readConfigFile() throws IOException {
+        File resource = new File("config");
+        boolean exists = resource.exists();
+        if (exists) {
+            BufferedInputStream inputStream = new BufferedInputStream(new FileInputStream(resource));
+            byte[] bytes = new byte[1024];
+            StringBuilder builder = new StringBuilder();
+            while (inputStream.read(bytes) > 0) {
+                builder.append(new String(bytes));
+            }
+            return builder.toString();
+        } else {
+            return "{}";
+        }
+    }
+
 }

src/main/resources/application-dev.properties

@@ -3,4 +3,5 @@ db.security.config=Jnj84d14EmSgKEXyAbSH+bratWGkpV89/VA5Er4yQOt7qlnKtGYJzBVJNNYMB
 log.target=B7xSbq4imA5zapX8kEO42mU/5sA2TyF/Ba2Y/++F3z9Np7iT4ywDUkbRC4w/Xrxv1kMSR8PQMJ4dfYwc3mYj0SJJivN5A5/6hI+ZSQBabfZZrYwaIIRdM1XIk4wo1SIrSCXKzef8X6YUH70R2tnh+Uq6KNNp08KaZ2ZXM8vX5Ss=
 server.port=9500
 app.container.code=dev
-app.security.enable=false
+app.security.enable=false
+debug=true

src/main/resources/application.properties

@@ -2,5 +2,4 @@ db.center.config=hLcDKcDr4MgqYdb8j0gF0nF806yUy1UdEp1nmztEdo5rNL8IZliDj7/feOp2Fc7
 db.security.config=Jnj84d14EmSgKEXyAbSH+bratWGkpV89/VA5Er4yQOt7qlnKtGYJzBVJNNYMBdmSlW0G+nqDHMhJQcmHrwbjjChYuGeDcmKSRmvFQ9u7LwqmgEfazzKKoVawXmJ40dMsec2yaFyNnCM92xn1hzHvle5BL7x3kza2htGm+iOqO7Y=
 log.target=B7xSbq4imA5zapX8kEO42mU/5sA2TyF/Ba2Y/++F3z9Np7iT4ywDUkbRC4w/Xrxv1kMSR8PQMJ4dfYwc3mYj0SJJivN5A5/6hI+ZSQBabfZZrYwaIIRdM1XIk4wo1SIrSCXKzef8X6YUH70R2tnh+Uq6KNNp08KaZ2ZXM8vX5Ss=
 server.port=9500
-app.container.code=dev
-#app.debug=true
+app.container.code=dev

src/test/java/com/scbfkj/uni/api/GenericApiTest.java

@@ -0,0 +1,21 @@
+package com.scbfkj.uni.api;
+
+import com.scbfkj.uni.ControllerBaseTest;
+import org.junit.jupiter.api.Test;
+import org.springframework.http.MediaType;
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
+import org.springframework.test.web.servlet.result.MockMvcResultHandlers;
+import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class GenericApiTest extends ControllerBaseTest {
+
+    @Test
+    void matchService() throws Exception {
+        mockMvc.perform(MockMvcRequestBuilders.post("/openApi/hello").contentType(MediaType.APPLICATION_JSON_VALUE).content("{}"))
+                .andExpect(MockMvcResultMatchers.status().is4xxClientError())
+
+                .andDo(MockMvcResultHandlers.print());
+    }
+}