day_29

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

@@ -118,11 +118,13 @@ public class RequestUtil {
 
     public static String getUserId() {
 //        请求
-        ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder.currentRequestAttributes();
-//
-        Object appid = requestAttributes.getAttribute("userid", SCOPE_SESSION);
-        return Objects.nonNull(appid) ? appid.toString() : null;
-
+        Map<String, Object> userInfo = getUserInfo();
+        if (Objects.isNull(userInfo)) {
+            return null;
+        } else {
+            Object userid = userInfo.get("userid");
+            return Objects.isNull(userid) ? null : DataFormatUtil.toString(userid);
+        }
     }
 
     public static Map<String, Object> getUserInfo() {

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

@@ -1,7 +1,10 @@
 package com.scbfkj.uni.library.script;
 
+import com.fasterxml.jackson.databind.node.ArrayNode;
+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 org.springframework.util.StringUtils;
 
 import java.util.*;
@@ -46,36 +49,73 @@ public class DatabaseScriptUtil {
             List<String> filterNames = null;
 //            查询
             if (Objects.equals("0", event)) {
-                Map<String, Object> map = args.get(0);
-                Map<String, Object> filter = ((Map<String, Object>) map.getOrDefault("filter", map));
-                filterNames = filter.keySet().stream().toList();
-                String whereStr = null;
-                for (Object f : filterLines) {
-                    Map<String, Object> it = ((Map<String, Object>) f);
-                    whereStr = " %s %s %s %s %s %s %s %s ".formatted(
-                            whereStr,
-                            it.getOrDefault("left", ""),
-                            it.get("column"),
-                            it.get("comparator"),
-                            Objects.equals(it.get("comparator"), " is null ") ? "" : "?",
-                            !Objects.equals(it.get("comparator"), " is null ") ? " " : it.get("value"),
-                            it.getOrDefault("right", ""),
-                            it.getOrDefault("connector", "")
-                    );
-                }
-                expression = "select * from %s where %s and  %s".formatted(
-                        expression,
-                        filterNames.stream().map("%s = ?"::formatted).collect(Collectors.joining(" and ")),
-                        Objects.isNull(filterLineWhereStr) ? " 1=1 " : filterLineWhereStr);
+                Map<String, Object> argMap = args.get(0);
 
-                if (!filterColumns.isEmpty()) {
-                    expression = "select %s from (%s) as T".formatted(String.join(",", filterColumns), expression);
+                Object filter = argMap.getOrDefault("filter", argMap);
+                Map map = null;
+                if (filter instanceof ArrayNode f) {
+                    map = ((Map<?, ?>) f.get(0));
+                } else if (filter instanceof List<?> f) {
+                    map = ((Map<?, ?>) f.get(0));
+
+                } else if (filter instanceof Map<?, ?> f) {
+                    map = f;
                 }
 
+                String whereStr = "";
                 List<Object[]> values = new ArrayList<>();
-                for (Map<String, Object> arg : args) {
-                    Map<String, Object> o1 = ((Map<String, Object>) arg.getOrDefault("filter", arg));
-                    values.add(filterNames.stream().map(o1::get).toArray());
+                if (map.containsKey("column") && map.containsKey("comparator")) {
+
+                    ArrayList<Object> objects = new ArrayList<>();
+                    for (Map<String, Object> it : args) {
+                        filter = it.getOrDefault("filter", it);
+                        if (filter instanceof ArrayNode f) {
+                            map = ((Map<?, ?>) f.get(0));
+                        } else if (filter instanceof List<?> f) {
+                            map = ((Map<?, ?>) f.get(0));
+
+                        } else if (filter instanceof Map<?, ?> f) {
+                            map = f;
+                        }
+                        Object comparator = map.get("comparator");
+                        whereStr = " %s %s %s %s %s %s %s ".formatted(
+                                whereStr,
+                                map.getOrDefault("left", ""),
+                                map.get("column"),
+                                comparator,
+                                Objects.equals(comparator, " is null ") ? " " : "?",
+                                map.getOrDefault("right", ""),
+                                map.getOrDefault("connector", "")
+                        );
+                        if (!Objects.equals(comparator, " is null ")) {
+                            objects.add(map.get("value"));
+                        }
+                    }
+                    expression = "select * from %s where %s and %s".formatted(
+                            expression,
+                            Objects.isNull(filterLineWhereStr) ? " 1=1 " : filterLineWhereStr,
+                            whereStr.trim().isEmpty() ? " 1=? " : whereStr);
+                    if (whereStr.trim().isEmpty()) {
+                        values.add(new Object[]{1});
+                    } else {
+                        values.add(objects.toArray());
+                    }
+                } else {
+                    filterNames = map.keySet().stream().toList();
+
+                    expression = "select * from %s where %s and  %s".formatted(
+                            expression,
+                            filterNames.stream().map("%s = ?"::formatted).collect(Collectors.joining(" and ")),
+                            Objects.isNull(filterLineWhereStr) ? " 1=1 " : filterLineWhereStr);
+
+                    for (Map<String, Object> arg : args) {
+                        Map<String, Object> o1 = ((Map<String, Object>) arg.getOrDefault("filter", arg));
+                        values.add(filterNames.stream().map(o1::get).toArray());
+                    }
+                }
+
+                if (!filterColumns.isEmpty()) {
+                    expression = "select %s from (%s) as T".formatted(String.join(",", filterColumns), expression);
                 }
                 List<Map<String, Object>> result = DataBase.queryBatch(connectionStr, expression, values);
                 return UniReturnUtil.success(result);
@@ -116,9 +156,19 @@ public class DatabaseScriptUtil {
             } else {
 //                新增
                 if (Objects.equals("1", event)) {
-                    Map<String, Object> map = args.get(0);
-                    Map<String, Object> value = ((Map<String, Object>) map.getOrDefault("value", map));
-                    valueNames = value.keySet().stream().toList();
+                    Map<String, Object> value = args.get(0);
+                    Object valueObj = value.getOrDefault("value", value);
+                    Map map = null;
+                    if (valueObj instanceof ArrayNode v) {
+                        map = ((Map<?, ?>) v.get(0));
+                    } else if (valueObj instanceof List<?> v) {
+                        map = ((Map<?, ?>) v.get(0));
+
+                    } else if (valueObj instanceof Map<?, ?> v) {
+                        map = v;
+                    }
+//                    Map<String, Object> value = ((Map<String, Object>) map.getOrDefault("value", map));
+                    valueNames = map.keySet().stream().toList();
                     expression = "insert into %s ( %s) values(%s)".formatted(expression, String.join(",", valueNames), valueNames.stream().map(it -> "?").collect(Collectors.joining(",")));
 //                    更新
                 } else if (Objects.equals("2", event)) {
@@ -133,9 +183,20 @@ public class DatabaseScriptUtil {
                             Objects.isNull(filterLineWhereStr) ? " 1=1 " : filterLineWhereStr);
 //                    删除
                 } else if (Objects.equals("3", event)) {
-                    Map<String, Object> map = args.get(0);
-                    Map<String, Object> filter = ((Map<String, Object>) map.getOrDefault("filter", map));
-                    filterNames = filter.keySet().stream().toList();
+
+
+                    Map<String, Object> argMap = args.get(0);
+                    Object filter = argMap.getOrDefault("filter", argMap);
+                    Map map = null;
+                    if (filter instanceof ArrayNode f) {
+                        map = ((Map<?, ?>) f.get(0));
+                    } else if (filter instanceof List<?> f) {
+                        map = ((Map<?, ?>) f.get(0));
+
+                    } else if (filter instanceof Map<?, ?> f) {
+                        map = f;
+                    }
+                    filterNames = map.keySet().stream().toList();
                     expression = "delete from %s where %s and  %s".formatted(expression,
                             filterNames.stream().map("%s = ?"::formatted).collect(Collectors.joining(" and ")),
                             Objects.isNull(filterLineWhereStr) ? " 1=1 " : filterLineWhereStr);
@@ -317,4 +378,82 @@ public class DatabaseScriptUtil {
         }
     }
 
+
+    public static Map<String, Object> execBySql(String datasourceId, String expression, Map<String, Object> args) throws Exception {
+        List<Map<String, Object>> dataContent = DataFormatUtil.toList(args.get("datacontent")).stream().map(it -> ((Map<String, Object>) it)).toList();
+        Object filterColumnsTemp = args.get("filterColumns");
+        List<String> filterColumns = null;
+        if (Objects.nonNull(filterColumnsTemp))
+            filterColumns = DataFormatUtil.toList(filterColumnsTemp).stream().map(it -> it.toString()).toList();
+        Object filterLinesTemp = args.get("filterLines");
+        List<Map<String, Object>> filterLines = null;
+        if (Objects.nonNull(filterLinesTemp))
+            filterLines = DataFormatUtil.toList(filterLinesTemp).stream().map(it -> ((Map<String, Object>) it)).toList();
+        Object event = args.get("event");
+
+        return exec(queryConnectionStr(datasourceId), expression, dataContent, event, filterColumns, filterLines);
+    }
+
+    public static Map<String, Object> execByTableName(String datasourceId, String table, Map<String, Object> args) throws Exception {
+        List<Map<String, Object>> dataContent = DataFormatUtil.toList(args.get("datacontent")).stream().map(it -> ((Map<String, Object>) it)).toList();
+        Object filterColumnsTemp = args.get("filterColumns");
+        List<String> filterColumns = null;
+        if (Objects.nonNull(filterColumnsTemp))
+            filterColumns = DataFormatUtil.toList(filterColumnsTemp).stream().map(it -> it.toString()).toList();
+        Object filterLinesTemp = args.get("filterLines");
+        List<Map<String, Object>> filterLines = null;
+        if (Objects.nonNull(filterLinesTemp))
+            filterLines = DataFormatUtil.toList(filterLinesTemp).stream().map(it -> ((Map<String, Object>) it)).toList();
+        Object event = args.get("event");
+        return exec(queryConnectionStr(datasourceId), table, dataContent, event, filterColumns, filterLines);
+    }
+
+    public static Map<String, Object> execByDynamicSql(String datasourceId, String expression, Map<String, Object> args) throws Exception {
+        List<Map<String, Object>> dataContent = DataFormatUtil.toList(args.get("datacontent")).stream().map(it -> ((Map<String, Object>) it)).toList();
+        Object filterColumnsTemp = args.get("filterColumns");
+        List<String> filterColumns = null;
+        if (Objects.nonNull(filterColumnsTemp))
+            filterColumns = DataFormatUtil.toList(filterColumnsTemp).stream().map(it -> it.toString()).toList();
+        Object filterLinesTemp = args.get("filterLines");
+        List<Map<String, Object>> filterLines = null;
+        if (Objects.nonNull(filterLinesTemp))
+            filterLines = DataFormatUtil.toList(filterLinesTemp).stream().map(it -> ((Map<String, Object>) it)).toList();
+        Object event = args.get("event");
+
+        return exec(queryConnectionStr(datasourceId), expression, dataContent, event, filterColumns, filterLines);
+    }
+
+    public static Map<String, Object> execByDynamicTableName(String datasourceId, String table, Map<String, Object> args) throws Exception {
+        List<Map<String, Object>> dataContent = DataFormatUtil.toList(args.get("datacontent")).stream().map(it -> ((Map<String, Object>) it)).toList();
+        Object filterColumnsTemp = args.get("filterColumns");
+        List<String> filterColumns = null;
+        if (Objects.nonNull(filterColumnsTemp))
+            filterColumns = DataFormatUtil.toList(filterColumnsTemp).stream().map(it -> it.toString()).toList();
+        Object filterLinesTemp = args.get("filterLines");
+        List<Map<String, Object>> filterLines = null;
+        if (Objects.nonNull(filterLinesTemp))
+            filterLines = DataFormatUtil.toList(filterLinesTemp).stream().map(it -> ((Map<String, Object>) it)).toList();
+        Object event = args.get("event");
+
+        return exec(queryConnectionStr(datasourceId), table, dataContent, event, filterColumns, filterLines);
+    }
+
+    private static String queryConnectionStr(String datasourceId) throws Exception {
+        List<Map<String, Object>> result = DataBase.query(Config.getCenterConnectionStr(), """
+                select datasourceid,
+                       host,
+                       username,
+                       password,
+                       driverclassname
+                from datasource
+                where datasourceid = ?""", datasourceId);
+        if (result.isEmpty()) {
+            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;
+        }).get());
+    }
 }

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

@@ -10,10 +10,10 @@ import com.scbfkj.uni.library.script.JsScriptEngineUtil;
 import com.scbfkj.uni.process.DataBase;
 import com.scbfkj.uni.system.Config;
 
+import java.text.NumberFormat;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
-import java.util.stream.Collectors;
 
 
 public class DataProcessService {
@@ -61,7 +61,7 @@ public class DataProcessService {
                                                loopcount,
                                                frequency,
                                                enablelog
-                                        from serviceinfo;
+                                        from serviceinfo
                                         where serviceid = ?""", serviceId);
             if (!serviceInfoList.isEmpty()) {
                 serviceInfo = serviceInfoList.get(0);
@@ -90,7 +90,8 @@ public class DataProcessService {
                            datasourceid,
                            preparameterset,
                            targetsource,
-                           algorithmdescription
+                           algorithmdescription,
+                           algorithmsourcelibraryid
                     from algorithmlibrary
                     where serviceid = ? order by executionorder""", serviceId);
 
@@ -154,28 +155,110 @@ public class DataProcessService {
                 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);
+                List<Map<String, Object>> params = DataBase.query(Config.getCenterConnectionStr(), """
+                        select
+                        algorithmparametersid, algorithmlibraryid, parametername, subscriptionexpressions, parametertype, datasource
+                        from algorithmparameters where algorithmlibraryid =?""", algorithmlibraryid.toString());
 
 //        获取入参列表
                 List<Object> parameters = new ArrayList<>();
+                for (Map<String, Object> param : params) {
+                    Object o = param.get("datasource");
+                    Object subscriptionExpressions = param.get("subscriptionexpressions");
+                    Object parameterType = param.get("parametertype");
+                    if ("0".equals(o)) {
+
+
+                    } else if ("1".equals(o)) {
+                        Object o1 = algorithmLibrary.get(subscriptionExpressions);
+                        switch (parameterType.toString()) {
+                            case "String" -> {
+                                parameters.add(DataFormatUtil.toString(o1));
+                            }
+                            case "Array" -> {
+                                parameters.add(DataFormatUtil.toList(o1));
+                            }
+                            case "Map" -> {
+                                parameters.add(DataFormatUtil.toMap(o1));
+                            }
+                            case "Number" -> {
+                                parameters.add(NumberFormat.getInstance().parse(o1.toString()));
+                            }
+                            default -> {
+                                throw new RuntimeException("参数数据类型错误");
+                            }
+                        }
+
+                    } else if ("2".equals(o)) {
+
+                        switch (parameterType.toString()) {
+                            case "String" -> {
+                                parameters.add(DataFormatUtil.toString(subscriptionExpressions));
+                            }
+                            case "Array" -> {
+                                parameters.add(DataFormatUtil.toList(subscriptionExpressions));
+                            }
+                            case "Map" -> {
+                                parameters.add(DataFormatUtil.toMap(subscriptionExpressions));
+                            }
+                            case "Number" -> {
+                                parameters.add(NumberFormat.getInstance().parse(subscriptionExpressions.toString()));
+                            }
+                            default -> {
+                                throw new RuntimeException("参数数据类型错误");
+                            }
+                        }
+                    } else if ("3".equals(o)) {
+                        parameters.addAll(getParams(parameterType + ".$.args" + subscriptionExpressions.toString(), source));
+                    }
+
+                }
                 if (Objects.nonNull(parameterSet)) {
                     source.put("datasource", datasource);
 //                    算法参数配置 获取算法参数 组合成String.$.datasource.host;;String.$.datasource.port;;String.$.datasource.username;;String.$.datasource.password;;List.$.args[0].result.returnData
-                    List<Map<String, Object>> params = DataBase.query(Config.getCenterConnectionStr(), """
-                            select concat(parametertype,'.',subscriptionexpressions) as expressions
-                            from algorithmparameters where algorithmlibraryid =?""", algorithmlibraryid.toString());
 
-//                  从algorithmparameters  获取算法参数
-                    parameters.addAll(getParams(params.stream().map(it -> it.get("expressions").toString()).collect(Collectors.joining(";;")), source));
 
 //                  从algorithmlibrary 的parameterSet  获取算法参数
-                    if (Objects.isNull(parameterSet)) {
+                    if (Objects.nonNull(parameterSet)) {
                         parameters.addAll(getParams(parameterSet.toString(), source));
                     }
 //                    算法入参
-                    data.put("parameters", parameters);
                 }
-                Object type = algorithmLibrary.get("algorithmtype");
-                algorithmResult = processByAlgorithm(type, parameters);
+                data.put("parameters", parameters);
+                Object algorithmsourcelibraryid = algorithmLibrary.get("algorithmsourcelibraryid");
+                if (Objects.nonNull(algorithmsourcelibraryid) && algorithmsourcelibraryid.toString().trim().length() > 0) {
+
+                    List<Map<String, Object>> algorithmsourcelibraryList = DataBase.query(Config.getCenterConnectionStr(), "select * from algorithmsourcelibrary where id=? ", algorithmsourcelibraryid);
+                    Map<String, Object> algorithmsourcelibrary = algorithmsourcelibraryList.get(0);
+
+                    HashMap<String, Object> configMap = new HashMap<>();
+                    configMap.put("methodName", algorithmsourcelibrary.get("code"));
+                    configMap.put("path", algorithmsourcelibrary.get("filepath"));
+                    configMap.put("className", algorithmsourcelibrary.get("library"));
+                    Map<String, Object> result = JavaScriptEngineUtil.invoke(configMap, algorithmsourcelibrary.get("code").toString(), parameters.toArray());
+
+                    if ("0".equals(result.get("code"))) {
+                        Object returnData = result.get("returnData");
+                        if (returnData instanceof Map<?, ?> d) {
+                            if (Objects.isNull(result.get("code"))) {
+                                algorithmResult = result;
+
+                            } else {
+                                algorithmResult = (Map<String, Object>) d;
+
+                            }
+                        } else {
+                            algorithmResult = result;
+
+                        }
+                    } else {
+                        return UniReturnUtil.fail(result.get("message").toString());
+                    }
+
+                } else {
+                    Object type = algorithmLibrary.get("algorithmtype");
+                    algorithmResult = processByAlgorithm(type, parameters);
+                }
 //                    算法执行结果
                 data.put("result", algorithmResult);
                 execTime = System.currentTimeMillis() - startTime;
@@ -209,9 +292,7 @@ public class DataProcessService {
                 logData.put("prepesource", DataFormatUtil.toString(preResource));
                 logData.put("returnmessage", message);
                 logData.put("lifecycleid", lifecycleid);
-
                 LoggerService.log(target, logData);
-
             }
         }
 
@@ -322,7 +403,6 @@ public class DataProcessService {
             res = result;
         }
         return res;
-
     }
 
 

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

@@ -231,6 +231,7 @@ public class SecurityService {
             }
         }
 
+        String loginPassword = DataEncryptionUtil.decryptRSAByPrivateKey(password.get());
         String query = """
                 select userid,
                        usergroupid,
@@ -244,14 +245,21 @@ public class SecurityService {
                        passwordlastmodified,
                        isdelete
                 from userinfo
-                     where  account =? and userpassword=? """;
-        List<Map<String, Object>> userInfoList = DataBase.query(Config.getSecurityConnectionStr(), query, username.get(), DataEncryptionUtil.decryptRSAByPrivateKey(password.get()));
+                     where  account =?""";
+        List<Map<String, Object>> userInfoList = DataBase.query(Config.getSecurityConnectionStr(), query, username.get());
+
+        Map<String, Object> userInfo;
         if (userInfoList.isEmpty()) {
             return UniReturnUtil.fail("用户名密码错误");
+        } else {
+            userInfo = userInfoList.get(0);
+            String userPassword = DataFormatUtil.toString(userInfo.get("userpassword"));
+            userPassword = DataEncryptionUtil.decryptRSAByPrivateKey(userPassword);
+            if (!Objects.equals(userPassword, loginPassword)) {
+                return UniReturnUtil.fail("用户名密码错误");
+            }
         }
-        Map<String, Object> userInfo = userInfoList.get(0);
         Object userId = userInfo.get("userid");
-        RequestContextHolder.currentRequestAttributes().setAttribute("userid", userId, SCOPE_SESSION);
         RequestContextHolder.currentRequestAttributes().setAttribute("userinfo", userInfo, SCOPE_SESSION);
         String query1 = """
                 select loginid,
@@ -265,10 +273,9 @@ public class SecurityService {
                        logouttime,
                        apptoken,
                        isexpires,
-                       appid,
-                       expirestime
+                       appid
                 from userloginlog                 
-                    where userid=?""";
+                    where userid = ? and isexpires = 0 and logouttime is null""";
         List<Map<String, Object>> userLoginLogList = DataBase.query(Config.getSecurityConnectionStr(), query1, userInfo.get("userid"));
 
         Map<String, Object> data = new HashMap<>();
@@ -311,8 +318,6 @@ public class SecurityService {
 
     public Map<String, Object> forceLogin() throws Exception {
 
-        Map<String, Object> application = RequestUtil.getApplication();
-
         String appToken = RequestUtil.getAppToken();
         String ip = RequestUtil.getIpAddr();
         String sessionId = RequestUtil.getSessionId();
@@ -328,28 +333,20 @@ public class SecurityService {
                        logouttime,
                        apptoken,
                        isexpires,
-                       appid,
-                       expirestime
+                       appid
                 from userloginlog
-                     where apptoken=? and sessionid=? and requestip=? and isexpires=0 """;
+                     where apptoken=? and sessionid=? and requestip=? and isexpires=0 and logouttime is null """;
         List<Map<String, Object>> userLoginLogList = DataBase.query(Config.getSecurityConnectionStr(), query, appToken, sessionId, ip);
         if (userLoginLogList.isEmpty()) {
             return UniReturnUtil.fail("登录失败：在数据库中没有找到当前session的登录请求");
         }
         Map<String, Object> userLoginLog = userLoginLogList.get(0);
-        Object securityCodeEffectiveObj = application.get("securitycodeeffective");
-        Long securityCodeEffective = defaultSecurityCodeEffective;
-        if (Objects.nonNull(securityCodeEffectiveObj)) {
-            securityCodeEffective = Long.parseLong(securityCodeEffectiveObj.toString());
-        }
-        LocalDateTime expiresTime = LocalDateTime.now().plusSeconds(securityCodeEffective);
         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, expiresTime, userLoginLog.get("loginid")
+                userToken, LocalDateTime.now(), userLoginLog.get("loginid")
         );
         HashMap<String, Object> data = new HashMap<>();
-        data.put("expirestime", expiresTime);
         data.put("usertoken", userToken);
 
         return UniReturnUtil.success(data);
@@ -369,8 +366,7 @@ public class SecurityService {
                        logouttime,
                        apptoken,
                        isexpires,
-                       appid,
-                       expirestime
+                       appid
                 from userloginlog
                                  where isexpires = 0 and usertoken = ? and sessionid = ?""";
         List<Map<String, Object>> userLoginLogList = DataBase.query(Config.getSecurityConnectionStr(), query, userToken, sessionId);
@@ -413,8 +409,7 @@ public class SecurityService {
                        logouttime,
                        apptoken,
                        isexpires,
-                       appid,
-                       expirestime
+                       appid
                 from userloginlog
                                  where isexpires=0 and usertoken=? and sessionid=?""";
 
@@ -430,6 +425,8 @@ public class SecurityService {
         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("成功");
     }
 
@@ -557,7 +554,6 @@ public class SecurityService {
         Optional<String> passwordOpt = getValue("password", requestData);
         Map<String, Object> userInfo = RequestUtil.getUserInfo();
         String userpassword = userInfo.get("userpassword").toString();
-        String password = DataEncryptionUtil.decryptRSAByPrivateKey(passwordOpt.get());
         String oldPassword = DataEncryptionUtil.decryptRSAByPrivateKey(oldPasswordOpt.get());
         if (!userpassword.equals(oldPassword)) {
             return UniReturnUtil.fail("密码错误");
@@ -565,7 +561,7 @@ public class SecurityService {
             String userId = RequestUtil.getUserId();
             String update = "update userinfo set userpassword=? where userid=?";
             DataBase.update(Config.getSecurityConnectionStr(), update,
-                    password, userId
+                    passwordOpt.get(), userId
             );
             return UniReturnUtil.success("成功");
         }
@@ -616,7 +612,6 @@ public class SecurityService {
         return DataBase.update(Config.getSecurityConnectionStr(), deleteSql,
                 code, sessionId, appid, requestIp
         );
-
     }
 
 

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

@@ -1,6 +1,7 @@
 package com.scbfkj.uni.system;
 
 import com.scbfkj.uni.library.DataEncryptionUtil;
+import com.scbfkj.uni.library.UniReturnUtil;
 import com.scbfkj.uni.process.DataBase;
 import com.scbfkj.uni.service.ControlService;
 import com.scbfkj.uni.service.LoggerService;
@@ -90,6 +91,18 @@ public class SystemInit {
         HashMap<String, Object> occurrencetime = new HashMap<>();
         occurrencetime.put("occurrencetime", LocalDateTime.now());
         LoggerService.log(LoggerService.LogType.SYSTEM, occurrencetime);
+
+//        心跳检查
+        ScheduleUtil.startFrequencyTask(() -> {
+            try {
+                DataBase.update(Config.getSecurityConnectionStr(), """
+                                            update userloginlog
+                        set isexpires  = 1
+                        where lastheartbeat< ?""", LocalDateTime.now().plusSeconds(-60));
+            } catch (Exception e) {
+                System.out.println(UniReturnUtil.getMessage(e));
+            }
+        }, 1000);
     }
 
     private void initializeSystemEnvironment() throws Exception {

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

@@ -187,4 +187,20 @@ class DataEncryptionUtilTest {
     @Test
     void verify() {
     }
+
+    @Test
+    void enc() throws Exception {
+        String string = DataEncryptionUtil.encryptRSAByPublicKey("123!@#QWEqwe");
+        System.out.println(string);
+        string = DataEncryptionUtil.encryptRSAByPublicKey("123!@#QWEqwe");
+        System.out.println(string);
+        string = DataEncryptionUtil.encryptRSAByPublicKey("123!@#QWEqwe");
+        System.out.println(string);
+        string = DataEncryptionUtil.encryptRSAByPublicKey("123!@#QWEqwe");
+        System.out.println(string);
+        string = DataEncryptionUtil.encryptRSAByPublicKey("123!@#QWEqwe");
+        System.out.println(string);
+        string = DataEncryptionUtil.encryptRSAByPublicKey("123!@#QWEqwe");
+        System.out.println(string);
+    }
 }