YOHOBUY / yohobuy-union · Commits

Go to a project

Authored by ping
Commit 18f3b80222049f68a5d3834308fa76902560d858 1 parent 94b43d42

change to parent

Inline Side-by-side
Showing 7 changed files with 125 additions and 28 deletions
package com.yoho.unions.common.enums;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
/**
* 性别枚举
... ...
package com.yoho.unions.dal.model;
import com.yoho.service.model.BaseBO;
import com.yoho.service.model.union.BaseBO;
public class UnionCallLog extends BaseBO {
/**
... ...
package com.yoho.unions.dal.model;
import com.yoho.service.model.BaseBO;
import com.yoho.service.model.union.BaseBO;
public class UnionsActiveRecord extends BaseBO {
/**
... ...
... ... @@ -2,7 +2,7 @@ package com.yoho.unions.dal.model;
import java.util.Date;
import com.yoho.service.model.BaseBO;
import com.yoho.service.model.union.BaseBO;
public class UserBase extends BaseBO {
/**
... ...
... ... @@ -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,121 @@
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<!-- CORE核心代码�?-->
<dependency>
<groupId>com.yoho.core</groupId>
<artifactId>yoho-core-common</artifactId>
</dependency>
<dependency>
<groupId>com.yoho.core</groupId>
<artifactId>yoho-core-rest-client-simple</artifactId>
</dependency>
<dependency>
<groupId>com.yoho.core</groupId>
<artifactId>yoho-core-dal</artifactId>
</dependency>
<!-- <dependency>
<groupId>com.yoho.common</groupId>
<artifactId>error-code</artifactId>
</dependency>
<dependency>
<groupId>com.yoho.core</groupId>
<artifactId>yoho-core-common</artifactId>
</dependency>
<dependency>
<groupId>com.yoho.core</groupId>
<artifactId>yoho-core-dal</artifactId>
</dependency>
<dependency>
<groupId>com.yoho.core</groupId>
<artifactId>yoho-core-rest-client-simple</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>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-oxm</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
</dependency>
日志
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</dependency> -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<modules>
<module>dal</module>
<module>server</module>
... ...
... ... @@ -10,34 +10,16 @@
<dependent-module archiveName="yoho-unions-server-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/yoho-unions-server/yoho-unions-server">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="union-service-model-1.0.4-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/union-service-model/union-service-model">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="yoho-unions-common-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/yoho-unions-common/yoho-unions-common">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="error-code-1.0.4-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/error-code/error-code">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="sns-service-model-1.0.4-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/sns-service-model/sns-service-model">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="resource-service-model-1.0.4-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/resource-service-model/resource-service-model">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="promotion-service-model-1.0.4-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/promotion-service-model/promotion-service-model">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="users-service-model-1.0.4-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/users-service-model/users-service-model">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="product-service-model-1.0.4-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/product-service-model/product-service-model">
<dependent-module archiveName="error-code-1.0.5-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/error-code/error-code">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="order-service-model-1.0.4-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/order-service-model/order-service-model">
<dependent-module archiveName="union-service-model-1.0.5-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/union-service-model/union-service-model">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="message-service-model-1.0.4-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/message-service-model/message-service-model">
<dependent-module archiveName="users-service-model-1.0.5-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/users-service-model/users-service-model">
<dependency-type>uses</dependency-type>
</dependent-module>
<property name="java-output-path" value="/yoho-unions-web/target/classes"/>
... ...
... ... @@ -21,7 +21,7 @@ redis.proxy.address=192.168.102.217
redis.proxy.port=6379
redis.proxy.auth=
zkAddress=127.0.0.1:11111
zkAddress=127.0.0.1:2181
# web context
web.context=union
... ...