Authored by hugufei

Merge branch 'master_hotfix' into dev

@@ -77,12 +77,12 @@ @@ -77,12 +77,12 @@
77 </mvc:message-converters> 77 </mvc:message-converters>
78 </mvc:annotation-driven> 78 </mvc:annotation-driven>
79 79
80 - <!--service接口调用拦截器-->  
81 - <bean id="serviceMethodInterceptor" class="com.yoho.core.common.monitor.interceptor.MethodProfileInterceptor"/> 80 + <!-- <!--service接口调用拦截器-->
  81 + <!-- <bean id="serviceMethodInterceptor" class="com.yoho.core.common.monitor.interceptor.MethodProfileInterceptor"/>
82 <aop:config> 82 <aop:config>
83 <aop:pointcut id="serviceMethodPoint" expression="(execution(* com.yoho.*.*.service.*.*(..))) or (execution(* com.yoho.*.*.service.impl.*.*(..))) or (execution(* com.yoho.*.*.restapi.*.*(..)))"/> 83 <aop:pointcut id="serviceMethodPoint" expression="(execution(* com.yoho.*.*.service.*.*(..))) or (execution(* com.yoho.*.*.service.impl.*.*(..))) or (execution(* com.yoho.*.*.restapi.*.*(..)))"/>
84 <aop:advisor pointcut-ref="serviceMethodPoint" advice-ref="serviceMethodInterceptor"/> 84 <aop:advisor pointcut-ref="serviceMethodPoint" advice-ref="serviceMethodInterceptor"/>
85 - </aop:config> 85 + </aop:config> -->
86 86
87 <bean id="serviceGlobalExceptionHandler" class="com.yoho.error.exception.handler.ServiceGlobalExceptionHandler" /> 87 <bean id="serviceGlobalExceptionHandler" class="com.yoho.error.exception.handler.ServiceGlobalExceptionHandler" />
88 <bean id="applicationContextUtil" class="com.yoho.search.utils.ApplicationContextUtil"></bean> 88 <bean id="applicationContextUtil" class="com.yoho.search.utils.ApplicationContextUtil"></bean>