init_06

pom.xml

@@ -33,11 +33,6 @@
 			<scope>runtime</scope>
 			<optional>true</optional>
 		</dependency>
-		<dependency>
-			<groupId>com.h2database</groupId>
-			<artifactId>h2</artifactId>
-			<scope>runtime</scope>
-		</dependency>
 		<dependency>
 			<groupId>com.mysql</groupId>
 			<artifactId>mysql-connector-j</artifactId>

src/main/java/com/scbfkj/uni/UniApplication.java

@@ -3,9 +3,11 @@ package com.scbfkj.uni;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
 @EnableAspectJAutoProxy
+@EnableScheduling
 public class UniApplication {
 
     public static void main(String[] args) {

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

@@ -6,13 +6,11 @@ import com.scbfkj.uni.process.DataBase;
 import com.scbfkj.uni.service.LoggerService;
 import com.scbfkj.uni.service.SecurityService;
 import com.scbfkj.uni.system.Config;
-import com.scbfkj.uni.system.LogTarget;
 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;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.request.RequestContextHolder;
@@ -40,9 +38,9 @@ public class LogAop {
 
         ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder.currentRequestAttributes();
 //            前端需求添加header
-        if (requestAttributes.getResponse() != null) {
-            requestAttributes.getResponse().addHeader("Set-Cookie", "SameSite=None");
-        }
+//        if (requestAttributes.getResponse() != null) {
+//            requestAttributes.getResponse().addHeader("Set-Cookie", "SameSite=None");
+//        }
         HttpServletRequest request = requestAttributes.getRequest();
 
         try {

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

@@ -1,8 +1,13 @@
 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;
@@ -27,7 +32,7 @@ public class SecurityApi {
      * @return
      */
     @PostMapping("user/getToken")
-    public ResponseEntity<Map<String,Object>> getToken(@RequestBody Map<String, Object> body) throws Exception {
+    public ResponseEntity<Map<String, Object>> getToken(@RequestBody Map<String, Object> body) throws Exception {
         return ResponseEntity.ok(securityService.getToken(body));
     }
 
@@ -37,7 +42,7 @@ public class SecurityApi {
      * @return
      */
     @PostMapping("user/refreshToken")
-    public ResponseEntity<Map<String,Object>> refreshToken() throws Exception {
+    public ResponseEntity<Map<String, Object>> refreshToken() throws Exception {
         return ResponseEntity.ok(securityService.refreshToken());
     }
 
@@ -47,7 +52,7 @@ public class SecurityApi {
      * @return
      */
     @PostMapping({"user/testToken", "foxlibc/testToken"})
-    public ResponseEntity<Map<String,Object>> testToken() throws Exception {
+    public ResponseEntity<Map<String, Object>> testToken() throws Exception {
         String appToken = RequestUtil.getAppToken();
         return ResponseEntity.ok(securityService.verifyToken(appToken));
     }
@@ -58,7 +63,7 @@ public class SecurityApi {
      * @return
      */
     @PostMapping({"user/verifyCode", "foxlibc/verification-code"})
-    public ResponseEntity<Map<String,Object>> getCode() throws Exception {
+    public ResponseEntity<Map<String, Object>> getCode() throws Exception {
         return ResponseEntity.ok(securityService.verifyCode());
     }
 
@@ -68,7 +73,7 @@ public class SecurityApi {
      * @return
      */
     @PostMapping({"user/forceLogin", "foxlibc/force_sign"})
-    public ResponseEntity<Map<String,Object>> forceLogin() throws Exception {
+    public ResponseEntity<Map<String, Object>> forceLogin() throws Exception {
         return ResponseEntity.ok(securityService.forceLogin());
     }
 
@@ -79,7 +84,7 @@ public class SecurityApi {
      * @return
      */
     @PostMapping({"user/login", "foxlibc/sign-in"})
-    public ResponseEntity<Map<String,Object>> login(@RequestBody Map<String, Object> body) throws Exception {
+    public ResponseEntity<Map<String, Object>> login(@RequestBody Map<String, Object> body) throws Exception {
         return ResponseEntity.ok(securityService.login(body));
     }
 
@@ -89,7 +94,7 @@ public class SecurityApi {
      * @return
      */
     @PostMapping({"user/permissions", "foxlibc/permissions"})
-    public ResponseEntity<Map<String,Object>> getPermissions() throws Exception {
+    public ResponseEntity<Map<String, Object>> getPermissions() throws Exception {
         return ResponseEntity.ok(securityService.permission());
     }
 
@@ -101,7 +106,7 @@ public class SecurityApi {
      * @return
      */
     @PostMapping({"user/changePassword", "foxlibc/reset-passwd"})
-    public ResponseEntity<Map<String,Object>> changePwd(@RequestBody Map<String, Object> body) throws Exception {
+    public ResponseEntity<Map<String, Object>> changePwd(@RequestBody Map<String, Object> body) throws Exception {
         return ResponseEntity.ok(securityService.changePassword(body));
     }
 
@@ -111,7 +116,7 @@ public class SecurityApi {
      * @return
      */
     @PostMapping({"user/logOut", "foxlibc/sign-out"})
-    public ResponseEntity<Map<String,Object>> logOut() throws Exception {
+    public ResponseEntity<Map<String, Object>> logOut() throws Exception {
         return ResponseEntity.ok(securityService.logOut());
     }
 
@@ -121,7 +126,21 @@ public class SecurityApi {
      * @return
      */
     @PostMapping({"user/health", "foxlibc/health"})
-    public ResponseEntity<Map<String,Object>> health() throws Exception {
+    public ResponseEntity<Map<String, Object>> health() throws Exception {
         return ResponseEntity.ok(securityService.userHeartbeat());
     }
+
+    /**
+     * 获取公钥字符串
+     *
+     * @return
+     */
+    @PostMapping("user/publicKey")
+    public ResponseEntity<Map<String, Object>> getPubKey() {
+        ObjectNode objectNode = new ObjectNode(JsonNodeFactory.instance);
+        objectNode.put("pubKeyStr", DataEncryptionUtil.publicKeyStr);
+        objectNode.put("type", DataEncryptionUtil.TYPE);
+        objectNode.put("algorithm", DataEncryptionUtil.ALGORITHM);
+        return ResponseEntity.ok(UniReturnUtil.success(objectNode));
+    }
 }

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

@@ -18,6 +18,17 @@ import java.util.Objects;
 public class DataEncryptionUtil {
 
 
+    //    私有密钥
+    private 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";
+
+
     /**
      * 对给定的字符串进行加密操作
      *
@@ -212,7 +223,9 @@ public class DataEncryptionUtil {
      */
     public static String decryptByPrivateKey(@Nonnull String data, @Nonnull String privateKeyStr, @Nonnull String type, @Nonnull String algorithm) throws Exception {
         return new String(doFinalByKeyStr(1, Base64.getDecoder().decode(data), privateKeyStr, type, algorithm, Cipher.DECRYPT_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));
     }
 
 

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

@@ -1,6 +1,5 @@
 package com.scbfkj.uni.library;
 
-import co.elastic.clients.util.DateTime;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -9,12 +8,11 @@ import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import jakarta.json.JsonObject;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.time.temporal.Temporal;
+import java.util.Map;
 
 public final class DataFormatUtil {
     private final static ObjectMapper objectMapper = new ObjectMapper();
@@ -30,8 +28,13 @@ public final class DataFormatUtil {
     public static JsonNode stringToJsonNode(String source) throws JsonProcessingException {
         return objectMapper.readTree(source);
     }
-    public static <T> T  stringToBean(String source,Class<T> clazz) throws JsonProcessingException {
-        return objectMapper.readValue(source,clazz);
+
+    public static <T> T stringToBean(String source, Class<T> clazz) throws JsonProcessingException {
+        return objectMapper.readValue(source, clazz);
+    }
+
+    public static Map<?, ?> stringToMap(String source) throws JsonProcessingException {
+        return stringToBean(source, Map.class);
     }
 
     public static ObjectNode stringToObjectNode(String source) throws JsonProcessingException {

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

@@ -1,41 +0,0 @@
-package com.scbfkj.uni.library;
-
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class DbUtil {
-
-    private static final Map<String, List<String>> columns = new HashMap<>();
-
-    public static List<String> getColumns(String connection, String sql, ResultSet resultSet) throws SQLException {
-        if (columns.containsKey(connection + sql)) {
-            return columns.get(connection + sql);
-        }
-        ArrayList<String> names = new ArrayList<>();
-        ResultSetMetaData metaData = resultSet.getMetaData();
-        for (int i = 0; i < metaData.getColumnCount(); i++) {
-            names.add(metaData.getColumnName(i + 1));
-        }
-        columns.put(connection + sql, names);
-        return names;
-    }
-
-    public static List<Map<String, Object>> getResult(String connection, String sql, ResultSet resultSet) throws SQLException {
-        List<String> cs = getColumns(connection, sql, resultSet);
-        List<Map<String, Object>> result = new ArrayList<>();
-        while (resultSet.next()) {
-            Map<String, Object> resultMap = new HashMap<>();
-            for (String name : cs) {
-                Object object = resultSet.getObject(name);
-                resultMap.put(name, object);
-            }
-            result.add(resultMap);
-        }
-        return result;
-    }
-}

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

@@ -2,15 +2,11 @@ package com.scbfkj.uni.process;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.scbfkj.uni.library.DataFormatUtil;
-import com.scbfkj.uni.library.DbUtil;
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.pool.HikariPool;
 import jakarta.annotation.Nonnull;
 
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
+import java.sql.*;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -28,7 +24,7 @@ public class DataBase {
                     preparedStatement.setObject(i + 1, args[i]);
                 }
                 ResultSet resultSet = preparedStatement.executeQuery();
-                List<Map<String, Object>> result = DbUtil.getResult(connectionStr, sql, resultSet);
+                List<Map<String, Object>> result = getResult(connectionStr, sql, resultSet);
                 return result.stream();
             } catch (Exception exception) {
                 throw new RuntimeException("数据异常: %s\n sql: %s ;\n args: %s ".formatted(exception.getMessage(), sql, DataFormatUtil.toDate(args)));
@@ -37,6 +33,7 @@ public class DataBase {
 
     }
 
+
     public static int[] updateBatch(String connectionStr, String sql, List<Object[]> argsList) throws Exception {
         HikariPool dataSourcePool = getDataSourcePool(connectionStr);
         try (Connection connection = dataSourcePool.getConnection();
@@ -151,7 +148,7 @@ public class DataBase {
         JsonNode username = jsonNode.get("username");
         JsonNode password = jsonNode.get("password");
         JsonNode driverClassName = jsonNode.get("driverClassName");
-        HikariPool dataSourcePool = createDataSourcePool(jdbcUrl.asText(), Objects.isNull(username) ? null : username.asText(), Objects.isNull(password) ? null : password.asText(), driverClassName.asText(), connectionStr);
+        HikariPool dataSourcePool = createDataSourcePool(jdbcUrl.asText(), Objects.isNull(username) ? null : username.asText(), Objects.isNull(password) ? null : password.asText(), Objects.isNull(driverClassName) ? null : driverClassName.asText(), connectionStr);
         dataSourcePools.put(connectionStr, dataSourcePool);
         return dataSourcePool;
     }
@@ -192,5 +189,33 @@ public class DataBase {
         return new HikariPool(hikariConfig);
     }
 
+    private static final Map<String, List<String>> columns = new HashMap<>();
+
+    public static List<String> getColumns(String connection, String sql, ResultSet resultSet) throws SQLException {
+        if (columns.containsKey(connection + sql)) {
+            return columns.get(connection + sql);
+        }
+        ArrayList<String> names = new ArrayList<>();
+        ResultSetMetaData metaData = resultSet.getMetaData();
+        for (int i = 0; i < metaData.getColumnCount(); i++) {
+            names.add(metaData.getColumnName(i + 1));
+        }
+        columns.put(connection + sql, names);
+        return names;
+    }
+
+    private static List<Map<String, Object>> getResult(String connection, String sql, ResultSet resultSet) throws SQLException {
+        List<String> cs = getColumns(connection, sql, resultSet);
+        List<Map<String, Object>> result = new ArrayList<>();
+        while (resultSet.next()) {
+            Map<String, Object> resultMap = new HashMap<>();
+            for (String name : cs) {
+                Object object = resultSet.getObject(name);
+                resultMap.put(name, object);
+            }
+            result.add(resultMap);
+        }
+        return result;
+    }
 
 }

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

@@ -1,4 +1,17 @@
 package com.scbfkj.uni.process;
 
+import com.scbfkj.uni.library.UniReturnUtil;
+
+import java.util.Map;
+import java.util.Objects;
+
 public class Elasticsearch {
+
+    public static Map<String,Object> send(String connection,String index, Object data){
+        if(Objects.isNull(data) ){
+            return UniReturnUtil.fail("数据为空");
+        }
+
+        return null;
+    }
 }

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

@@ -1,4 +1,16 @@
 package com.scbfkj.uni.process;
 
+import com.scbfkj.uni.library.UniReturnUtil;
+
+import java.util.Map;
+import java.util.Objects;
+
 public class Kafka {
+    public static Map<String, Object> send(String connection, String topic, Object data) {
+
+        if(Objects.isNull(data) ){
+            return UniReturnUtil.fail("数据为空");
+        }
+        return null;
+    }
 }

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

@@ -1,20 +1,91 @@
 package com.scbfkj.uni.service;
 
-import java.util.Map;
+import com.scbfkj.uni.library.DataFormatUtil;
+import com.scbfkj.uni.library.UniReturnUtil;
+import com.scbfkj.uni.process.DataBase;
+import com.scbfkj.uni.system.Config;
+import com.scbfkj.uni.system.ScheduleTask;
+import com.scbfkj.uni.system.ScheduleUtil;
+import org.springframework.util.StringUtils;
+
+import java.time.LocalDateTime;
+import java.util.*;
 
 public class ControlService {
 
-    public Map<String,Object> start(String serviceId){
 
-        return null;
-    }
+    public static Map<String, ScheduleTask> ScheduleTaskMaps = new HashMap<>();
+    /**
+     * 服务启动
+     *
+     * @param serviceId
+     * @return
+     */
+    public static Map<String,Object> start(String serviceId) throws Exception {
+        //采集数据源及参数配置
+        List<Map<String, Object>> collectServiceList = DataBase.query(Config.centerConnectionStr,"SELECT SI.* FROM  serviceinfo SI WHERE SI.serviceType ='4'  AND serviceID = ?", Collections.singletonList(new Object[]{serviceId}));
 
-    public Map<String,Object> stop(String serviceId){
+        if (Objects.isNull(collectServiceList) || collectServiceList.isEmpty()) {
+            return UniReturnUtil.fail("采集服务不存在");
+        }
+        Map<String, Object> collectServiceMaps = collectServiceList.get(0); //采集服务
+        Integer loopCount = Objects.isNull (collectServiceMaps.get("loopCount")) ? null : Integer.parseInt(collectServiceMaps.get("loopCount").toString());
+        int frequencyCount = Objects.isNull (collectServiceMaps.get("frequencyCount")) ? 1 : Integer.parseInt(collectServiceMaps.get("frequencyCount").toString());
+        int frequencyUnit = Objects.isNull (collectServiceMaps.get("frequencyUnit")) ? 1 : Integer.parseInt(collectServiceMaps.get("frequencyUnit").toString());
+        int taskType = Objects.isNull (collectServiceMaps.get("taskType")) ? 1 : Integer.parseInt(collectServiceMaps.get("taskType").toString());
+        Object cronExpress = collectServiceMaps.get("cronExpress");
+        LocalDateTime taskValidDate = DataFormatUtil.toDateTime(collectServiceMaps.get("taskValid"));
+        LocalDateTime taskInvalidDate = DataFormatUtil.toDateTime(collectServiceMaps.get("taskInvalid"));
+        //创建定时任务：
+        ScheduleTask scheduleTask = ScheduleTaskMaps.get(serviceId);
+        if (Objects.isNull(scheduleTask)) {
+            scheduleTask = new ScheduleTask(serviceId, loopCount, taskValidDate, taskInvalidDate);
+            ScheduleTaskMaps.put(serviceId, scheduleTask);
+        }
+        // todo 记录日志
+        boolean start = ScheduleUtil.start(scheduleTask, (frequencyCount * frequencyUnit), cronExpress, taskType);
+//        LogUtils.log("start: 2", "0", null, (start ? "启动成功" : "启动失败"), serviceId,  null, null, null,null);//无条件记录数据接收日志
+        if (start) {
+            return UniReturnUtil.success("启动成功");
+        }
+        DataBase.updateBatch(Config.centerConnectionStr,"update serviceinfo set runState = 1 where  serviceid =?",Collections.singletonList(new Object[]{serviceId}));
+        ScheduleTaskMaps.remove(serviceId);
+        return UniReturnUtil.fail("启动失败");
+    }
 
-        return null;
+    /**
+     * 服务停止
+     *
+     * @param service_id
+     * @return
+     */
+    public static Map<String,Object> stop(String service_id) throws Exception {
+        ScheduleTask scheduleTask = ScheduleTaskMaps.get(service_id);
+        if (Objects.isNull(scheduleTask)) {
+            return UniReturnUtil.fail("服务： " + service_id + " 已经停止");
+        }
+        boolean reset = ScheduleUtil.cancel(scheduleTask);
+        ScheduleTaskMaps.remove(service_id);
+        DataBase.updateBatch(Config.centerConnectionStr,"update serviceinfo set runState = 0 where  serviceID =?",Collections.singletonList(new Object[]{service_id}));
+//        LogUtils.log("stop: 2", "0", null, (reset ? "停止成功" : "停止失败"), service_id, null, null, null,null);//无条件记录数据接收日志
+        return UniReturnUtil.success("停止" + (reset ? "成功" : "失败"));
     }
-    public Map<String,Object> restart(String serviceId){
 
-        return null;
+    public static Map<String,Object> startOrStop(Map<String, Object> params, String statue) throws Exception {
+        Object serviceId1 = params.get("serviceId");
+        String serviceId = Objects.isNull(serviceId1) ? null : serviceId1.toString();
+        if (!StringUtils.hasText(serviceId)) {
+            return  UniReturnUtil.fail("服务ID不能为空");
+        }
+        List<Map<String, Object>> serviceTypeData = DataBase.query(Config.centerConnectionStr,"select serviceType from serviceinfo where serviceID=?", Collections.singletonList(new Object[]{serviceId}));
+
+        if (Objects.nonNull(serviceTypeData) && Objects.equals("4",serviceTypeData.get(0).get("serviceType").toString())) {
+            if (statue.equals("0")) {
+                return stop(serviceId);
+            }
+            return start(serviceId);
+        }
+//        ObjectMap.getordropInput(serviceId,false);
+        return UniReturnUtil.success("重启成功");
     }
 }

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

@@ -14,8 +14,15 @@ import java.net.URLClassLoader;
 import java.util.*;
 import java.util.stream.Collectors;
 
-@Service
+
 public class DataProcessService {
+
+    private String id;
+
+    public DataProcessService(String id) {
+        this.id = id;
+    }
+
     public Map<String, Object> process(Map<String, Object> inData) throws Exception {
         Optional<String> serviceIdOpt = DataAliasGetUtil.getValue("serviceid", inData);
         if (serviceIdOpt.isEmpty()) {
@@ -162,4 +169,11 @@ public class DataProcessService {
         return !mapList.get(0).get("existscount").equals("0");
     }
 
+    public void close() {
+
+    }
+
+    public Object getErrorMessage() {
+        return null;
+    }
 }

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

@@ -1,42 +1,14 @@
 package com.scbfkj.uni.service;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.scbfkj.uni.system.LogTarget;
-import org.springframework.stereotype.Service;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Service
 public class LoggerService {
 
-    private static Map<String, List<ObjectNode>> logs = new HashMap<>();
-
 
 
+//    应用
+    public static void log(String connection,String sourceName,String appId,String appName,String ip,String sessionId,String input,String output) {
 
-    public static void log(List<LogTarget> targetList, JsonNode data) {
-        if (data instanceof ArrayNode nodes) {
-            for (JsonNode node : nodes) {
-                log(targetList, node);
-            }
-        } else if (data instanceof ObjectNode node) {
-            for (LogTarget target : targetList) {
-                write(target, node);
-            }
-        }
     }
 
-    private static void write(LogTarget target, ObjectNode node) {
-        String key = target.getType() + ";" + target.getConnection();
-        if (!logs.containsKey(key)) {
-            logs.put(key, List.of(node));
-        } else {
-            logs.get(key).add(node);
-        }
-    }
+
 
 }

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

@@ -24,10 +24,12 @@ public class SecurityService {
     @Value("${app.code-effective:600}")
     private long defaultSecurityCodeEffective;
 
+    @Value("${app.debug:false}")
+    private boolean debug;
+
     private final CodeCacheService codeCacheService;
 
     public SecurityService(CodeCacheService codeCacheService) {
-
         this.codeCacheService = codeCacheService;
     }
 
@@ -187,6 +189,8 @@ public class SecurityService {
 
             Map<String, Object> data = new HashMap<>();
             data.put("verifyCodeImage", base64Code);
+            if (debug)
+                data.put("code", code);
             return UniReturnUtil.success(data);
         }
         return UniReturnUtil.fail("没有配置验证码规则");
@@ -197,24 +201,28 @@ public class SecurityService {
 
     public Map<String, Object> login(Map<String, Object> requestData) throws Exception {
 
-        Optional<String> username = getValue("username", requestData);
+        Optional<String> username = getValue("account", requestData);
         Optional<String> password = getValue("password", requestData);
         Optional<String> verifycode = getValue("verifycode", requestData);
-//        解密验证码
-        String code = DataEncryptionUtil.decryptByPrivateKey(verifycode.get(), Config.privateKeyStr, Config.TYPE, Config.ALGORITHM);
-        String appId = RequestUtil.getAppId();
 
-        Map<String, Object> application = RequestUtil.getApplication();
-        Object securityCodeRule = application.get("securitycoderule");
+        String appId = RequestUtil.getAppId();
         String sessionId = RequestUtil.getSessionId();
         String ip = RequestUtil.getIpAddr();
-        if (Objects.nonNull(securityCodeRule) && !codeCacheService.check(code, sessionId, appId, ip)) {
-            return UniReturnUtil.fail("验证码错误");
+//        解密验证码
+        Map<String, Object> application = RequestUtil.getApplication();
+        Object securityCodeRule = application.get("securitycoderule");
+        String code = null;
+
+        if (Objects.nonNull(securityCodeRule) && !debug) {
+            code = DataEncryptionUtil.decryptRSAByPrivateKey(verifycode.get());
+            if (Objects.nonNull(securityCodeRule) && !codeCacheService.check(code, sessionId, appId, ip)) {
+                return UniReturnUtil.fail("验证码错误");
+            }
         }
 
         String query = "select * from userinfo where  username =? and userpassword=? ";
         List<Map<String, Object>> userInfoList = DataBase.query(Config.securityConnectionStr, query, new ArrayList<>() {{
-            add(new Object[]{username.get(), DataEncryptionUtil.decryptByPrivateKey(password.get(), Config.privateKeyStr, Config.TYPE, Config.ALGORITHM)});
+            add(new Object[]{username.get(), DataEncryptionUtil.decryptRSAByPrivateKey(password.get())});
         }});
         if (userInfoList.isEmpty()) {
             return UniReturnUtil.fail("用户名密码错误");
@@ -258,9 +266,10 @@ public class SecurityService {
                 data.put("userstatus", "1");
             }
         }
-
-        codeCacheService.remove(code, sessionId, appId, ip);
-
+        data.put("userid",userId);
+        if (Objects.nonNull(securityCodeRule)) {
+            codeCacheService.remove(code, sessionId, appId, ip);
+        }
         return UniReturnUtil.success(data);
     }
 
@@ -374,8 +383,8 @@ public class SecurityService {
         Optional<String> passwordOpt = getValue("password", requestData);
         Map<String, Object> userInfo = RequestUtil.getUserInfo();
         String userpassword = userInfo.get("userpassword").toString();
-        String password = DataEncryptionUtil.decryptByPrivateKey(passwordOpt.get(), Config.privateKeyStr, Config.TYPE, Config.ALGORITHM);
-        String oldPassword = DataEncryptionUtil.decryptByPrivateKey(oldPasswordOpt.get(), Config.privateKeyStr, Config.TYPE, Config.ALGORITHM);
+        String password = DataEncryptionUtil.decryptRSAByPrivateKey(passwordOpt.get());
+        String oldPassword = DataEncryptionUtil.decryptRSAByPrivateKey(oldPasswordOpt.get());
         if (!userpassword.equals(oldPassword)) {
             return UniReturnUtil.fail("密码错误");
         } else {

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

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.oracle.truffle.api.Option;
 import com.scbfkj.uni.library.DataEncryptionUtil;
 import com.scbfkj.uni.library.DataFormatUtil;
+import com.scbfkj.uni.service.DataProcessService;
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.pool.HikariPool;
 import jakarta.annotation.Nonnull;
@@ -21,13 +22,13 @@ public class Config {
     public static String centerConnectionStr;
     public static String securityConnectionStr;
 
+    //    是否启动安全验证
     public static boolean enable;
 
-    public static List<LogTarget> logTargets=new ArrayList<>();
+    public static String containerCode;
+
+    public static List<String> targets = new ArrayList<>();
 
-    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 final static String TYPE = "RSA";
 
-    public final static String ALGORITHM = "RSA/ECB/PKCS1Padding";
 }

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

@@ -1,30 +0,0 @@
-package com.scbfkj.uni.system;
-
-public class LogTarget {
-    private LogTargetType type;
-    private String connection;
-
-    public LogTarget(LogTargetType type, String connection) {
-        this.type = type;
-        this.connection = connection;
-    }
-
-    public LogTarget() {
-    }
-
-    public LogTargetType getType() {
-        return type;
-    }
-
-    public void setType(LogTargetType type) {
-        this.type = type;
-    }
-
-    public String getConnection() {
-        return connection;
-    }
-
-    public void setConnection(String connection) {
-        this.connection = connection;
-    }
-}

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

@@ -1,5 +0,0 @@
-package com.scbfkj.uni.system;
-
-public enum LogTargetType {
-    ES,DB,KAFKA
-}

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

@@ -1,22 +1,30 @@
 package com.scbfkj.uni.system;
 
+import com.scbfkj.uni.service.ControlService;
+import com.scbfkj.uni.service.DataProcessService;
+
 import java.time.LocalDateTime;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Objects;
 
 public class ScheduleTask implements Runnable {
-    private final String id; // 服务ID
+    private String id; // 服务ID
+
+    public String getId() {
+        return id;
+    }
 
-    private final String name;
     Integer loopCount;
     int count = 0;
     public LocalDateTime taskValid;
     public LocalDateTime taskInvalid;
 
+
     /**
      * @param id 任务ID
      */
-    public ScheduleTask(String name, String id, Integer loopCount, LocalDateTime taskValid, LocalDateTime taskInvalid) {
-        this.name = name;
+    public ScheduleTask(String id, Integer loopCount, LocalDateTime taskValid, LocalDateTime taskInvalid) {
         this.id = id;
         this.loopCount = loopCount;
         this.taskValid = taskValid;
@@ -25,7 +33,43 @@ public class ScheduleTask implements Runnable {
 
     @Override
     public void run() {
+        if (Objects.nonNull(taskInvalid) && taskInvalid.isBefore(LocalDateTime.now())) {
+            try {
+                ControlService.stop(id);
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+            return;
+        }
+        if (Objects.isNull(taskValid) || taskValid.isAfter(LocalDateTime.now())) {
+            if (Objects.isNull(loopCount) || count < loopCount) {
+                if (!Objects.isNull(loopCount))
+                    count++;
+                DataProcessService dataProcess =  ScheduleUtil.getordropInput(id);
+                if (Objects.isNull(dataProcess) || Objects.nonNull(dataProcess.getErrorMessage())) {
+//                 todo   LogUtils.log("run: 1", "-1",  null,"启动服务失败，获取采集对象异常:" + (Objects.isNull(dataProcess) ? "" : dataProcess.getErrorMessage()), id,"服务编号：" + id, null,null,null);//无条件记录数据接收日志
+                    return;
+                }
+                try {
+                    dataProcess.process(new HashMap<>() {{
+                        put("dataContent", "1");
+                        put("event", "1");
+                    }});
+
+                } catch (Exception e) {
+//                    todo 日志
+                }
 
+            } else {
+                try {
+                    ControlService.stop(id);
+                    count = 0;
+                } catch (Exception e) {
+//                    todo 日志
+                }
+            }
+        }
     }
 
+
 }

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

@@ -1,4 +1,95 @@
 package com.scbfkj.uni.system;
 
+import com.scbfkj.uni.service.DataProcessService;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
+import org.springframework.scheduling.support.CronTrigger;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.ScheduledFuture;
+
 public class ScheduleUtil {
+
+
+    private static Map<String, DataProcessService> dataProcessMaps = new HashMap<>(); //数据接收
+
+    private static DataProcessService getordropInput(String serviceId, boolean isGet) {
+        if (isGet) {
+            DataProcessService dataProcess = dataProcessMaps.get(serviceId);
+            if (Objects.nonNull(dataProcess) && Objects.nonNull(dataProcess.getErrorMessage())) {
+                dataProcess.close();
+                dataProcess = null;
+                dataProcessMaps.remove(serviceId);
+            }
+            if (!dataProcessMaps.containsKey(serviceId)) {
+                dataProcessMaps.put(serviceId, new DataProcessService(serviceId));
+            }
+            return dataProcessMaps.get(serviceId);
+        } else {
+            DataProcessService datacollect = dataProcessMaps.get(serviceId);
+            if (Objects.nonNull(datacollect)) {
+                datacollect.close();
+                datacollect = null;
+            }
+            dataProcessMaps.remove(serviceId);
+            return null;
+        }
+    }
+
+    public static DataProcessService getordropInput(String serviceId) {
+        return getordropInput(serviceId, true);
+    }
+
+
+    private static ThreadPoolTaskScheduler threadPoolTaskScheduler = new ThreadPoolTaskScheduler();
+
+    private static Map<String, ScheduledFuture<?>> scheduledFutureMap = new HashMap<>();
+
+    static {
+
+        threadPoolTaskScheduler.setPoolSize(8);
+        threadPoolTaskScheduler.initialize();
+        System.out.println("定时任务线程池启动");
+    }
+
+    /**
+     * 启动
+     *
+     * @param scheduleTask 定时任务
+     */
+    public static boolean start(ScheduleTask scheduleTask, int cycleFrequency, Object cronExpress, int taskType) {
+        System.out.println("启动定时任务线程 taskId " + scheduleTask.getId());// 设置时间比当前时间晚了
+        ScheduledFuture<?> scheduledFuture;
+        if (taskType == 1) {
+            scheduledFuture = threadPoolTaskScheduler.scheduleWithFixedDelay(scheduleTask, new Date(), cycleFrequency);
+        } else {
+            if (Objects.isNull(cronExpress)) {
+//                todo 记录日志
+                return false;
+            }
+            scheduledFuture = threadPoolTaskScheduler.schedule(scheduleTask, new CronTrigger(cronExpress.toString()));
+        }
+        scheduledFutureMap.put(scheduleTask.getId(), scheduledFuture);
+        return true;
+    }
+
+    /**
+     * 取消
+     *
+     * @param scheduleTask 定时任务
+     */
+    public static boolean cancel(ScheduleTask scheduleTask) {
+        System.out.println("关闭定时任务线程 taskId " + scheduleTask.getId());
+        String serviceId = scheduleTask.getId();
+        ScheduledFuture<?> scheduledFuture = scheduledFutureMap.get(serviceId);
+        if (scheduledFuture != null && !scheduledFuture.isCancelled()) {
+            scheduledFuture.cancel(false);
+        }
+        scheduledFutureMap.remove(serviceId);
+        //根据服务ID获取所有算法，进行统一关闭
+        getordropInput(serviceId,false);
+        return true;
+    }
 }

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

@@ -2,11 +2,15 @@ package com.scbfkj.uni.system;
 
 import com.scbfkj.uni.library.DataEncryptionUtil;
 import com.scbfkj.uni.library.DataFormatUtil;
+import com.scbfkj.uni.process.DataBase;
+import com.scbfkj.uni.service.DataProcessService;
 import jakarta.annotation.PostConstruct;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
 
 @Component
@@ -21,28 +25,40 @@ public class SystemInit {
 
     @Value("${app.security.enable:true}")
     private boolean enableSecurity;
+    @Value("${app.container.code}")
+    private String containerCode;
 
 
-    private final static String TYPE = "RSA";
-
-    private final static String ALGORITHM = "RSA/ECB/PKCS1Padding";
-
     @Value("${log.target}")
     private List<String> targets;
 
 
     @PostConstruct
     public void init() throws Exception {
+        Config.containerCode = containerCode;
         Config.enable = enableSecurity;
-        Config.centerConnectionStr = DataEncryptionUtil.decryptByPrivateKey(centerConfig, Config.privateKeyStr, TYPE, ALGORITHM);
-        Config.securityConnectionStr = DataEncryptionUtil.decryptByPrivateKey(securityconfig, Config.privateKeyStr, TYPE, ALGORITHM);
+        Config.centerConnectionStr = DataEncryptionUtil.decryptRSAByPrivateKey(centerConfig);
+        Config.securityConnectionStr = DataEncryptionUtil.decryptRSAByPrivateKey(securityconfig);
 
+//        日志配置初始化
         for (String targetStr : targets) {
+            String target = DataEncryptionUtil.decryptRSAByPrivateKey(targetStr);
+            Config.targets.add(target);
+        }
 
-            String target = DataEncryptionUtil.decryptByPrivateKey(targetStr, Config.privateKeyStr, TYPE, ALGORITHM);
-            Config.logTargets.add(DataFormatUtil.stringToBean(target, LogTarget.class));
+        startService();
+    }
 
-        }
+    public void startService() throws Exception {
+        String queryServiceInfos = "select * from serviceinfo where containercode=?";
+        List<Map<String, Object>> serviceInfos = DataBase.query(Config.centerConnectionStr, queryServiceInfos, Collections.singletonList(new Object[]{Config.containerCode}));
+        for (Map<String, Object> serviceInfo : serviceInfos) {
+            String serviceId = serviceInfo.get("serviceid").toString();
+            String serviceType = serviceInfo.get("servicetype").toString();
+            String taskType = serviceInfo.get("tasktype").toString();
+//
+//            todo 启动服务
 
+        }
     }
 }

src/main/resources/application.properties

@@ -1,6 +1,5 @@
-cer.private-key=MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAJ9vK5Gsb5hRft3L/OI2rGw8/tg8pSe2L6bfIN8l03YwprUZwi8+R8hdnkR8SSgj2bk3A994L6TAzV8NbG9j+gyj+VakgCjbOSHGywhdKS6QXv0jQ3i8f4kBy4c3uWU9iAwaSTIh78U/8DVmQYRrKMwyqbhx8+ze+2GxaB2ZufEfAgMBAAECgYAyMdTcuxYzNU0k1SkbqyzjstxlBcrVUtVzywHVX1pQ9oY1tBNfvlLpMRg35Y0+tvLADiMJAxS04QKHb3l5JFe/jE24hNxMj2h9JfxO36bGblyqZ7PlS+5/pvXdVaFYolN+5Rocf63/Iq2RSCb8W3D5uUQqLwO/i1iFQT+UROUA4QJBAOvvOJSB4BIu4VD/6XGqZ5cLU3DMtwzHIyvTTH2REGF33eEHc0z83VYi4xbUDGxvDD1d58bPqkpnvJiByXmYVa8CQQCs/mHfpO8fDy7ZKGzs1u4eBsPowSnJLsGbY2mYiaawnHeeLYOaGEdtxRVk06+seTFLw5oi3FDJG8U8LP6FiGeRAkAjZiQeHBJrh/8kcREsjb23KurdDMoWL7a2N6DNYjuL9DklL0H8diAbcWaTIUOv7UVv26wP506MlV31n9uD0/hfAkBo3gwWtrT97wZHPepJ6ECQkylPf0kFXAKhX7Izdb5GcZNRn+WXFAC42jAN3wUvWIg5lWlqmIOgZeU6hUwFRpsBAkEAsSe8v0cho1YTdmXiGQ7uhUxZ455mrw81AdzmuvDxvWFLx1uHAZna9eylZsfbEa7Y9DcmakLJKGWaTvKvYc55ZQ==
-cer.public-key=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCfbyuRrG+YUX7dy/ziNqxsPP7YPKUnti+m3yDfJdN2MKa1GcIvPkfIXZ5EfEkoI9m5NwPfeC+kwM1fDWxvY/oMo/lWpIAo2zkhxssIXSkukF79I0N4vH+JAcuHN7llPYgMGkkyIe/FP/A1ZkGEayjMMqm4cfPs3vthsWgdmbnxHwIDAQAB
-db.center.config=Ozv/+moZAen+UIE6yFPRwjEXiwnfjSlPIXlkUiv4DXdf5U2/a+zV3pewOY1GF79GMZbZqfgdUBcXkzJ1zPptw5OHTzqMw5a/K6+o+OLNfSUtk4IvTTWT3qfsE5S1MBwprbSz694Nyf4dFLQc4s3Nbd1USGsLfGF8bi6juzZcBpg=
-db.security.config=K3FX+3Jtr4unWWODD1+hWjueXJiJpA5ML5iRcM4bVn+gJHBZyA/TTb3zzv0fA5QLy6yOO2ngakhL0DsL3txcXeQGeXh5sFNjAlYXv169FQdKf6XIXiCCzR9VWKy6h4yhC9L3ib5h2LXVZ+lQQnLLswpq0FYYhgdm7KAxrTZrviA=
+db.center.config=hLcDKcDr4MgqYdb8j0gF0nF806yUy1UdEp1nmztEdo5rNL8IZliDj7/feOp2Fc7j19m9jtiwFp5nPvClI1Ni4kxluI8MQepS8nBK3bEzRzsGSswNHa/Sjyw0GK9/ZnOaiD+lDQyI7+fVbmpdvkLy7QE07bpTIjdI1tcLx8Z9QWs=
+db.security.config=Jnj84d14EmSgKEXyAbSH+bratWGkpV89/VA5Er4yQOt7qlnKtGYJzBVJNNYMBdmSlW0G+nqDHMhJQcmHrwbjjChYuGeDcmKSRmvFQ9u7LwqmgEfazzKKoVawXmJ40dMsec2yaFyNnCM92xn1hzHvle5BL7x3kza2htGm+iOqO7Y=
 log.target=B7xSbq4imA5zapX8kEO42mU/5sA2TyF/Ba2Y/++F3z9Np7iT4ywDUkbRC4w/Xrxv1kMSR8PQMJ4dfYwc3mYj0SJJivN5A5/6hI+ZSQBabfZZrYwaIIRdM1XIk4wo1SIrSCXKzef8X6YUH70R2tnh+Uq6KNNp08KaZ2ZXM8vX5Ss=
 server.port=8085
+#app.debug=true

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

@@ -30,7 +30,7 @@ class DataEncryptionUtilTest {
                 }
                                 """;
         String encryptedData = DataEncryptionUtil.encryptByPublicKey(data, publicKeyString, type, algorithm);
-        String decryptedData = DataEncryptionUtil.decryptByPrivateKey(encryptedData, privateKeyString, type, algorithm);
+        String decryptedData = DataEncryptionUtil.decryptRSAByPrivateKey(encryptedData);
         System.out.println(data + ": " + encryptedData);
         Assertions.assertEquals(data, decryptedData);
         data = """
@@ -60,5 +60,26 @@ class DataEncryptionUtilTest {
 //        Assertions.assertEquals(data, decryptedData);
     }
 
+    @Test
+    public void dec() throws Exception {
+
+        String type = "RSA";
+
+        // 将公钥和私钥转换为Base64编码的字符串
+//        String publicKeyString = Base64.getEncoder().encodeToString(publicKey.getEncoded());
+        String publicKeyString = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCfbyuRrG+YUX7dy/ziNqxsPP7YPKUnti+m3yDfJdN2MKa1GcIvPkfIXZ5EfEkoI9m5NwPfeC+kwM1fDWxvY/oMo/lWpIAo2zkhxssIXSkukF79I0N4vH+JAcuHN7llPYgMGkkyIe/FP/A1ZkGEayjMMqm4cfPs3vthsWgdmbnxHwIDAQAB";
+//        String privateKeyString = Base64.getEncoder().encodeToString(privateKey.getEncoded());
+        String privateKeyString = "MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAJ9vK5Gsb5hRft3L/OI2rGw8/tg8pSe2L6bfIN8l03YwprUZwi8+R8hdnkR8SSgj2bk3A994L6TAzV8NbG9j+gyj+VakgCjbOSHGywhdKS6QXv0jQ3i8f4kBy4c3uWU9iAwaSTIh78U/8DVmQYRrKMwyqbhx8+ze+2GxaB2ZufEfAgMBAAECgYAyMdTcuxYzNU0k1SkbqyzjstxlBcrVUtVzywHVX1pQ9oY1tBNfvlLpMRg35Y0+tvLADiMJAxS04QKHb3l5JFe/jE24hNxMj2h9JfxO36bGblyqZ7PlS+5/pvXdVaFYolN+5Rocf63/Iq2RSCb8W3D5uUQqLwO/i1iFQT+UROUA4QJBAOvvOJSB4BIu4VD/6XGqZ5cLU3DMtwzHIyvTTH2REGF33eEHc0z83VYi4xbUDGxvDD1d58bPqkpnvJiByXmYVa8CQQCs/mHfpO8fDy7ZKGzs1u4eBsPowSnJLsGbY2mYiaawnHeeLYOaGEdtxRVk06+seTFLw5oi3FDJG8U8LP6FiGeRAkAjZiQeHBJrh/8kcREsjb23KurdDMoWL7a2N6DNYjuL9DklL0H8diAbcWaTIUOv7UVv26wP506MlV31n9uD0/hfAkBo3gwWtrT97wZHPepJ6ECQkylPf0kFXAKhX7Izdb5GcZNRn+WXFAC42jAN3wUvWIg5lWlqmIOgZeU6hUwFRpsBAkEAsSe8v0cho1YTdmXiGQ7uhUxZ455mrw81AdzmuvDxvWFLx1uHAZna9eylZsfbEa7Y9DcmakLJKGWaTvKvYc55ZQ==";
+
+        System.out.println("public:  " + publicKeyString);
+        System.out.println("private:  " + privateKeyString);
+
+        String algorithm = "RSA/ECB/PKCS1Padding";
+        String password = "FIPlYkIL9R+AZ/KGhEjGguLpuBmUjgPNhnO9DbrTw+sJGXTDR5vGMQwLfli3QeJAES1pZCr/icDF5yhJa7Q3mSKpDgl7q1/X+NyuKna43h1rR617d55TLkOBx/h3nvVQGwoOLkQnQvZoYXZplNTyOkGuKRS2ze/iOZuKnhIlZDc=";
+
+        String decryptedData = DataEncryptionUtil.decryptByPrivateKey(password, privateKeyString, type, algorithm);
+        System.out.println(decryptedData);
+    }
+
 
 }