YOHOBUY / yohobuy-union · Commits

Go to a project

Authored by ping
Commit 9ec193140809fc9ce0ef0c7b5393582b78cdfa7a 1 parent abcd0de7

联盟去除zk

Inline Side-by-side
Showing 4 changed files with 65 additions and 26 deletions
... ... @@ -4,8 +4,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.yoho</groupId>
<artifactId>yoho-starter</artifactId>
<version>1.0.4-SNAPSHOT</version>
<artifactId>parent</artifactId>
<version>1.0.5-SNAPSHOT</version>
</parent>
<groupId>com.yoho.dsf</groupId>
<artifactId>yoho-unions</artifactId>
... ... @@ -43,6 +43,52 @@
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<!-- CORE核心代码�? -->
<dependency>
<groupId>com.yoho.core</groupId>
<artifactId>yoho-core-common</artifactId>
</dependency>
<dependency>
<groupId>com.netflix.archaius</groupId>
<artifactId>archaius-zookeeper</artifactId>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
<groupId>com.yoho.core</groupId>
<artifactId>yoho-core-dal</artifactId>
</dependency>
<dependency>
<groupId>com.yoho.service.model</groupId>
<artifactId>union-service-model</artifactId>
</dependency>
<dependency>
<groupId>com.yoho.service.model</groupId>
<artifactId>users-service-model</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.6.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<modules>
<module>dal</module>
<module>server</module>
... ...
... ... @@ -12,24 +12,25 @@
http://www.springframework.org/schema/mvc
http://www.springframework.org/schema/mvc/spring-mvc-4.0.xsd">
<context:component-scan base-package="com.yoho" />
<bean id="memcachedClientFactory" class="com.yoho.core.cache.impl.MemcachedClientFactory">
<constructor-arg name="memcachedServers" value="${cache.servers.memcached.address}"/>
</bean>
<constructor-arg name="memcachedServers"
value="${cache.servers.memcached.address}" />
</bean>
<!-- 元宵节抽签活动写文件 -->
<bean class="com.yoho.activity.thread.DrawServiceThread" />
<mvc:annotation-driven />
<!-- 装在properties文件 -->
<context:property-placeholder location="classpath*:config.properties" />
<!-- <bean id="restServiceBeanRegistry" class="com.yoho.core.rest.spring.RestServiceBeanRegistry">
<property name="registry" ref="serviceRegistry"></property>
</bean> -->
<bean id="serviceGlobalExceptionHandler" class="com.yoho.error.exception.handler.ServiceGlobalExceptionHandler"/>
<mvc:annotation-driven />
<!-- 装在properties文件 -->
<context:property-placeholder location="classpath*:config.properties" />
<!-- <bean id="restServiceBeanRegistry" class="com.yoho.core.rest.spring.RestServiceBeanRegistry">
<property name="registry" ref="serviceRegistry"></property> </bean> -->
<bean id="serviceGlobalExceptionHandler"
class="com.yoho.error.exception.handler.ServiceGlobalExceptionHandler" />
<!-- 启动SpringMVC的注解功能，完成请求和注解POJO的映射 -->
<bean
class="org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter">
... ... @@ -54,4 +55,7 @@
<bean id="jsonConverter"
class="com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter">
</bean>
<mvc:interceptors>
<ref bean="threadProfileInterceptor" />
</mvc:interceptors>
</beans>
\ No newline at end of file
... ...
... ... @@ -21,7 +21,7 @@ redis.proxy.address=192.168.102.217
redis.proxy.port=6379
redis.proxy.auth=
zkAddress=127.0.0.1:2181
#zkAddress=127.0.0.1:2181
# web context
web.context=union
... ...
... ... @@ -40,18 +40,7 @@
<filter-name>encodingFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<filter>
<filter-name>timer</filter-name>
<filter-class>com.yoho.core.common.monitor.filter.TimerFilter</filter-class>
<init-param>
<param-name>threshold</param-name>
<param-value>200</param-value>
</init-param>
</filter>
<filter-mapping>
<filter-name>timer</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<welcome-file-list>
<welcome-file>/index.jsp</welcome-file>
</welcome-file-list>
... ...