Merge branch 'master_hotfix' into dev

@@ -76,13 +76,6 @@
             <ref bean="jsonConverter" />
         </mvc:message-converters>
     </mvc:annotation-driven>
-
-    <!-- <!--service接口调用拦截器-->
-   <!--  <bean id="serviceMethodInterceptor" class="com.yoho.core.common.monitor.interceptor.MethodProfileInterceptor"/>
-    <aop:config>
-        <aop:pointcut id="serviceMethodPoint" expression="(execution(* com.yoho.*.*.service.*.*(..))) or (execution(* com.yoho.*.*.service.impl.*.*(..))) or (execution(* com.yoho.*.*.restapi.*.*(..)))"/>
-        <aop:advisor pointcut-ref="serviceMethodPoint" advice-ref="serviceMethodInterceptor"/>
-    </aop:config> -->
 	
     <bean id="serviceGlobalExceptionHandler" class="com.yoho.error.exception.handler.ServiceGlobalExceptionHandler" />
     <bean id="applicationContextUtil" class="com.yoho.search.utils.ApplicationContextUtil"></bean>