update

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

@@ -173,10 +173,6 @@ public class SecurityService {
             } else if (codeRule.contains("L")) {
                 rule += "abcdefghgkmnpqrstuvwxyz";
             }
-//            字符 c
-            if (codeRule.contains("C")) {
-                rule += "~!@#%&-_;:";
-            }
 //            最后四位长度为最小长度和最大长度
             String minMax = codeRule.substring(codeRule.length() - 4);
 
@@ -579,9 +575,19 @@ public class SecurityService {
         if (!userpassword.equals(oldPassword)) {
             return UniReturnUtil.fail("密码错误");
         } else {
+            String newPassword = DataEncryptionUtil.decryptRSAByPrivateKey(passwordOpt.get());
+            Map<String, Object> application = RequestUtil.getApplication();
+            Object passwordrule = application.get("passwordrule");
+            if (passwordrule != null) {
+                try {
+                    checkPasswordRule(newPassword, passwordrule.toString());
+                } catch (Exception e) {
+                    return UniReturnUtil.fail(e.getMessage());
+                }
+            }
             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, newPassword, userId);
             return UniReturnUtil.success("成功");
         }
     }
@@ -626,4 +632,71 @@ public class SecurityService {
         return DATABASE.update(Config.getSecurityConnectionStr(), deleteSql, code, sessionId, appid, requestIp) > 0;
     }
 
+
+/**
+ * 检查密码是否符合指定的规则。
+ *
+ * @param password 待检查的密码字符串。
+ * @param codeRule 规则代码，由不同的字母组成，每个字母代表一种规则：
+ *                 N - 密码必须包含数字
+ *                 W - 密码必须包含大写字母和小写字母
+ *                 U - 密码必须包含大写字母
+ *                 L - 密码必须包含小写字母
+ *                 C - 密码必须包含特殊字符
+ * @return 布尔值，如果密码符合所有指定的规则，则返回true；否则，方法可能抛出异常而不会返回。
+ * @throws RuntimeException 如果密码不满足某些特定规则或长度要求，则抛出此异常。
+ */
+public boolean checkPasswordRule(String password, String codeRule) {
+    // 检查密码是否包含指定的字符类型，以及密码长度是否符合规定
+    if (codeRule.contains("N")) {
+        checkRule("0123456789", password, "密码必须包含数字");
+    }
+    // 同时检查大写字母和小写字母
+    if (codeRule.contains("W")) {
+        checkRule("ABCDEFGHGKMNPQRSTUVWXYZ", password, "密码必须包含大写字母");
+        checkRule("abcdefghgkmnpqrstuvwxyz", password, "密码必须包含小写字母");
+    // 单独检查大写字母
+    } else if (codeRule.contains("U")) {
+        checkRule("ABCDEFGHGKMNPQRSTUVWXYZ", password, "密码必须包含大写字母");
+    // 单独检查小写字母
+    } else if (codeRule.contains("L")) {
+        checkRule("abcdefghgkmnpqrstuvwxyz", password, "密码必须包含小写字母");
+    }
+    // 检查密码是否包含特殊字符
+    if (codeRule.contains("C")) {
+        checkRule("~!@#%&-_;:", password, "密码必须包含特殊字符");
+    }
+    // 检查密码长度是否符合规则代码指定的最小长度和最大长度
+    int minLength = Integer.parseInt(codeRule.substring(codeRule.length() - 4, codeRule.length() - 2));
+    int maxLength = Integer.parseInt(codeRule.substring(codeRule.length() - 2));
+    if (password.length() < minLength || password.length() > maxLength) {
+        throw new RuntimeException("密码长度不符合要求");
+    }
+    return true;
+}
+
+
+    /**
+     * 检查密码是否符合指定规则。
+     *
+     * @param ruleStr 规则字符串，包含需要在密码中出现的字符。
+     * @param password 待检查的密码。
+     * @param message 如果密码不符合规则时抛出异常所携带的信息。
+     * @throws RuntimeException 如果密码不包含规则字符串中的任何字符。
+     */
+    private static void checkRule(String ruleStr, String password, String message) {
+        boolean rule = false; // 默认规则不满足
+        for (char c : ruleStr.toCharArray()) {
+            // 检查密码是否包含规则字符串中的字符
+            if (password.contains(c + "")) {
+                rule = true; // 密码中包含规则字符，设置规则满足
+                break;
+            }
+        }
+        // 如果密码不包含规则字符串中的任何字符，则抛出异常
+        if (!rule) {
+            throw new RuntimeException(message);
+        }
+    }
+
 }

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

