Merge remote-tracking branch 'origin/master'

gateway/src/main/resources/application.yml

@@ -8,14 +8,12 @@ spring:
     allow-bean-definition-overriding: true
   application:
     name: jzg-gateway
-#  redis:
-#    redisson:
-##      address: redis://172.24.144.227:6379
-##      password: 123456
-##      database: 0
-#
-#      address: redis://192.168.5.250:6379
-#      password: 123456
-#      database: 0
+  redis:
+    redisson:
+      address: redis://192.168.5.250:6379
+      password: 123456
+      database: 0
+ssl:
+  trust-all: true
 
 isEncrypted: false

tenant/costsorrule/src/main/java/com/jzg/costsorrule/service/impl/RuleServiceImpl.java

@@ -130,7 +130,11 @@ public class RuleServiceImpl implements RuleService {
     }
 
     private boolean checkBoxEqual(RuleAttrLinkVo linkVo, String value) {
-        String[] split = linkVo.getMin().split(",");
+        String min = linkVo.getMin();
+        if (min == null || min.isEmpty()) {
+            return false;
+        }
+        String[] split = min.split(",");
         for (String sp : split) {
             if (sp.equals(value)) {
                 return true;

tenant/insurance/quotation-commons/pom.xml

@@ -28,7 +28,7 @@
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
-            <version>5.7.21</version>
+            <version>5.8.31</version>
         </dependency>
         <!--thumbnailator图片处理-->
         <dependency>