权限授权新增删除调整

pom.xml

@@ -17,7 +17,7 @@
         <java.version>17</java.version>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
-        <graalvm.version>23.1.0</graalvm.version>
+        <graalvm.version>23.0.1</graalvm.version>
     </properties>
     <dependencies>
         <dependency>
@@ -68,22 +68,22 @@
             <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>org.graalvm.polyglot</groupId>
-            <artifactId>polyglot</artifactId>
-            <version>${graalvm.version}</version>
-        </dependency>
         <dependency>
-            <groupId>org.graalvm.polyglot</groupId>
-            <artifactId>js-community</artifactId>
+            <groupId>org.graalvm.js</groupId>
+            <artifactId>js</artifactId>
             <version>${graalvm.version}</version>
-            <type>pom</type>
         </dependency>
+        <!--        <dependency>-->
+        <!--            <groupId>org.graalvm.polyglot</groupId>-->
+        <!--            <artifactId>polyglot</artifactId>-->
+        <!--            <version>${graalvm.version}</version>-->
+        <!--        </dependency>-->
+        <!--        <dependency>-->
+        <!--            <groupId>org.graalvm.polyglot</groupId>-->
+        <!--            <artifactId>js-community</artifactId>-->
+        <!--            <version>${graalvm.version}</version>-->
+        <!--            <type>pom</type>-->
+        <!--        </dependency>-->
         <!-- add additional languages and tools, if needed -->
         <dependency>
             <groupId>com.zaxxer</groupId>

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

@@ -4,6 +4,7 @@ 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.UniReturnUtil;
+import com.scbfkj.uni.library.script.AuthorizationScriptUtil;
 import com.scbfkj.uni.service.SecurityService;
 import jakarta.annotation.Resource;
 import org.springframework.http.ResponseEntity;
@@ -138,4 +139,23 @@ public class SecurityApi {
         objectNode.put("algorithm", DataEncryptionUtil.ALGORITHM);
         return ResponseEntity.ok(UniReturnUtil.success(objectNode));
     }
+
+
+    /**
+     * 根据传入的type 和id 分别对用户组和用户做授权
+     */
+
+    @PostMapping("/user/authorization")
+    public ResponseEntity<Map<String, Object>> authorization(@RequestBody Map<String, Object> body) throws Exception {
+        return ResponseEntity.ok(AuthorizationScriptUtil.authorization("1", body));
+    }
+
+    /**
+     * 根据传入的type 和id 分别对用户组和用户做授权
+     */
+
+    @PostMapping("/user/getAuthorization")
+    public ResponseEntity<Map<String, Object>> getAuthorization(@RequestBody Map<String, Object> body) throws Exception {
+        return ResponseEntity.ok(AuthorizationScriptUtil.getAuthorization("1", body));
+    }
 }

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

@@ -5,79 +5,112 @@ import com.scbfkj.uni.library.UniReturnUtil;
 import com.scbfkj.uni.process.DataBase;
 
 import java.util.*;