@@ -79,6 +79,17 @@ public class ScheduleUtil {
         return true;
     }
 
+    /**
+     * 间隔执行 毫秒级 执行结束到下次开始执行时间
+     *
+     * @param runnable
+     * @param frequency
+     * @return
+     */
+    public static void startCronTask(Runnable runnable, String cronExpress) {
+        threadPoolTaskScheduler.schedule(runnable, new CronTrigger(cronExpress));
+    }
+
     /**
      * 间隔执行 毫秒级 执行结束到下次开始执行时间
      *

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

@@ -1,19 +1,22 @@
 package com.scbfkj.uni.system;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import com.scbfkj.uni.library.DataEncryptionUtil;
 import com.scbfkj.uni.library.DataFormatUtil;
-import com.scbfkj.uni.library.EmailUtil;
 import com.scbfkj.uni.library.UniReturnUtil;
 import com.scbfkj.uni.library.script.DatabaseScriptUtil;
 import com.scbfkj.uni.library.script.JsScriptEngineUtil;
 import com.scbfkj.uni.library.script.KafkaScriptUtil;
 import com.scbfkj.uni.process.DataBase;
 import com.scbfkj.uni.process.Elasticsearch;
-import com.scbfkj.uni.process.Kafka;
+import com.scbfkj.uni.process.Http;
 import com.scbfkj.uni.service.ControlService;
 import com.scbfkj.uni.service.LoggerService;
+import com.scbfkj.uni.utils.Util;
 import jakarta.annotation.PostConstruct;
+import org.apache.commons.io.FileUtils;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.support.ResourcePatternResolver;
 import org.springframework.stereotype.Component;
@@ -23,7 +26,10 @@ import java.io.*;
 import java.nio.charset.StandardCharsets;
 import java.time.LocalDateTime;
 import java.util.*;
-import java.util.concurrent.*;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 
@@ -56,23 +62,17 @@ public class SystemInit {
     List<String> qualityControlIds = new ArrayList<>();
     Set<String> qualityControlIds2 = new HashSet<>();
 
+
+//    @Value("${APPKEY}")
+//    private String appkey;
+//
+//    @Value("${DEFAULT_SERVICE_URL}")
+//    private String serviceUrl;
+
     public SystemInit(ResourcePatternResolver resourcePatternResolver) {
         this.resourcePatternResolver = resourcePatternResolver;
     }
 
-    public static String readFileToString(File file) {
-        StringBuilder content = new StringBuilder();
-        try (Scanner scanner = new Scanner(file)) {
-            while (scanner.hasNextLine()) {
-                content.append(scanner.nextLine());
-            }
-        } catch (FileNotFoundException e) {
-            if (Config.isDebug()) {
-                e.printStackTrace();
-            }
-        }
-        return content.toString();
-    }
 
     private static void containerHeartbeat() {
         try {
@@ -87,6 +87,23 @@ public class SystemInit {
 
     @PostConstruct
     public void init() throws Exception {
+
+//        String serviceUrl = SpringContextApplication.getString("DEFAULT_SERVICE_URL");
+//        String appkey = SpringContextApplication.getString("APPKEY");
+//        try {
+//            checkAppKey(serviceUrl, appkey);
+//            ScheduleUtil.startCronTask(() -> {
+//                try {
+//                    checkAppKey(serviceUrl, appkey);
+//                } catch (Exception e) {
+//                    System.out.println(e.getMessage());
+//                    System.exit(-1);
+//                }
+//            }, "0 0 0 * * *");
+//        } catch (Exception e) {
+//            System.out.println(e.getMessage());
+//            System.exit(-1);
+//        }
         Config.setContainerCode(containerCode);
         Config.setSecurityEnable(securityEnable);
         Config.setDebug(debug);
@@ -353,7 +370,7 @@ public class SystemInit {
 
                                     if (send) {
                                         // 发送消息
-                                        sendMessage(target == null ? null : target.toString(),targetName == null ? null : targetName.toString(), messageTemplate == null ? null : messageTemplate.toString(), result);
+                                        sendMessage(target == null ? null : target.toString(), targetName == null ? null : targetName.toString(), messageTemplate == null ? null : messageTemplate.toString(), result);
                                         DATA_BASE.update(Config.getCenterConnectionStr(), "update qualitycontrol set lastruntime = ? , lastruncontainercode= ? where id =?", LocalDateTime.now(), Config.getContainerCode(), id);
                                     }
 //                                    判断日志记录
@@ -427,7 +444,7 @@ public class SystemInit {
         }
     }
 
-    private  void sendData(String message, List<Object> data, String datasourceId, String targetTopic) throws Exception {
+    private void sendData(String message, List<Object> data, String datasourceId, String targetTopic) throws Exception {
         List<Map<String, Object>> dataSources = DATA_BASE.query(Config.getCenterConnectionStr(), "select * from datasource where datasourceid = ?", datasourceId);
         if (!dataSources.isEmpty()) {
             Map<String, Object> dataSourceMap = dataSources.get(0);
@@ -450,4 +467,71 @@ public class SystemInit {
             }
         }
     }
+
+
+    private void checkAppKey(String url, String key) throws IOException {
+        // 获取本地机器的MAC地址
+        String mac = Util.mac();
+
+        // 尝试从本地许可证文件进行验证
+        String licensePath = SpringContextApplication.getString("app.license.file");
+        Resource resource = new FileSystemResource(licensePath);
+        if (resource.exists()) {
+            // 读取并解密许可证文件
+            String license = FileUtils.readFileToString(resource.getFile(), StandardCharsets.UTF_8);
+            try {
+                JsonNode jsonNode = DataFormatUtil.toJsonNode(DataEncryptionUtil.decryptRSAByPrivateKey(license));
+                // 验证许可证中的MAC地址是否与本地机器的MAC地址匹配
+                if (jsonNode.has("mac")) {
+                    String localMac = jsonNode.get("mac").asText();
+                    if (!localMac.equalsIgnoreCase(mac)) {
+                        throw new RuntimeException("密钥无效");
+                    }
+                    // 检查许可证是否已过期
+                    String exp = jsonNode.get("exp").asText();
+                    LocalDateTime expLocalDateTime = LocalDateTime.parse(exp);
+                    if (expLocalDateTime.isBefore(LocalDateTime.now())) {
+                        throw new RuntimeException("密钥已过期");
+                    }
+                } else
+                    throw new RuntimeException("密钥无效");
+            } catch (Exception e) {
+                throw new RuntimeException(e.getMessage());
+            }
+        } else {
+            // 通过Web API进行密钥验证
+            Map<String, Object> result = new Http().execWebApi(
+                    new HashMap<>() {{
+                        put("Content-Type", "application/json");
+                    }},
+                    "POST",
+                    new HashMap<>() {{
+                        put("event", "0");
+                        put("datacontent", new HashMap<String, Object>() {{
+                            put("appkey", key);
+                            put("mac", mac);
+                        }});
+                    }}, url + "/openApi/checkappkey");
+
+            // 处理Web API验证响应
+            if (result.isEmpty()) {
+                throw new RuntimeException("密钥无效");
+            }
+            Object code = result.get("code");
+            if (!Objects.equals("0", code)) {
+                throw new RuntimeException(result.getOrDefault("message", "验证失败").toString());
+            }
+
+            // 解析并检查通过Web API返回的密钥过期时间
+            Object data = result.get("returnData");
+            JsonNode json = DataFormatUtil.toJsonNode(data.toString());
+
+            String exp = json.get("returnData").get(0).get("exptime").asText();
+            LocalDateTime expLocalDateTime = LocalDateTime.parse(exp);
+            if (expLocalDateTime.isBefore(LocalDateTime.now())) {
+                throw new RuntimeException("密钥已过期");
+            }
+        }
+    }
+
 }