Merge branch 'release' of http://192.168.12.182/invoice/sims-order into release

order-management-consumer/pom.xml

@@ -548,6 +548,15 @@
             <version>3.1.1</version>
         </dependency>
         <!-- axis 1.4 jar end -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-pool2</artifactId>
+            <version>2.5.0</version>
+        </dependency>
+        <dependency>
+            <groupId>redis.clients</groupId>
+            <artifactId>jedis</artifactId>
+        </dependency>
 
     </dependencies>
     <build>

order-management-consumer/src/main/resources/bootstrap.yaml

@@ -39,7 +39,7 @@ sims:
     #订单数据库类型区分,要么mysql,要么Oracle,要么weblogic
     db: mysql
     #订单redis数据库类型区分,要么redis,要么redis-sentinel
-    redisDb: redis
+    redisDb: redis-sentinel
 
 # 0 mysql 1 oracle
 dataType: 0