day_22

DockerfileBase

@@ -6,7 +6,8 @@ FROM ubuntu:latest
 WORKDIR /usr/local/kona-jdk-17
 
 RUN apt-get update
-RUN apt-get install -y language-pack-zh-hans
+RUN apt-get upgrade -y
+RUN apt-get install -y language-pack-zh-hans libfreetype6-dev
 RUN locale-gen zh_CN.UTF-8
 ENV LC_ALL=zh_CN.UTF-8
 RUN apt-get clean
@@ -20,9 +21,4 @@ RUN mv TencentKona-17.0.9.b1/* .
 ENV JAVA_HOME=/usr/local/kona-jdk-17
 ENV JAVA_VERSION=17.0.9
 ENV TENCENTKONA_VERSION=17.0.9
-ENV PATH=/usr/local/kona-jdk-17/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-#EXPOSE 9500
-#RUN mkdir "/app"
-#WORKDIR /app
-#COPY target/*.jar /app/app.jar
-#ENTRYPOINT ["java","-jar","app.jar"]
+ENV PATH=/usr/local/kona-jdk-17/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin

pom.xml

@@ -1,134 +1,134 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.1.5</version>
-		<relativePath/> <!-- lookup parent from repository -->
-	</parent>
-	<groupId>com.scbfkj</groupId>
-	<artifactId>uni</artifactId>
-	<version>0.0.1</version>
-	<name>uni</name>
-	<description>uni</description>
-	<properties>
-		<java.version>17</java.version>
-		<graalvm.version>23.0.1</graalvm.version>
-	</properties>
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-devtools</artifactId>
-			<scope>runtime</scope>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.mysql</groupId>
-			<artifactId>mysql-connector-j</artifactId>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>io.projectreactor</groupId>
-			<artifactId>reactor-test</artifactId>
-			<scope>test</scope>
-		</dependency>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>3.1.5</version>
+        <relativePath/> <!-- lookup parent from repository -->
+    </parent>
+    <groupId>com.scbfkj</groupId>
+    <artifactId>uni</artifactId>
+    <version>0.0.1</version>
+    <name>uni</name>
+    <description>uni</description>
+    <properties>
+        <java.version>17</java.version>
+        <graalvm.version>23.0.1</graalvm.version>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <scope>runtime</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.projectreactor</groupId>
+            <artifactId>reactor-test</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.kafka</groupId>
             <artifactId>kafka-clients</artifactId>
         </dependency>
-		<dependency>
-			<groupId>com.ibm.mq</groupId>
-			<artifactId>com.ibm.mq.allclient</artifactId>
-			<version>9.3.2.0</version>
-		</dependency>
-		<dependency>
-			<groupId>co.elastic.clients</groupId>
-			<artifactId>elasticsearch-java</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.rabbitmq</groupId>
-			<artifactId>amqp-client</artifactId>
-			<version>5.18.0</version>
-		</dependency>
+        <dependency>
+            <groupId>com.ibm.mq</groupId>
+            <artifactId>com.ibm.mq.allclient</artifactId>
+            <version>9.3.2.0</version>
+        </dependency>
+        <dependency>
+            <groupId>co.elastic.clients</groupId>
+            <artifactId>elasticsearch-java</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.rabbitmq</groupId>
+            <artifactId>amqp-client</artifactId>
+            <version>5.18.0</version>
+        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
         </dependency>
-		<dependency>
-			<groupId>commons-net</groupId>
-			<artifactId>commons-net</artifactId>
-			<version>3.9.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.graalvm.js</groupId>
-			<artifactId>js</artifactId>
-			<version>${graalvm.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.zaxxer</groupId>
-			<artifactId>HikariCP</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.xerial</groupId>
-			<artifactId>sqlite-jdbc</artifactId>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-aop</artifactId>
-		</dependency>
+        <dependency>
+            <groupId>commons-net</groupId>
+            <artifactId>commons-net</artifactId>
+            <version>3.9.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.graalvm.js</groupId>
+            <artifactId>js</artifactId>
+            <version>${graalvm.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.zaxxer</groupId>
+            <artifactId>HikariCP</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.xerial</groupId>
+            <artifactId>sqlite-jdbc</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-pool2</artifactId>
         </dependency>
-		<dependency>
-			<groupId>com.jayway.jsonpath</groupId>
-			<artifactId>json-path</artifactId>
-		</dependency>
+        <dependency>
+            <groupId>com.jayway.jsonpath</groupId>
+            <artifactId>json-path</artifactId>
+        </dependency>
 
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
-		</dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-webflux</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-websocket</artifactId>
         </dependency>
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-			<version>32.0.0-jre</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.activemq</groupId>
-			<artifactId>activemq-client</artifactId>
-			<version>5.18.3</version>
-		</dependency>
-		<dependency>
-			<groupId>org.flywaydb</groupId>
-			<artifactId>flyway-core</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.flywaydb</groupId>
-			<artifactId>flyway-mysql</artifactId>
-		</dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>32.0.0-jre</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-client</artifactId>
+            <version>5.18.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.flywaydb</groupId>
+            <artifactId>flyway-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.flywaydb</groupId>
+            <artifactId>flyway-mysql</artifactId>
+        </dependency>
 
-	</dependencies>
+    </dependencies>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>

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

@@ -5,7 +5,10 @@ import com.scbfkj.uni.library.UniReturnUtil;
 import com.scbfkj.uni.process.DataBase;
 import com.scbfkj.uni.service.ControlService;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 import java.util.Map;
@@ -15,7 +18,7 @@ import java.util.Optional;
 @RequestMapping("controlApi")
 public class ControlApi {
     @PostMapping("start")
-    public ResponseEntity<Map<String, Object>> start( @RequestBody Map<String, Object> body) throws Exception {
+    public ResponseEntity<Map<String, Object>> start(@RequestBody Map<String, Object> body) throws Exception {
         Map<String, Object> started = ControlService.startOrStop(body, "1", false);
         return ResponseEntity.ok(started);
     }
@@ -65,10 +68,8 @@ public class ControlApi {
             keys.parallelStream().forEach(DataBase.cacheDatas::remove);
         });
         if (table.isEmpty()) {
-
             DataBase.cacheDatas.clear();
         }
-
         return ResponseEntity.ok(UniReturnUtil.success(true));
     }
 

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

@@ -6,9 +6,11 @@ import com.scbfkj.uni.service.DataProcessService;
 import com.scbfkj.uni.system.Config;
 import org.springframework.http.HttpStatusCode;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -17,7 +19,7 @@ import java.util.Map;
 public class GenericApi {
 
     @PostMapping({"newdata", "modifydata", "movedata", "query"})
-    public ResponseEntity<Map<String,Object>> base(@RequestBody Map<String, Object> body) throws Exception {
+    public ResponseEntity<Map<String, Object>> base(@RequestBody Map<String, Object> body) {
         String uri = RequestUtil.getUri();
         String event = "0";
 
@@ -45,17 +47,18 @@ public class GenericApi {
      */
 
     @PostMapping("*")
-    public ResponseEntity<Map<String,Object>> matchService( @RequestBody Map<String, Object> body) throws Exception {
+    public ResponseEntity<Map<String, Object>> matchService(@RequestBody Map<String, Object> body) throws Exception {
         String uri = RequestUtil.getUri();
-        List<Map<String, Object>> serviceinfoList = DataBase.query(Config.getCenterConnectionStr(), "select * from serviceinfo where urilist like concat('%',?,'%')","/openApi/%s".formatted(uri));
-
+        List<Map<String, Object>> serviceinfoList = DataBase.query(Config.getCenterConnectionStr(), """
+                select serviceid
+                from serviceinfo
+                where urilist like concat('%', ?, '%')""", "/openApi/%s".formatted(uri));
         if (serviceinfoList.isEmpty()) {
             return ResponseEntity.status(HttpStatusCode.valueOf(404)).build();
         }
-
         Object serviceid = serviceinfoList.get(0).get("serviceid");
-        body.put("serviceid",serviceid);
-        return ResponseEntity.ok(body);
+        body.put("serviceid", serviceid);
+        return ResponseEntity.ok(DataProcessService.process(body));
     }
 
 }

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

@@ -10,7 +10,6 @@ import com.scbfkj.uni.service.LoggerService;
 import com.scbfkj.uni.service.SecurityService;
 import com.scbfkj.uni.system.Config;
 import jakarta.annotation.Resource;
-import jakarta.servlet.http.HttpServletRequest;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
@@ -18,8 +17,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
 
 import java.time.LocalDateTime;
 import java.util.*;
