YOHOBUY / yohobuy-union · Commits

Go to a project

Authored by ping
Commit 4cea25bcdd1629831eeb69264356a11ff5dd4920 1 parent eddeea3d

update

Inline Side-by-side
Showing 6 changed files with 24 additions and 6 deletions
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <parent> 4 <parent>
5 <groupId>com.yoho</groupId> 5 <groupId>com.yoho</groupId>
6 <artifactId>yoho-starter</artifactId> 6 <artifactId>yoho-starter</artifactId>
7 - <version>1.0.1-SNAPSHOT</version> 7 + <version>1.0.2-SNAPSHOT</version>
8 </parent> 8 </parent>
9 <groupId>com.yoho.dsf</groupId> 9 <groupId>com.yoho.dsf</groupId>
10 <artifactId>yoho-union</artifactId> 10 <artifactId>yoho-union</artifactId>
@@ -27,7 +27,6 @@ @@ -27,7 +27,6 @@
27 <dependency> 27 <dependency>
28 <groupId>com.yoho.service.model</groupId> 28 <groupId>com.yoho.service.model</groupId>
29 <artifactId>union-service-model</artifactId> 29 <artifactId>union-service-model</artifactId>
30 - <version>1.0.2-SNAPSHOT</version>  
31 </dependency> 30 </dependency>
32 <dependency> 31 <dependency>
33 <groupId>org.aspectj</groupId> 32 <groupId>org.aspectj</groupId>
@@ -16,6 +16,27 @@ @@ -16,6 +16,27 @@
16 <dependent-module archiveName="error-code-1.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/error-code/error-code"> 16 <dependent-module archiveName="error-code-1.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/error-code/error-code">
17 <dependency-type>uses</dependency-type> 17 <dependency-type>uses</dependency-type>
18 </dependent-module> 18 </dependent-module>
  19 + <dependent-module archiveName="sns-service-model-1.0.2-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/sns-service-model/sns-service-model">
  20 + <dependency-type>uses</dependency-type>
  21 + </dependent-module>
  22 + <dependent-module archiveName="resource-service-model-1.0.2-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/resource-service-model/resource-service-model">
  23 + <dependency-type>uses</dependency-type>
  24 + </dependent-module>
  25 + <dependent-module archiveName="promotion-service-model-1.0.2-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/promotion-service-model/promotion-service-model">
  26 + <dependency-type>uses</dependency-type>
  27 + </dependent-module>
  28 + <dependent-module archiveName="users-service-model-1.0.2-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/users-service-model/users-service-model">
  29 + <dependency-type>uses</dependency-type>
  30 + </dependent-module>
  31 + <dependent-module archiveName="product-service-model-1.0.2-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/product-service-model/product-service-model">
  32 + <dependency-type>uses</dependency-type>
  33 + </dependent-module>
  34 + <dependent-module archiveName="order-service-model-1.0.2-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/order-service-model/order-service-model">
  35 + <dependency-type>uses</dependency-type>
  36 + </dependent-module>
  37 + <dependent-module archiveName="message-service-model-1.0.2-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/message-service-model/message-service-model">
  38 + <dependency-type>uses</dependency-type>
  39 + </dependent-module>
19 <property name="context-root" value="yoho-union-web"/> 40 <property name="context-root" value="yoho-union-web"/>
20 <property name="java-output-path" value="/yoho-union-web/target/classes"/> 41 <property name="java-output-path" value="/yoho-union-web/target/classes"/>
21 </wb-module> 42 </wb-module>
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
17 17
18 <mvc:annotation-driven /> 18 <mvc:annotation-driven />
19 <!-- 装在properties文件 --> 19 <!-- 装在properties文件 -->
20 - <context:property-placeholder location="classpath*:jdbc.properties" /> 20 + <context:property-placeholder location="classpath*:jdbc.properties,classpath*:config.properties" />
21 <!-- <bean id="restServiceBeanRegistry" class="com.yoho.core.rest.spring.RestServiceBeanRegistry"> 21 <!-- <bean id="restServiceBeanRegistry" class="com.yoho.core.rest.spring.RestServiceBeanRegistry">
22 <property name="registry" ref="serviceRegistry"></property> 22 <property name="registry" ref="serviceRegistry"></property>
23 </bean> --> 23 </bean> -->
  1 +zkAddress=192.168.102.162:32806
@@ -23,6 +23,3 @@ jdbc.mysql.yohobuy_logs.master.url=jdbc:mysql://192.168.50.69:9980/yohobuy_logs @@ -23,6 +23,3 @@ jdbc.mysql.yohobuy_logs.master.url=jdbc:mysql://192.168.50.69:9980/yohobuy_logs
23 jdbc.mysql.yohobuy_logs.slave.url=jdbc:mysql://192.168.102.219:3306/yohobuy_logs 23 jdbc.mysql.yohobuy_logs.slave.url=jdbc:mysql://192.168.102.219:3306/yohobuy_logs
24 jdbc.mysql.yohobuy_logs.username=yh_test 24 jdbc.mysql.yohobuy_logs.username=yh_test
25 jdbc.mysql.yohobuy_logs.password=yh_test 25 jdbc.mysql.yohobuy_logs.password=yh_test
26 -  
27 -  
28 -#zkAddress=192.168.102.162:32791