-import java.util.stream.Collectors;
 
 public class AuthorizationScriptUtil {
 
 
     public static Map<String, Object> authorization(String datasourceId, Map<String, Object> data) throws Exception {
 
-        List<Map<String, Object>> dataContent = Optional.ofNullable(DataFormatUtil.toList(data.get("datacontent"))).map(it -> it.stream().map(d -> {
-            Map<?, ?> map = DataFormatUtil.toMap(d);
-            return (Map<String, Object>) map;
-        }).toList()).orElse(new ArrayList<>());
+        List<Object> dataContent = Optional.ofNullable(DataFormatUtil.toList(data.get("datacontent"))).orElse(new ArrayList<>());
         if (dataContent.isEmpty()) {
             return UniReturnUtil.fail("datacontent 为空");
         }
         Object event = data.get("event").toString();
-        /**
-         * 继续对mapList做type分组
-         */
-        Map<Object, List<Map<String, Object>>> typeDatas = dataContent.stream().collect(Collectors.groupingBy(it -> it.get("type")));
-
-        Map<String, List<Object[]>> args = new HashMap<>();
-        typeDatas.entrySet().stream().forEach(it -> {
-            List<Map<String, Object>> itValue = it.getValue();
-            if (it.getKey().equals("1")) {
-                List<Object[]> values = itValue.stream().map(value -> {
-                    ArrayList<Object> arrayList = new ArrayList<>();
-                    arrayList.add(value.get("id"));
-                    arrayList.add(value.get("pageconfigurationid"));
-                    return arrayList.toArray();
-                }).toList();
-//                新增
-                if ("1".equals(event)) {
-
-                    args.put("""
-                            insert into userpermissions (userid, pageconfigurationid)
-                            values (?, ?)""", values);
-
-//                    删除
-                } else if ("3".equals(event)) {
-
-                    args.put("""
-                            delete
-                            from userpermissions
-                            where userid=? and pageconfigurationid=?""", values);
+        String id = data.get("id").toString();
+        Object type = data.get("type").toString();
+        String sql = null;
+
+        if (type.equals("1")) {
+            if ("1".equals(event)) {
+                sql = """
+                        insert into userpermissions (userid, pageconfigurationid)
+                        values (%s, ?)""".formatted(id);
+            } else if ("3".equals(event)) {
+                sql = """
+                        delete
+                        from userpermissions
+                        where userid=%s and pageconfigurationid=?""".formatted(id);
+            }
+            int[] result = DataBase.updateBatch(DatabaseScriptUtil.queryConnectionStr(datasourceId), sql, dataContent.stream().map(it -> new Object[]{it}).toList());
+            return UniReturnUtil.success(result);
+        } else if (type.equals("2")) {
+            Set<Object> childrenGroup = getChildrenGroup(datasourceId, id);
+            Map<String, List<Object[]>> children = new HashMap<>();
+            ArrayList<Object[]> lines = new ArrayList<>();
+            for (Object o : dataContent) {
+                lines.add(new Object[]{id, o});
+            }
+            for (Object id1 : childrenGroup) {
+                for (Object o : dataContent) {
+                    lines.add(new Object[]{id1, o});
                 }
-            } else if (it.getKey().equals("2")) {
-                List<Object[]> values = itValue.stream().map(value -> {
-                    ArrayList<Object> arrayList = new ArrayList<>();
-                    arrayList.add(value.get("id"));
-                    arrayList.add(value.get("pageconfigurationid"));
-                    return arrayList.toArray();
-                }).toList();
-
-//                新增
-                if ("1".equals(event)) {
-                    args.put("""
-                            insert into usergrouppermissions (usergroupid, pageconfigurationid)
-                            values (?, ?)""", values);
-
-//                    删除
-                } else if ("3".equals(event)) {
-
-                    args.put("""
-                            delete
-                            from usergrouppermissions
-                            where usergroupid=? and pageconfigurationid=?""", values);
+            }
+
+            ArrayList<Object[]> userInfoValues = new ArrayList<>();
+            Set<Object> childrenUserInfo = getChildrenUserInfo(datasourceId, childrenGroup);
+            for (Object id1 : childrenUserInfo) {
+                for (Object o : dataContent) {
+                    userInfoValues.add(new Object[]{id1, o});
                 }
             }
-        });
-        DataBase.updateBatchExtend(DatabaseScriptUtil.queryConnectionStr(datasourceId), args);
-        return UniReturnUtil.success(true);
+            if ("1".equals(event)) {
+
+                sql = """
+                        insert into usergrouppermissions (usergroupid, pageconfigurationid)
+                        values (?, ?)""";
+                children.put(sql, lines);
+
+                sql = """
+                        insert into userpermissions (userid, pageconfigurationid)
+                        values (?, ?)
+                        """;
+                children.put(sql, userInfoValues);
+
+
+            } else if ("3".equals(event)) {
+                sql = """
+                        delete
+                        from usergrouppermissions
+                        where usergroupid=? and pageconfigurationid=?""";
+
+                children.put(sql, lines);
+
+                sql = """
+                        delete
+                        from userpermissions
+                        where userid=? and pageconfigurationid=?
+                        """;
+                children.put(sql, userInfoValues);
+            }
+            DataBase.updateBatchExtend(DatabaseScriptUtil.queryConnectionStr(datasourceId), children);
+            return UniReturnUtil.success(true);
+        }
+        return UniReturnUtil.fail("类型错误");
+
+    }
 
+    public static Set<Object> getChildrenGroup(String datasourceId, String id) throws Exception {
+        Set<Object> children = new HashSet<>();
+        String sql = """
+                                select usergroupid
+                from usergroup where superiorid=?""";
+        List<Map<String, Object>> result = DataBase.query(DatabaseScriptUtil.queryConnectionStr(datasourceId), sql, id);
+        for (Map<String, Object> it : result) {
+            children.addAll(getChildrenGroup(datasourceId, it.get("usergroupid").toString()));
+        }
+        return children;
+    }
 
+    public static Set<Object> getChildrenUserInfo(String datasourceId, Set<Object> groupIds) throws Exception {
+        Set<Object> children = new HashSet<>();
+        String sql = """
+                                select userid
+                from userinfo where usergroupid=?""";
+        List<Map<String, Object>> result = DataBase.queryBatch(DatabaseScriptUtil.queryConnectionStr(datasourceId), sql, groupIds.stream().map(it -> new Object[]{it}).toList());
+        for (Map<String, Object> it : result) {
+            children.addAll(getChildrenGroup(datasourceId, it.get("userid").toString()));
+        }
+        return children;
     }
 
     public static Map<String, Object> getAuthorization(String datasourceId, Map<String, Object> data) throws Exception {
@@ -98,7 +131,6 @@ public class AuthorizationScriptUtil {
                              right join pageconfiguration on pageconfiguration.pageconfigurationid = usergrouppermissions.pageconfigurationid
                     where usergroupid = ?""", id);
         } else {
-
             results = DataBase.query(DatabaseScriptUtil.queryConnectionStr(datasourceId), """
                     select  distinct pageconfiguration.*
                     from userpermissions

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

@@ -438,7 +438,7 @@ public class DatabaseScriptUtil {
         return exec(queryConnectionStr(datasourceId), table, dataContent, event, filterColumns, filterLines);
     }
 
-    private static String queryConnectionStr(String datasourceId) throws Exception {
+    public static String queryConnectionStr(String datasourceId) throws Exception {
         List<Map<String, Object>> result = DataBase.query(Config.getCenterConnectionStr(), """
                 select datasourceid,
                        host,
@@ -451,9 +451,12 @@ public class DatabaseScriptUtil {
             throw new RuntimeException("数据源错误：没有找到数据源");
         }
         return DataFormatUtil.toString(result.stream().findFirst().map(it -> {
-            it.put("jdbcUrl", it.get("host"));
-            it.put("driverClassName", it.get("driverclassname"));
-            return it;
+            HashMap<String, Object> hashMap = new HashMap<>();
+            hashMap.put("jdbcUrl", it.get("host"));
+            hashMap.put("username", it.get("username"));
+            hashMap.put("password", it.get("password"));
+            hashMap.put("driverClassName", it.get("driverclassname"));
+            return hashMap;
         }).get());
     }
 }

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

@@ -54,12 +54,14 @@ public final class JsScriptEngineUtil {
             function = scriptPool.borrowObject(script);
             if (function.canExecute()) {
                 Value result = function.execute(Arrays.stream(args).map(Value::asValue).toArray());
-
+                System.out.println(DataFormatUtil.toString(result));
                 return UniReturnUtil.success(toHostObject(result));
             } else {
                 return UniReturnUtil.success(toString(function));
             }
         } catch (Exception e) {
+            System.out.println(script);
+            e.printStackTrace();
             throw new RuntimeException(e);
         } finally {
             if (Objects.nonNull(function)) {

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

@@ -0,0 +1,43 @@
+package com.scbfkj.uni.library.script;
+
+import com.scbfkj.uni.library.DataFormatUtil;
+import com.scbfkj.uni.process.DataBase;
+import com.scbfkj.uni.process.Kafka;
+import com.scbfkj.uni.system.Config;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class KafkaScriptUtil {
+
+    public static Map<String, Object> receptionMessage(String dataSourceId, String topic, String groupId) throws Exception {
+
+        return Kafka.receptionMessage(queryConnectionStr(dataSourceId), topic, groupId);
+    }
+
+    public static Map<String, Object> sendMessage(String dataSourceId, String topic, Object datas) throws Exception {
+
+
+        return Kafka.sendMessage(queryConnectionStr(dataSourceId), topic, DataFormatUtil.toList(datas));
+
+    }
+
+
+    private static String queryConnectionStr(String datasourceId) throws Exception {
+        List<Map<String, Object>> result = DataBase.query(Config.getCenterConnectionStr(), """
+                select host
+                from datasource
+                where datasourceid = ?""", datasourceId);
+        if (result.isEmpty()) {
+            throw new RuntimeException("数据源错误：没有找到数据源");
+        }
+        return result.stream().findFirst().map(it -> {
+            HashMap<String, Object> hashMap = new HashMap<>();
+            hashMap.put("bootstrap.servers", it.get("host"));
+            hashMap.put("max.poll.records", "10");
+            return hashMap;
+        }).map(DataFormatUtil::toString).get();
+    }
+
+}

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

@@ -146,6 +146,40 @@ public class DataBase {
         }
     }
 
+    public static Map<String, int[]> updateBatchExtend(String connectionStr, Map<String, List<Object[]>> datas) throws Exception {
+        HikariPool dataSourcePool = getDataSourcePool(connectionStr);
+        try (Connection connection = dataSourcePool.getConnection()) {
+
+            Map<String, int[]> results = new HashMap<>();
+            try {
+                for (Map.Entry<String, List<Object[]>> entry : datas.entrySet()) {
+                    int[] result;
+                    int index = 0;
+                    String sql = entry.getKey();
+                    try (PreparedStatement preparedStatement = connection.prepareStatement(sql)) {
+                        List<Object[]> argsList = entry.getValue();
+                        while (argsList.size() > index) {
+                            Object[] args = argsList.get(index);
+                            for (int i = 0; i < args.length; i++) {
+                                preparedStatement.setObject(i + 1, args[i]);
+                            }
+                            preparedStatement.addBatch();
+                            index++;
+                        }
+                        result = preparedStatement.executeBatch();
+                    }
+                    results.put(sql, result);
+                }
+
+                connection.commit();
+            } catch (SQLException e) {
+                connection.rollback();
+                throw e;
+            }
+            return results;
+        }
+    }
+
     public static int exec(String connectionStr, String sql) throws Exception {
         HikariPool dataSourcePool = getDataSourcePool(connectionStr);
         try (Connection connection = dataSourcePool.getConnection();

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

@@ -114,7 +114,7 @@ public class Elasticsearch {
 
         } else if (Objects.nonNull(token)) {
             builder.setDefaultHeaders(new Header[]{
-                    new BasicHeader("Authorization", "Bearer " + token)
+                    new BasicHeader("AuthorizationScript", "Bearer " + token)
             });
         }
         restClient = builder.build();

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

@@ -42,7 +42,7 @@ public class Kafka {
         }
     });
 
-    public static Map<String, Object> sendMessage(String connection, String topic, List<String> datas) throws Exception {
+    public static Map<String, Object> sendMessage(String connection, String topic, List<Object> datas) throws Exception {
 
         if (Objects.isNull(datas) || datas.isEmpty()) {
             return UniReturnUtil.fail("数据为空");
@@ -79,7 +79,7 @@ public class Kafka {
             connectConfigMaps.put("group.id", groupId);
         }
 
-        String key = DataFormatUtil.toString(connectConfig);
+        String key = DataFormatUtil.toString(connectConfigMaps);
         Consumer<String, String> consumer = consumerPool.borrowObject(key);
         try {
             List<String> messageList = new ArrayList<>();
@@ -94,6 +94,7 @@ public class Kafka {
                     messageList.add(readValue);
                 }
             }
+            System.out.println(DataFormatUtil.toString(messageList));
             return UniReturnUtil.success(messageList);
         } finally {
             consumerPool.returnObject(key, consumer);

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

@@ -16,7 +16,7 @@ import java.util.stream.Collectors;
 
 public class ControlService {
 
-    private final static String SERVICEINFO_WHERE_CONTAINERCODE = "select serviceid from serviceinfo where containercode=? ";
+    private final static String SERVICEINFO_WHERE_CONTAINERCODE = "select serviceid from containerdeploy where containercode=? ";
 
     private final static String SERVICE_ID = "serviceid";
     private final static String CODE = "code";
@@ -67,17 +67,15 @@ public class ControlService {
             }
             Map<String, Object> serviceInfo = serviceInfoList.get(0);
             Object taskType = serviceInfo.get("tasktype");
+            updateServiceState(serviceId, "1");
             if (Objects.equals(taskType, "0")) {
 //            设置服务状态为运行中
 
-                updateServiceState(serviceId, "1");
                 return UniReturnUtil.success(null);
             } else {
                 //启动定时任务：
                 boolean start = ScheduleUtil.startService(serviceId);
                 if (start) {
-
-                    updateServiceState(serviceId, "1");
                     return UniReturnUtil.success("启动成功");
                 } else {
                     return UniReturnUtil.fail("启动失败");
@@ -111,7 +109,7 @@ public class ControlService {
     private static void updateServiceState(String serviceId, String state) throws Exception {
         if (Objects.equals(state, "1")) {
 
-            List<Map<String, Object>> mapList = DataBase.query(Config.getCenterConnectionStr(), "select runstate from servicestate where serviceid=? and containercode=?", serviceId, Config.getContainerCode());
+            List<Map<String, Object>> mapList = DataBase.query(Config.getCenterConnectionStr(), "select runstate,servicestateid from servicestate where starttime is not null and  serviceid=? and containercode=?", serviceId, Config.getContainerCode());
             if (mapList.isEmpty()) {
 
                 DataBase.update(Config.getCenterConnectionStr(), "insert into  servicestate(serviceid,starttime,containercode,runstate) values (?,?,?,'1')",
@@ -119,14 +117,18 @@ public class ControlService {
                         DataFormatUtil.toString(LocalDateTime.now()),
                         Config.getContainerCode());
             } else {
-                DataBase.update(Config.getCenterConnectionStr(), "update servicestate set starttime=?,runstate='1' where serviceid=? and containercode=?",
+                String serviceStateId = mapList.get(0).get("servicestateid").toString();
+                DataBase.update(Config.getCenterConnectionStr(), "update servicestate set starttime=?,runstate='1' where  servicestateid = ?",
                         DataFormatUtil.toString(LocalDateTime.now()),
-                        serviceId, Config.getContainerCode());
+                        serviceStateId);
             }
         } else {
-            DataBase.update(Config.getCenterConnectionStr(), "update servicestate set stoptime=?,runstate='0' where serviceid=? and containercode=?",
+            List<Map<String, Object>> mapList = DataBase.query(Config.getCenterConnectionStr(), "select servicestateid, runstate from servicestate where stoptime is null and  serviceid=? and containercode=? order by servicestateid desc", serviceId, Config.getContainerCode());
+
+            String serviceStateId = mapList.get(0).get("servicestateid").toString();
+            DataBase.update(Config.getCenterConnectionStr(), "update servicestate set stoptime=?,runstate='0' where  servicestateid = ?",
                     DataFormatUtil.toString(LocalDateTime.now()),
-                    serviceId, Config.getContainerCode());
+                    serviceStateId);
         }
     }
 

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

@@ -42,10 +42,10 @@ public class DataProcessService {
 //        熔断
 //            查询服务运行状态
             List<Map<String, Object>> serviceState = DataBase.query(Config.getCenterConnectionStr(), """
-                    select 1 as runstate
+                    select  runstate
                     from servicestate
-                    where serviceid =? and runstate = '1' and containercode=?""", serviceId, Config.getContainerCode());
-            if (serviceState.isEmpty()) {
+                    where serviceid =? and runstate = '1' and containercode=? order by servicestateid desc""", serviceId, Config.getContainerCode());
+            if (serviceState.isEmpty() || serviceState.get(0).get("runstate").equals("0")) {
                 throw new RuntimeException("服务没有运行");
             }
             List<Map<String, Object>> serviceInfoList = DataBase.query(Config.getCenterConnectionStr(), """

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

@@ -46,8 +46,7 @@ public class SecurityService {
         Optional<String> appSecret = getValue("appsecret", requestData);
         if (appSecret.isPresent() && appid.isPresent()) {
             String clean = "delete from appconnectlog where expiretime < ? ";
-            DataBase.update(Config.getSecurityConnectionStr(), clean,
-                    LocalDateTime.now());
+            DataBase.update(Config.getSecurityConnectionStr(), clean, LocalDateTime.now());
             String query = """
                                 select applicationid,
                            appid,
@@ -343,9 +342,7 @@ public class SecurityService {
         Map<String, Object> userLoginLog = userLoginLogList.get(0);
         String userToken = DataEncryptionUtil.signatureMD5("%s:%s".formatted(LocalDateTime.now(), sessionId));
         String update = "update userloginlog set apptoken=null,usertoken=?,lasttime=? where  loginid=?";
-        DataBase.update(Config.getSecurityConnectionStr(), update,
-                userToken, LocalDateTime.now(), userLoginLog.get("loginid")
-        );
+        DataBase.update(Config.getSecurityConnectionStr(), update, userToken, LocalDateTime.now(), userLoginLog.get("loginid"));
         HashMap<String, Object> data = new HashMap<>();
         data.put("usertoken", userToken);
 
@@ -413,8 +410,7 @@ public class SecurityService {
                 from userloginlog
                                  where isexpires=0 and usertoken=? and sessionid=?""";
 
-        List<Map<String, Object>> userLoginLogList = DataBase.query(Config.getSecurityConnectionStr(), query,
-                userToken, sessionId);
+        List<Map<String, Object>> userLoginLogList = DataBase.query(Config.getSecurityConnectionStr(), query, userToken, sessionId);
 
         if (userLoginLogList.isEmpty()) {
             return UniReturnUtil.fail("登出失败");
@@ -422,9 +418,7 @@ public class SecurityService {
         Map<String, Object> userLoginLog = userLoginLogList.get(0);
         Object userIdObj = userLoginLog.get("userid");
         String delete = "update userloginlog set  isexpires=1, logouttime=? where userid=?  and  usertoken=? and sessionid=?";
-        DataBase.update(Config.getSecurityConnectionStr(), delete,
-                LocalDateTime.now(), userIdObj, userToken, sessionId
-        );
+        DataBase.update(Config.getSecurityConnectionStr(), delete, LocalDateTime.now(), userIdObj, userToken, sessionId);
         RequestContextHolder.currentRequestAttributes().removeAttribute("application", SCOPE_SESSION);
         RequestContextHolder.currentRequestAttributes().removeAttribute("userinfo", SCOPE_SESSION);
         return UniReturnUtil.success("成功");
@@ -560,9 +554,7 @@ public class SecurityService {
         } else {
             String userId = RequestUtil.getUserId();
             String update = "update userinfo set userpassword=? where userid=?";
-            DataBase.update(Config.getSecurityConnectionStr(), update,
-                    passwordOpt.get(), userId
-            );
+            DataBase.update(Config.getSecurityConnectionStr(), update, passwordOpt.get(), userId);
             return UniReturnUtil.success("成功");
         }
 
@@ -589,15 +581,11 @@ public class SecurityService {
 //      使用数据库
 //        先清理数据库中的重复请求 和过期数据
         String deleteSql = "delete from tempsecuritycode where expiretime < ? or appid = ? and requestip = ? and sessionid =? ";
-        DataBase.update(Config.getSecurityConnectionStr(), deleteSql,
-                LocalDateTime.now(), appid, requestIp, 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
-        );
+        DataBase.update(Config.getSecurityConnectionStr(), insertSql, appid, requestIp, sessionId, code, localDateTime);
 
     }
 
@@ -609,10 +597,7 @@ public class SecurityService {
                   and sessionid = ?
                   and appid = ?
                   and requestip = ?""";
-        return DataBase.update(Config.getSecurityConnectionStr(), deleteSql,
-                code, sessionId, appid, requestIp
-        );
+        return DataBase.update(Config.getSecurityConnectionStr(), deleteSql, code, sessionId, appid, requestIp);
     }
 
-
 }

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

@@ -56,11 +56,11 @@ public class ScheduleUtil {
             taskType = "0";
         }
         Trigger trigger;
-//        轮询
-        if (Objects.equals(taskType.toString(), "2")) {
-            trigger = new CronTrigger(cronExpress.toString());
 //            定时
-        } else if (Objects.equals(taskType.toString(), "1")) {
+        if (Objects.equals(taskType.toString(), "1")) {
+            trigger = new CronTrigger(cronExpress.toString());
+//        轮询
+        } else if (Objects.equals(taskType.toString(), "2")) {
             Object frequency = serviceInfo.getOrDefault("frequency", "0");
             trigger = new PeriodicTrigger(Duration.ofMillis(Long.parseLong(frequency.toString())));
         } else if (Objects.equals(taskType.toString(), "0")) {
@@ -75,7 +75,6 @@ public class ScheduleUtil {
         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;
     }
 

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

@@ -2,14 +2,13 @@ package com.scbfkj.uni;
 
 import jakarta.servlet.http.Cookie;
 import org.junit.jupiter.api.BeforeEach;
-import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.mock.web.MockCookie;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 
-@SpringBootTest
+
 @ActiveProfiles("dev")
 public abstract class ControllerBaseTest {
 

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

@@ -2,13 +2,11 @@ package com.scbfkj.uni.process;
 
 import com.scbfkj.uni.library.DataFormatUtil;
 import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
 
 import java.util.*;
 
 import static com.scbfkj.uni.library.script.DatabaseScriptUtil.exec;
 
-@SpringBootTest
 class DataBaseTest {
     public static String tableName = "log_error";
     static String connectionStr = """