Merge branch 'develop_dl_plan6_temp_merge_colony' of…

amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml

@@ -3609,7 +3609,7 @@
         <comment>add data cb_data_dictionary</comment>
         <sql>
             INSERT INTO `cb_data_dictionary` VALUES (1665, '1665', '机场人员', 'DLRYLX', NULL, NULL, NULL, NULL, NULL, NULL, b'0', 2);
-            INSERT INTO `cb_data_dictionary` VALUES (1666, '1666', '消防人员', 'DLRYLX', NULL, NULL, NULL, NULL, NULL, NULL, b'0', 3);
+            INSERT INTO `cb_data_dictionary` VALUES (1601, '1601', '消防人员', 'DLRYLX', NULL, NULL, NULL, NULL, NULL, NULL, b'0', 3);
 
         </sql>
     </changeSet>

amos-boot-system-patrol/src/main/resources/application-dev.properties

@@ -59,11 +59,23 @@ spring.redis.lettuce.pool.max-wait=-1
 spring.redis.lettuce.shutdown-timeout=100
 
 #单机集群判断 cluster集群 single单机
-spring.redis.mode=single
-#redis 单机配置
-spring.redis.host=172.16.11.20
-spring.redis.port=6379
+spring.redis.mode=cluster
 
+#redis 单机配置
+#spring.redis.host=172.16.11.20
+#spring.redis.port=6379
+
+
+#集群配置
+spring.redis.cluster.nodes=172.16.3.41:6381,172.16.3.41:6002
+spring.redis.cluster.max-redirects=3
+spring.redis.cluster.scan-interval=1000
+spring.redis.cluster.read-mode=SLAVE
+spring.redis.cluster.retry-attempts=3
+spring.redis.cluster.failed-attempts=3
+spring.redis.cluster.slave-connection-pool-size=64
+spring.redis.cluster.master-connection-pool-size=64
+spring.redis.cluster.retry-interval=1500