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

@@ -4,7 +4,7 @@
     <group>
 		<!--yoho-search-autoconfig-->
 		<property name="yoho.search.service.env.webapphome" defaultValue="/home/test/yoho-search-service/deploy" description="应用根目录"/>
-        <property name="yoho.search.service.env.serverport" defaultValue="13" description="应用端口"/>
+        <property name="yoho.search.service.env.serverport" defaultValue="22" description="应用端口"/>
         <property name="yoho.search.service.env.namespace" defaultValue="search-service" description="应用命名空间"/>
 		<property name="yoho.env.javahome" defaultValue="/usr/local/java" description="" />
 		<property name="yoho.env.productmode" defaultValue="TEST" description="" />

@@ -78,23 +78,6 @@
         <aop:advisor pointcut-ref="serviceMethodPoint" advice-ref="serviceMethodInterceptor"/>
     </aop:config>
 
-    <!-- Redis 配置 start -->
-    <bean id="jedisPoolConfig" class="redis.clients.jedis.JedisPoolConfig">
-        <property name="maxTotal" value="300" />
-        <property name="maxIdle" value="10" />
-        <property name="maxWaitMillis" value="1000" />
-        <property name="testOnBorrow" value="true" />
-    </bean>
-    <bean id="jedisPool" class="redis.clients.jedis.JedisPool">
-        <constructor-arg index="0" ref="jedisPoolConfig" />
-        <constructor-arg index="1" value="${redis.server}" />
-        <constructor-arg index="2" value="${redis.port}" />
-    </bean>
-    <!-- 包装类 -->
-    <bean id="redisUtil" class="com.yoho.search.utils.RedisUtil">
-        <property name="jedisPool" ref="jedisPool" />
-    </bean>
-
     <bean id="applicationContextUtil" class="com.yoho.search.utils.ApplicationContextUtil">
     </bean>
     <!-- Redis 配置 end -->