YOHOBUY / yohobuy-union · Commits

Go to a project

Authored by ping
Commit eddeea3db5ec6a4089a0cc332a4204b056c75d9e 1 parent b42f3991

联盟

Inline Side-by-side
Showing 14 changed files with 24 additions and 35 deletions
... ... @@ -6,7 +6,7 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="src/main/resources"/>
<classpathentry including="**/*.java" kind="src" path="src/main/resources"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="optional" value="true"/>
... ... @@ -21,7 +21,7 @@
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="owner.project.facets" value="java"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
... ...
... ... @@ -16,12 +16,12 @@
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<name>org.eclipse.wst.validation.validationbuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.wst.validation.validationbuilder</name>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
... ...
eclipse.preferences.version=1
encoding//src/main/java=UTF-8
encoding//src/main/resources=UTF-8
encoding//src/test/java=UTF-8
encoding/<project>=UTF-8
... ...
disabled=06target
eclipse.preferences.version=1
... ...
... ... @@ -20,7 +20,7 @@
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="owner.project.facets" value="java"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
... ...
... ... @@ -16,12 +16,12 @@
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<name>org.eclipse.wst.validation.validationbuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.wst.validation.validationbuilder</name>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
... ...
disabled=06target
eclipse.preferences.version=1
... ...
... ... @@ -27,7 +27,7 @@
<dependency>
<groupId>com.yoho.service.model</groupId>
<artifactId>union-service-model</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.0.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
... ...
... ... @@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import com.yoho.error.exception.ServiceException;
import com.yoho.service.model.union.request.ActiveUnionRequestBO;
import com.yoho.service.model.union.request.AddUnionRequestBO;
import com.yoho.service.model.union.response.UnionResponseBO;
import com.yoho.union.server.service.IUnionService;
... ... @@ -30,7 +31,7 @@ public class UnionRest {
}
@RequestMapping(value = "/activeUnion")
@ResponseBody public UnionResponseBO activeUnion(@RequestBody AddUnionRequestBO req) throws ServiceException {
@ResponseBody public UnionResponseBO activeUnion(@RequestBody ActiveUnionRequestBO req) throws ServiceException {
log.info("enter UnionRest.activeUnion with param is {}", req);
return unionService.activeUnion(req);
}
... ...
package com.yoho.union.server.service;
import com.yoho.error.exception.ServiceException;
import com.yoho.service.model.union.request.ActiveUnionRequestBO;
import com.yoho.service.model.union.request.AddUnionRequestBO;
import com.yoho.service.model.union.response.UnionResponseBO;
... ... @@ -20,5 +21,5 @@ public interface IUnionService {
* @return
* @throws ServiceException
*/
public UnionResponseBO activeUnion(AddUnionRequestBO request) throws ServiceException;
public UnionResponseBO activeUnion(ActiveUnionRequestBO request) throws ServiceException;
}
... ...
... ... @@ -19,6 +19,7 @@ import org.springframework.stereotype.Service;
import com.alibaba.fastjson.JSONObject;
import com.yoho.error.ServiceError;
import com.yoho.error.exception.ServiceException;
import com.yoho.service.model.union.request.ActiveUnionRequestBO;
import com.yoho.service.model.union.request.AddUnionRequestBO;
import com.yoho.service.model.union.response.UnionResponseBO;
import com.yoho.union.dal.IUnionLogDAO;
... ... @@ -67,9 +68,9 @@ public class UnionServiceImpl implements IUnionService {
}
@Override
public UnionResponseBO activeUnion(AddUnionRequestBO request) throws ServiceException {
public UnionResponseBO activeUnion(ActiveUnionRequestBO request) throws ServiceException {
log.debug("activeUnion with param is {}", request);
if (StringUtils.isEmpty(request.getApp())) {
if (StringUtils.isEmpty(request.getAppid())) {
log.warn("activeUnion error app is null with param is {}", request);
throw new ServiceException(ServiceError.APP_IS_NULL);
}
... ... @@ -79,7 +80,7 @@ public class UnionServiceImpl implements IUnionService {
}
//检查该app和udid是否存在
UnionLog union = new UnionLog();
union.setApp(request.getApp());
union.setApp(request.getAppid());
union.setUdid(request.getUdid());
UnionLog u = unionLogDAO.selectByUdidAndApp(union);
... ...
eclipse.preferences.version=1
encoding//src/main/java=UTF-8
encoding//src/main/resources=UTF-8
encoding//src/main/resources/jdbc.properties=UTF-8
encoding//src/test/java=UTF-8
... ...
... ... @@ -10,33 +10,12 @@
<dependent-module archiveName="yoho-union-server-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/yoho-union-server/yoho-union-server">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="union-service-model-1.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/union-service-model/union-service-model">
<dependent-module archiveName="union-service-model-1.0.2-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="error-code-1.0.1-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.1-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.1-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.1-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.1-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.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/product-service-model/product-service-model">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="order-service-model-1.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/order-service-model/order-service-model">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="message-service-model-1.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/message-service-model/message-service-model">
<dependency-type>uses</dependency-type>
</dependent-module>
<property name="context-root" value="yoho-union-web"/>
<property name="java-output-path" value="/yoho-union-web/target/classes"/>
</wb-module>
... ...
... ... @@ -25,3 +25,4 @@ jdbc.mysql.yohobuy_logs.username=yh_test
jdbc.mysql.yohobuy_logs.password=yh_test
#zkAddress=192.168.102.162:32791
\ No newline at end of file
... ...