@@ -30,33 +27,20 @@ import java.util.concurrent.TimeUnit;
 public class LogAop {
 
     private static final Logger logger = LoggerFactory.getLogger(LogAop.class);
-
-
+    private static final Map<String, RateLimiter> rateLimiterMap = new HashMap<>();
     @Resource
     private SecurityService securityService;
 
-
-    private static Map<String, RateLimiter> rateLimiterMap = new HashMap<>();
-
-
     @Around(value = "within( com.scbfkj.uni.api.*Api)")
     public ResponseEntity<Map<String, Object>> invokeAround(ProceedingJoinPoint joinPoint) {
         LocalDateTime requestTime = LocalDateTime.now();
-
-        ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder.currentRequestAttributes();
-//            前端需求添加header
-//        if (requestAttributes.getResponse() != null) {
-//            requestAttributes.getResponse().addHeader("Set-Cookie", "SameSite=None");
-//        }
-        HttpServletRequest request = requestAttributes.getRequest();
-
 //        请求
-        String uri = request.getRequestURI();
+        String uri = RequestUtil.getUri();
 
 
 //        请求参数
         Object[] args = joinPoint.getArgs();
-        Object returnData = null;
+        ResponseEntity<Map<String, Object>> returnData = null;
         String message = null;
 
 
@@ -78,7 +62,8 @@ public class LogAop {
                     Optional serviceid = DataAliasGetUtil.getValue("serviceid", map);
                     if (serviceid.isPresent()) {
 //                        查找状态
-                        List<Map<String, Object>> mapList = DataBase.query(Config.getCenterConnectionStr(), "select * from servicestate where serviceid=? and containercode = ?", serviceid.get(), Config.getContainerCode());
+                        List<Map<String, Object>> mapList = DataBase.query(Config.getCenterConnectionStr(), """
+                                select runstate from servicestate where serviceid=? and containercode = ?""", serviceid.get(), Config.getContainerCode());
                         if (!mapList.isEmpty()) {
                             Map<String, Object> serviceState = mapList.get(0);
                             Object o = serviceState.get("runstate");
@@ -133,9 +118,11 @@ public class LogAop {
                                 if (Objects.isNull(appToken)) {
                                     return ResponseEntity.ok(UniReturnUtil.fail("没有找到token"));
                                 }
-                                Map<String, Object> result = securityService.verifyToken(appToken);
-                                if (!result.get("code").equals("0")) {
-                                    return ResponseEntity.ok(result);
+                                try {
+//                                    校验apptoken 成功表示验证通过
+                                    RequestUtil.getApplication();
+                                } catch (Exception e) {
+                                    return ResponseEntity.ok(UniReturnUtil.fail("token验证失败"));
                                 }
                             }
                             if (Objects.equals("usertoken", s)) {
@@ -152,37 +139,37 @@ public class LogAop {
                     }
                 }
             }
-            returnData = joinPoint.proceed(args);
+            returnData = (ResponseEntity<Map<String, Object>>) joinPoint.proceed(args);
 
-            if (Config.isDebug()) {
-                logger.info("返回值：{}", DataFormatUtil.toString(returnData));
-            }
-            return ((ResponseEntity<Map<String, Object>>) returnData);
         } catch (Throwable e) {
             if (Config.isDebug()) {
                 e.printStackTrace();
             }
 //            错误异常消息
             message = UniReturnUtil.getMessage(e);
-            return ResponseEntity.ok(UniReturnUtil.fail(message));
+            returnData = ResponseEntity.ok(UniReturnUtil.fail(message));
         } finally {
-            Object finalReturnData = returnData;
-            LoggerService.log(LoggerService.LogType.INTERFACE, new HashMap<>() {{
-                put("requesttime", requestTime);
-                put("requestpath", uri);
-                put("requestdata", DataFormatUtil.toString(args));
-                put("sessionid", RequestUtil.getSessionId());
-                put("returndata", DataFormatUtil.toString(finalReturnData));
-                try {
-                    put("applicationid", RequestUtil.getAppId());
-                } catch (Exception e) {
-                    if (Config.isDebug()) {
-                        e.printStackTrace();
-                    } else {
-                        System.out.println(UniReturnUtil.getMessage(e));
-                    }
+            HashMap<String, Object> logData = new HashMap<>();
+            logData.put("requesttime", requestTime);
+            logData.put("requestpath", uri);
+            logData.put("requestdata", DataFormatUtil.toString(args));
+            logData.put("sessionid", RequestUtil.getSessionId());
+            logData.put("returndata", DataFormatUtil.toString(returnData));
+            try {
+                logData.put("applicationid", RequestUtil.getAppId());
+            } catch (Exception e) {
+                if (Config.isDebug()) {
+                    e.printStackTrace();
+                } else {
+                    System.out.println(UniReturnUtil.getMessage(e));
                 }
-            }});
+            }
+            LoggerService.log(LoggerService.LogType.INTERFACE, logData);
+        }
+
+        if (Config.isDebug()) {
+            logger.info("返回值：{}", DataFormatUtil.toString(returnData));
         }
+        return returnData;
     }
 }

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

@@ -1,21 +1,16 @@
 package com.scbfkj.uni.api;
 
-import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.scbfkj.uni.library.DataEncryptionUtil;
-import com.scbfkj.uni.library.RequestUtil;
 import com.scbfkj.uni.library.UniReturnUtil;
 import com.scbfkj.uni.service.SecurityService;
-import com.scbfkj.uni.system.Config;
 import jakarta.annotation.Resource;
 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.HashMap;
 import java.util.Map;
 
 @RestController
@@ -46,16 +41,16 @@ public class SecurityApi {
         return ResponseEntity.ok(securityService.refreshToken());
     }
 
-    /**
-     * 校验token 包含appToken 和用户token
-     *
-     * @return
-     */
-    @PostMapping({"user/testToken", "foxlibc/testToken"})
-    public ResponseEntity<Map<String, Object>> testToken() throws Exception {
-        String appToken = RequestUtil.getAppToken();
-        return ResponseEntity.ok(securityService.verifyToken(appToken));
-    }
+//    /**
+//     * 校验token 包含appToken 和用户token
+//     *
+//     * @return
+//     */
+//    @PostMapping({"user/testToken", "foxlibc/testToken"})
+//    public ResponseEntity<Map<String, Object>> testToken() throws Exception {
+//        String appToken = RequestUtil.getAppToken();
+//        return ResponseEntity.ok(securityService.verifyToken(appToken));
+//    }
 
     /**
      * 获取验证码
@@ -64,7 +59,7 @@ public class SecurityApi {
      */
     @PostMapping({"user/verifyCode", "foxlibc/verification-code"})
     public ResponseEntity<Map<String, Object>> getCode() throws Exception {
-        return ResponseEntity.ok(securityService.verifyCode());
+        return ResponseEntity.ok(securityService.getSecurityCode());
     }
 
     /**

src/main/java/com/scbfkj/uni/library/DataAliasGetUtil.java

@@ -3,12 +3,17 @@ package com.scbfkj.uni.library;
 import com.scbfkj.uni.process.DataBase;
 import com.scbfkj.uni.system.Config;
 
-import java.util.*;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
 
 public class DataAliasGetUtil {
 
 
     private static List<Map<String, Object>> keyAlias = null;
+    private static long sequence = 0L;
+    private static long lastTimestamp = -1L;
 
     public static Optional<String> getValue(String key, Map<String, Object> data) throws Exception {
 
@@ -17,7 +22,9 @@ public class DataAliasGetUtil {
         if (result.isPresent()) return result;
         if (Objects.isNull(keyAlias) || keyAlias.isEmpty()) {
 
-            keyAlias = DataBase.query(Config.getCenterConnectionStr(), "select * from keyalias ");
+            keyAlias = DataBase.query(Config.getCenterConnectionStr(), """
+                    select aliasid, keyname, aliasname, aliasdescribe
+                    from keyalias""");
 
         }
         List<Map<String, Object>> keynames = keyAlias.stream().filter(it -> Objects.equals(it.get("keyname"), key)).toList();
@@ -25,9 +32,6 @@ public class DataAliasGetUtil {
         return keynames.stream().map(it -> it.get("aliasname")).map(data::get).filter(Objects::nonNull).map(Object::toString).findAny();
     }
 
-
-    private static long sequence = 0L;
-    private static long lastTimestamp = -1L;
     public synchronized static String createLifeCycleCol(String containerCode, String serviceId) {
         long timestamp = System.currentTimeMillis();
         //如果当前时间小于上一次ID生成的时间戳，说明系统时钟回退过这个时候应当抛出异常

src/main/java/com/scbfkj/uni/library/DataEncryptionUtil.java

@@ -18,16 +18,13 @@ import java.util.Objects;
 public class DataEncryptionUtil {
 
 
-    //    私有密钥
-    public static String privateKeyStr = "MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAJ9vK5Gsb5hRft3L/OI2rGw8/tg8pSe2L6bfIN8l03YwprUZwi8+R8hdnkR8SSgj2bk3A994L6TAzV8NbG9j+gyj+VakgCjbOSHGywhdKS6QXv0jQ3i8f4kBy4c3uWU9iAwaSTIh78U/8DVmQYRrKMwyqbhx8+ze+2GxaB2ZufEfAgMBAAECgYAyMdTcuxYzNU0k1SkbqyzjstxlBcrVUtVzywHVX1pQ9oY1tBNfvlLpMRg35Y0+tvLADiMJAxS04QKHb3l5JFe/jE24hNxMj2h9JfxO36bGblyqZ7PlS+5/pvXdVaFYolN+5Rocf63/Iq2RSCb8W3D5uUQqLwO/i1iFQT+UROUA4QJBAOvvOJSB4BIu4VD/6XGqZ5cLU3DMtwzHIyvTTH2REGF33eEHc0z83VYi4xbUDGxvDD1d58bPqkpnvJiByXmYVa8CQQCs/mHfpO8fDy7ZKGzs1u4eBsPowSnJLsGbY2mYiaawnHeeLYOaGEdtxRVk06+seTFLw5oi3FDJG8U8LP6FiGeRAkAjZiQeHBJrh/8kcREsjb23KurdDMoWL7a2N6DNYjuL9DklL0H8diAbcWaTIUOv7UVv26wP506MlV31n9uD0/hfAkBo3gwWtrT97wZHPepJ6ECQkylPf0kFXAKhX7Izdb5GcZNRn+WXFAC42jAN3wUvWIg5lWlqmIOgZeU6hUwFRpsBAkEAsSe8v0cho1YTdmXiGQ7uhUxZ455mrw81AdzmuvDxvWFLx1uHAZna9eylZsfbEa7Y9DcmakLJKGWaTvKvYc55ZQ==";
-    public static String publicKeyStr = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCfbyuRrG+YUX7dy/ziNqxsPP7YPKUnti+m3yDfJdN2MKa1GcIvPkfIXZ5EfEkoI9m5NwPfeC+kwM1fDWxvY/oMo/lWpIAo2zkhxssIXSkukF79I0N4vH+JAcuHN7llPYgMGkkyIe/FP/A1ZkGEayjMMqm4cfPs3vthsWgdmbnxHwIDAQAB";
-
     //    加密类型
     public final static String TYPE = "RSA";
-
     //    加密算法
     public final static String ALGORITHM = "RSA/ECB/PKCS1Padding";
-
+    //    私有密钥
+    public static String privateKeyStr = "MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAJ9vK5Gsb5hRft3L/OI2rGw8/tg8pSe2L6bfIN8l03YwprUZwi8+R8hdnkR8SSgj2bk3A994L6TAzV8NbG9j+gyj+VakgCjbOSHGywhdKS6QXv0jQ3i8f4kBy4c3uWU9iAwaSTIh78U/8DVmQYRrKMwyqbhx8+ze+2GxaB2ZufEfAgMBAAECgYAyMdTcuxYzNU0k1SkbqyzjstxlBcrVUtVzywHVX1pQ9oY1tBNfvlLpMRg35Y0+tvLADiMJAxS04QKHb3l5JFe/jE24hNxMj2h9JfxO36bGblyqZ7PlS+5/pvXdVaFYolN+5Rocf63/Iq2RSCb8W3D5uUQqLwO/i1iFQT+UROUA4QJBAOvvOJSB4BIu4VD/6XGqZ5cLU3DMtwzHIyvTTH2REGF33eEHc0z83VYi4xbUDGxvDD1d58bPqkpnvJiByXmYVa8CQQCs/mHfpO8fDy7ZKGzs1u4eBsPowSnJLsGbY2mYiaawnHeeLYOaGEdtxRVk06+seTFLw5oi3FDJG8U8LP6FiGeRAkAjZiQeHBJrh/8kcREsjb23KurdDMoWL7a2N6DNYjuL9DklL0H8diAbcWaTIUOv7UVv26wP506MlV31n9uD0/hfAkBo3gwWtrT97wZHPepJ6ECQkylPf0kFXAKhX7Izdb5GcZNRn+WXFAC42jAN3wUvWIg5lWlqmIOgZeU6hUwFRpsBAkEAsSe8v0cho1YTdmXiGQ7uhUxZ455mrw81AdzmuvDxvWFLx1uHAZna9eylZsfbEa7Y9DcmakLJKGWaTvKvYc55ZQ==";
+    public static String publicKeyStr = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCfbyuRrG+YUX7dy/ziNqxsPP7YPKUnti+m3yDfJdN2MKa1GcIvPkfIXZ5EfEkoI9m5NwPfeC+kwM1fDWxvY/oMo/lWpIAo2zkhxssIXSkukF79I0N4vH+JAcuHN7llPYgMGkkyIe/FP/A1ZkGEayjMMqm4cfPs3vthsWgdmbnxHwIDAQAB";
 
     /**
      * 对给定的字符串进行加密操作
@@ -163,6 +160,7 @@ public class DataEncryptionUtil {
         //返回base64编码后的字符串
         return Base64.getEncoder().encodeToString(doFinalByKeyStr(0, data.getBytes(), publicKeyStr, TYPE, ALGORITHM, Cipher.ENCRYPT_MODE));
     }
+
     public static String decryptRSAByPrivateKey(@Nonnull String data) throws Exception {
         return new String(doFinalByKeyStr(1, Base64.getDecoder().decode(data), privateKeyStr, TYPE, ALGORITHM, Cipher.DECRYPT_MODE));
     }
@@ -265,6 +263,7 @@ public class DataEncryptionUtil {
     public static String sign(String data, String priKey, String type, String algorithm) throws Exception {
         return sign(data.getBytes(), Base64.getDecoder().decode(priKey), type, algorithm);
     }
+
     /**
      * RSA校验数字签名
      *
@@ -335,7 +334,6 @@ public class DataEncryptionUtil {
     }
 
 
-
     private static PublicKey getPublicKey(String publicKeyStr, String type) throws NoSuchAlgorithmException, InvalidKeySpecException {
         X509EncodedKeySpec keySpec = new X509EncodedKeySpec(Base64.getDecoder().decode(publicKeyStr.getBytes()));
         KeyFactory keyFactory = KeyFactory.getInstance(type);
@@ -349,7 +347,6 @@ public class DataEncryptionUtil {
     }
 
 
-
     private static String sign(byte[] data, byte[] priKey, String type, String algorithm) throws Exception {
         //创建PKCS8编码密钥规范
         PKCS8EncodedKeySpec pkcs8KeySpec = new PKCS8EncodedKeySpec(priKey);
@@ -370,7 +367,6 @@ public class DataEncryptionUtil {
     }
 
 
-
     private static boolean verify(byte[] data, byte[] sign, byte[] pubKey, String type, String algorithm) throws Exception {
         //返回转换指定算法的KeyFactory对象
         KeyFactory keyFactory = KeyFactory.getInstance(checkSingType(type));

src/main/java/com/scbfkj/uni/library/ImageUtil.java

@@ -1,26 +1,22 @@
 package com.scbfkj.uni.library;
 
-import com.scbfkj.uni.system.SpringContextApplication;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.support.ResourcePatternResolver;
 import org.springframework.stereotype.Component;
-import org.springframework.util.FileCopyUtils;
 
 import javax.imageio.ImageIO;
 import java.awt.*;
 import java.awt.image.BufferedImage;
-import java.io.*;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
 import java.security.SecureRandom;
 import java.util.Base64;
-import java.util.Objects;
 
 @Component
 public class ImageUtil {
 
 
-    private static ResourcePatternResolver resourcePatternResolver;
     private static final int WIDTH = 120; // 图片宽度
     private static final int HEIGHT = 45; // 图片高度
     private static final String IMAGE_FORMAT = "JPG";
@@ -30,9 +26,10 @@ public class ImageUtil {
             new Color(255, 0, 0)
     };
     private static final SecureRandom RANDOM = new SecureRandom();
+    private static ResourcePatternResolver resourcePatternResolver;
 
     public ImageUtil(ResourcePatternResolver resourcePatternResolver) {
-        this.resourcePatternResolver = resourcePatternResolver;
+        ImageUtil.resourcePatternResolver = resourcePatternResolver;
     }
 
 
@@ -61,10 +58,7 @@ public class ImageUtil {
             try (
                     InputStream inputStream = resource.getInputStream()
             ) {
-                File font1 = File.createTempFile("font", ".otf");
-                System.out.println(Objects.isNull(inputStream));
-                FileCopyUtils.copy(inputStream, new FileOutputStream(font1));
-                font = Font.createFont(Font.TRUETYPE_FONT, font1);
+                font = Font.createFont(Font.TRUETYPE_FONT, inputStream);
             }
         }
         font = font.deriveFont((float) (HEIGHT - 10));

src/main/java/com/scbfkj/uni/library/RequestUtil.java

@@ -6,6 +6,7 @@ import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -13,9 +14,11 @@ import java.util.Objects;
 import static org.springframework.web.context.request.RequestAttributes.SCOPE_SESSION;
 
 public class RequestUtil {
-    private RequestUtil(){}
     public final static String APP_ID = "appid";
 
+    private RequestUtil() {
+    }
+
     public static String getIpAddr() {
 //        请求
         ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder.currentRequestAttributes();
@@ -60,6 +63,11 @@ public class RequestUtil {
     }
 
     public static Map<String, Object> getApplication() throws Exception {
+
+        String clean = "delete from appconnectlog where expiretime <  ?";
+
+//        清理过期数据
+        DataBase.update(Config.getSecurityConnectionStr(), clean, LocalDateTime.now());
 //        请求
         ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder.currentRequestAttributes();
 //
@@ -67,7 +75,7 @@ public class RequestUtil {
         if (Objects.isNull(application)) {
             String appToken = getAppToken();
             String requestIp = getIpAddr();
-            String query = "select * from appconnectlog where apptoken=? and requestip =?";
+            String query = "select appid from appconnectlog where apptoken=? and requestip =?";
             List<Map<String, Object>> appConnectLogList = DataBase.query(Config.getSecurityConnectionStr(), query,
                     appToken, requestIp);
             if (appConnectLogList.isEmpty()) {
@@ -76,16 +84,34 @@ public class RequestUtil {
             Map<String, Object> stringObjectMap = appConnectLogList.get(0);
             Object applicationid = stringObjectMap.get(APP_ID);
 
-            query = "select * from application where appid=?";
+            query = """
+                    select applicationid,
+                           appid,
+                           appsecret,
+                           appname,
+                           appengname,
+                           appdescribe,
+                           applogo,
+                           smalllogo,
+                           backgroundimage,
+                           apptokeneffective,
+                           securitycoderule,
+                           securitycodeeffective,
+                           multilogin,
+                           passwordrule,
+                           passwordeffective
+                    from application
+                    where appid = ?""";
             List<Map<String, Object>> applicationList = DataBase.query(Config.getSecurityConnectionStr(), query, applicationid);
             if (applicationList.isEmpty()) {
                 throw new RuntimeException("获取应用失败");
             }
-            Map<String, Object> app = applicationList.get(0);
-            requestAttributes.setAttribute("application", app, SCOPE_SESSION);
-            return app;
+            application = applicationList.get(0);
+            requestAttributes.setAttribute("application", application, SCOPE_SESSION);
         }
-        return (Map<String, Object>) application;
+        Map<String, Object> applicationMap = (Map<String, Object>) application;
+
+        return applicationMap;
 
 
     }

src/main/java/com/scbfkj/uni/library/script/DatabaseScriptUtil.java

@@ -11,6 +11,10 @@ import java.util.stream.Collectors;
 
 public class DatabaseScriptUtil {
 
+    private static final Pattern regExpression = Pattern.compile("(?<=《)([^》]+)?(?=》)");//提取书名号变量的正则表达式
+    private static final Map<String, List<String>> sqlStrVarList = new HashMap<>();//SQL语句的书名号变量列表
+    public static Map<String, String> sqlStrNewSQL = new HashMap<>();//SQL语句更换书名号变量后的可执行SQL
+
     public static Map<String, Object> exec(String connectionStr, String expression, List<Map<String, Object>> args, Object event, List<String> filterColumns, List<Map<String, Object>> filterLines) throws Exception {
 
         if (Objects.isNull(event) || !StringUtils.hasText(event.toString())) {
@@ -70,16 +74,8 @@ public class DatabaseScriptUtil {
 
                 List<Object[]> values = new ArrayList<>();
                 for (Map<String, Object> arg : args) {
-                    List<Object> objects = new ArrayList<>();
-                    if (Objects.nonNull(valueNames)) {
-                        Map<String, Object> o1 = ((Map<String, Object>) arg.getOrDefault("value", arg));
-                        objects.addAll(valueNames.stream().map(o1::get).toList());
-                    }
-                    if (Objects.nonNull(filterNames)) {
-                        Map<String, Object> o1 = ((Map<String, Object>) arg.getOrDefault("filter", arg));
-                        objects.addAll(filterNames.stream().map(o1::get).toList());
-                    }
-                    values.add(objects.toArray());
+                    Map<String, Object> o1 = ((Map<String, Object>) arg.getOrDefault("filter", arg));
+                    values.add(filterNames.stream().map(o1::get).toArray());
                 }
                 List<Map<String, Object>> result = DataBase.queryBatch(connectionStr, expression, values);
                 return UniReturnUtil.success(result);
@@ -103,7 +99,7 @@ public class DatabaseScriptUtil {
                         insertValues.add(arg);
                     }
                 }
-                Map<String, Object> insertResult=null;
+                Map<String, Object> insertResult = null;
                 if (!insertValues.isEmpty())
                     insertResult = exec(connectionStr, expression, insertValues, "1", filterColumns, filterLines);
                 Map<String, Object> updateResult = null;
@@ -112,10 +108,11 @@ public class DatabaseScriptUtil {
 
                 Map<String, Object> finalInsertResult = insertResult;
                 Map<String, Object> finalUpdateResult = updateResult;
-                return UniReturnUtil.success(new HashMap<>() {{
-                    put("insert", finalInsertResult);
-                    put("update", finalUpdateResult);
-                }});
+                HashMap<Object, Object> data = new HashMap<>();
+                data.put("insert", finalInsertResult);
+                data.put("update", finalUpdateResult);
+
+                return UniReturnUtil.success(data);
             } else {
 //                新增
                 if (Objects.equals("1", event)) {
@@ -239,11 +236,6 @@ public class DatabaseScriptUtil {
         }
     }
 
-
-    private static Pattern regExpression = Pattern.compile("(?<=《)([^》]+)?(?=》)");//提取书名号变量的正则表达式
-    private static Map<String, List<String>> sqlStrVarList = new HashMap<>();//SQL语句的书名号变量列表
-    public static Map<String, String> sqlStrNewSQL = new HashMap<>();//SQL语句更换书名号变量后的可执行SQL
-
     public static List<String> getSQLVarList(String sqlStr) {
         String newSqlStr = sqlStr;//不破坏之前SQL语句
         List<String> sqlvarList = sqlStrVarList.containsKey(sqlStr) ? sqlStrVarList.get(sqlStr) : new ArrayList<>();//优先从缓存中取
@@ -285,7 +277,7 @@ public class DatabaseScriptUtil {
             );
         }
         if (Objects.nonNull(filterLineWhereStr)) {
-            sql = " %s %s and %s ".formatted(sql, sql.contains(" where ") ? " 1 = 1" : " where ", Objects.isNull(filterLineWhereStr) ? " 1=1 " : filterLineWhereStr);
+            sql = " %s %s and %s ".formatted(sql, sql.contains(" where ") ? " 1 = 1" : " where ", filterLineWhereStr);
         }
         if (Objects.nonNull(filterColumns) && !filterColumns.isEmpty()) {
             sql = "select %s from ( %s ) T".formatted(String.join(",", filterColumns), sql);
@@ -308,9 +300,7 @@ public class DatabaseScriptUtil {
                 }
                 String whereStr = " " + joiner;
                 String sqlStr = sql.replace("《whereStr》", whereStr);
-                List<Map<String, Object>> apply = DataBase.queryBatch(connectionStr, sqlStr, new ArrayList<>() {{
-                    add(args.toArray());
-                }});
+                List<Map<String, Object>> apply = DataBase.query(connectionStr, sqlStr, args.toArray());
                 list.addAll(apply);
             }
             return list;

src/main/java/com/scbfkj/uni/library/script/JavaScriptEngineUtil.java

@@ -3,7 +3,6 @@ package com.scbfkj.uni.library.script;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.scbfkj.uni.library.DataFormatUtil;
 import com.scbfkj.uni.library.UniReturnUtil;
-import com.scbfkj.uni.service.LoggerService;
 import org.apache.commons.pool2.BaseKeyedPooledObjectFactory;
 import org.apache.commons.pool2.KeyedObjectPool;
 import org.apache.commons.pool2.PooledObject;
@@ -15,60 +14,11 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.URL;
 import java.net.URLClassLoader;
-import java.time.LocalDateTime;
-import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
 public class JavaScriptEngineUtil {
 
-    private static class JavaApply {
-        private Object instance;
-        private Method apply;
-        private Method close;
-
-        public JavaApply(Object instance, Method apply, Method close) {
-            this.instance = instance;
-            this.apply = apply;
-            this.close = close;
-        }
-
-        public Object getInstance() {
-            return instance;
-        }
-
-        public void setInstance(Object instance) {
-            this.instance = instance;
-        }
-
-        public Method getApply() {
-            return apply;
-        }
-
-        public void setApply(Method apply) {
-            this.apply = apply;
-        }
-
-        public Method getClose() {
-            return close;
-        }
-
-        public void setClose(Method close) {
-            this.close = close;
-        }
-
-        public void invokeClose() throws InvocationTargetException, IllegalAccessException {
-            if (Objects.nonNull(close)) {
-                close.invoke(instance);
-            }
-        }
-
-        public Object invokeApply(Object... args) throws InvocationTargetException, IllegalAccessException {
-            return apply.invoke(instance, args);
-        }
-    }
-
     private final static KeyedObjectPool<String, JavaApply> javaRefPool = new GenericKeyedObjectPool<>(new BaseKeyedPooledObjectFactory<String, JavaApply>() {
         @Override
         public JavaApply create(String key) throws Exception {
@@ -76,8 +26,8 @@ public class JavaScriptEngineUtil {
             JsonNode path = jsonNode.get("path");
             JsonNode className = jsonNode.get("className");
             JsonNode method = jsonNode.get("methodName");
-            ClassLoader classLoader=null;
-            try{
+            ClassLoader classLoader = null;
+            try {
                 if (Objects.nonNull(path) && !path.isNull()) {
                     String userPath = System.getProperty("user.dir");
                     File file = new File(userPath.concat(File.separator).concat("plugins").concat(File.separator).concat(path.asText()));
@@ -85,7 +35,7 @@ public class JavaScriptEngineUtil {
                         throw new RuntimeException("外部文件加载不存在：".concat(userPath).concat(File.separator).concat("plugins").concat(File.separator).concat(path.asText()));
                     }
                     URL url = file.toURI().toURL();
-                    classLoader = new URLClassLoader(new URL[]{url},Thread.currentThread().getContextClassLoader());
+                    classLoader = new URLClassLoader(new URL[]{url}, Thread.currentThread().getContextClassLoader());
                 } else {
                     classLoader = Thread.currentThread().getContextClassLoader();
                 }
@@ -103,8 +53,8 @@ public class JavaScriptEngineUtil {
                     }
                 }
                 return new JavaApply(classInstance, javaMethod, closeMethod);
-            }finally {
-                if(Objects.nonNull(classLoader)){
+            } finally {
+                if (Objects.nonNull(classLoader)) {
                     if (classLoader instanceof URLClassLoader cl) {
                         cl.close();
                     }
@@ -142,4 +92,50 @@ public class JavaScriptEngineUtil {
             }
         }
     }
+
+    private static class JavaApply {
+        private Object instance;
+        private Method apply;
+        private Method close;
+
+        public JavaApply(Object instance, Method apply, Method close) {
+            this.instance = instance;
+            this.apply = apply;
+            this.close = close;
+        }
+
+        public Object getInstance() {
+            return instance;
+        }
+
+        public void setInstance(Object instance) {
+            this.instance = instance;
+        }
+
+        public Method getApply() {
+            return apply;
+        }
+
+        public void setApply(Method apply) {
+            this.apply = apply;
+        }
+
+        public Method getClose() {
+            return close;
+        }
+
+        public void setClose(Method close) {
+            this.close = close;
+        }
+
+        public void invokeClose() throws InvocationTargetException, IllegalAccessException {
+            if (Objects.nonNull(close)) {
+                close.invoke(instance);
+            }
+        }
+
+        public Object invokeApply(Object... args) throws InvocationTargetException, IllegalAccessException {
+            return apply.invoke(instance, args);
+        }
+    }
 }

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

@@ -10,7 +10,7 @@ import java.util.*;
 public class ActiveMQ {
 
 
-    private static Map<String, Session> sessionMap = new HashMap<>();
+    private static final Map<String, Session> sessionMap = new HashMap<>();
 
 
     /**
@@ -28,11 +28,8 @@ public class ActiveMQ {
             if (max < 0) {
                 max = Math.abs(max);
             }
-            Session session;
-            session = sessionMap.get(connectConfig);
-            if (session == null) {
-                session = createSession(connectConfig);
-            }
+            Session session = createSession(connectConfig);
+
             try (MessageConsumer consumer = session.createConsumer(session.createQueue(sourceObjectName))) {
 
                 ArrayList<String> result = new ArrayList<>();
@@ -54,15 +51,24 @@ public class ActiveMQ {
     }
 
     private static Session createSession(String connectionStr) throws JMSException {
-        Map<?, ?> connectionConfig = DataFormatUtil.toMap(connectionStr);
 
-        String host = connectionConfig.get("host").toString();
-        Object username = connectionConfig.get("username");
-        Object password = connectionConfig.get("password");
-        ConnectionFactory connectionFactory = new ActiveMQConnectionFactory(username == null ? null : username.toString(), password == null ? null : password.toString(), host);
-        Connection connection = connectionFactory.createConnection();
-        connection.start();
-        return connection.createSession(true, Session.AUTO_ACKNOWLEDGE);
+        Session session = sessionMap.get(connectionStr);
+        if (session == null) {
+            Map<?, ?> connectionConfig = DataFormatUtil.toMap(connectionStr);
+
+            String host = connectionConfig.get("host").toString();
+            Object username = connectionConfig.get("username");
+            Object password = connectionConfig.get("password");
+            ConnectionFactory connectionFactory = new ActiveMQConnectionFactory(username == null ? null : username.toString(), password == null ? null : password.toString(), host);
+            Connection connection = connectionFactory.createConnection();
+            connection.start();
+            session = connection.createSession(true, Session.AUTO_ACKNOWLEDGE);
+            sessionMap.put(connectionStr, session);
+            return session;
+
+        }
+        return session;
+
 
     }
 
@@ -77,11 +83,7 @@ public class ActiveMQ {
             return UniReturnUtil.fail(Objects.isNull(sourceObjectName) ? ("队列为空 " + data) : ("数据内容为空 " + data));
         }
         try {
-            Session session;
-            session = sessionMap.get(connectConfig);
-            if (session == null) {
-                session = createSession(connectConfig);
-            }
+            Session session = createSession(connectConfig);
             try (MessageProducer producer = session.createProducer(session.createQueue(sourceObjectName))) {
 
                 for (Object datum : data) {

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

@@ -14,9 +14,9 @@ import java.util.*;
 public class DataBase {
 
     public final static Map<String, Map<String, Object>> cacheDatas = new Hashtable<>();
-    private static List<Map<String, Object>> cacheConfigList = new ArrayList<>();
     public final static Map<String, HikariPool> dataSourcePools = new HashMap<>();
-
+    private static final Map<String, List<String>> columns = new HashMap<>();
+    private static List<Map<String, Object>> cacheConfigList = new ArrayList<>();
 
     public static List<Map<String, Object>> queryBatch(String connectionStr, String sql, List<Object[]> argsList) throws Exception {
 
@@ -66,7 +66,6 @@ public class DataBase {
         return result;
     }
 
-
     public static List<Map<String, Object>> query(String connectionStr, String sql, Object... args) throws Exception {
 
 //        缓存数据 connectionStr + sql
@@ -114,7 +113,6 @@ public class DataBase {
         return result;
     }
 
-
     public static int[] updateBatch(String connectionStr, String sql, List<Object[]> argsList) throws Exception {
         HikariPool dataSourcePool = getDataSourcePool(connectionStr);
         try (Connection connection = dataSourcePool.getConnection();
@@ -166,13 +164,12 @@ public class DataBase {
             for (int i = 0; i < args.length; i++) {
                 preparedStatement.setObject(i + 1, args[i]);
             }
-            boolean execute = preparedStatement.execute();
+            preparedStatement.execute();
             connection.commit();
-            return execute;
+            return preparedStatement.getUpdateCount() > 0;
         }
     }
 
-
     public static HikariPool getDataSourcePool(String connectionStr) throws Exception {
         if (dataSourcePools.containsKey(connectionStr)) {
             return dataSourcePools.get(connectionStr);
@@ -188,7 +185,6 @@ public class DataBase {
         return dataSourcePool;
     }
 
-
     private static HikariPool createDataSourcePool(@Nonnull String url, String username, String password, String driver, String poolName) throws Exception {
         HikariConfig hikariConfig = new HikariConfig();
         hikariConfig.setMaximumPoolSize(Math.min(Runtime.getRuntime().availableProcessors(), 8));//最大核心数:当前可用CPU数，最大16
@@ -224,8 +220,6 @@ public class DataBase {
         return new HikariPool(hikariConfig);
     }
 
-    private static final Map<String, List<String>> columns = new HashMap<>();
-
     private static List<String> getColumns(String connection, String sql, ResultSet resultSet) throws SQLException {
         if (columns.containsKey(connection + sql)) {
             return columns.get(connection + sql);
@@ -253,12 +247,4 @@ public class DataBase {
         return result;
     }
 
-
-    public static String formatConfig(String configStr) {
-        Map<?, ?> config = DataFormatUtil.toMap(configStr);
-//        todo 把不不标准的key复制成标准的key
-        return DataFormatUtil.toString(config);
-    }
-
-
 }

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

@@ -20,7 +20,7 @@ import java.util.stream.Collectors;
 
 public class Elasticsearch {
 
-    private static Map<String, RestClient> restClientMap = new HashMap<>();
+    private static final Map<String, RestClient> restClientMap = new HashMap<>();
 
 
     public static Map<String, Object> exec(String connection, List<String> datas) {
@@ -54,16 +54,14 @@ public class Elasticsearch {
             request.setJsonEntity(DataFormatUtil.toString(d));
             return request;
         }).forEach(r -> {
-            HashMap<Object, Object> result = new HashMap<>() {{
-
-                try {
-
-                    Response response = restClient.performRequest(r);
-                    put("response", response);
-                } catch (IOException e) {
-                    put("exception", e);
-                }
-            }};
+            HashMap<Object, Object> result = new HashMap<>();
+            try {
+
+                Response response = restClient.performRequest(r);
+                result.put("response", response);
+            } catch (IOException e) {
+                result.put("exception", e);
+            }
             results.add(result);
         });
         List<Exception> exceptions = results.stream().map(it -> it.get("exception")).filter(Objects::nonNull).map(it -> ((Exception) it)).toList();
@@ -108,9 +106,9 @@ public class Elasticsearch {
         if (Objects.nonNull(username) && Objects.nonNull(password)) {
             builder
                     .setHttpClientConfigCallback(httpClientBuilder -> {
-                        httpClientBuilder.setDefaultCredentialsProvider(new BasicCredentialsProvider() {{
-                            setCredentials(AuthScope.ANY, new UsernamePasswordCredentials(username.toString(), password.toString()));
-                        }});
+                        BasicCredentialsProvider credentialsProvider = new BasicCredentialsProvider();
+                        credentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials(username.toString(), password.toString()));
+                        httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
                         return httpClientBuilder;
                     });
 

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

@@ -94,7 +94,7 @@ public class FTP {
                     String path = System.getProperty("user.dir") + File.separator + "ftp" + File.separator + ftpFile.getName();
                     File targetFile = new File(path);
                     files.add(targetFile);
-                    try (FileOutputStream fileOutputStream = new FileOutputStream(targetFile);) {
+                    try (FileOutputStream fileOutputStream = new FileOutputStream(targetFile)) {
                         ftp.retrieveFile(ftpFile.getName(), fileOutputStream);
                     } catch (Exception e) {
                         System.err.println("数据下载异常".concat(UniReturnUtil.getMessage(e)));
@@ -108,7 +108,7 @@ public class FTP {
                 File targetFile = new File(path);
                 if (targetFile.exists()) {
                     try (GZIPInputStream gzipInputStream = new GZIPInputStream(Files.newInputStream(targetFile.toPath()));
-                         ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                         ByteArrayOutputStream baos = new ByteArrayOutputStream()
                     ) {
                         byte[] buf = new byte[BUFFER_SIZE];
                         int len;

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

@@ -35,6 +35,7 @@ public class Kafka {
             connectConfigMaps.put("value.deserializer", "org.apache.kafka.common.serialization.StringDeserializer");
             return new KafkaConsumer<>(connectConfigMaps);
         }
+
         @Override
         public PooledObject<Consumer<String, String>> wrap(Consumer<String, String> value) {
             return new DefaultPooledObject<>(value);

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

@@ -10,7 +10,6 @@ import com.scbfkj.uni.library.UniReturnUtil;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.TimeoutException;
@@ -67,7 +66,7 @@ public class RabbitMQ {
         Map<String, Object> connectConfigMaps = (Map<String, Object>) DataFormatUtil.toMap(connectConfig);
         Object arguments = connectConfigMaps.get("arguments");
 //        Object prefetchCount = connectConfigMaps.get("prefetchCount");
-        try (Connection connection = createConnectFactory(connectConfig).newConnection(); Channel currentChannel = connection.createChannel();) {
+        try (Connection connection = createConnectFactory(connectConfig).newConnection(); Channel currentChannel = connection.createChannel()) {
             //创建消息通道
             currentChannel.queueDeclare(exchangeName, true, false, false, Objects.isNull(arguments) ? null : ((Map<String, Object>) arguments));
             currentChannel.basicQos(1); //服务端在同一时刻只发送1条数据

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

@@ -2,24 +2,25 @@ package com.scbfkj.uni.process;
 
 import com.scbfkj.uni.library.DataFormatUtil;
 import com.scbfkj.uni.library.UniReturnUtil;
-import org.apache.commons.pool2.BaseKeyedPooledObjectFactory;
-import org.apache.commons.pool2.KeyedObjectPool;
-import org.apache.commons.pool2.PooledObject;
+import org.apache.commons.pool2.*;
 import org.apache.commons.pool2.impl.DefaultPooledObject;
 import org.apache.commons.pool2.impl.GenericKeyedObjectPool;
+import org.apache.commons.pool2.impl.GenericObjectPool;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
 import org.springframework.http.converter.StringHttpMessageConverter;
 import org.springframework.util.StringUtils;
 import org.springframework.web.client.RestTemplate;
+import org.springframework.web.reactive.function.client.WebClient;
 
 import java.nio.charset.StandardCharsets;
 import java.util.*;
 
 public class Web {
 
-    private KeyedObjectPool<String, Web> webPool = new GenericKeyedObjectPool<>(new BaseKeyedPooledObjectFactory<String, Web>() {
+    private final KeyedObjectPool<String, Web> webPool = new GenericKeyedObjectPool<>(new BaseKeyedPooledObjectFactory<String, Web>() {
         @Override
         public Web create(String s) throws Exception {
             return new Web();
@@ -30,6 +31,18 @@ public class Web {
             return new DefaultPooledObject<>(web);
         }
     });
+    private final ObjectPool<WebClient> clientPool = new GenericObjectPool<>(new BasePooledObjectFactory<>() {
+
+        @Override
+        public WebClient create() throws Exception {
+            return WebClient.create();
+        }
+
+        @Override
+        public PooledObject<WebClient> wrap(WebClient webClient) {
+            return new DefaultPooledObject<>(webClient);
+        }
+    });
 
 
     private RestTemplate restTemplate; //webapi请求对象
@@ -45,18 +58,17 @@ public class Web {
     /**
      * webapi 执行入口函数
      */
-    public Map<String, Object> exec(Object header, String method, Object defaultBody, String connectConfig) throws Exception {
-        Web web = null;
-        try {
-            web = webPool.borrowObject(connectConfig);
-            return web.execWebApi(header, method, defaultBody, connectConfig);
-
-        } finally {
-            if (web != null) {
-                webPool.returnObject(connectConfig, web);
-            }
+    public Map<String, Object> exec(Object header, String method, Object defaultBody, String connectConfigStr) throws Exception {
+        WebClient webClient = clientPool.borrowObject();
+        HttpMethod httpMethod = HttpMethod.valueOf(method.toUpperCase());
+        Map<?, ?> connectConfig = DataFormatUtil.toMap(connectConfigStr);
+        String url = Objects.nonNull(connectConfig.get("url")) ? connectConfig.get("url").toString() : null;
+        if (Objects.isNull(url)) {
+            return UniReturnUtil.fail("webapi请求地址为空");
         }
+        return UniReturnUtil.fail("");
     }
+
     public Map<String, Object> execWebApi(Object header, String method, Object defaultBody, String connectConfig) {
         Map<String, Object> connectConfigMaps = (Map<String, Object>) DataFormatUtil.toMap(connectConfig);
         Map<String, Object> restTemplateResult = initWebApiParams(connectConfigMaps); // 通过连接配置 获取restTemplate

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

@@ -8,7 +8,10 @@ import com.scbfkj.uni.system.Config;
 import com.scbfkj.uni.system.ScheduleUtil;
 
 import java.time.LocalDateTime;
-import java.util.*;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 public class ControlService {
@@ -129,15 +132,11 @@ public class ControlService {
         } else if (serviceIdOpt.isPresent()) {
 
             String serviceId = serviceIdOpt.get();
-            Map<String, Object> stop = stop(serviceId);
-            if (statue.equals("0")) {
-                return stop;
-            }
-            List<Map<String, Object>> serviceTypeData = DataBase.query(Config.getCenterConnectionStr(), "select serviceType from serviceinfo where serviceID=? and containercode=? and servicetype='4'", serviceId, Config.getContainerCode());
-            if (serviceTypeData.isEmpty()) {
-                throw new RuntimeException("没有找到服务配置");
+            if (Objects.equals(statue, "0")) {
+                return stop(serviceId);
+            } else {
+                return start(serviceId);
             }
-            return start(serviceId);
         } else {
             if (Objects.equals(statue, "0")) {
                 stopServiceByContainerCode();

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

@@ -33,23 +33,33 @@ public class DataProcessService {
 
         try {
             serviceIdOpt = DataAliasGetUtil.getValue("serviceid", inData);
-            if (Objects.isNull(inData) || inData.isEmpty() || serviceIdOpt.isEmpty())
+            if (Objects.isNull(inData) || inData.isEmpty() || serviceIdOpt.isEmpty()) {
                 throw new RuntimeException("服务编号不能为空");
+            }
             serviceId = serviceIdOpt.get();
 
-            List<Map<String, Object>> serviceInfoList = DataBase.query(Config.getCenterConnectionStr(), "select * from serviceinfo where serviceid = ?", serviceId);
+            List<Map<String, Object>> serviceInfoList = DataBase.query(Config.getCenterConnectionStr(), "select enablelog from serviceinfo where serviceid = ?", serviceId);
             if (!serviceInfoList.isEmpty()) {
                 serviceInfo = serviceInfoList.get(0);
             }
 
 //        熔断
 
-            List<Map<String, Object>> algorithmLibraries;
-            algorithmLibraries = DataBase.query(Config.getCenterConnectionStr(), "select * from algorithmlibrary where serviceid=?", serviceId);
+            List<Map<String, Object>> algorithmLibraries = DataBase.query(Config.getCenterConnectionStr(), """
+                    select algorithmlibraryid,
+                           serviceid,
+                           algorithmtype,
+                           computingexpression,
+                           parameterset,
+                           preconditions,
+                           executionnumber,
+                           datasourceid,
+                           preparameterset
+                    from algorithmlibrary
+                    where serviceid = ?""", serviceId);
 
 
-            Optional<String> lifecycleidOpt;
-            lifecycleidOpt = DataAliasGetUtil.getValue("lifecycleid", inData);
+            Optional<String> lifecycleidOpt = DataAliasGetUtil.getValue("lifecycleid", inData);
 
             if (lifecycleidOpt.isEmpty()) {
                 lifecycleid = DataAliasGetUtil.createLifeCycleCol(Config.getContainerCode(), serviceId);
@@ -65,7 +75,6 @@ public class DataProcessService {
 
                 startDateTime = LocalDateTime.now();
                 long startTime = System.currentTimeMillis();
-                List<Object> parameters = null;
                 algorithmlibraryid = algorithmLibrary.get("algorithmlibraryid");
                 Object preConditions = algorithmLibrary.get("preconditions");
                 Object preparameterset = algorithmLibrary.get("preparameterset");
@@ -109,10 +118,10 @@ public class DataProcessService {
                 Object parameterSet = algorithmLibrary.get("parameterset");
                 Object dataSourceId = algorithmLibrary.get("datasourceid");
                 List<Map<String, Object>> datasourceList = DataBase.query(Config.getCenterConnectionStr(), "select * from datasource where datasourceid=?", dataSourceId);
-                Map<String, Object> datasource = datasourceList.isEmpty()?null: datasourceList.get(0);
+                Map<String, Object> datasource = datasourceList.isEmpty() ? null : datasourceList.get(0);
 
 //        获取入参列表
-                parameters = new ArrayList<>();
+                List<Object> parameters = new ArrayList<>();
                 if (Objects.nonNull(parameterSet)) {
                     source.put("datasource", datasource);
                     parameters.addAll(getParams(parameterSet.toString(), source));
@@ -136,7 +145,7 @@ public class DataProcessService {
                     throw new RuntimeException(message);
                 }
             }
-            return UniReturnUtil.success(((Map) resource.get(resource.size() - 1).get("result")).get("returnData"));
+            return UniReturnUtil.success(((Map<?, ?>) resource.get(resource.size() - 1).get("result")).get("returnData"));
         } catch (Exception e) {
             message = e.getMessage();
             return UniReturnUtil.fail(e);
@@ -147,19 +156,16 @@ public class DataProcessService {
                 if (Objects.nonNull(message)) {
                     target = LoggerService.LogType.SERVICE_ERR;
                 }
-                LocalDateTime finalStartDateTime = startDateTime;
-                String finalServiceId = serviceId;
-                String finalMessage = message;
-                String finalLifecycleid = lifecycleid;
-                LoggerService.log(target, new HashMap<>() {{
-                    put("begintime", finalStartDateTime);
-                    put("endtime", LocalDateTime.now());
-                    put("serviceid", finalServiceId);
-                    put("resource", DataFormatUtil.toString(resource));
-                    put("prepesource", DataFormatUtil.toString(preResource));
-                    put("returnmessage", finalMessage);
-                    put("lifecycleid", finalLifecycleid);
-                }});
+                HashMap<String, Object> logData = new HashMap<>();
+                logData.put("begintime", startDateTime);
+                logData.put("endtime", LocalDateTime.now());
+                logData.put("serviceid", serviceId);
+                logData.put("resource", DataFormatUtil.toString(resource));
+                logData.put("prepesource", DataFormatUtil.toString(preResource));
+                logData.put("returnmessage", message);
+                logData.put("lifecycleid", lifecycleid);
+
+                LoggerService.log(target, logData);
 
             }
         }
@@ -167,27 +173,28 @@ public class DataProcessService {
     }
 
     /**
+     * 根据算法类型对数据进行处理
+     *
+     * @param type       算法类型
      * @param parameters 算法参数
-     * @return
+     * @return 处理结果
      * @throws Exception
      */
-    public static Map<String, Object> processByAlgorithm
-    (Object type, List<Object> parameters) throws Exception {
-
+    public static Map<String, Object> processByAlgorithm(Object type, List<Object> parameters) throws Exception {
 
         switch (type.toString()) {
-//            java反射
+            // java反射
             case "1" -> {
                 return JavaScriptEngineUtil.invoke((Map<String, Object>) parameters.get(0), DataFormatUtil.toString(parameters.get(1)), parameters.subList(2, parameters.size()).toArray());
             }
-//            JS表达式
+            // JS表达式
             case "2" -> {
                 return JsScriptEngineUtil.eval(DataFormatUtil.toString(parameters.get(0)), parameters.subList(1, parameters.size()).toArray());
             }
-//            数据库
+            // 数据库
             case "3" -> {
-//                下放到Database中处理数据
-//                参数表达式顺序是 数据源连接字符串（String.$.datasource.connectset）,sql表达式(String.$.algorithm.computingexpression)，需要操作的值(List.$.args[1].returnData)，执行编号(String.$.algorithm.executionnumber)
+                // 下放到Database中处理数据
+                // 参数表达式顺序是 数据源连接字符串（String.$.datasource.connectset）,sql表达式(String.$.algorithm.computingexpression），需要操作的值(List.$.args[1].returnData)，执行编号(String.$.algorithm.executionnumber)
                 return DatabaseScriptUtil.exec(DataFormatUtil.toString(parameters.get(0)), DataFormatUtil.toString(parameters.get(1)), ((List<Map<String, Object>>) parameters.get(2)), parameters.get(3), (List<String>) parameters.get(4), (List<Map<String, Object>>) parameters.get(5));
             }
             default -> {
@@ -203,69 +210,73 @@ public class DataProcessService {
      * @return
      */
     public static List<Object> getParams(String parameterSet, Object source) {
-        if (Objects.isNull(parameterSet)) return Collections.emptyList();
-        String[] paths = parameterSet.split(";;");
-        String json = DataFormatUtil.toString(source);
-        List<Object> result = new ArrayList<>();
-
-        for (String it : paths) {
-            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.toLowerCase())) {
-                    result.add(null);
-                } else {
-                    result.add(type);
+        List<Object> res;
+        if (Objects.isNull(parameterSet)) {
+            res = Collections.emptyList();
+        } else {
+            String[] paths = parameterSet.split(";;");
+            String json = DataFormatUtil.toString(source);
+            List<Object> result = new ArrayList<>();
+            for (String it : paths) {
+                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.toLowerCase())) {
+                        result.add(null);
+                    } else {
+                        result.add(type);
+                    }
+                    continue;
                 }
-                continue;
-            }
-            String path = it.replace(type + ".", "");
-            Object value = null;
+                String path = it.replace(type + ".", "");
+                Object value = null;
 //            $开头的使用标准的jsonPath
-            if (path.startsWith("$")) {
-                value = JsonPath.read(json, path);
-            } else if (path.startsWith("#")) {
-//                todo  缓存之类的特殊值
+                if (path.startsWith("$")) {
+                    value = JsonPath.read(json, path);
+                } else if (path.startsWith("#")) {
+//                todo  缓存中的值，获取什么位置的缓存？
 
 //                不是使用$#开头的直接取后面的字符串
-            } else {
-                value = path;
-            }
-            if (Objects.isNull(value)) {
-                result.add(null);
-                continue;
-            }
-            if ("String".equalsIgnoreCase(type)) {
-                value = DataFormatUtil.toString(value);
-            } else if ("List".equalsIgnoreCase(type)) {
-                value = DataFormatUtil.toList(value);
-            } else if ("Array".equalsIgnoreCase(type)) {
-                value = DataFormatUtil.toArray(value);
-            } else if ("Map".equalsIgnoreCase(type)) {
-                value = DataFormatUtil.toMap(value);
-            } else if ("Long".equalsIgnoreCase(type)) {
-                value = Long.parseLong(value.toString());
-            } else if ("Integer".equalsIgnoreCase(type)) {
-                value = Integer.parseInt(value.toString());
-            } else if ("Double".equalsIgnoreCase(type)) {
-                value = Double.parseDouble(value.toString());
-            } else if ("Float".equalsIgnoreCase(type)) {
-                value = Float.parseFloat(value.toString());
-            } else if ("Boolean".equalsIgnoreCase(type)) {
-                value = Boolean.parseBoolean(value.toString());
-            } else if ("Datetime".equalsIgnoreCase(type)) {
-                String string = value.toString();
-                String patten = "yyyy-MM-dd HH:mm:ss";
-                if (string.contains("(")) {
-                    patten = string.substring(string.indexOf("(") + 1, string.length() - 1);
-                    string = string.substring(0, string.indexOf("("));
+                } else {
+                    value = path;
+                }
+                if (Objects.isNull(value)) {
+                    result.add(null);
+                    continue;
+                }
+                if ("String".equalsIgnoreCase(type)) {
+                    value = DataFormatUtil.toString(value);
+                } else if ("List".equalsIgnoreCase(type)) {
+                    value = DataFormatUtil.toList(value);
+                } else if ("Array".equalsIgnoreCase(type)) {
+                    value = DataFormatUtil.toArray(value);
+                } else if ("Map".equalsIgnoreCase(type)) {
+                    value = DataFormatUtil.toMap(value);
+                } else if ("Long".equalsIgnoreCase(type)) {
+                    value = Long.parseLong(value.toString());
+                } else if ("Integer".equalsIgnoreCase(type)) {
+                    value = Integer.parseInt(value.toString());
+                } else if ("Double".equalsIgnoreCase(type)) {
+                    value = Double.parseDouble(value.toString());
+                } else if ("Float".equalsIgnoreCase(type)) {
+                    value = Float.parseFloat(value.toString());
+                } else if ("Boolean".equalsIgnoreCase(type)) {
+                    value = Boolean.parseBoolean(value.toString());
+                } else if ("Datetime".equalsIgnoreCase(type)) {
+                    String string = value.toString();
+                    String patten = "yyyy-MM-dd HH:mm:ss";
+                    if (string.contains("(")) {
+                        patten = string.substring(string.indexOf("(") + 1, string.length() - 1);
+                        string = string.substring(0, string.indexOf("("));
+                    }
+                    value = LocalDateTime.parse(string, DateTimeFormatter.ofPattern(patten));
                 }
-                value = LocalDateTime.parse(string, DateTimeFormatter.ofPattern(patten));
-            }
 
-            result.add(value);
+                result.add(value);
+            }
+            res = result;
         }
-        return result;
+        return res;
     }
 
 

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

@@ -15,26 +15,6 @@ import java.util.stream.Stream;
 
 public class LoggerService {
 
-    public enum LogType {
-
-        USER("userlog"),
-        INTERFACE("interfacelog"),
-        SYSTEM("systemerrlog"),
-        SERVICE("servicelog"),
-        SERVICE_ERR("serviceerrlog");
-
-        private String name;
-
-        LogType(String name) {
-            this.name = name;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-    }
-
     private static final String CONNECTION = """
             {
               "jdbcUrl": "jdbc:sqlite:%s",
@@ -42,10 +22,9 @@ public class LoggerService {
               "enableCache":false
             }
             """;
-    private static String currentFileName;
-
     private final static Set<Long> fileNames = new HashSet<>();
     private static final String DIR = "logs/";
+    private static String currentFileName;
 
     public static void log(LogType type, Map<String, Object> data) {
         long filename = System.currentTimeMillis() / Config.getSplitCount();
@@ -217,4 +196,24 @@ public class LoggerService {
             }
         }
     }
+
+    public enum LogType {
+
+        USER("userlog"),
+        INTERFACE("interfacelog"),
+        SYSTEM("systemerrlog"),
+        SERVICE("servicelog"),
+        SERVICE_ERR("serviceerrlog");
+
+        private final String name;
+
+        LogType(String name) {
+            this.name = name;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+    }
 }

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

@@ -20,17 +20,14 @@ import static org.springframework.web.context.request.RequestAttributes.SCOPE_SE
 public class SecurityService {
 
 
+    private static final SecureRandom RANDOM = new SecureRandom();
     @Value("${app.token-effective:604800}")
     private long defaultAppTokenEffective;
     @Value("${app.code-effective:600}")
     private long defaultSecurityCodeEffective;
-
     @Value("${app.debug:false}")
     private boolean debug;
 
-
-    private static final SecureRandom RANDOM = new SecureRandom();
-
     private static String createCode(int size, String source) {
         StringBuilder verifyCode = new StringBuilder(size);
         int codesLen = source.length();
@@ -55,7 +52,7 @@ public class SecurityService {
             List<Map<String, Object>> applicationList = DataBase.query(Config.getSecurityConnectionStr(), query, appid.get(), appSecret.get());
 
             if (applicationList.isEmpty()) {
-                return UniReturnUtil.fail("appid 或 appsecret 错误");
+                throw new RuntimeException("appid 或 appsecret 错误");
             }
             Map<String, Object> application = applicationList.get(0);
 
@@ -66,64 +63,35 @@ public class SecurityService {
                 apptokeneffective = Long.parseLong(apptokeneffectiveObj.toString());
             }
             LocalDateTime expiresTime = LocalDateTime.now().plusSeconds(apptokeneffective);
-            Map<String, Object> data = new HashMap<>();
             String ip = RequestUtil.getIpAddr();
-            List<Map<String, Object>> logs = DataBase.query(Config.getSecurityConnectionStr(), "select * from appconnectlog where requestip=? and appid = ?", ip, appid.get());
+            List<Map<String, Object>> logs = DataBase.query(Config.getSecurityConnectionStr(), "select connid,  apptoken, expiretime, lasttime from appconnectlog where requestip=? and appid = ?", ip, appid.get());
             String appToken;
             if (!logs.isEmpty()) {
+                Map<String, Object> applicationlog = logs.get(0);
                 DataBase.update(Config.getSecurityConnectionStr(), """
                                                 update appconnectlog
                         set expiretime = ?,lasttime=?
-                        where connid=?""", expiresTime, LocalDateTime.now(), logs.get(0).get("connid"));
-                Map<String, Object> map = logs.get(0);
-                RequestContextHolder.currentRequestAttributes().setAttribute("application", application, SCOPE_SESSION);
-                appToken = map.get("apptoken").toString();
+                        where connid=?""", expiresTime, LocalDateTime.now(), applicationlog.get("connid"));
+                appToken = applicationlog.get("apptoken").toString();
             } else {
                 String sessionId = RequestUtil.getSessionId();
                 appToken = DataEncryptionUtil.signatureMD5("%s:%s".formatted(LocalDateTime.now(), sessionId));
-                RequestContextHolder.currentRequestAttributes().setAttribute("appid", appid, SCOPE_SESSION);
 
                 DataBase.update(Config.getSecurityConnectionStr(), """
                                                 insert into appconnectlog (appid, requesttime, requestip, apptoken, expiretime, lasttime)
                         values (?,?,?,?,?,?)""", appid.get(), LocalDateTime.now(), ip, appToken, expiresTime, LocalDateTime.now());
-
             }
-            data.put("token", appToken);
-            data.put("expirestime", DataFormatUtil.toString(expiresTime));
-            data.put("appname", application.get("appname"));
-            data.put("appenname", application.get("appengname"));
-            data.put("logo", application.get("applog"));
-            data.put("smalllogo", application.get("smalllogo"));
-            data.put("background", application.get("backgroundimage"));
-            data.put("securitycoderule", application.get("securitycoderule"));
+//            添加token和过期时间
+            application.put("token", appToken);
+            application.put("expirestime", DataFormatUtil.toString(expiresTime));
             RequestContextHolder.currentRequestAttributes().setAttribute("application", application, SCOPE_SESSION);
-            return UniReturnUtil.success(data);
+//            清理敏感信息 appsecret
+            application.put("appsecret", null);
+            return UniReturnUtil.success(application);
         }
         return UniReturnUtil.fail("appid 或 appsecret 不能为空");
     }
 
-    //校验连接令牌
-
-    public Map<String, Object> verifyToken(String appToken) throws Exception {
-        String clean = "delete from appconnectlog where expiretime <  ?";
-
-        DataBase.update(Config.getSecurityConnectionStr(), clean, LocalDateTime.now());
-
-
-        String requestIp = RequestUtil.getIpAddr();
-        String query = "select * from appconnectlog where apptoken=? and requestip =?";
-        List<Map<String, Object>> appConnectLogList = DataBase.query(Config.getSecurityConnectionStr(), query,
-                appToken, requestIp);
-        Map<String, Object> data = new HashMap<>();
-        if (!appConnectLogList.isEmpty()) {
-            Map<String, Object> appConnectLog = appConnectLogList.get(0);
-            data.put("validstatus", true);
-            data.put("appid", appConnectLog.get("appid"));
-            return UniReturnUtil.success(data);
-        }
-        data.put("validstatus", false);
-        return UniReturnUtil.success(data);
-    }
 
     //刷新连接令牌
 
@@ -145,10 +113,15 @@ public class SecurityService {
         Map<String, Object> data = new HashMap<>();
         try {
             String update = "update appconnectlog set expiretime=? where apptoken =? and requestip =? and appid=?";
-            DataBase.update(Config.getSecurityConnectionStr(), update, expiresTime, appToken, RequestUtil.getIpAddr(), appid);
-            data.put("expirestime", DataFormatUtil.toString(expiresTime));
-            data.put("token", appToken);
-            return UniReturnUtil.success(data);
+            boolean updateRow = DataBase.update(Config.getSecurityConnectionStr(), update, expiresTime, appToken, RequestUtil.getIpAddr(), appid);
+
+            if (updateRow) {
+                data.put("expirestime", DataFormatUtil.toString(expiresTime));
+                data.put("token", appToken);
+                return UniReturnUtil.success(data);
+            } else {
+                return UniReturnUtil.fail("刷新令牌失败");
+            }
         } catch (Exception exception) {
             return UniReturnUtil.fail("刷新令牌失败：%s".formatted(exception.getMessage()));
         }
@@ -156,7 +129,7 @@ public class SecurityService {
 
     //获取登录验证码
 
-    public Map<String, Object> verifyCode() throws Exception {
+    public Map<String, Object> getSecurityCode() throws Exception {
 
         String appId = RequestUtil.getAppId();
         Map<String, Object> application = RequestUtil.getApplication();
@@ -235,7 +208,7 @@ public class SecurityService {
 
         if (Objects.nonNull(securityCodeRule) && !debug) {
             code = DataEncryptionUtil.decryptRSAByPrivateKey(verifycode.get());
-            if (Objects.nonNull(securityCodeRule) && !check(code, sessionId, appId, ip)) {
+            if (!check(code, sessionId, appId, ip)) {
                 return UniReturnUtil.fail("验证码错误");
             }
         }
@@ -264,12 +237,12 @@ public class SecurityService {
                 Optional<Map<String, Object>> log = userLoginLogList.stream().filter(it -> it.get("sessionid").equals(sessionId)).findAny();
                 if (log.isEmpty()) {
                     DataBase.update(Config.getSecurityConnectionStr(), insert, userId, ip, sessionId, LocalDateTime.now(), null, LocalDateTime.now(), LocalDateTime.now(), appToken, appId);
-                } else {
-                    Map<String, Object> map = log.get();
-                    if (Objects.isNull(map.get("apptoken"))) {
-
-                        DataBase.update(Config.getSecurityConnectionStr(), "update  userloginlog set apptoken = ? where loginid = ?", appToken, map.get("loginid"));
-                    }
+//                } else {
+//                    Map<String, Object> map = log.get();
+//                    if (Objects.isNull(map.get("apptoken"))) {
+//
+//                        DataBase.update(Config.getSecurityConnectionStr(), "update  userloginlog set apptoken = ? where loginid = ?", appToken, map.get("loginid"));
+//                    }
                 }
                 data.put("userstatus", "0");
 
@@ -283,9 +256,7 @@ public class SecurityService {
             }
         }
         data.put("userid", userId);
-        if (Objects.nonNull(securityCodeRule)) {
-            remove(code, sessionId, appId, ip);
-        }
+
         return UniReturnUtil.success(data);
     }
 
@@ -451,24 +422,34 @@ public class SecurityService {
 
     public void addCode(String code, String sessionId, String appid, Long securitycodeeffective, String requestIp) throws Exception {
 //      使用数据库
+//        先清理数据库中的重复请求 和过期数据
+        String deleteSql = "delete from tempsecuritycode where expiretime < ? or appid = ? and requestip = ? and sessionid =? ";
+        DataBase.update(Config.getSecurityConnectionStr(), deleteSql,
+                LocalDateTime.now(), appid, requestIp, sessionId
+        );
+//        新增数据
         LocalDateTime localDateTime = LocalDateTime.now().plusSeconds(securitycodeeffective);
         String insertSql = "insert into tempsecuritycode(appid,requestip,sessionid,securitycode,expiretime) values (?,?,?,?,?)";
         DataBase.update(Config.getSecurityConnectionStr(), insertSql,
                 appid, requestIp, sessionId, code, localDateTime
         );
-        String deleteSql = "delete from tempsecuritycode where expiretime < ?";
-        DataBase.update(Config.getSecurityConnectionStr(), deleteSql,
-                LocalDateTime.now()
-        );
+
     }
 
     public boolean check(String code, String sessionId, String appid, String requestIp) throws Exception {
 
-        String selectSql = "select * from tempsecuritycode where securitycode=? and sessionid=? and appid=? and requestip=?";
-        List<Map<String, Object>> map = DataBase.query(Config.getSecurityConnectionStr(), selectSql,
+
+//        String selectSql = "select count(1) as result from tempsecuritycode where securitycode=? and sessionid=? and appid=? and requestip=?";
+        String deleteSql = """
+                                delete
+                from tempsecuritycode
+                where securitycode = ?
+                  and sessionid = ?
+                  and appid = ?
+                  and requestip = ?""";
+        return DataBase.update(Config.getSecurityConnectionStr(), deleteSql,
                 code, sessionId, appid, requestIp
         );
-        return !map.isEmpty();
 
     }
 

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

@@ -6,12 +6,7 @@ import java.util.Map;
 
 
 public class Config {
-    /**
-     * 不能创建这个类
-     */
-    private Config() {
-    }
-
+    public static List<Map<String, Object>> targets = new ArrayList<>();
     private static String centerConnectionStr;
     private static String securityConnectionStr;
 
@@ -20,12 +15,14 @@ public class Config {
     private static boolean debug;
 
     private static String containerCode;
-
-    public static List<Map<String,Object>> targets = new ArrayList<>();
-
     //    本地日志缓存分片 10分钟
     private static int splitCount = 600000;
 
+    /**
+     * 不能创建这个类
+     */
+    private Config() {
+    }
 
     public static String getCenterConnectionStr() {
         return centerConnectionStr;

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

@@ -10,11 +10,6 @@ public class ScheduleTask implements Runnable {
 
 
     private final String id; // 服务ID
-
-    public String getId() {
-        return id;
-    }
-
     private final Integer loopCount;
     int count = 0;
 
@@ -23,6 +18,10 @@ public class ScheduleTask implements Runnable {
         this.loopCount = Objects.isNull(loopCount) || loopCount < 0 ? 0 : loopCount;
     }
 
+    public String getId() {
+        return id;
+    }
+
     @Override
     public void run() {
 

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

@@ -8,16 +8,17 @@ import org.springframework.scheduling.support.CronTrigger;
 import org.springframework.scheduling.support.PeriodicTrigger;
 
 import java.time.Duration;
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.ScheduledFuture;
 
 public class ScheduleUtil {
 
 
-    private static ThreadPoolTaskScheduler threadPoolTaskScheduler = new ThreadPoolTaskScheduler();
-
-
-    private static Map<String, ScheduledFuture<?>> scheduledFutureMap = new HashMap<>();
+    private static final ThreadPoolTaskScheduler threadPoolTaskScheduler = new ThreadPoolTaskScheduler();
+    private static final Map<String, ScheduledFuture<?>> scheduledFutureMap = new HashMap<>();
     public static Map<String, ScheduleTask> scheduleTaskMaps = new HashMap<>();
 
     static {
@@ -48,12 +49,12 @@ public class ScheduleUtil {
             return true;
         }
 
-
-        ScheduleTask scheduleTask = new ScheduleTask(serviceId, loopCount);
-        scheduleTaskMaps.put(serviceId, scheduleTask);
         //创建定时任务：
-        System.out.println("启动定时任务线程 taskId " + scheduleTask.getId());// 设置时间比当前时间晚了
+        System.out.println("启动定时任务线程 taskId " + serviceId);
         Object taskType = serviceInfo.get("tasktype");
+        if (Objects.isNull(taskType)) {
+            taskType = "0";
+        }
         Trigger trigger;
 //        定时
         if (Objects.equals(taskType.toString(), "1")) {
@@ -63,26 +64,19 @@ public class ScheduleUtil {
             Object frequency = serviceInfo.getOrDefault("frequency", "0");
             trigger = new PeriodicTrigger(Duration.ofMillis(Long.parseLong(frequency.toString())));
         } else {
+            System.out.println("服务任务类型：" + taskType + "，服务ID: " + serviceId);
             throw new RuntimeException("任务类型不支持  定时任务支持：1：定时任务，2：轮询任务");
         }
+
+
+        ScheduleTask scheduleTask = new ScheduleTask(serviceId, loopCount);
+        scheduleTaskMaps.put(serviceId, scheduleTask);
         ScheduledFuture<?> scheduledFuture = threadPoolTaskScheduler.schedule(scheduleTask, trigger);
         scheduledFutureMap.put(serviceId, scheduledFuture);
         DataBase.update(Config.getCenterConnectionStr(), "update serviceinfo set runState = 1 where  serviceid =?", serviceId);
         return true;
     }
 
-    /**
-     * 定时执行 秒级
-     *
-     * @param runnable
-     * @param cron
-     * @return
-     */
-    public static boolean startByCron(Runnable runnable, String cron) {
-        threadPoolTaskScheduler.schedule(runnable, new CronTrigger(cron));
-        return true;
-    }
-
     /**
      * 间隔执行 毫秒级 执行结束到下次开始执行时间
      *
@@ -90,9 +84,8 @@ public class ScheduleUtil {
      * @param frequency
      * @return
      */
-    public static boolean startService(Runnable runnable, long frequency) {
+    public static void startFrequencyTask(Runnable runnable, long frequency) {
         threadPoolTaskScheduler.schedule(runnable, new PeriodicTrigger(Duration.ofMillis(frequency)));
-        return true;
     }
 
     /**

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

@@ -25,11 +25,6 @@ public class SpringContextApplication implements ApplicationContextAware, Enviro
         SpringContextApplication.env = env;
     }
 
-    @Override
-    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-        setContent(applicationContext);
-    }
-
     @SuppressWarnings("unchecked")
     public static <T> T getBean(String beanName) throws BeansException {
         return (T) content.getBean(beanName);
@@ -39,13 +34,18 @@ public class SpringContextApplication implements ApplicationContextAware, Enviro
         return content.getBean(type);
     }
 
+    public static String getString(String key) {
+        return env.getProperty(key);
+    }
+
     @Override
-    public void setEnvironment(Environment environment) {
-        setEnv(environment);
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        setContent(applicationContext);
     }
 
-    public static String getString(String key) {
-        return env.getProperty(key);
+    @Override
+    public void setEnvironment(Environment environment) {
+        setEnv(environment);
     }
 
 }

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

@@ -14,7 +14,6 @@ import org.springframework.stereotype.Component;
 import java.io.*;
 import java.nio.charset.StandardCharsets;
 import java.time.LocalDateTime;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Scanner;
 
@@ -36,7 +35,6 @@ public class SystemInit {
     @Value("${app.container.code}")
     private String containerCode;
 
-
     @Value("${app.debug:false}")
     private boolean debug = true;
 
@@ -49,6 +47,20 @@ public class SystemInit {
         this.resourcePatternResolver = resourcePatternResolver;
     }
 
+    public static String readFileToString(File file) {
+        StringBuilder content = new StringBuilder();
+        try (Scanner scanner = new Scanner(file)) {
+            while (scanner.hasNextLine()) {
+                content.append(scanner.nextLine());
+            }
+        } catch (FileNotFoundException e) {
+            if (Config.isDebug()) {
+                e.printStackTrace();
+            }
+        }
+        return content.toString();
+    }
+
     @PostConstruct
     public void init() throws Exception {
         Config.setContainerCode(containerCode);
@@ -67,12 +79,14 @@ public class SystemInit {
         }
 
 //        日志配置初始化
-        Config.targets.addAll(DataBase.query(Config.getCenterConnectionStr(), "select * from systeminfo"));
+        Config.targets.addAll(DataBase.query(Config.getCenterConnectionStr(), """
+                select
+                    systemid, keyname, datasourceid, expression, systemdescribe
+                from systeminfo"""));
 
         initializeSystemEnvironment();
-        ControlService.startServiceByContainerCode();
 //        日志任务
-        ScheduleUtil.startService(LoggerService::sendMessage, 100);
+        ScheduleUtil.startFrequencyTask(LoggerService::sendMessage, 100);
         HashMap<String, Object> occurrencetime = new HashMap<>();
         occurrencetime.put("occurrencetime", LocalDateTime.now());
         LoggerService.log(LoggerService.LogType.SYSTEM, occurrencetime);
@@ -151,21 +165,6 @@ public class SystemInit {
 
     }
 
-
-    public static String readFileToString(File file) {
-        StringBuilder content = new StringBuilder();
-        try (Scanner scanner = new Scanner(file)) {
-            while (scanner.hasNextLine()) {
-                content.append(scanner.nextLine());
-            }
-        } catch (FileNotFoundException e) {
-            if (Config.isDebug()) {
-                e.printStackTrace();
-            }
-        }
-        return content.toString();
-    }
-
     /**
      * 迁移数据，数据库管理
      *

src/main/resources/db/systemset/V1_2__create_service_info_table.sql

@@ -1,4 +1,4 @@
-create table if not exists  serviceinfo
+create table if not exists serviceinfo
 (
     serviceid            int auto_increment comment '主键'
         primary key,

src/main/resources/db/systemset/V1_3__create_container_table.sql

@@ -1,4 +1,4 @@
-create table if not exists  container
+create table if not exists container
 (
     containerid       int auto_increment
         primary key,

src/main/resources/db/systemset/V1_4__create_datasource_table.sql

@@ -1,4 +1,4 @@
-create table if not exists  datasource
+create table if not exists datasource
 (
     datasourceid       int auto_increment
         primary key,

src/main/resources/db/systemset/V1_5__create_key_alias_table.sql

@@ -1,4 +1,4 @@
-create table if not exists  keyalias
+create table if not exists keyalias
 (
     aliasid       int auto_increment
         primary key,

src/main/resources/db/systemset/V1_6__create_data_cache_table.sql

@@ -1,4 +1,4 @@
-create table  if not exists datacache
+create table if not exists datacache
 (
     datacacheid       int auto_increment
         primary key,
@@ -8,5 +8,5 @@ create table  if not exists datacache
     effectiveduration int  null comment '缓存时长（秒）',
     datacachedescribe text null comment '描述'
 )
-comment '二级缓存配置';
+    comment '二级缓存配置';
 

src/main/resources/db/systemset/V1_7__create_service_state_table.sql

@@ -1,4 +1,4 @@
-create table if not exists  servicestate
+create table if not exists servicestate
 (
     servicestateid int auto_increment
         primary key,

src/main/resources/db/systemset/V1_8__create_algorithm_library_table.sql

@@ -1,4 +1,4 @@
-create table  if not exists algorithmlibrary
+create table if not exists algorithmlibrary
 (
     algorithmlibraryid  int auto_increment comment '算法编号'
         primary key,

src/test/java/com/scbfkj/uni/ControllerBaseTest.java

@@ -14,13 +14,12 @@ import org.springframework.web.context.WebApplicationContext;
 public abstract class ControllerBaseTest {
 
 
+    protected static String token;
     protected MockMvc mockMvc;
-
     protected Cookie cookie = MockCookie.parse("JSESSIONID=78C3FBDF21FFFBE46B8DD728D5C5DBF7");
-    protected static String token;
 
     @BeforeEach
-    public void before (WebApplicationContext webApplicationContext){
+    public void before(WebApplicationContext webApplicationContext) {
         mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).build();
     }
 }

src/test/java/com/scbfkj/uni/UniApplicationTests.java

@@ -1,7 +1,6 @@
 package com.scbfkj.uni;
 
 import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
 
 import java.util.HashMap;
 import java.util.List;
@@ -9,30 +8,31 @@ import java.util.Map;
 
 
 class UniApplicationTests {
-	private final static Map<String, List<String>> alias = new HashMap<>();
-
-	static {
-		alias.put("appid", List.of("appid", "app_id", "appId", "APPID"));
-		alias.put("appsecret", List.of("appSecret", "app_secret", "APP_SECRET", "appsecret", "APPSECRET"));
-		alias.put("sessionid", List.of("sessionId", "sessionid", "SESSIONID", "SESSION_ID", "session_id"));
-		alias.put("requestip", List.of("requestIp", "requestip", "request_ip", "REQUEST_IP", "request_ip", "REQUESTIP", "ip"));
-		alias.put("username", List.of("username", "userName", "user_name", "USER_NAME", "USERNAME"));
-		alias.put("password", List.of("password", "pwd", "PWD", "PASSWORD"));
-		alias.put("version", List.of("version", "Version", "VERSION"));
-		alias.put("verifycode", List.of("verifycode", "verifyCode", "code"));
-	}
-	@Test
-	void contextLoads() {
-		String sql ="insert into keyalias (keyname,aliasname) values";
-		StringBuilder stringBuilder = new StringBuilder(sql);
-		alias.forEach((key,value)->{
-
-		value.forEach(it->{
-			stringBuilder.append("('%s','%s'),".formatted(key,it));
-		});
-		});
-
-		System.out.println(stringBuilder);
-	}
+    private final static Map<String, List<String>> alias = new HashMap<>();
+
+    static {
+        alias.put("appid", List.of("appid", "app_id", "appId", "APPID"));
+        alias.put("appsecret", List.of("appSecret", "app_secret", "APP_SECRET", "appsecret", "APPSECRET"));
+        alias.put("sessionid", List.of("sessionId", "sessionid", "SESSIONID", "SESSION_ID", "session_id"));
+        alias.put("requestip", List.of("requestIp", "requestip", "request_ip", "REQUEST_IP", "request_ip", "REQUESTIP", "ip"));
+        alias.put("username", List.of("username", "userName", "user_name", "USER_NAME", "USERNAME"));
+        alias.put("password", List.of("password", "pwd", "PWD", "PASSWORD"));
+        alias.put("version", List.of("version", "Version", "VERSION"));
+        alias.put("verifycode", List.of("verifycode", "verifyCode", "code"));
+    }
+
+    @Test
+    void contextLoads() {
+        String sql = "insert into keyalias (keyname,aliasname) values";
+        StringBuilder stringBuilder = new StringBuilder(sql);
+        alias.forEach((key, value) -> {
+
+            value.forEach(it -> {
+                stringBuilder.append("('%s','%s'),".formatted(key, it));
+            });
+        });
+
+        System.out.println(stringBuilder);
+    }
 
 }

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

@@ -7,8 +7,6 @@ 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

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

@@ -16,7 +16,6 @@ import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
 class SecurityApiTest extends ControllerBaseTest {
 
 
-
     @Test
     @Order(1)
     void getToken() throws Exception {
@@ -41,9 +40,9 @@ class SecurityApiTest extends ControllerBaseTest {
     @Order(2)
     void refreshToken() throws Exception {
         mockMvc.perform(MockMvcRequestBuilders.post("/user/refreshToken")
-                        .contentType(MediaType.APPLICATION_JSON_VALUE)
+                                .contentType(MediaType.APPLICATION_JSON_VALUE)
 //                        .header("token", token)
-                        .cookie(cookie)
+                                .cookie(cookie)
                                 .content("")
                 )
 

src/test/java/com/scbfkj/uni/library/DataEncryptionUtilTest.java

@@ -3,11 +3,6 @@ package com.scbfkj.uni.library;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import java.security.KeyPairGenerator;
-import java.util.UUID;
-
-import static org.junit.jupiter.api.Assertions.*;
-
 class DataEncryptionUtilTest {
     @Test
     void rsaEncodeAndDecrypt() throws Exception {

src/test/java/com/scbfkj/uni/library/DataFormatUtilTest.java

@@ -12,8 +12,8 @@ class DataFormatUtilTest {
     void toJsonNode() throws JsonProcessingException {
         JsonNode jsonNode = DataFormatUtil.toJsonNode("[{\"name\": \"Alice\", \"age\": 25}, {\"name\": \"Bob\", \"age\": 30}]");
         System.out.println(jsonNode);
-        jsonNode = DataFormatUtil.toJsonNode(new HashMap<>(){{
-            put("a",1);
+        jsonNode = DataFormatUtil.toJsonNode(new HashMap<>() {{
+            put("a", 1);
         }});
         System.out.println(jsonNode);
 

src/test/java/com/scbfkj/uni/library/ImageUtilTest.java

@@ -5,8 +5,6 @@ import org.junit.jupiter.api.Test;
 import java.awt.*;
 import java.io.IOException;
 
-import static org.junit.jupiter.api.Assertions.*;
-
 class ImageUtilTest {
 
     @Test

src/test/java/com/scbfkj/uni/library/ScriptEngineUtilTest.java

@@ -1,9 +1,5 @@
 package com.scbfkj.uni.library;
 
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.*;
-
 class ScriptEngineUtilTest {
 
 }

src/test/java/com/scbfkj/uni/library/script/DatabaseScriptUtilTest.java

@@ -2,45 +2,43 @@ package com.scbfkj.uni.library.script;
 
 import com.scbfkj.uni.library.UniReturnUtil;
 import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.junit.jupiter.api.Assertions.*;
-
 //@SpringBootTest
 class DatabaseScriptUtilTest {
 
+    String x = """
+                        {
+              "url": "http://127.0.0.1:8080",
+              "method": "POST",
+              "header": {
+                "key1": ["value1","value2"],
+                "key2":"value"
+              },
+              "body": {
+                "key": "value"
+              },
+              "params": {
+                "key": "value"
+              }
+            }""";
+
     @Test
     void exec() throws Exception {
         Map<String, Object> exec = DatabaseScriptUtil.exec("""
-                {
-  "jdbcUrl": "jdbc:mysql://127.0.0.1:3306/test",
-  "username": "root",
-  "password": "123@bigdata",
-  "driverClassName": "com.mysql.cj.jdbc.Driver"
-}
-                """, "select * from interfacelog where  interfacelogid > 《id》", Collections.singletonList(new HashMap<>() {{
+                                {
+                  "jdbcUrl": "jdbc:mysql://127.0.0.1:3306/test",
+                  "username": "root",
+                  "password": "123@bigdata",
+                  "driverClassName": "com.mysql.cj.jdbc.Driver"
+                }
+                                """, "select * from interfacelog where  interfacelogid > 《id》", Collections.singletonList(new HashMap<>() {{
             put("id", 1);
         }}), "0", null, null);
         System.out.println(UniReturnUtil.success(new ArrayList<>()));
     }
-    String x = """
-            {
-  "url": "http://127.0.0.1:8080",
-  "method": "POST",
-  "header": {
-    "key1": ["value1","value2"],
-    "key2":"value"
-  },
-  "body": {
-    "key": "value"
-  },
-  "params": {
-    "key": "value"
-  }
-}""";
 }

src/test/java/com/scbfkj/uni/library/script/JavaScriptEngineUtilTest.java

@@ -1,14 +1,11 @@
 package com.scbfkj.uni.library.script;
 
-import com.scbfkj.uni.process.Kafka;
 import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.junit.jupiter.api.Assertions.*;
-
 class JavaScriptEngineUtilTest {
 
     @Test

src/test/java/com/scbfkj/uni/process/DataBaseTest.java

@@ -1,17 +1,16 @@
 package com.scbfkj.uni.process;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.scbfkj.uni.library.DataFormatUtil;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import static com.scbfkj.uni.library.script.DatabaseScriptUtil.exec;
 
 import java.util.*;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static com.scbfkj.uni.library.script.DatabaseScriptUtil.exec;
 
 @SpringBootTest
 class DataBaseTest {
+    public static String tableName = "log_error";
     static String connectionStr = """
                             {
               "jdbcUrl": "jdbc:mysql://120.26.64.82:3306/mid_log",
@@ -19,9 +18,7 @@ class DataBaseTest {
               "password": "123@bigdata",
               "driverClassName": "com.mysql.cj.jdbc.Driver"
             }""";
-    public static String tableName = "log_error";
-
-  static    List<Map<String, Object>> insert = Collections.singletonList(new HashMap<>() {{
+    static List<Map<String, Object>> insert = Collections.singletonList(new HashMap<>() {{
         put("filter", new HashMap<>() {{
             put("id", 15);
         }});
@@ -40,7 +37,7 @@ class DataBaseTest {
         }});
     }});
 
-  static   List<Map<String, Object>> insertOrupdate = new ArrayList<>() {{
+    static List<Map<String, Object>> insertOrupdate = new ArrayList<>() {{
         add(new HashMap<>() {{
             put("filter", new HashMap<>() {{
                 put("id", 15);
@@ -60,25 +57,24 @@ class DataBaseTest {
             }});
         }});
     }};
-   static List<String> filterColumns = new ArrayList<>() {{
+    static List<String> filterColumns = new ArrayList<>() {{
         add("id");
         add("serviceid");
     }};
-   static List<Map<String, Object>> filterLines = new ArrayList<Map<String,Object>>(){{
-       add(new HashMap<>(){{
-           put("left","(");
-           put("column","id");
-           put("comparator","=");
-           put("value",15);
-           put("right",")");
-       }});
-   }};
+    static List<Map<String, Object>> filterLines = new ArrayList<Map<String, Object>>() {{
+        add(new HashMap<>() {{
+            put("left", "(");
+            put("column", "id");
+            put("comparator", "=");
+            put("value", 15);
+            put("right", ")");
+        }});
+    }};
 
     @Test
     void testExec() throws Exception {
 
 
-
         Map<String, Object> exec = exec(connectionStr, tableName, insert, "3", filterColumns, filterLines);
         System.out.println(DataFormatUtil.toString(exec));
         exec = exec(connectionStr, tableName, insert, "1", filterColumns, filterLines);
@@ -100,26 +96,29 @@ class DataBaseTest {
         Map<String, Object> exec = exec(connectionStr, "select * from %s where 《whereStr》".formatted(tableName), insert, "0", filterColumns, filterLines);
         System.out.println(DataFormatUtil.toString(exec));
     }
+
     @Test
     void testBookTitleSymbol() throws Exception {
         Map<String, Object> exec = exec(connectionStr, "select * from %s where id=《id》".formatted(tableName), insert, "0", filterColumns, filterLines);
         System.out.println(DataFormatUtil.toString(exec));
     }
+
     @Test
     void testBookTitleSymbol2() throws Exception {
-        Map<String, Object> exec = exec(connectionStr, "select * from %s where id=《id》".formatted(tableName), insert.stream().map(it-> ((Map<String,Object>) it.get("filter"))).toList(), "0", filterColumns, filterLines);
+        Map<String, Object> exec = exec(connectionStr, "select * from %s where id=《id》".formatted(tableName), insert.stream().map(it -> ((Map<String, Object>) it.get("filter"))).toList(), "0", filterColumns, filterLines);
         System.out.println(DataFormatUtil.toString(exec));
     }
+
     @Test
     void testFilter() throws Exception {
-        Map<String, Object> exec = exec(connectionStr, "select * from %s where 《whereStr》".formatted(tableName), List.of(new HashMap<>(){{
-            put("filter",new ArrayList<Map<String,Object>>(){{
-                add(new HashMap<>(){{
-                    put("left","(");
-                    put("column","id");
-                    put("comparator","=");
-                    put("value",15);
-                    put("right",")");
+        Map<String, Object> exec = exec(connectionStr, "select * from %s where 《whereStr》".formatted(tableName), List.of(new HashMap<>() {{
+            put("filter", new ArrayList<Map<String, Object>>() {{
+                add(new HashMap<>() {{
+                    put("left", "(");
+                    put("column", "id");
+                    put("comparator", "=");
+                    put("value", 15);
+                    put("right", ")");
                 }});
             }});
         }}), "0", filterColumns, filterLines);

src/test/java/com/scbfkj/uni/process/KafkaTest.java

@@ -5,8 +5,6 @@ import org.junit.jupiter.api.Test;
 import java.util.ArrayList;
 import java.util.Map;
 
-import static org.junit.jupiter.api.Assertions.*;
-
 class KafkaTest {
 
     @Test

src/test/java/com/scbfkj/uni/service/DataProcessServiceTest.java

@@ -7,15 +7,13 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 
-import static org.junit.jupiter.api.Assertions.*;
-
 class DataProcessServiceTest {
 
     @Test
     void processByAlgorithm() throws Exception {
         String data = "hello world";
         String prikey = "12087a12bee95f5d4ffad39bc664d36d3e5befcec9e38e32214347cf263c7479";
-        String pubkey="04343d06aa7d9fbf3897906755c0172a43faeec77b346a26636ea67bd9a7e319774024ddac2c0ac697ec4b9333db3f823e29ad11cdce4ff377d2d4b3dd64c47310";
+        String pubkey = "04343d06aa7d9fbf3897906755c0172a43faeec77b346a26636ea67bd9a7e319774024ddac2c0ac697ec4b9333db3f823e29ad11cdce4ff377d2d4b3dd64c47310";
         HashMap<String, Object> config = new HashMap<>() {{
             put("path", "sm2-1.0-SNAPSHOT-jar-with-dependencies.jar");
             put("className", "com.bfkj.SM2");
@@ -27,7 +25,7 @@ class DataProcessServiceTest {
             add(pubkey);
         }});
         System.out.println(map);
-       String data2 = map.get("returnData").toString();
+        String data2 = map.get("returnData").toString();
         map = DataProcessService.processByAlgorithm("1", new ArrayList<>() {{
             add(config);
             add("decrypt");
@@ -35,6 +33,6 @@ class DataProcessServiceTest {
             add(prikey);
         }});
         System.out.println(map);
-        System.out.println(Objects.equals(data,map.get("returnData")));
+        System.out.println(Objects.equals(data, map.get("returnData")));
     }
 }