Merge remote-tracking branch 'origin/dev' into dev

huigou-xt/src/main/resources/config/spring/spring-redis.xml

@@ -20,7 +20,7 @@
         <property name="port" value="${shiro.port}"/>
         <property name="usePool" value="true"/>
         <property name="poolConfig" ref="jedisPoolConfig"/>
-        <!--<property name="database" value="2"/>--><!--指定数据库-->
+        <property name="database" value="0"/><!--指定数据库-->
     </bean>
 
     <bean id="redisTemplate" class="org.springframework.data.redis.core.RedisTemplate">