yoho-search / yoho-search-service · Commits

Go to a project

Authored by zhumeilian
Commit ea0d2ab9fcb89f7800dedd0124c33c2979fe0668 2 parents bde709b0 ec8bcc01

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

Inline Side-by-side
Showing 2 changed files with 1 additions and 18 deletions
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <group> 4 <group>
5 <!--yoho-search-autoconfig--> 5 <!--yoho-search-autoconfig-->
6 <property name="yoho.search.service.env.webapphome" defaultValue="/home/test/yoho-search-service/deploy" description="应用根目录"/> 6 <property name="yoho.search.service.env.webapphome" defaultValue="/home/test/yoho-search-service/deploy" description="应用根目录"/>
7 - <property name="yoho.search.service.env.serverport" defaultValue="13" description="应用端口"/> 7 + <property name="yoho.search.service.env.serverport" defaultValue="22" description="应用端口"/>
8 <property name="yoho.search.service.env.namespace" defaultValue="search-service" description="应用命名空间"/> 8 <property name="yoho.search.service.env.namespace" defaultValue="search-service" description="应用命名空间"/>
9 <property name="yoho.env.javahome" defaultValue="/usr/local/java" description="" /> 9 <property name="yoho.env.javahome" defaultValue="/usr/local/java" description="" />
10 <property name="yoho.env.productmode" defaultValue="TEST" description="" /> 10 <property name="yoho.env.productmode" defaultValue="TEST" description="" />
@@ -78,23 +78,6 @@ @@ -78,23 +78,6 @@
78 <aop:advisor pointcut-ref="serviceMethodPoint" advice-ref="serviceMethodInterceptor"/> 78 <aop:advisor pointcut-ref="serviceMethodPoint" advice-ref="serviceMethodInterceptor"/>
79 </aop:config> 79 </aop:config>
80 80
81 - <!-- Redis 配置 start -->  
82 - <bean id="jedisPoolConfig" class="redis.clients.jedis.JedisPoolConfig">  
83 - <property name="maxTotal" value="300" />  
84 - <property name="maxIdle" value="10" />  
85 - <property name="maxWaitMillis" value="1000" />  
86 - <property name="testOnBorrow" value="true" />  
87 - </bean>  
88 - <bean id="jedisPool" class="redis.clients.jedis.JedisPool">  
89 - <constructor-arg index="0" ref="jedisPoolConfig" />  
90 - <constructor-arg index="1" value="${redis.server}" />  
91 - <constructor-arg index="2" value="${redis.port}" />  
92 - </bean>  
93 - <!-- 包装类 -->  
94 - <bean id="redisUtil" class="com.yoho.search.utils.RedisUtil">  
95 - <property name="jedisPool" ref="jedisPool" />  
96 - </bean>  
97 -  
98 <bean id="applicationContextUtil" class="com.yoho.search.utils.ApplicationContextUtil"> 81 <bean id="applicationContextUtil" class="com.yoho.search.utils.ApplicationContextUtil">
99 </bean> 82 </bean>
100 <!-- Redis 配置 end --> 83 <!-- Redis 配置 end -->